From 347f653614c77072b1317b2cb0880284b55551a3 Mon Sep 17 00:00:00 2001 From: Technus Date: Tue, 26 Dec 2017 11:57:39 +0100 Subject: Code cleanup --- .../com/github/technus/tectech/CommonValues.java | 22 +-- .../java/com/github/technus/tectech/TecTech.java | 31 ++--- src/main/java/com/github/technus/tectech/Util.java | 18 ++- .../java/com/github/technus/tectech/Vec3pos.java | 6 +- src/main/java/com/github/technus/tectech/XSTR.java | 35 +++-- .../thaumcraft/EssentiaCompatEnabled.java | 8 +- .../definitions/AspectDefinitionCompatEnabled.java | 45 +++--- .../definitions/dComplexAspectDefinition.java | 9 +- .../definitions/ePrimalAspectDefinition.java | 1 + .../GT_MetaTileEntity_EM_essentiaDequantizer.java | 8 +- .../GT_MetaTileEntity_EM_essentiaQuantizer.java | 6 +- .../elementalMatter/core/cElementalDecay.java | 6 +- .../core/cElementalDefinitionStackMap.java | 2 +- .../core/cElementalInstanceStackMap.java | 54 ++++---- .../core/cElementalMutableDefinitionStackMap.java | 34 ++--- .../elementalMatter/core/cElementalStackMap.java | 10 +- .../elementalMatter/core/rElementalRecipe.java | 6 +- .../core/stacks/cElementalDefinitionStack.java | 4 +- .../core/stacks/cElementalInstanceStack.java | 70 +++++----- .../core/templates/cElementalDefinition.java | 4 +- .../core/templates/cElementalPrimitive.java | 14 +- .../core/templates/iElementalDefinition.java | 3 +- .../core/transformations/bTransformationInfo.java | 6 +- .../core/transformations/iExchangeInfo.java | 2 +- .../definitions/complex/atom/dAtomDefinition.java | 139 +++++++++---------- .../definitions/complex/atom/iaeaNuclide.java | 38 ++--- .../complex/hadron/dHadronDefinition.java | 31 ++--- .../technus/tectech/entity/fx/BlockHint.java | 6 +- .../technus/tectech/loader/ElementalLoader.java | 1 + .../technus/tectech/loader/MachineLoader.java | 1 + .../github/technus/tectech/loader/MainLoader.java | 4 +- .../technus/tectech/loader/RecipeLoader.java | 1 + .../technus/tectech/loader/ThingsLoader.java | 1 + .../github/technus/tectech/nei/NEI_TT_Config.java | 3 + .../tectech/nei/TT_NEI_ResearchHandler.java | 129 ++++++++++------- .../technus/tectech/nei/TT_NEI_ScannerHandler.java | 131 +++++++++++------- .../github/technus/tectech/network/Dispatcher.java | 1 + .../github/technus/tectech/proxy/ClientProxy.java | 2 +- .../github/technus/tectech/recipe/TT_recipe.java | 26 ++-- .../technus/tectech/recipe/TT_recipeAdder.java | 20 +-- .../technus/tectech/thing/CustomItemList.java | 2 +- .../tectech/thing/block/QuantumGlassBlock.java | 8 +- .../tectech/thing/block/QuantumStuffBlock.java | 9 +- .../tectech/thing/block/QuantumStuffRender.java | 3 +- .../tectech/thing/block/ReactorSimBlock.java | 6 +- .../tectech/thing/casing/GT_Block_CasingsTT.java | 4 +- .../tectech/thing/casing/GT_Block_HintTT.java | 2 + .../thing/item/ConstructableTriggerItem.java | 1 - .../item/DebugElementalInstanceContainer_EM.java | 1 - .../item/ElementalDefinitionContainer_EM.java | 1 - .../item/ElementalDefinitionScanStorage_EM.java | 3 +- .../tectech/thing/item/ParametrizerMemoryCard.java | 9 +- .../tectech/thing/item/gui/ScanDisplayScreen.java | 30 ++-- ...GT_MetaTileEntity_Hatch_ElementalContainer.java | 9 +- .../GT_MetaTileEntity_Hatch_OverflowElemental.java | 8 +- .../hatch/GT_MetaTileEntity_Hatch_Param.java | 2 + .../hatch/GT_MetaTileEntity_Hatch_Rack.java | 14 +- .../hatch/GT_MetaTileEntity_Hatch_Uncertainty.java | 8 +- .../hatch/gui/GT_Container_Holder.java | 5 +- .../hatch/gui/GT_Container_Param.java | 120 ++++++++-------- .../hatch/gui/GT_Container_ParamAdv.java | 130 ++++++++--------- .../hatch/gui/GT_Container_Rack.java | 25 ++-- .../hatch/gui/GT_Container_Uncertainty.java | 91 ++++++------ .../hatch/gui/GT_GUIContainer_Holder.java | 14 +- .../hatch/gui/GT_GUIContainer_Param.java | 26 ++-- .../hatch/gui/GT_GUIContainer_ParamAdv.java | 38 ++--- .../hatch/gui/GT_GUIContainer_Rack.java | 14 +- .../hatch/gui/GT_GUIContainer_Uncertainty.java | 24 ++-- .../hatch/gui/GT_GUIContainer_UncertaintyAdv.java | 97 +++++-------- .../multi/GT_MetaTileEntity_EM_annihilation.java | 3 +- .../multi/GT_MetaTileEntity_EM_bhg.java | 3 +- .../multi/GT_MetaTileEntity_EM_collider.java | 19 +-- .../multi/GT_MetaTileEntity_EM_computer.java | 52 +++---- .../multi/GT_MetaTileEntity_EM_crafting.java | 5 +- .../multi/GT_MetaTileEntity_EM_decay.java | 8 +- .../multi/GT_MetaTileEntity_EM_dequantizer.java | 3 +- .../multi/GT_MetaTileEntity_EM_infuser.java | 27 ++-- .../multi/GT_MetaTileEntity_EM_junction.java | 33 ++--- .../multi/GT_MetaTileEntity_EM_quantizer.java | 11 +- .../multi/GT_MetaTileEntity_EM_research.java | 26 ++-- .../multi/GT_MetaTileEntity_EM_scanner.java | 31 +++-- .../multi/GT_MetaTileEntity_EM_stabilizer.java | 3 +- .../multi/GT_MetaTileEntity_EM_switch.java | 31 +++-- .../multi/GT_MetaTileEntity_EM_transformer.java | 8 +- .../multi/GT_MetaTileEntity_EM_wormhole.java | 3 +- .../multi/GT_MetaTileEntity_TM_microwave.java | 29 ++-- .../multi/base/GT_Container_MultiMachineEM.java | 50 +++---- .../multi/base/GT_GUIContainer_MultiMachineEM.java | 18 +-- .../base/GT_MetaTileEntity_MultiblockBase_EM.java | 153 ++++++++++----------- .../em_machine/GT_MetaTileEntity_EM_machine.java | 56 ++++---- .../pipe/GT_MetaTileEntity_Pipe_Data.java | 24 ++-- .../pipe/GT_MetaTileEntity_Pipe_EM.java | 18 +-- .../GT_MetaTileEntity_DebugPowerGenerator.java | 5 +- .../GT_MetaTileEntity_DebugStructureWriter.java | 9 +- .../gui/GT_Container_DebugPowerGenerator.java | 84 +++++------ .../gui/GT_Container_DebugStructureWriter.java | 91 ++++++------ .../gui/GT_GUIContainer_DebugPowerGenerator.java | 20 +-- .../gui/GT_GUIContainer_DebugStructureWriter.java | 20 +-- .../thing/tileEntity/ReactorSimTileEntity.java | 16 +-- .../blocks/turretbases/TurretBaseEM.java | 12 +- .../blocks/turretbases/TurretBaseItemEM.java | 1 + .../blocks/turretheads/TurretHeadEM.java | 12 +- .../blocks/turretheads/TurretHeadItemEM.java | 1 + .../blocks/turretheads/TurretHeadItemRenderEM.java | 7 +- .../entity/projectiles/projectileEM.java | 32 +++-- .../entity/projectiles/projectileRenderEM.java | 4 +- .../tileentity/turret/TileTurretHeadEM.java | 9 ++ .../tileentity/turretbase/TileTurretBaseEM.java | 1 + 108 files changed, 1331 insertions(+), 1249 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/technus/tectech/CommonValues.java b/src/main/java/com/github/technus/tectech/CommonValues.java index fb5b04f63d..0c49f98655 100644 --- a/src/main/java/com/github/technus/tectech/CommonValues.java +++ b/src/main/java/com/github/technus/tectech/CommonValues.java @@ -6,26 +6,26 @@ import net.minecraft.util.EnumChatFormatting; * Created by danie_000 on 11.01.2017. */ public final class CommonValues { - public final static String TEC_MARK_GENERAL = + public static final String TEC_MARK_GENERAL = EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech" + EnumChatFormatting.BLUE + ": Interdimensional"; - public final static String TEC_MARK_EM = + public static final String TEC_MARK_EM = EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech" + EnumChatFormatting.BLUE + ": Elemental Matter"; - public final static String BASS_MARK = + public static final String BASS_MARK = EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech" + EnumChatFormatting.BLUE + ": Theta Movement"; - public final static byte DECAY_AT = 0;// hatches compute decays - public final static byte MULTI_PURGE_1_AT = 2;// multiblocks clean their hatches 1 - public final static byte MOVE_AT = 4;// move stuff around - public final static byte RECIPE_AT = 6;// move stuff around - public final static byte MULTI_PURGE_2_AT = 8;// multiblocks clean their hatches 2 - public final static byte OVERFLOW_AT = 10;// then hatches clean themselves + public static final byte DECAY_AT = 0;// hatches compute decays + public static final byte MULTI_PURGE_1_AT = 2;// multiblocks clean their hatches 1 + public static final byte MOVE_AT = 4;// move stuff around + public static final byte RECIPE_AT = 6;// move stuff around + public static final byte MULTI_PURGE_2_AT = 8;// multiblocks clean their hatches 2 + public static final byte OVERFLOW_AT = 10;// then hatches clean themselves // - in case some hatches are not in multiblock structure - public final static byte MULTI_CHECK_AT = 12;// multiblock checks it's state - public final static byte DISPERSE_AT = 14;// overflow hatches perform disperse + public static final byte MULTI_CHECK_AT = 12;// multiblock checks it's state + public static final byte DISPERSE_AT = 14;// overflow hatches perform disperse } diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index adcaccdcb1..e82ab21895 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -7,8 +7,6 @@ import com.github.technus.tectech.loader.ModGuiHandler; import com.github.technus.tectech.proxy.CommonProxy; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.network.NetworkRegistry; @@ -35,15 +33,15 @@ public class TecTech { @SidedProxy(clientSide = Reference.CLIENTSIDE, serverSide = Reference.SERVERSIDE) public static CommonProxy proxy; - @Instance(Reference.MODID) + @Mod.Instance(Reference.MODID) public static TecTech instance; public static final XSTR Rnd = XSTR.XSTR_INSTANCE; public static final LogHelper Logger = new LogHelper(Reference.MODID); - private static IngameErrorLog Module_AdminErrorLogs = null; - public static MainLoader GTCustomLoader = null; + private static IngameErrorLog Module_AdminErrorLogs; + public static MainLoader GTCustomLoader; public static TecTechConfig ModConfig; - public static CreativeTabs mainTab = null; + public static CreativeTabs mainTab; public static boolean hasCOFH = false, hasThaumcraft = false; @@ -54,15 +52,14 @@ public class TecTech { Module_AdminErrorLogs.AddErrorLogOnAdminJoin(pMessage); } - @EventHandler + @Mod.EventHandler public void PreLoad(FMLPreInitializationEvent PreEvent) { Logger.setDebugOutput(true); ModConfig = new TecTechConfig(PreEvent.getModConfigurationDirectory(), Reference.COLLECTIONNAME, Reference.MODID); - if (!ModConfig.LoadConfig()) - Logger.error(Reference.MODID + " could not load its config file. Things are going to be weird!"); + if (!ModConfig.LoadConfig()) Logger.error(Reference.MODID + " could not load its config file. Things are going to be weird!"); if (ModConfig.ModAdminErrorLogs_Enabled) { Logger.debug("Module_AdminErrorLogs is enabled"); @@ -71,10 +68,10 @@ public class TecTech { GTCustomLoader = new MainLoader(); - TecTech.Logger.info("Added Atom Overrider"); + Logger.info("Added Atom Overrider"); } - @EventHandler + @Mod.EventHandler public void Load(FMLInitializationEvent event) { hasCOFH = Loader.isModLoaded(Reference.COFHCORE); hasThaumcraft = Loader.isModLoaded(Reference.THAUMCRAFT); @@ -86,18 +83,18 @@ public class TecTech { proxy.registerRenderInfo(); } - @EventHandler + @Mod.EventHandler public void PostLoad(FMLPostInitializationEvent PostEvent) { GTCustomLoader.postLoad(); if (ModConfig.NERF_FUSION) FixBrokenFusionRecipes(); fixBlocks(); } - @EventHandler + @Mod.EventHandler public void serverLoad(FMLServerStartingEvent pEvent) { } - @EventHandler + @Mod.EventHandler public void onServerAboutToStart(FMLServerAboutToStartEvent ev) { } @@ -107,14 +104,14 @@ public class TecTech { FluidStack p = m.getPlasma(1); if (p != null) { if (DEBUG_MODE) - TecTech.Logger.info("Found Plasma of " + m.mName); + Logger.info("Found Plasma of " + m.mName); if (m.mElement != null && (m.mElement.mProtons >= Materials.Iron.mElement.mProtons || -m.mElement.mProtons >= Materials.Iron.mElement.mProtons || m.mElement.mNeutrons >= Materials.Iron.mElement.mNeutrons || -m.mElement.mNeutrons >= Materials.Iron.mElement.mNeutrons)) { if (DEBUG_MODE) - TecTech.Logger.info("Attempting to bind " + m.mName); + Logger.info("Attempting to bind " + m.mName); if (m.getMolten(1) != null) binds.put(p.getFluid(), m.getMolten(1).getFluid()); else if (m.getGas(1) != null) binds.put(p.getFluid(), m.getGas(1).getFluid()); else if (m.getFluid(1) != null) binds.put(p.getFluid(), m.getFluid(1).getFluid()); @@ -126,7 +123,7 @@ public class TecTech { Fluid f = binds.get(r.mFluidOutputs[0].getFluid()); if (f != null) { if (DEBUG_MODE) - TecTech.Logger.info("Nerfing Recipe " + r.mFluidOutputs[0].getUnlocalizedName()); + Logger.info("Nerfing Recipe " + r.mFluidOutputs[0].getUnlocalizedName()); r.mFluidOutputs[0] = new FluidStack(f, r.mFluidInputs[0].amount); } } diff --git a/src/main/java/com/github/technus/tectech/Util.java b/src/main/java/com/github/technus/tectech/Util.java index aa3f8eee1d..ff058d044d 100644 --- a/src/main/java/com/github/technus/tectech/Util.java +++ b/src/main/java/com/github/technus/tectech/Util.java @@ -75,7 +75,7 @@ public class Util { byte facing = aBaseMetaTileEntity.getFrontFacing(); int x, y, z, a, b, c, pointer; - final int + int baseX=aBaseMetaTileEntity.getXCoord(), baseZ=aBaseMetaTileEntity.getZCoord(), baseY=aBaseMetaTileEntity.getYCoord(); @@ -199,7 +199,7 @@ public class Util { IMetaTileEntity imt = aBaseMetaTileEntity.getMetaTileEntity(); int x, y, z, a, b, c, pointer; - final int + int baseX=aBaseMetaTileEntity.getXCoord(), baseZ=aBaseMetaTileEntity.getZCoord(), baseY=aBaseMetaTileEntity.getYCoord(); @@ -344,7 +344,7 @@ public class Util { //TE Rotation int x, y, z, a, b, c, pointer; - final int + int baseX=tileEntity.xCoord, baseZ=tileEntity.zCoord, baseY=tileEntity.yCoord; @@ -472,7 +472,7 @@ public class Util { ItemStack[] array = new ItemStack[10]; int x, y, z, a, b, c; - final int + int baseX=aBaseMetaTileEntity.getXCoord(), baseZ=aBaseMetaTileEntity.getZCoord(), baseY=aBaseMetaTileEntity.getYCoord(); @@ -533,7 +533,7 @@ public class Util { if (!block.hasTileEntity(meta) && block.getMaterial() != Material.air) { boolean err = true; - final ItemStack is = new ItemStack(block, 1, meta); + ItemStack is = new ItemStack(block, 1, meta); for (int i = 0; i < array.length; i++) { if (array[i] == null) { array[i] = is; @@ -730,7 +730,7 @@ public class Util { amt = tStack.stackSize; boolean temp = true; for (ItemStack aStack : givenInputs) { - if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true))) { + if (GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true)) { if (aDontCheckStackSizes) { temp = false; break; @@ -762,7 +762,6 @@ public class Util { aFluid.amount = 0; } else { aFluid.amount -= amt; - amt = 0; break; } } @@ -776,7 +775,7 @@ public class Util { if (tStack != null) { amt = tStack.stackSize; for (ItemStack aStack : givenInputs) { - if ((GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true))) { + if (GT_Utility.areUnificationsEqual(aStack, tStack, true) || GT_Utility.areUnificationsEqual(GT_OreDictUnificator.get(false, aStack), tStack, true)) { if (aDontCheckStackSizes) { aStack.stackSize -= amt; break; @@ -786,7 +785,6 @@ public class Util { aStack.stackSize = 0; } else { aStack.stackSize -= amt; - amt = 0; break; } } @@ -833,7 +831,7 @@ public class Util { } public static String[] infoFromNBT(NBTTagCompound nbt) { - final String[] strings = new String[nbt.getInteger("i")]; + String[] strings = new String[nbt.getInteger("i")]; for (int i = 0; i < strings.length; i++) strings[i] = nbt.getString(Integer.toString(i)); return strings; diff --git a/src/main/java/com/github/technus/tectech/Vec3pos.java b/src/main/java/com/github/technus/tectech/Vec3pos.java index b38a76ded5..30509d3f02 100644 --- a/src/main/java/com/github/technus/tectech/Vec3pos.java +++ b/src/main/java/com/github/technus/tectech/Vec3pos.java @@ -16,9 +16,9 @@ public class Vec3pos implements Comparable { } public Vec3pos(IGregTechTileEntity te) { - this.x = te.getXCoord(); - this.y = te.getYCoord(); - this.z = te.getZCoord(); + x = te.getXCoord(); + y = te.getYCoord(); + z = te.getZCoord(); } @Override diff --git a/src/main/java/com/github/technus/tectech/XSTR.java b/src/main/java/com/github/technus/tectech/XSTR.java index cb19449d85..af048bb19b 100644 --- a/src/main/java/com/github/technus/tectech/XSTR.java +++ b/src/main/java/com/github/technus/tectech/XSTR.java @@ -37,14 +37,13 @@ public class XSTR extends Random { private static final long serialVersionUID = 6208727693524452904L; private long seed; - private long last; private static final long GAMMA = 0x9e3779b97f4a7c15L; private static final int PROBE_INCREMENT = 0x9e3779b9; private static final long SEEDER_INCREMENT = 0xbb67ae8584caa73bL; private static final double DOUBLE_UNIT = 0x1.0p-53; // 1.0 / (1L << 53) private static final float FLOAT_UNIT = 0x1.0p-24f; // 1.0f / (1 << 24) private static final AtomicLong seedUniquifier = new AtomicLong(8682522807148012L); - public final static XSTR XSTR_INSTANCE=new XSTR(){ + public static final XSTR XSTR_INSTANCE=new XSTR(){ @Override public synchronized void setSeed(long seed) { if(!Thread.currentThread().getStackTrace()[2].getClassName().equals(Random.class.getName())) @@ -88,12 +87,14 @@ public class XSTR extends Random { this.seed = seed; } + @Override public boolean nextBoolean() { return next(1) != 0; } + @Override public double nextDouble() { - return (((long) (next(26)) << 27) + next(27)) * DOUBLE_UNIT; + return (((long) next(26) << 27) + next(27)) * DOUBLE_UNIT; } /** @@ -112,6 +113,7 @@ public class XSTR extends Random { * * @param seed the new seed */ + @Override public synchronized void setSeed(long seed) { this.seed = seed; } @@ -132,20 +134,22 @@ public class XSTR extends Random { * @param nbits * @return */ + @Override public int next(int nbits) { long x = seed; - x ^= (x << 21); - x ^= (x >>> 35); - x ^= (x << 4); + x ^= x << 21; + x ^= x >>> 35; + x ^= x << 4; seed = x; - x &= ((1L << nbits) - 1); + x &= (1L << nbits) - 1; return (int) x; } private boolean haveNextNextGaussian = false; private double nextNextGaussian = 0; - synchronized public double nextGaussian() { + @Override + public synchronized double nextGaussian() { // See Knuth, ACP, Section 3.4.1 Algorithm C. if (haveNextNextGaussian) { haveNextNextGaussian = false; @@ -219,6 +223,7 @@ public class XSTR extends Random { * @throws IllegalArgumentException if bound is not positive * @since 1.2 */ + @Override public int nextInt(int bound) { //if (bound <= 0) { //throw new RuntimeException("BadBound"); @@ -237,27 +242,31 @@ public class XSTR extends Random { } return r;*/ //speedup, new nextInt ~+40% - last = seed ^ (seed << 21); - last ^= (last >>> 35); - last ^= (last << 4); + long last = seed ^ seed << 21; + last ^= last >>> 35; + last ^= last << 4; seed = last; int out = (int) last % bound; - return (out < 0) ? -out : out; + return out < 0 ? -out : out; } + @Override public int nextInt() { return next(32); } + @Override public float nextFloat() { return next(24) * FLOAT_UNIT; } + @Override public long nextLong() { // it's okay that the bottom word remains signed. - return ((long) (next(32)) << 32) + next(32); + return ((long) next(32) << 32) + next(32); } + @Override public void nextBytes(byte[] bytes_arr) { for (int iba = 0, lenba = bytes_arr.length; iba < lenba; ) for (int rndba = nextInt(), diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompatEnabled.java index a66f51ff2d..30e310756d 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompatEnabled.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/EssentiaCompatEnabled.java @@ -25,20 +25,20 @@ public class EssentiaCompatEnabled extends EssentiaCompat { @Override public boolean check(GT_MetaTileEntity_MultiblockBase_EM meta) { TileEntity tile =meta.getBaseMetaTileEntity().getTileEntityAtSide(meta.getBaseMetaTileEntity().getBackFacing()); - return tile!=null && (tile instanceof TileEssentiaReservoir) || (tile instanceof TileJarFillable); + return tile!=null && tile instanceof TileEssentiaReservoir || tile instanceof TileJarFillable; } @Override public TileEntity getContainer(GT_MetaTileEntity_MultiblockBase_EM meta) { TileEntity tile =meta.getBaseMetaTileEntity().getTileEntityAtSide(meta.getBaseMetaTileEntity().getBackFacing()); - return tile!=null && !tile.isInvalid() && (tile instanceof TileEssentiaReservoir) || (tile instanceof TileJarFillable)?tile:null; + return tile!=null && !tile.isInvalid() && tile instanceof TileEssentiaReservoir || tile instanceof TileJarFillable ?tile:null; } @Override public boolean putElementalInstanceStack(TileEntity container,cElementalInstanceStack stack){ if(container==null || container.isInvalid())return false; - if((container instanceof IAspectContainer) && (stack.definition instanceof iElementalAspect)){ - Aspect aspect=(Aspect)(((iElementalAspect) stack.definition).materializeIntoAspect()); + if(container instanceof IAspectContainer && stack.definition instanceof iElementalAspect){ + Aspect aspect=(Aspect) ((iElementalAspect) stack.definition).materializeIntoAspect(); if(aspect!=null){ ((IAspectContainer) container).addToContainer(aspect,1); return true; diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompatEnabled.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompatEnabled.java index 210b88cb9e..6b46d47257 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompatEnabled.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/AspectDefinitionCompatEnabled.java @@ -13,20 +13,21 @@ import static com.github.technus.tectech.compatibility.thaumcraft.definitions.eP * Created by Tec on 21.05.2017. */ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat { + @Override public void run(){ - defToAspect.put(magic_air,"aer"); - defToAspect.put(magic_earth,"terra"); - defToAspect.put(magic_fire,"ignis"); - defToAspect.put(magic_water,"aqua"); - defToAspect.put(magic_order,"ordo"); - defToAspect.put(magic_entropy,"perditio"); + AspectDefinitionCompat.defToAspect.put(magic_air,"aer"); + AspectDefinitionCompat.defToAspect.put(magic_earth,"terra"); + AspectDefinitionCompat.defToAspect.put(magic_fire,"ignis"); + AspectDefinitionCompat.defToAspect.put(magic_water,"aqua"); + AspectDefinitionCompat.defToAspect.put(magic_order,"ordo"); + AspectDefinitionCompat.defToAspect.put(magic_entropy,"perditio"); - aspectToDef.put("aer",magic_air); - aspectToDef.put("terra",magic_earth); - aspectToDef.put("ignis",magic_fire); - aspectToDef.put("aqua",magic_water); - aspectToDef.put("ordo",magic_order); - aspectToDef.put("perditio",magic_entropy); + AspectDefinitionCompat.aspectToDef.put("aer",magic_air); + AspectDefinitionCompat.aspectToDef.put("terra",magic_earth); + AspectDefinitionCompat.aspectToDef.put("ignis",magic_fire); + AspectDefinitionCompat.aspectToDef.put("aqua",magic_water); + AspectDefinitionCompat.aspectToDef.put("ordo",magic_order); + AspectDefinitionCompat.aspectToDef.put("perditio",magic_entropy); ArrayList list=Aspect.getCompoundAspects(); Aspect[] array=list.toArray(new Aspect[0]); @@ -36,22 +37,18 @@ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat Aspect[] content = aspect.getComponents(); if (content.length != 2) { list.remove(aspect); - }else if(aspectToDef.containsKey(content[0].getTag()) && - aspectToDef.containsKey(content[1].getTag())){ + }else if(AspectDefinitionCompat.aspectToDef.containsKey(content[0].getTag()) && AspectDefinitionCompat.aspectToDef.containsKey(content[1].getTag())){ try { dComplexAspectDefinition newAspect; if(content[0].getTag().equals(content[1].getTag())){ - newAspect = new dComplexAspectDefinition( - aspectToDef.get(content[0].getTag()).getStackForm(2) + newAspect = new dComplexAspectDefinition(AspectDefinitionCompat.aspectToDef.get(content[0].getTag()).getStackForm(2) ); }else{ - newAspect = new dComplexAspectDefinition( - aspectToDef.get(content[0].getTag()).getStackForm(1), - aspectToDef.get(content[1].getTag()).getStackForm(1) + newAspect = new dComplexAspectDefinition(AspectDefinitionCompat.aspectToDef.get(content[0].getTag()).getStackForm(1), AspectDefinitionCompat.aspectToDef.get(content[1].getTag()).getStackForm(1) ); } - aspectToDef.put(aspect.getTag(),newAspect); - defToAspect.put(newAspect,aspect.getTag()); + AspectDefinitionCompat.aspectToDef.put(aspect.getTag(),newAspect); + AspectDefinitionCompat.defToAspect.put(newAspect,aspect.getTag()); }catch (tElementalException e) { /**/ }finally { @@ -65,17 +62,17 @@ public final class AspectDefinitionCompatEnabled extends AspectDefinitionCompat @Override Aspect getAspect(cElementalDefinition definition) { - return Aspect.getAspect(defToAspect.get(definition)); + return Aspect.getAspect(AspectDefinitionCompat.defToAspect.get(definition)); } @Override String getAspectTag(cElementalDefinition definition) { - return defToAspect.get(definition); + return AspectDefinitionCompat.defToAspect.get(definition); } @Override iElementalDefinition getDefinition(String aspect) { - return aspectToDef.get(aspect); + return AspectDefinitionCompat.aspectToDef.get(aspect); } } diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java index 3084abb1f2..2afaf0e3f8 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/dComplexAspectDefinition.java @@ -56,7 +56,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme private dComplexAspectDefinition(boolean check, cElementalDefinitionStackMap aspects) throws tElementalException { if (check && !canTheyBeTogether(aspects)) throw new tElementalException("Hadron Definition error"); - this.aspectStacks = aspects; + aspectStacks = aspects; float mass=0; for(cElementalDefinitionStack stack:aspects.values()){ mass+=stack.getMass(); @@ -166,7 +166,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme @Override public float getEnergyDiffBetweenStates(long currentEnergyLevel, long newEnergyLevel) { - return DEFAULT_ENERGY_REQUIREMENT*(newEnergyLevel-currentEnergyLevel); + return iElementalDefinition.DEFAULT_ENERGY_REQUIREMENT *(newEnergyLevel-currentEnergyLevel); } @Override @@ -204,6 +204,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme return null; } + @Override public Object materializeIntoAspect() { return aspectDefinitionCompat.getAspect(this); } @@ -220,7 +221,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme if (DEBUG_MODE) e.printStackTrace(); } if(DEBUG_MODE) - TecTech.Logger.info("Registered Elemental Matter Class: ComplexAspect "+nbtType+" "+(-96)); + TecTech.Logger.info("Registered Elemental Matter Class: ComplexAspect "+nbtType+" "+ -96); } @Override @@ -236,7 +237,7 @@ public final class dComplexAspectDefinition extends cElementalDefinition impleme @Override public void addScanResults(ArrayList lines, int capabilities, long energyLevel) { if(Util.areBitsSet(SCAN_GET_CLASS_TYPE, capabilities)) - lines.add("CLASS = "+nbtType+" "+getClassType()); + lines.add("CLASS = "+ nbtType +" "+getClassType()); if(Util.areBitsSet(SCAN_GET_NOMENCLATURE|SCAN_GET_CHARGE|SCAN_GET_MASS, capabilities)) { lines.add("NAME = "+getName()); //lines.add("SYMBOL = "+getSymbol()); diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/ePrimalAspectDefinition.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/ePrimalAspectDefinition.java index 6205055967..64c1b7ea19 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/ePrimalAspectDefinition.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/definitions/ePrimalAspectDefinition.java @@ -35,6 +35,7 @@ public final class ePrimalAspectDefinition extends cElementalPrimitive implement return "Primal: " + name; } + @Override public Object materializeIntoAspect() { return aspectDefinitionCompat.getAspect(this); } diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java index 374fad20d3..19a02fc1aa 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaDequantizer.java @@ -29,7 +29,6 @@ import static gregtech.api.enums.GT_Values.E; * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { - private TileEntity container; //region Structure //use multi A energy inputs, use less power the longer it runs @@ -63,8 +62,9 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_ super(aName); } + @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_EM_essentiaDequantizer(this.mName); + return new GT_MetaTileEntity_EM_essentiaDequantizer(mName); } @Override @@ -102,8 +102,8 @@ public class GT_MetaTileEntity_EM_essentiaDequantizer extends GT_MetaTileEntity_ @Override public boolean checkRecipe_EM(ItemStack itemStack) { - container=essentiaContainerCompat.getContainer(this); - if (eInputHatches.size() < 1 || container==null) { + TileEntity container = essentiaContainerCompat.getContainer(this); + if (eInputHatches.size() < 1 || container ==null) { stopMachine(); return false; } diff --git a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java index 65a43c76ab..c2a4d13f78 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java +++ b/src/main/java/com/github/technus/tectech/compatibility/thaumcraft/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_essentiaQuantizer.java @@ -29,7 +29,6 @@ import static gregtech.api.enums.GT_Values.E; * Created by danie_000 on 17.12.2016. */ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable { - private TileEntity container; //region Structure //use multi A energy inputs, use less power the longer it runs @@ -63,8 +62,9 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu super(aName); } + @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_EM_essentiaQuantizer(this.mName); + return new GT_MetaTileEntity_EM_essentiaQuantizer(mName); } @Override @@ -111,7 +111,7 @@ public class GT_MetaTileEntity_EM_essentiaQuantizer extends GT_MetaTileEntity_Mu @Override public boolean checkRecipe_EM(ItemStack itemStack) { - container=essentiaContainerCompat.getContainer(this); + TileEntity container = essentiaContainerCompat.getContainer(this); cElementalInstanceStack newStack=essentiaContainerCompat.getFromContainer(container); if(newStack!=null){ mMaxProgresstime = 20; diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalDecay.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalDecay.java index d80a2b4ccd..842d0cde5b 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalDecay.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalDecay.java @@ -26,7 +26,7 @@ public final class cElementalDecay { for (int i = 0; i < outArr.length; i++) { outArr[i] = new cElementalDefinitionStack(outSafe[i], 1); } - this.outputStacks = new cElementalDefinitionStackMap(outArr); + outputStacks = new cElementalDefinitionStackMap(outArr); this.probability = probability; } @@ -35,7 +35,7 @@ public final class cElementalDecay { } public cElementalDecay(float probability, cElementalDefinitionStack... out) { - this.outputStacks = new cElementalDefinitionStackMap(out); + outputStacks = new cElementalDefinitionStackMap(out); this.probability = probability; } @@ -44,7 +44,7 @@ public final class cElementalDecay { } public cElementalDecay(float probability, cElementalDefinitionStackMap tree) { - this.outputStacks = tree; + outputStacks = tree; this.probability = probability; } diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalDefinitionStackMap.java index b3c66e42ce..c4dfb93bab 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalDefinitionStackMap.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalDefinitionStackMap.java @@ -53,7 +53,7 @@ public final class cElementalDefinitionStackMap/*IMMUTABLE*/ extends cElementalS } public static cElementalDefinitionStackMap fromNBT(NBTTagCompound nbt) throws tElementalException { - final cElementalDefinitionStack[] defStacks = new cElementalDefinitionStack[nbt.getInteger("i")]; + cElementalDefinitionStack[] defStacks = new cElementalDefinitionStack[nbt.getInteger("i")]; for (int i = 0; i < defStacks.length; i++) { defStacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i))); if (defStacks[i].definition.equals(nbtE__)) diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java index 9fad16c46a..f5ac7b7778 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalInstanceStackMap.java @@ -114,20 +114,20 @@ public final class cElementalInstanceStackMap implements Comparable= instance.amount; else { - final long diff = target.amount - instance.amount; + long diff = target.amount - instance.amount; if (diff > 0) { target.amount = diff; return true; @@ -140,13 +140,13 @@ public final class cElementalInstanceStackMap implements Comparable= stack.getAmount(); else { - final long diff = target.amount - stack.getAmount(); + long diff = target.amount - stack.getAmount(); if (diff > 0) { target.amount = diff; return true; @@ -185,7 +185,7 @@ public final class cElementalInstanceStackMap implements Comparable> entries = container.map.entrySet().iterator(); entries.hasNext(); ) { - Map.Entry entry = entries.next(); + for (Map.Entry entry : container.map.entrySet()) { test &= removeAmount(true, entry.getValue()); } if (testOnly || !test) return test; - for (Iterator> entries = container.map.entrySet().iterator(); entries.hasNext(); ) { - Map.Entry entry = entries.next(); + for (Map.Entry entry : container.map.entrySet()) { removeAmount(false, entry.getValue()); } return true; @@ -207,13 +205,11 @@ public final class cElementalInstanceStackMap implements Comparable> entries = container.map.entrySet().iterator(); entries.hasNext(); ) { - Map.Entry entry = entries.next(); + for (Map.Entry entry : container.map.entrySet()) { test &= removeAmount(true, entry.getValue()); } if (testOnly || !test) return test; - for (Iterator> entries = container.map.entrySet().iterator(); entries.hasNext(); ) { - Map.Entry entry = entries.next(); + for (Map.Entry entry : container.map.entrySet()) { test &= removeAmount(false, entry.getValue()); } return true; @@ -224,14 +220,14 @@ public final class cElementalInstanceStackMap implements Comparable stacksCount) { - iElementalDefinition[] keys = this.keys(); + iElementalDefinition[] keys = keys(); for (int i = stacksCount; i < keys.length; i++) { massRemoved += map.get(keys[i]).getDefinitionStack().getMass(); map.remove(keys[i]); } } - for (cElementalInstanceStack instance : this.values()) + for (cElementalInstanceStack instance : values()) if (instance.amount > stackCapacity) { massRemoved += instance.definition.getMass() * (instance.amount - stackCapacity); instance.amount = stackCapacity; @@ -246,11 +242,11 @@ public final class cElementalInstanceStackMap implements Comparable inTreeUnsafe) { - this.map.putAll(inTreeUnsafe); + map.putAll(inTreeUnsafe); } public void putReplaceAll(cElementalInstanceStackMap inContainerUnsafe) { @@ -296,7 +292,7 @@ public final class cElementalInstanceStackMap implements Comparable info = getScanInfo(capabilities); + NBTTagCompound nbt = new NBTTagCompound(); + ArrayList info = getScanInfo(capabilities); nbt.setInteger("i", info.size()); for (int i = 0; i < info.size(); i++) nbt.setString(Integer.toString(i), info.get(i)); @@ -389,7 +385,7 @@ public final class cElementalInstanceStackMap implements Comparable= instance.amount; else { - final long diff = target.amount - instance.amount; + long diff = target.amount - instance.amount; if (diff > 0) { map.put(target.definition, new cElementalDefinitionStack(target.definition, diff)); return true; @@ -111,13 +111,13 @@ public final class cElementalMutableDefinitionStackMap extends cElementalStackMa } public boolean removeAmount(boolean testOnly, iHasElementalDefinition stack) { - final cElementalDefinitionStack target = map.get(stack.getDefinition()); + cElementalDefinitionStack target = map.get(stack.getDefinition()); if (target == null) return false; if (testOnly) return target.amount >= stack.getAmount(); else { - final long diff = target.amount - stack.getAmount(); + long diff = target.amount - stack.getAmount(); if (diff > 0) { map.put(target.definition, new cElementalDefinitionStack(target.definition, diff)); return true; @@ -156,7 +156,7 @@ public final class cElementalMutableDefinitionStackMap extends cElementalStackMa @Deprecated public boolean removeAllAmounts(boolean testOnly, iElementalDefinition... definitions) { - final cElementalDefinitionStack[] stacks = new cElementalDefinitionStack[definitions.length]; + cElementalDefinitionStack[] stacks = new cElementalDefinitionStack[definitions.length]; for (int i = 0; i < stacks.length; i++) stacks[i] = new cElementalDefinitionStack(definitions[i], 1); return removeAllAmounts(testOnly, stacks); @@ -164,13 +164,11 @@ public final class cElementalMutableDefinitionStackMap extends cElementalStackMa public boolean removeAllAmounts(boolean testOnly, cElementalStackMap container) { boolean test=true; - for (Iterator> entries = container.map.entrySet().iterator(); entries.hasNext(); ) { - Map.Entry entry = entries.next(); + for (Map.Entry entry : container.map.entrySet()) { test &= removeAmount(true, entry.getValue()); } if (testOnly || !test) return test; - for (Iterator> entries = container.map.entrySet().iterator(); entries.hasNext(); ) { - Map.Entry entry = entries.next(); + for (Map.Entry entry : container.map.entrySet()) { removeAmount(false, entry.getValue()); } return true; @@ -178,13 +176,11 @@ public final class cElementalMutableDefinitionStackMap extends cElementalStackMa public boolean removeAllAmounts(boolean testOnly, cElementalInstanceStackMap container) { boolean test=true; - for (Iterator> entries = container.map.entrySet().iterator(); entries.hasNext(); ) { - Map.Entry entry = entries.next(); + for (Map.Entry entry : container.map.entrySet()) { test &= removeAmount(true, entry.getValue()); } if (testOnly || !test) return test; - for (Iterator> entries = container.map.entrySet().iterator(); entries.hasNext(); ) { - Map.Entry entry = entries.next(); + for (Map.Entry entry : container.map.entrySet()) { test &= removeAmount(false, entry.getValue()); } return true; @@ -197,16 +193,16 @@ public final class cElementalMutableDefinitionStackMap extends cElementalStackMa public void putReplaceAll(cElementalDefinitionStack... defStacks) { for (cElementalDefinitionStack defStack : defStacks) - this.map.put(defStack.definition, defStack); + map.put(defStack.definition, defStack); } public void putReplaceAll(cElementalStackMap inContainerUnsafe) { - this.map.putAll(inContainerUnsafe.map); + map.putAll(inContainerUnsafe.map); } //Put unify public cElementalDefinitionStack putUnify(cElementalDefinitionStack def) { - final cElementalDefinitionStack stack=map.get(def.definition); + cElementalDefinitionStack stack=map.get(def.definition); if(stack==null) return map.put(def.definition,def); return map.put(def.definition, stack.addAmountIntoNewInstance(def.amount)); } @@ -238,7 +234,7 @@ public final class cElementalMutableDefinitionStackMap extends cElementalStackMa } public static cElementalMutableDefinitionStackMap fromNBT(NBTTagCompound nbt) throws tElementalException { - final cElementalDefinitionStack[] defStacks = new cElementalDefinitionStack[nbt.getInteger("i")]; + cElementalDefinitionStack[] defStacks = new cElementalDefinitionStack[nbt.getInteger("i")]; for (int i = 0; i < defStacks.length; i++) { defStacks[i] = cElementalDefinitionStack.fromNBT(nbt.getCompoundTag(Integer.toString(i))); if (defStacks[i].definition.equals(nbtE__)) diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalStackMap.java index a5139bc254..fc2d210946 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalStackMap.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalStackMap.java @@ -33,7 +33,7 @@ abstract class cElementalStackMap implements Comparable { } public final String[] getElementalInfo() { - final String[] info = new String[map.size() * 3]; + String[] info = new String[map.size() * 3]; int i = 0; for (cElementalDefinitionStack defStack : map.values()) { info[i] = EnumChatFormatting.BLUE + defStack.definition.getName(); @@ -71,8 +71,8 @@ abstract class cElementalStackMap implements Comparable { //NBT public final NBTTagCompound getInfoNBT() { - final NBTTagCompound nbt = new NBTTagCompound(); - final String[] info = getElementalInfo(); + NBTTagCompound nbt = new NBTTagCompound(); + String[] info = getElementalInfo(); nbt.setInteger("i", info.length); for (int i = 0; i < info.length; i++) nbt.setString(Integer.toString(i), info[i]); @@ -80,7 +80,7 @@ abstract class cElementalStackMap implements Comparable { } public final NBTTagCompound toNBT() { - final NBTTagCompound nbt = new NBTTagCompound(); + NBTTagCompound nbt = new NBTTagCompound(); nbt.setInteger("i", map.size()); int i = 0; for (cElementalDefinitionStack defStack : map.values()) @@ -90,7 +90,7 @@ abstract class cElementalStackMap implements Comparable { @Override public final int compareTo(cElementalStackMap o) {//this actually compares rest - final int sizeDiff = map.size() - o.map.size(); + int sizeDiff = map.size() - o.map.size(); if (sizeDiff != 0) return sizeDiff; cElementalDefinitionStack[] ofThis = values(), ofO = o.values(); for (int i = 0; i < ofO.length; i++) { diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/rElementalRecipe.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/rElementalRecipe.java index b6cd7a5ccb..c193e91e0b 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/rElementalRecipe.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/rElementalRecipe.java @@ -12,7 +12,7 @@ public class rElementalRecipe implements Comparable { public final cElementalDefinitionStackMap outEM; public final ItemStack[] outItems; public final FluidStack[] outFluids; - public Object[] extension = null; + public Object[] extension; public rElementalRecipe( cElementalDefinitionStackMap inEM,//not null plz @@ -24,7 +24,7 @@ public class rElementalRecipe implements Comparable { this.outEM = outEM; this.outItems = outItems; this.outFluids = outFluids; - this.ID = id;//allows multiple recipes with the same input EM,so u can actually extend... + ID = id;//allows multiple recipes with the same input EM,so u can actually extend... } public rElementalRecipe extend(Object... data) { @@ -34,7 +34,7 @@ public class rElementalRecipe implements Comparable { @Override public int compareTo(rElementalRecipe o) { - final int compare = inEM.compareTo(o.inEM); + int compare = inEM.compareTo(o.inEM); return compare != 0 ? compare : (int) ID - o.ID; } diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalDefinitionStack.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalDefinitionStack.java index 3928d940b4..bd35a31192 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalDefinitionStack.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalDefinitionStack.java @@ -14,7 +14,7 @@ public final class cElementalDefinitionStack implements iHasElementalDefinition public final long amount; public cElementalDefinitionStack(iElementalDefinition def, long amount) { - this.definition = def == null ? null__ : def; + definition = def == null ? null__ : def; this.amount = amount; } @@ -33,10 +33,12 @@ public final class cElementalDefinitionStack implements iHasElementalDefinition return amount; } + @Override public long getCharge() { return definition.getCharge() * amount; } + @Override public float getMass() { return definition.getMass() * amount; } diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java index 525843f24c..bd401094be 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java @@ -41,16 +41,16 @@ public final class cElementalInstanceStack implements iHasElementalDefinition { } public cElementalInstanceStack(iElementalDefinition defSafe, long amount, float lifeTimeMult, long age, long energy) { - this.definition = defSafe == null ? null__ : defSafe; + definition = defSafe == null ? null__ : defSafe; byte color = definition.getColor(); if (color < 0 || color > 2) {//transforms colorable??? into proper color this.color = color; } else { - this.color = (byte) (TecTech.Rnd.nextInt(3)); + this.color = (byte) TecTech.Rnd.nextInt(3); } this.lifeTimeMult = lifeTimeMult; this.energy = energy; - this.lifeTime = definition.getRawTimeSpan(energy) * this.lifeTimeMult; + lifeTime = definition.getRawTimeSpan(energy) * this.lifeTimeMult; this.age = age; this.amount = amount; } @@ -76,10 +76,12 @@ public final class cElementalInstanceStack implements iHasElementalDefinition { return amount; } + @Override public long getCharge() { return definition.getCharge() * amount; } + @Override public float getMass() { return definition.getMass() * amount; } @@ -122,8 +124,8 @@ public final class cElementalInstanceStack implements iHasElementalDefinition { } public byte nextColor() {//does not allow changing magic element - if (this.color < 0 || this.color > 2) return this.color; - return this.color = (byte) (TecTech.Rnd.nextInt(3)); + if (color < 0 || color > 2) return color; + return color = (byte) TecTech.Rnd.nextInt(3); } public float getLifeTime() { @@ -133,10 +135,10 @@ public final class cElementalInstanceStack implements iHasElementalDefinition { public float setLifeTimeMultipleOfBaseValue(float mult) { if(mult<=0) //since infinity*0=nan throw new IllegalArgumentException("mu