Skip to content

Commit

Permalink
Fixed more client access exceptions. Closes #1614
Browse files Browse the repository at this point in the history 
Yes, I actually ran a server test this time.
  • Loading branch information
@BluSunrize
BluSunrize committed Oct 18, 2016
1 parent be29ce1 commit bbc17a4
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 47 deletions.
20 changes: 7 additions & 13 deletions src/main/java/blusunrize/immersiveengineering/client/IEManualInstance.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import blusunrize.immersiveengineering.api.Lib;
import blusunrize.immersiveengineering.api.ManualHelper;
import blusunrize.immersiveengineering.common.Config;
import blusunrize.immersiveengineering.common.Config.IEConfig;
import blusunrize.immersiveengineering.common.util.Utils;
import blusunrize.lib.manual.IManualPage;
Expand All @@ -15,17 +16,10 @@
import net.minecraftforge.common.DimensionManager;
import org.lwjgl.input.Keyboard;

import java.util.HashMap;
import java.util.LinkedHashSet;

public class IEManualInstance extends ManualInstance
{
public static HashMap<String, Boolean> config_bool = new HashMap<String, Boolean>();
public static HashMap<String, Integer> config_int = new HashMap<String, Integer>();
public static HashMap<String, int[]> config_intA = new HashMap<String, int[]>();
public static HashMap<String, Double> config_double = new HashMap<String, Double>();
public static HashMap<String, double[]> config_doubleA = new HashMap<String, double[]>();

public IEManualInstance()
{
super(new IEItemFontRender(), "immersiveengineering:textures/gui/manual.png");
Expand Down Expand Up @@ -67,15 +61,15 @@ public String formatText(String s)
if(segment[1].equalsIgnoreCase("b"))
{
if(segment.length>3)
result = (config_bool.get(segment[2])?segment[3]: segment.length>4?segment[4]:"");
result = (Config.manual_bool.get(segment[2])?segment[3]: segment.length>4?segment[4]:"");
else
result = ""+ config_bool.get(segment[2]);
result = ""+ Config.manual_bool.get(segment[2]);
}
else if(segment[1].equalsIgnoreCase("i"))
result = ""+ config_int.get(segment[2]);
result = ""+ Config.manual_int.get(segment[2]);
else if(segment[1].equalsIgnoreCase("iA"))
{
int[] iA = config_intA.get(segment[2]);
int[] iA = Config.manual_intA.get(segment[2]);
if(segment.length>3)
try{
if(segment[3].startsWith("l"))
Expand All @@ -97,10 +91,10 @@ else if(segment[1].equalsIgnoreCase("iA"))
result += (i>0?", ":"")+iA[i];
}
else if(segment[1].equalsIgnoreCase("d"))
result = ""+ config_double.get(segment[2]);
result = ""+ Config.manual_double.get(segment[2]);
else if(segment[1].equalsIgnoreCase("dA"))
{
double[] iD = config_doubleA.get(segment[2]);
double[] iD = Config.manual_doubleA.get(segment[2]);
if(segment.length>3)
try{
int idx = Integer.parseInt(segment[3]);
Expand Down
62 changes: 34 additions & 28 deletions src/main/java/blusunrize/immersiveengineering/common/Config.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import blusunrize.immersiveengineering.ImmersiveEngineering;
import blusunrize.immersiveengineering.api.crafting.*;
import blusunrize.immersiveengineering.client.IEManualInstance;
import blusunrize.immersiveengineering.common.Config.IEConfig.Machines;
import blusunrize.immersiveengineering.common.blocks.metal.TileEntityConnectorLV;
import blusunrize.immersiveengineering.common.util.IELogger;
Expand All @@ -17,18 +16,25 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.lang.reflect.Field;
import java.util.HashMap;
import java.util.Map;

public class Config
{
public static HashMap<String, Boolean> manual_bool = new HashMap<String, Boolean>();
public static HashMap<String, Integer> manual_int = new HashMap<String, Integer>();
public static HashMap<String, int[]> manual_intA = new HashMap<String, int[]>();
public static HashMap<String, Double> manual_double = new HashMap<String, Double>();
public static HashMap<String, double[]> manual_doubleA = new HashMap<String, double[]>();

@net.minecraftforge.common.config.Config(modid=ImmersiveEngineering.MODID)
public static class IEConfig
{
//Wire Stuff
@Comment({"Drop connections with non-existing endpoints when loading the world. Use with care and backups and only when suspecting corrupted data.", "This option will check and load all connection endpoints and may slow down the world loading process."})
public static boolean validateConnections = false;
@Comment({"The transfer rates in Flux/t for the wire tiers (copper, electrum, HV, Structural Rope, Cable & Redstone(no transfer) )"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_intA")
@Mapped(mapClass=Config.class, mapName="manual_intA")
public static int[] wireTransferRate = new int[]{2048, 8192, 32768, 0, 0, 0};
@Comment({"The percentage of power lost every 16 blocks of distance for the wire tiers (copper, electrum, HV, Structural Rope, Cable & Redstone(no transfer) )"})
public static double[] wireLossRatio = new double[]{.05, .025, .025, 1, 1, 1};
Expand Down Expand Up @@ -69,7 +75,7 @@ public static class Machines
{
//Connectors
@Comment({"In- and output rates of LV,MV and HV Wire Conenctors. This is independant of the transferrate of the wires."})
@Mapped(mapClass=IEManualInstance.class, mapName="config_intA")
@Mapped(mapClass=Config.class, mapName="manual_intA")
public static int[] wireConnectorInput = new int[]{256, 1024, 4096};
//Capacitors
@Comment({"The maximum amount of Flux that can be stored in a low-voltage capacitor"})
Expand Down Expand Up @@ -99,42 +105,42 @@ public static class Machines
@Comment({"The Flux that will be output by the lightning rod when it is struck"})
public static int lightning_output = 4 * 4000000;
@Comment({"The Flux per tick that the Diesel Generator will output. The burn time of the fuel determines the total output"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_int")
@Mapped(mapClass=Config.class, mapName="manual_int")
public static int dieselGen_output = 4096;

//Simple Machines
@Comment({"The Flux per tick consumed to add one heat to a furnace. Creates up to 4 heat in the startup time and then 1 heat per tick to keep it running"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_int")
@Mapped(mapClass=Config.class, mapName="manual_int")
public static int heater_consumption = 8;
@Comment({"The Flux per tick consumed to double the speed of the furnace. Only happens if furnace is at maximum heat."})
@Mapped(mapClass=IEManualInstance.class, mapName="config_int")
@Mapped(mapClass=Config.class, mapName="manual_int")
public static int heater_speedupConsumption = 24;
@Comment({"The Flux per tick the Blast Furnace Preheater will consume to speed up the Blast Furnace"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_int")
@Mapped(mapClass=Config.class, mapName="manual_int")
public static int preheater_consumption = 32;
@Comment({"The length in ticks it takes for the Core Sample Drill to figure out which mineral is found in a chunk"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_int")
@Mapped(mapClass=Config.class, mapName="manual_int")
public static int coredrill_time = 200;
@Comment({"The Flux per tick consumed by the Core Sample Drill"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_int")
@Mapped(mapClass=Config.class, mapName="manual_int")
public static int coredrill_consumption = 40;
@Comment({"The Flux the Fluid Pump will consume to pick up a fluid block in the world"})
public static int pump_consumption = 250;
@Comment({"The Flux the Fluid Pump will consume pressurize+accellerate fluids, increasing the transferrate"})
public static int pump_consumption_accelerate = 5;
@Comment({"Set this to false to disable the fluid pump being able to draw infinite water from sources"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_bool")
@Mapped(mapClass=Config.class, mapName="manual_bool")
public static boolean pump_infiniteWater = true;
@Comment({"If this is set to true (default) the pump will replace fluids it picks up with cobblestone in order to reduce lag caused by flowing fluids."})
@Mapped(mapClass=IEManualInstance.class, mapName="config_bool")
@Mapped(mapClass=Config.class, mapName="manual_bool")
public static boolean pump_placeCobble = true;
@Comment({"The Flux per tick the Charging Station can insert into an item"})
public static int charger_consumption = 256;
@Comment({"The Flux per tick the Tesla Coil will consume, simply by being active"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_int")
@Mapped(mapClass=Config.class, mapName="manual_int")
public static int teslacoil_consumption = 256;
@Comment({"The amount of Flux the Tesla Coil will consume when shocking an entity"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_int")
@Mapped(mapClass=Config.class, mapName="manual_int")
public static int teslacoil_consumption_active = 512;
@Comment({"The amount of damage the Tesla Coil will do when shocking an entity"})
public static float teslacoil_damage = 6;
Expand Down Expand Up @@ -182,7 +188,7 @@ public static class Machines
@Comment({"The maximum amount of damage Graphite Electrodes can take. While the furnace is working, electrodes sustain 1 damage per tick, so this is effectively the lifetime in ticks. The default value of 96000 makes them last for 8 consecutive ingame days"})
public static int arcfurnace_electrodeDamage = 96000;
@Comment({"Set this to true to make the blueprint for graphite electrodes craftable in addition to villager/dungeon loot"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_bool")
@Mapped(mapClass=Config.class, mapName="manual_bool")
public static boolean arcfurnace_electrodeCrafting = false;
@Comment({"Set this to false to disable the Arc Furnace's recycling of armors and tools"})
public static boolean arcfurnace_recycle = true;
Expand All @@ -193,7 +199,7 @@ public static class Machines
//@Comment({"The Flux the Bottling Machine will consume per tick, when filling items"})
//public static int bottlingMachine_consumption = 8;
@Comment({"The Flux per tick the Excavator will consume to dig"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_int")
@Mapped(mapClass=Config.class, mapName="manual_int")
public static int excavator_consumption = 4096;
@Comment({"The speed of the Excavator. Basically translates to how many degrees per tick it will turn."})
public static double excavator_speed = 1d;
Expand All @@ -211,22 +217,22 @@ public static class Machines
public static class Ores
{
@Comment({"Generation config for Copper Ore.", "Parameters: Vein size, lowest possible Y, highest possible Y, veins per chunk, chance for vein to spawn (out of 100). Set vein size to 0 to disable the generation"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_intA")
@Mapped(mapClass=Config.class, mapName="manual_intA")
public static int[] ore_copper = new int[]{8, 40, 72, 8, 100};
@Comment({"Generation config for Bauxite Ore.", "Parameters: Vein size, lowest possible Y, highest possible Y, veins per chunk, chance for vein to spawn (out of 100). Set vein size to 0 to disable the generation"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_intA")
@Mapped(mapClass=Config.class, mapName="manual_intA")
public static int[] ore_bauxite = new int[]{4, 40, 85, 8, 100};
@Comment({"Generation config for Lead Ore.", "Parameters: Vein size, lowest possible Y, highest possible Y, veins per chunk, chance for vein to spawn (out of 100). Set vein size to 0 to disable the generation"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_intA")
@Mapped(mapClass=Config.class, mapName="manual_intA")
public static int[] ore_lead = new int[]{6, 8, 36, 4, 100};
@Comment({"Generation config for Silver Ore.", "Parameters: Vein size, lowest possible Y, highest possible Y, veins per chunk, chance for vein to spawn (out of 100). Set vein size to 0 to disable the generation"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_intA")
@Mapped(mapClass=Config.class, mapName="manual_intA")
public static int[] ore_silver = new int[]{8, 8, 40, 4, 80};
@Comment({"Generation config for Nickel Ore.", "Parameters: Vein size, lowest possible Y, highest possible Y, veins per chunk, chance for vein to spawn (out of 100). Set vein size to 0 to disable the generation"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_intA")
@Mapped(mapClass=Config.class, mapName="manual_intA")
public static int[] ore_nickel = new int[]{6, 8, 24, 2, 100};
@Comment({"Generation config for Uranium Ore.", "Parameters: Vein size, lowest possible Y, highest possible Y, veins per chunk, chance for vein to spawn (out of 100). Set vein size to 0 to disable the generation"})
@Mapped(mapClass=IEManualInstance.class, mapName="config_intA")
@Mapped(mapClass=Config.class, mapName="manual_intA")
public static int[] ore_uranium = new int[]{4, 8, 24, 2, 60};
@Comment({"A blacklist of dimensions in which IE ores won't spawn. By default this is Nether (-1) and End (1)"})
public static int[] oreDimBlacklist = new int[]{-1, 1};
Expand Down Expand Up @@ -297,8 +303,8 @@ public static class Tools
}
}
// public static HashMap<String, Boolean> config_boolean = new HashMap();
// public static HashMap<String, Integer> config_int = new HashMap();
// public static HashMap<String, Double> config_double = new HashMap();
// public static HashMap<String, Integer> manual_int = new HashMap();
// public static HashMap<String, Double> manual_double = new HashMap();
// public static HashMap<String, String> config_string = new HashMap();
// public static HashMap<String, double[]> config_doubleArray = new HashMap();
// public static HashMap<String, int[]> config_intArray = new HashMap();
Expand Down Expand Up @@ -330,7 +336,7 @@ public static void preInit(FMLPreInitializationEvent event)
ArcFurnaceRecipe.energyModifier = IEConfig.Machines.arcFurnace_energyModifier;
ArcFurnaceRecipe.timeModifier = IEConfig.Machines.arcFurnace_timeModifier;

IEManualInstance.config_int.put("excavator_depletion_days", Machines.excavator_depletion*45/24000);
Config.manual_int.put("excavator_depletion_days", Machines.excavator_depletion*45/24000);

checkMappedValues(IEConfig.class);

Expand Down Expand Up @@ -391,22 +397,22 @@ else if(f.getType().getSuperclass()==Object.class) //Only support classes that a
//
// public static void setInt(String key, int i)
// {
//// config_int.put(key, i);
//// manual_int.put(key, i);
// }
// public static int getInt(String key)
// {
//// Integer i = config_int.get(key);
//// Integer i = manual_int.get(key);
//// return i!=null?i.intValue():0;
// return 0;
// }
//
// public static void setDouble(String key, double d)
// {
//// config_double.put(key, d);
//// manual_double.put(key, d);
// }
// public static double getDouble(String key)
// {
//// Double d = config_double.get(key);
//// Double d = manual_double.get(key);
//// return d!=null?d.floatValue():0;
// return 0;
// }
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/blusunrize/immersiveengineering/common/IERecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import blusunrize.immersiveengineering.api.crafting.MetalPressRecipe;
import blusunrize.immersiveengineering.api.tool.BulletHandler;
import blusunrize.immersiveengineering.api.tool.ConveyorHandler;
import blusunrize.immersiveengineering.client.IEManualInstance;
import blusunrize.immersiveengineering.common.Config.IEConfig;
import blusunrize.immersiveengineering.common.blocks.cloth.BlockTypes_ClothDevice;
import blusunrize.immersiveengineering.common.blocks.metal.*;
Expand Down Expand Up @@ -622,7 +621,7 @@ else if(name.startsWith("wire"))
GameRegistry.addRecipe(new RecipeShapedIngredient(new ItemStack(IEContent.itemMold, 1, 2), " P ", "PCP", " P ", 'P', "plateSteel", 'C', registeredMoldBases.get("rod")));
if(registeredMoldBases.containsKey("wire"))
GameRegistry.addRecipe(new RecipeShapedIngredient(new ItemStack(IEContent.itemMold, 1, 4), " P ", "PCP", " P ", 'P', "plateSteel", 'C', registeredMoldBases.get("wire")));
IEManualInstance.config_bool.put("crushingOreRecipe", !hammerCrushingList.isEmpty());
Config.manual_bool.put("crushingOreRecipe", !hammerCrushingList.isEmpty());
}

public static CrusherRecipe addCrusherRecipe(ItemStack output, Object input, int energy, Object... secondary)
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/blusunrize/immersiveengineering/common/util/compat/RailcraftHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import blusunrize.immersiveengineering.api.shader.ShaderCaseMinecart;
import blusunrize.immersiveengineering.api.tool.RailgunHandler;
import blusunrize.immersiveengineering.client.IEManualInstance;
import blusunrize.immersiveengineering.client.models.ModelShaderMinecart;
import blusunrize.immersiveengineering.common.Config;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelMinecart;
import net.minecraft.client.model.ModelRenderer;
Expand Down Expand Up @@ -47,7 +47,7 @@ public void init()
rebarColourMap[1+ i*3+2] = rebarColourMap[0];
}
RailgunHandler.registerProjectileProperties(new ItemStack(itemRebar), 7,1.25).setColourMap(rebarColourMap);
IEManualInstance.config_bool.put("literalRailGun", true);
Config.manual_bool.put("literalRailGun", true);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/assets/immersiveengineering/lang/en_US.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1257,8 +1257,8 @@ ie.manual.entry.lightningrod1=When the steel pole is struck, the huge amounts of
ie.manual.entry.minerals.name=Mineral Deposits
ie.manual.entry.minerals.subtext=Oresome
ie.manual.entry.minerals0=The deposits of Ore found around your world are nothing new to you. What you have so far left out of consideration though are mineral veins, which contain a mix of different ores. Due to their wide and thin spread, the average miner can't find them, but a <link;excavator;§o§nspecial §o§nmachine§r> might be able to assist with that.
ie.manual.entry.minerals1=To find and determine minerals in the world, you will want to craft a Core Sample Drill. Supply the machine with power and rightclick it or use redstone to activate it. It drill into the chunk and extract a core sample which shows if and what mineral was found and its yield. The Drill consumes <config;i;coredrill_consumption> Flux/t and takes <config;i;coredrill_time> ticks to fully retrieve and analyse a sample.
ie.manual.entry.minerals2=The following pages list every type of vein and the ores that can be retrieved from them.
ie.manual.entry.minerals1=To find and determine minerals in the world, you will want to craft a Core Sample Drill. Supply the machine with power and rightclick it or use redstone to activate it. It drills into the chunk and extracts a core sample which shows if and what mineral was found and its yield.
ie.manual.entry.minerals2=The Drill consumes <config;i;coredrill_consumption> Flux/t and takes <config;i;coredrill_time> ticks to fully retrieve and analyse a sample.<br>The following pages list every type of vein and the ores that can be retrieved from them.
ie.manual.entry.minerals3=%1$s<br>It consists of %2$s.
ie.manual.entry.mineralsDimValid=§l%1$s§r is a mineral vein that can be found in the %2$s.
ie.manual.entry.mineralsDimInvalid=§l%1$s§r is a mineral vein that can be found anywhere but in the %2$s.
Expand Down

0 comments on commit bbc17a4

Please sign in to comment.