From 2214833189caf3eb262f049746be4987b97aa6a7 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Fri, 15 Dec 2017 18:15:08 +1000 Subject: More fixes pre-gtnh update (#168) $ Tree Farmer Fix (a) $ Multitank Fix. ^ Version Bump. * + Added Chainsaw support to treefarm. + Added check for creative tools to tree farm for creative testing. --- src/Java/gtPlusPlus/core/lib/CORE.java | 2 +- src/Java/gtPlusPlus/core/slots/SlotBuzzSaw.java | 33 ++++++++++++++++--------- 2 files changed, 23 insertions(+), 12 deletions(-) (limited to 'src/Java/gtPlusPlus/core') diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 78b7cf4326..11ed154d5a 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -55,7 +55,7 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.6.101-prerelease"; + public static final String VERSION = "1.6.102-prerelease"; public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase(); public static String USER_COUNTRY = GeoUtils.determineUsersCountry(); public static boolean isModUpToDate = Utils.isModUpToDate(); diff --git a/src/Java/gtPlusPlus/core/slots/SlotBuzzSaw.java b/src/Java/gtPlusPlus/core/slots/SlotBuzzSaw.java index 3578eaedf1..af7c7c9c59 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotBuzzSaw.java +++ b/src/Java/gtPlusPlus/core/slots/SlotBuzzSaw.java @@ -31,25 +31,36 @@ public class SlotBuzzSaw extends Slot { if (OrePrefixes.craftingTool.contains(itemstack)) { if (itemstack.getDisplayName().toLowerCase().contains("saw") || itemstack.getDisplayName().toLowerCase().contains("gt.metatool.01.10") + || itemstack.getDisplayName().toLowerCase().contains("gt.metatool.01.110") + || itemstack.getDisplayName().toLowerCase().contains("gt.metatool.01.112") + || itemstack.getDisplayName().toLowerCase().contains("gt.metatool.01.114") || itemstack.getDisplayName().toLowerCase().contains("gt.metatool.01.140")) { if (itemstack.getItemDamage() == 10) { isValid = true; this.currentTool = SAWTOOL.SAW; } - if (itemstack.getItemDamage() == 140) { + else if (itemstack.getItemDamage() == 110) { + isValid = true; + this.currentTool = SAWTOOL.CHAINSAW; + } + else if (itemstack.getItemDamage() == 112) { + isValid = true; + this.currentTool = SAWTOOL.CHAINSAW; + } + else if (itemstack.getItemDamage() == 114) { + isValid = true; + this.currentTool = SAWTOOL.CHAINSAW; + } + else if (itemstack.getItemDamage() == 140) { isValid = true; this.currentTool = SAWTOOL.BUZZSAW; } + return isValid; } - } else { - this.currentTool = SAWTOOL.NONE; - } - } else { - this.currentTool = SAWTOOL.NONE; - } - } else { - this.currentTool = SAWTOOL.NONE; - } + } + } + } + this.currentTool = SAWTOOL.NONE; return isValid; } @@ -59,7 +70,7 @@ public class SlotBuzzSaw extends Slot { } public enum SAWTOOL { - NONE, SAW, BUZZSAW + NONE, SAW, BUZZSAW, CHAINSAW } } -- cgit From cda85480a079de30f201a6c87cc7e9997c838a08 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Mon, 18 Dec 2017 13:18:18 +1000 Subject: $ Fixed #169. --- src/Java/gtPlusPlus/core/util/player/PlayerUtils.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/Java/gtPlusPlus/core') diff --git a/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java b/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java index 82de626976..306e3ca6b5 100644 --- a/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java +++ b/src/Java/gtPlusPlus/core/util/player/PlayerUtils.java @@ -1,12 +1,10 @@ package gtPlusPlus.core.util.player; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.UUID; +import java.util.*; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.core.util.Utils; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -157,7 +155,11 @@ public class PlayerUtils { return null; } + @SideOnly(Side.CLIENT) public static final boolean isPlayerAlkalus(){ + if (Utils.isServer()){ + return false; + } return isPlayerAlkalus(Minecraft.getMinecraft().thePlayer); } -- cgit From b24a09c6a2684be77aa7ee5e1255409051249fe0 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Mon, 18 Dec 2017 13:25:25 +1000 Subject: + Added Trinium and Trinium related Alloys. (#170) + Added more recycling recipes. $ Fixed bad materials in component assembler recipes. --- src/Java/gtPlusPlus/core/item/ModItems.java | 7 +++- src/Java/gtPlusPlus/core/material/ALLOY.java | 47 ++++++++++++++++++++-- src/Java/gtPlusPlus/core/material/ELEMENT.java | 6 +++ src/Java/gtPlusPlus/core/material/Material.java | 24 +++++++++-- .../core/material/MaterialGenerator.java | 11 +++-- .../core/util/materials/MaterialUtils.java | 2 +- .../core/util/reflect/ReflectionUtils.java | 2 +- 7 files changed, 83 insertions(+), 16 deletions(-) (limited to 'src/Java/gtPlusPlus/core') diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index bdb1837aa1..387315a885 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -439,7 +439,6 @@ public final class ModItems { MaterialGenerator.generateNuclearMaterial(NUCLIDE.LiFBeF2ZrF4UF4); MaterialGenerator.generateNuclearMaterial(NUCLIDE.LiFBeF2ThF4UF4); - //Generate some Alloys //Misc Alloys @@ -491,6 +490,12 @@ public final class ModItems { //Super Conductor MaterialGenerator.generate(ALLOY.HG1223, false, false); + //Generate Fictional Materials + MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM, false); + MaterialGenerator.generate(ELEMENT.getInstance().TRINIUM_REFINED, false); + MaterialGenerator.generate(ALLOY.TRINIUM_TITANIUM); + MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH, false); + MaterialGenerator.generate(ALLOY.TRINIUM_NAQUADAH_CARBON); //Must be the final Alloy to Generate MaterialGenerator.generate(ALLOY.QUANTUM); diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java index 7488a3e0ae..8d1d4e5ecd 100644 --- a/src/Java/gtPlusPlus/core/material/ALLOY.java +++ b/src/Java/gtPlusPlus/core/material/ALLOY.java @@ -5,7 +5,7 @@ import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.materials.MaterialUtils; public final class ALLOY { - + //Just some GT Alloys that I need within mine. public static final Material BRONZE = MaterialUtils.generateMaterialFromGtENUM(Materials.Bronze); public static final Material STEEL = MaterialUtils.generateMaterialFromGtENUM(Materials.Steel); @@ -528,7 +528,7 @@ public final class ALLOY { new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Kanthal), 3), new MaterialStack(MaterialUtils.generateMaterialFromGtENUM(Materials.Invar), 15) }); - + public static final Material EGLIN_STEEL = new Material( "Eglin Steel", //Material Name MaterialState.SOLID, //State @@ -564,8 +564,49 @@ public final class ALLOY { }); + /** + * Stargate Materials - #D2FFA9 210, 255, 170 + */ - + public static final Material TRINIUM_TITANIUM = new Material( + "Trinium Titanium Alloy", //Material Name + MaterialState.SOLID, //State + new short[]{239,210,200, 0}, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, + -1, + true, //Uses Blast furnace? + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 3), + new MaterialStack(ELEMENT.getInstance().TITANIUM, 7) + }); + public static final Material TRINIUM_NAQUADAH = new Material( + "Trinium Naquadah Alloy", //Material Name + MaterialState.SOLID, //State + new short[]{255, 243, 117, 0}, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, + -1, + true, //Uses Blast furnace? + new MaterialStack[]{ + new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 5), + new MaterialStack(ELEMENT.getInstance().NAQUADAH, 9) + }); + public static final Material TRINIUM_NAQUADAH_CARBON = new Material( + "Trinium Naquadah Carbonite", //Material Name + MaterialState.SOLID, //State + new short[]{255, 233, 0, 0}, //Material Colour + -1, //Melting Point in C + -1, //Boiling Point in C + -1, + -1, + true, //Uses Blast furnace? + new MaterialStack[]{ + new MaterialStack(TRINIUM_NAQUADAH, 9), + new MaterialStack(ELEMENT.getInstance().CARBON, 1) + }); diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java index 60a27a8769..859ebd86cf 100644 --- a/src/Java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java @@ -128,4 +128,10 @@ public final class ELEMENT { public final Material IGNIS = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedFire); public final Material TERRA = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedEarth); public final Material AQUA = MaterialUtils.generateMaterialFromGtENUM(Materials.InfusedWater); + + //Fictional + public final Material NAQUADAH = MaterialUtils.generateMaterialFromGtENUM(Materials.Naquadah); + public final Material TRINIUM = new Material("Trinium", MaterialState.SOLID, new short[]{170, 210, 130}, 604, 4057, 181, 133, false, "Ke", 0, false);//Not a GT Inherited Material + public final Material TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material + //https://github.com/Blood-Asp/GT5-Unofficial/issues/609 } diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index c25b818aa2..40d8461209 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -28,6 +28,8 @@ public class Material { private final Fluid vMoltenFluid; private final Fluid vPlasma; + + private final boolean vGenerateCells; protected Object dataVar = MathUtils.generateSingularRandomHexValue(); @@ -72,14 +74,23 @@ public class Material { public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){ this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, inputs); + } + + public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, boolean addCells,final MaterialStack... inputs) { + this (materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, addCells, inputs); } public Material(final String materialName, final MaterialState defaultState, final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){ + this (materialName, defaultState, durability, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, true, inputs); + } + + public Material(final String materialName, final MaterialState defaultState, final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, boolean generateCells, final MaterialStack... inputs){ this.unlocalizedName = Utils.sanitizeString(materialName); this.localizedName = materialName; this.materialState = defaultState; this.RGBA = rgba; + this.vGenerateCells = generateCells; //Add Components to an array. if (inputs == null){ @@ -600,10 +611,10 @@ public class Material { Utils.LOG_WARNING("Generating our own fluid."); //Generate a Cell if we need to - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1) == null){ - @SuppressWarnings("unused") - final - Item temp = new BaseItemCell(this); + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1) == null){ + if (this.vGenerateCells){ + final Item temp = new BaseItemCell(this); + } } if (this.materialState == MaterialState.SOLID){ @@ -656,6 +667,11 @@ public class Material { return isValid.mPlasma; } } + + if (this.vGenerateCells){ + return null; + } + Utils.LOG_WARNING("Generating our own Plasma."); return FluidUtils.addGTPlasma(this); //return null; diff --git a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java index 6e529b3e92..65c0f1e6c0 100644 --- a/src/Java/gtPlusPlus/core/material/MaterialGenerator.java +++ b/src/Java/gtPlusPlus/core/material/MaterialGenerator.java @@ -102,10 +102,9 @@ public class MaterialGenerator { } } else { Item temp; - if (generateEverything == true){ - Block tempBlock; - tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour); - } + Block tempBlock; + tempBlock = new BlockBaseModular(unlocalizedName, materialName,BlockTypes.STANDARD, Colour); + temp = new BaseItemIngot(matInfo); temp = new BaseItemDust("itemDust"+unlocalizedName, materialName, matInfo, Colour, "Dust", materialTier, sRadiation); temp = new BaseItemDust("itemDustTiny"+unlocalizedName, materialName, matInfo, Colour, "Tiny", materialTier, sRadiation); @@ -145,7 +144,7 @@ public class MaterialGenerator { RecipeGen_Fluids.generateRecipes(matInfo); RecipeGen_Plates.generateRecipes(matInfo); RecipeGen_ShapedCrafting.generateRecipes(matInfo); - RecipeGen_Recycling.generateRecipes(matInfo); + new RecipeGen_Recycling(matInfo); return true; } catch (final Throwable t) { @@ -218,7 +217,7 @@ public class MaterialGenerator { RecipeGen_Fluids.generateRecipes(matInfo); RecipeGen_Assembler.generateRecipes(matInfo); RecipeGen_DustGeneration.generateRecipes(matInfo, true); - RecipeGen_Recycling.generateRecipes(matInfo); + new RecipeGen_Recycling(matInfo); } catch (final Throwable t){ Utils.LOG_INFO(""+matInfo.getLocalizedName()+" failed to generate."); } diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java index 3e79d46c19..66c991ce99 100644 --- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java @@ -82,7 +82,7 @@ public class MaterialUtils { if (hasValidRGBA(rgba) || (element == Element.H) || ((material == Materials.InfusedAir) || (material == Materials.InfusedFire) || (material == Materials.InfusedEarth) || (material == Materials.InfusedWater))){ //ModItems.itemBaseDecidust = UtilsItems.generateDecidust(material); //ModItems.itemBaseCentidust = UtilsItems.generateCentidust(material); - return new Material(name, materialState, durability, rgba, melting, boiling, protons, neutrons, blastFurnace, chemicalFormula, radioactivity); + return new Material(name, materialState, durability, rgba, melting, boiling, protons, neutrons, blastFurnace, chemicalFormula, radioactivity, false); } return null; diff --git a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java index f88f8e32e0..5f7a60f546 100644 --- a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java +++ b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java @@ -95,7 +95,7 @@ public class ReflectionUtils { public static String getMethodName(final int depth) { final StackTraceElement[] ste = new Throwable().getStackTrace(); //System. out.println(ste[ste.length-depth].getClassName()+"#"+ste[ste.length-depth].getMethodName()); - return ste[depth].getMethodName(); + return ste[depth+1].getMethodName(); } -- cgit From f0b0ced99b15884fd485129c1fb231c04eaa9e42 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Mon, 18 Dec 2017 14:23:05 +1000 Subject: + Added some safety handling to Bee generation since they will not generate in older versions of Forestry. % Made all of Growthcraft support reflective. --- src/Java/gtPlusPlus/core/lib/CORE.java | 4 ---- src/Java/gtPlusPlus/core/proxy/ClientProxy.java | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Java/gtPlusPlus/core') diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 11ed154d5a..2fb3dd42b4 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -10,8 +10,6 @@ import java.util.concurrent.ConcurrentHashMap; import com.mojang.authlib.GameProfile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.array.Pair; @@ -46,8 +44,6 @@ public class CORE { public static boolean DEVENV = false; public static boolean DEBUG = false; - @SideOnly(Side.CLIENT) - public static boolean mFancyGraphics = false; //Only can be set in Dev, no config or setting elsewhere. public static final boolean LOAD_ALL_CONTENT = false;; diff --git a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java index 448188379a..b7525e2863 100644 --- a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java +++ b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java @@ -37,9 +37,13 @@ public class ClientProxy extends CommonProxy implements Runnable{ private final HashSet mCapeList = new HashSet(); private final GTPP_CapeRenderer mCapeRenderer; + @SideOnly(Side.CLIENT) + public static boolean mFancyGraphics = false; public ClientProxy(){ mCapeRenderer = new GTPP_CapeRenderer(mCapeList); + //Get Graphics Mode. + mFancyGraphics = Minecraft.isFancyGraphicsEnabled(); } @SubscribeEvent -- cgit From 2a4795f65d98ff60a177d7d6a5552fd687d9f6e8 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Wed, 20 Dec 2017 17:30:21 +1000 Subject: + Added support for GTNH Trinium. $ Fixed excessive fluid cells being generated. $ Further improve material recycling recipes. --- src/Java/gtPlusPlus/core/material/ALLOY.java | 2 +- src/Java/gtPlusPlus/core/material/ELEMENT.java | 17 +- src/Java/gtPlusPlus/core/material/Material.java | 218 ++++++++++++++------- .../core/material/MaterialGenerator.java | 14 +- .../core/material/nuclear/FLUORIDES.java | 1 + .../gtPlusPlus/core/material/nuclear/NUCLIDE.java | 14 +- 6 files changed, 168 insertions(+), 98 deletions(-) (limited to 'src/Java/gtPlusPlus/core') diff --git a/src/Java/gtPlusPlus/core/material/ALLOY.java b/src/Java/gtPlusPlus/core/material/ALLOY.java index 8d1d4e5ecd..84bd859ed4 100644 --- a/src/Java/gtPlusPlus/core/material/ALLOY.java +++ b/src/Java/gtPlusPlus/core/material/ALLOY.java @@ -589,7 +589,7 @@ public final class ALLOY { -1, //Boiling Point in C -1, -1, - true, //Uses Blast furnace? + false, //Uses Blast furnace? new MaterialStack[]{ new MaterialStack(ELEMENT.getInstance().TRINIUM_REFINED, 5), new MaterialStack(ELEMENT.getInstance().NAQUADAH, 9) diff --git a/src/Java/gtPlusPlus/core/material/ELEMENT.java b/src/Java/gtPlusPlus/core/material/ELEMENT.java index 859ebd86cf..eccd283da9 100644 --- a/src/Java/gtPlusPlus/core/material/ELEMENT.java +++ b/src/Java/gtPlusPlus/core/material/ELEMENT.java @@ -1,6 +1,7 @@ package gtPlusPlus.core.material; import gregtech.api.enums.Materials; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.util.StringUtils; import gtPlusPlus.core.util.materials.MaterialUtils; @@ -10,7 +11,17 @@ public final class ELEMENT { private static final ELEMENT thisClass = new ELEMENT(); public ELEMENT(){ - + + //GTNH Trinium Handling + if (CORE.GTNH){ + TRINIUM = MaterialUtils.generateMaterialFromGtENUM(Materials.valueOf("Trinium")); + TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material + } + else { + TRINIUM = new Material("Trinium", MaterialState.SOLID, new short[]{70, 110, 30}, 604, 4057, 181, 133, false, "Ke", 0, false);//Not a GT Inherited Material + TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material + } + } public static ELEMENT getInstance(){ @@ -131,7 +142,7 @@ public final class ELEMENT { //Fictional public final Material NAQUADAH = MaterialUtils.generateMaterialFromGtENUM(Materials.Naquadah); - public final Material TRINIUM = new Material("Trinium", MaterialState.SOLID, new short[]{170, 210, 130}, 604, 4057, 181, 133, false, "Ke", 0, false);//Not a GT Inherited Material - public final Material TRINIUM_REFINED = new Material("Refined Trinium", MaterialState.SOLID, new short[]{210, 255, 170}, 4304, 14057, 181, 133, false, "Ke", 0, new MaterialStack[]{new MaterialStack(TRINIUM, 1)});//Not a GT Inherited Material + public final Material TRINIUM; + public final Material TRINIUM_REFINED; //https://github.com/Blood-Asp/GT5-Unofficial/issues/609 } diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java index 40d8461209..0b1139cbcf 100644 --- a/src/Java/gtPlusPlus/core/material/Material.java +++ b/src/Java/gtPlusPlus/core/material/Material.java @@ -2,7 +2,7 @@ package gtPlusPlus.core.material; import static gregtech.api.enums.GT_Values.M; -import java.util.ArrayList; +import java.util.*; import gregtech.api.enums.*; import gtPlusPlus.core.item.base.cell.BaseItemCell; @@ -28,7 +28,7 @@ public class Material { private final Fluid vMoltenFluid; private final Fluid vPlasma; - + private final boolean vGenerateCells; protected Object dataVar = MathUtils.generateSingularRandomHexValue(); @@ -60,10 +60,17 @@ public class Material { public final int vToolQuality; public final int vHarvestLevel; + + public static Map invalidMaterials = new HashMap(); + public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final MaterialStack... inputs){ this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, "", 0, inputs); } + public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, boolean generateCells, final MaterialStack... inputs){ + this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, "", 0, generateCells, inputs); + } + public Material(final String materialName, final MaterialState defaultState,final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final int radiationLevel, final MaterialStack... inputs){ this(materialName, defaultState, 0, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, "", radiationLevel, inputs); } @@ -83,7 +90,7 @@ public class Material { public Material(final String materialName, final MaterialState defaultState, final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, final MaterialStack... inputs){ this (materialName, defaultState, durability, rgba, meltingPoint, boilingPoint, protons, neutrons, blastFurnace, chemicalSymbol, radiationLevel, true, inputs); } - + public Material(final String materialName, final MaterialState defaultState, final long durability, final short[] rgba, final int meltingPoint, final int boilingPoint, final long protons, final long neutrons, final boolean blastFurnace, final String chemicalSymbol, final int radiationLevel, boolean generateCells, final MaterialStack... inputs){ this.unlocalizedName = Utils.sanitizeString(materialName); @@ -105,7 +112,7 @@ public class Material { } } } - + //Set Melting/Boiling point, if value is -1 calculate it from compound inputs. if (meltingPoint != -1){ @@ -128,7 +135,7 @@ public class Material { this.meltingPointK = (int) MathUtils.celsiusToKelvin(this.meltingPointC); this.boilingPointK = (int) MathUtils.celsiusToKelvin(this.boilingPointC); - + //Set Proton/Neutron count, if value is -1 calculate it from compound inputs. if (protons != -1){ this.vProtons = protons; @@ -142,10 +149,10 @@ public class Material { else { this.vNeutrons = this.calculateNeutrons(); } - - - - + + + + this.vMass = this.getMass(); //Sets tool Durability @@ -247,12 +254,12 @@ public class Material { this.vChemicalFormula = "??"; } + final Materials isValid = Materials.get(this.getLocalizedName()); - if (FluidUtils.getFluidStack(localizedName, 1) != null){ this.vMoltenFluid = FluidUtils.getFluidStack(localizedName, 1).getFluid(); } - else if (isValid == Materials._NULL){ + else if (isValid == null || isValid == Materials._NULL){ this.vMoltenFluid = this.generateFluid(); } else { @@ -269,8 +276,6 @@ public class Material { this.vPlasma = this.generatePlasma(); - //dataVar = MathUtils.generateSingularRandomHexValue(); - String ratio = ""; if (this.vSmallestRatio != null) { for (int hu=0;hu Date: Wed, 20 Dec 2017 23:39:49 +1000 Subject: - Disabled some logging. % Minor Project Clean-up, added missing Override annotations to 100+ methods & removed pointless casts. % Moved Logging to it's own class. $ Fixed Multi-block handling of Pollution. $ Fixed the GT 5.09 material enabler system. (From My Side, it's still borked on GTs). + Added a Dynamic Proxy invocation for IMaterialHandler. + Added an AutoMap data type, which is a Auto-incremental ID'd Hashmap wrapper. --- src/Java/gtPlusPlus/core/block/ModBlocks.java | 5 +- .../core/block/general/antigrief/TowerDevice.java | 4 +- .../block/machine/Machine_ModularityTable.java | 4 +- .../core/block/machine/Machine_ProjectTable.java | 4 +- .../core/block/machine/Machine_TradeTable.java | 4 +- .../core/block/machine/Machine_Workbench.java | 4 +- .../core/client/model/ModelStaballoyConstruct.java | 15 ++- .../renderer/RenderMiningExplosivesPrimed.java | 6 +- .../core/client/renderer/RenderPotionthrow.java | 25 ++-- .../client/renderer/RenderStaballoyConstruct.java | 21 +-- src/Java/gtPlusPlus/core/commands/CommandMath.java | 50 ++++---- src/Java/gtPlusPlus/core/common/CommonProxy.java | 27 ++-- .../core/common/compat/COMPAT_Baubles.java | 6 +- .../core/container/Container_HeliumGenerator.java | 6 +- .../core/container/Container_ModularityTable.java | 21 ++- .../core/container/Container_ProjectTable.java | 16 ++- .../core/container/Container_TradeTable.java | 17 ++- .../core/container/Container_Workbench.java | 40 +++--- .../container/Container_WorkbenchAdvanced.java | 40 +++--- .../core/entity/InternalEntityRegistry.java | 4 +- .../entity/monster/EntityStaballoyConstruct.java | 12 +- .../projectile/EntityHydrofluoricAcidPotion.java | 5 +- .../projectile/EntitySulfuricAcidPotion.java | 3 +- .../core/gui/machine/GUI_TradeTable.java | 6 +- src/Java/gtPlusPlus/core/handler/BookHandler.java | 4 +- .../gtPlusPlus/core/handler/COMPAT_HANDLER.java | 4 +- src/Java/gtPlusPlus/core/handler/GuiHandler.java | 10 +- .../gtPlusPlus/core/handler/OldCircuitHandler.java | 8 +- .../handler/Recipes/LateRegistrationHandler.java | 6 +- .../core/handler/Recipes/RegistrationHandler.java | 4 +- .../core/handler/events/BlockEventHandler.java | 20 +-- .../core/handler/events/LoginEventHandler.java | 11 +- .../events/PickaxeBlockBreakEventHandler.java | 10 +- .../core/handler/events/SneakManager.java | 4 +- .../handler/events/UnbreakableBlockManager.java | 50 ++++---- .../events/ZombieBackupSpawnEventHandler.java | 8 +- .../workbench/Workbench_CraftingHandler.java | 4 +- .../inventories/InventoryWorkbenchHoloSlots.java | 14 +- src/Java/gtPlusPlus/core/item/ModItems.java | 35 ++--- .../core/item/base/BaseItemDamageable.java | 6 +- .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 6 +- src/Java/gtPlusPlus/core/item/base/CoreItem.java | 4 +- .../core/item/base/dusts/BaseItemDust.java | 34 ++--- .../core/item/base/dusts/BaseItemDustUnique.java | 12 +- .../core/item/base/foods/BaseItemHotFood.java | 3 +- .../core/item/base/ingots/BaseItemIngot.java | 8 +- .../core/item/base/ingots/BaseItemIngotHot.java | 3 +- .../core/item/base/ingots/BaseItemIngot_OLD.java | 8 +- .../core/item/base/itemblock/ItemBlockNBT.java | 4 +- .../core/item/base/misc/BaseItemMisc.java | 4 +- .../core/item/base/rods/BaseItemRod.java | 4 +- .../core/item/base/rods/BaseItemRodLong.java | 4 +- .../core/item/base/screws/BaseItemScrew.java | 4 +- .../gtPlusPlus/core/item/bauble/ModularBauble.java | 8 +- .../core/item/general/ItemAreaClear.java | 4 +- .../core/item/general/ItemBlueprint.java | 12 +- .../core/item/general/ItemHealingDevice.java | 4 +- .../item/general/capture/ItemEntityCatcher.java | 58 ++++----- .../throwables/ItemHydrofluoricAcidPotion.java | 1 + .../general/throwables/ItemSulfuricAcidPotion.java | 1 + .../gtPlusPlus/core/item/init/ItemsMultiTools.java | 4 +- .../core/item/tool/staballoy/MultiPickaxeBase.java | 13 +- .../core/item/tool/staballoy/StaballoyPickaxe.java | 34 ++--- .../core/item/tool/staballoy/StaballoySpade.java | 30 ++--- src/Java/gtPlusPlus/core/lib/LoadedMods.java | 92 +++++++------- src/Java/gtPlusPlus/core/material/Material.java | 85 +++++++------ .../core/material/MaterialGenerator.java | 5 +- src/Java/gtPlusPlus/core/proxy/ClientProxy.java | 13 +- .../core/recipe/Gregtech_Recipe_Adder.java | 4 +- .../gtPlusPlus/core/recipe/RECIPES_GREGTECH.java | 54 ++++---- .../gtPlusPlus/core/recipe/RECIPES_General.java | 10 +- .../core/recipe/RECIPES_LaserEngraver.java | 30 ++--- .../gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java | 4 +- .../core/recipe/RECIPES_MachineComponents.java | 8 +- .../gtPlusPlus/core/recipe/RECIPES_Machines.java | 8 +- .../core/recipe/RECIPES_Old_Circuits.java | 18 +-- .../gtPlusPlus/core/recipe/RECIPES_Shapeless.java | 4 +- .../gtPlusPlus/core/recipe/ShapedRecipeObject.java | 4 +- src/Java/gtPlusPlus/core/recipe/common/CI.java | 7 +- src/Java/gtPlusPlus/core/slots/SlotBlueprint.java | 6 +- .../core/slots/SlotCraftingNoCollect.java | 11 +- src/Java/gtPlusPlus/core/slots/SlotGtTool.java | 6 +- .../gtPlusPlus/core/slots/SlotGtToolElectric.java | 6 +- .../core/slots/SlotModularBaubleUpgrades.java | 6 +- .../core/tileentities/ModTileEntities.java | 4 +- .../core/tileentities/base/TileEntityBase.java | 10 +- .../tileentities/general/TileEntityFishTrap.java | 12 +- .../general/TileEntityInfiniteFluid.java | 14 +- .../general/TileEntityXpConverter.java | 38 +++--- .../machines/TileEntityModularityTable.java | 17 +-- .../machines/TileEntityProjectTable.java | 42 +++--- src/Java/gtPlusPlus/core/util/Utils.java | 141 +++++---------------- src/Java/gtPlusPlus/core/util/array/AutoMap.java | 77 +++++++++++ .../core/util/debug/DEBUG_ITEM_ShapeSpawner.java | 4 +- .../core/util/debug/DEBUG_TimerThread.java | 10 +- .../core/util/enchanting/EnchantingUtils.java | 6 +- .../gtPlusPlus/core/util/fluid/FluidUtils.java | 29 +++-- src/Java/gtPlusPlus/core/util/geo/GeoUtils.java | 14 +- .../gregtech/recipehandlers/GregtechRecipe.java | 14 +- .../core/util/inventory/InventoryUtils.java | 10 +- src/Java/gtPlusPlus/core/util/item/ItemUtils.java | 47 +++---- .../core/util/materials/MaterialUtils.java | 28 +--- src/Java/gtPlusPlus/core/util/math/MathUtils.java | 7 +- .../core/util/nbt/ModularArmourUtils.java | 4 +- src/Java/gtPlusPlus/core/util/nbt/NBTUtils.java | 8 +- .../core/util/networking/NetworkUtils.java | 12 +- .../gtPlusPlus/core/util/player/PlayerCache.java | 16 +-- .../gtPlusPlus/core/util/player/PlayerUtils.java | 2 +- .../gtPlusPlus/core/util/player/UtilsMining.java | 18 +-- .../gtPlusPlus/core/util/recipe/RecipeUtils.java | 140 ++++++++++---------- .../core/util/recipe/shapeless/ShapelessUtils.java | 6 +- .../core/util/reflect/ReflectionUtils.java | 44 ++++++- src/Java/gtPlusPlus/core/util/wrapper/var.java | 4 +- .../darkworld/biome/BiomeGenerator_Custom.java | 37 +++--- .../world/darkworld/biome/Biome_DarkWorld.java | 4 +- .../block/blockDarkWorldPollutedDirt.java | 4 +- .../world/darkworld/chunk/ChunkProviderModded.java | 6 +- .../world/darkworld/gen/WorldGenDeadLilly.java | 4 +- .../darkworld/gen/WorldGenMinable_Custom.java | 34 ++--- 119 files changed, 1050 insertions(+), 1008 deletions(-) create mode 100644 src/Java/gtPlusPlus/core/util/array/AutoMap.java (limited to 'src/Java/gtPlusPlus/core') diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java index 81d3a84dc9..cbd21a8888 100644 --- a/src/Java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java @@ -1,6 +1,7 @@ package gtPlusPlus.core.block; import cpw.mods.fml.common.registry.GameRegistry; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.base.BasicBlock.BlockTypes; import gtPlusPlus.core.block.base.BlockBaseOre; import gtPlusPlus.core.block.general.BlockCompressedObsidian; @@ -66,7 +67,7 @@ public final class ModBlocks { public static Block blockNet; public static void init() { - Utils.LOG_INFO("Initializing Blocks."); + Logger.INFO("Initializing Blocks."); //blockGriefSaver = new TowerDevice().setBlockName("blockGriefSaver").setCreativeTab(AddToCreativeTab.tabBlock).setBlockTextureName("blockDefault"); registerBlocks(); @@ -74,7 +75,7 @@ public final class ModBlocks { public static void registerBlocks(){ - Utils.LOG_INFO("Registering Blocks."); + Logger.INFO("Registering Blocks."); GameRegistry.registerBlock(MatterFabricatorEffectBlock = new LightGlass(Material.glass, false).setHardness(0.1F).setBlockTextureName(CORE.MODID + ":" + "blockMFEffect").setStepSound(Block.soundTypeGlass), "blockMFEffect"); //Fluids diff --git a/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java b/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java index 8ac4e2df8d..ea3d9c3ee9 100644 --- a/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java +++ b/src/Java/gtPlusPlus/core/block/general/antigrief/TowerDevice.java @@ -7,10 +7,10 @@ import java.util.Random; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.general.TileEntityReverter; -import gtPlusPlus.core.util.Utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -266,7 +266,7 @@ public class TowerDevice extends Block { public TileEntity createTileEntity(final World world, final int metadata) { if (metadata == 0) { - Utils.LOG_INFO("I have been created. [Antigriefer]"+this.getLocalizedName()); + Logger.INFO("I have been created. [Antigriefer]"+this.getLocalizedName()); return new TileEntityReverter(); } return null; diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java index 1b4c5ebd01..bd41980325 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java @@ -5,10 +5,10 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityModularityTable; -import gtPlusPlus.core.util.Utils; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -70,7 +70,7 @@ public class Machine_ModularityTable extends BlockContainer final TileEntity te = world.getTileEntity(x, y, z); if ((te != null) && (te instanceof TileEntityModularityTable)){ player.openGui(GTplusplus.instance, 1, world, x, y, z); - Utils.LOG_INFO("Player opened GUI"); + Logger.INFO("Player opened GUI"); return true; } return false; diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java index 939015adf7..712d32aba7 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_ProjectTable.java @@ -6,11 +6,11 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.player.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import ic2.core.item.tool.ItemToolWrench; @@ -95,7 +95,7 @@ public class Machine_ProjectTable extends BlockContainer player.openGui(GTplusplus.instance, 0, world, x, y, z); return true; } - Utils.LOG_INFO("Holding a Wrench, doing wrench things instead."); + Logger.INFO("Holding a Wrench, doing wrench things instead."); } return false; } diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java index 724b438b13..4cad0977ed 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java @@ -3,10 +3,10 @@ package gtPlusPlus.core.block.machine; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.base.BlockBaseNBT; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable; -import gtPlusPlus.core.util.Utils; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EnumCreatureType; @@ -55,7 +55,7 @@ public class Machine_TradeTable extends BlockBaseNBT return true; } else { - Utils.LOG_INFO("Bad TE"); + Logger.INFO("Bad TE"); } return false; } diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java index b5c54ad9a8..06df4ca480 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java @@ -6,11 +6,11 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.GTplusplus; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.player.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import ic2.core.item.tool.ItemToolWrench; @@ -95,7 +95,7 @@ public class Machine_Workbench extends BlockContainer player.openGui(GTplusplus.instance, 3, world, x, y, z); return true; } - Utils.LOG_INFO("Holding a Wrench, doing wrench things instead."); + Logger.INFO("Holding a Wrench, doing wrench things instead."); } return false; } diff --git a/src/Java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java b/src/Java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java index ab56e11a9a..72693e3de7 100644 --- a/src/Java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java +++ b/src/Java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java @@ -65,7 +65,8 @@ public class ModelStaballoyConstruct extends ModelIronGolem /** * Sets the models various rotation angles then renders the model. */ - public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_) + @Override + public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_) { this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_); this.ironGolemHead.render(p_78088_7_); @@ -81,7 +82,8 @@ public class ModelStaballoyConstruct extends ModelIronGolem * and legs, where par1 represents the time(so that arms and legs swing back and forth) and par2 represents how * "far" arms and legs can swing at most. */ - public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_) + @Override + public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_) { this.ironGolemHead.rotateAngleY = p_78087_4_ / (180F / (float)Math.PI); this.ironGolemHead.rotateAngleX = p_78087_5_ / (180F / (float)Math.PI); @@ -95,15 +97,16 @@ public class ModelStaballoyConstruct extends ModelIronGolem * Used for easily adding entity-dependent animations. The second and third float params here are the same second * and third as in the setRotationAngles method. */ - public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_) + @Override + public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_) { EntityIronGolem entityirongolem = (EntityIronGolem)p_78086_1_; int i = entityirongolem.getAttackTimer(); if (i > 0) { - this.ironGolemRightArm.rotateAngleX = -2.0F + 1.5F * this.func_78172_a((float)i - p_78086_4_, 10.0F); - this.ironGolemLeftArm.rotateAngleX = -2.0F + 1.5F * this.func_78172_a((float)i - p_78086_4_, 10.0F); + this.ironGolemRightArm.rotateAngleX = -2.0F + 1.5F * this.func_78172_a(i - p_78086_4_, 10.0F); + this.ironGolemLeftArm.rotateAngleX = -2.0F + 1.5F * this.func_78172_a(i - p_78086_4_, 10.0F); } else { @@ -111,7 +114,7 @@ public class ModelStaballoyConstruct extends ModelIronGolem if (j > 0) { - this.ironGolemRightArm.rotateAngleX = -0.8F + 0.025F * this.func_78172_a((float)j, 70.0F); + this.ironGolemRightArm.rotateAngleX = -0.8F + 0.025F * this.func_78172_a(j, 70.0F); this.ironGolemLeftArm.rotateAngleX = 0.0F; } else diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java b/src/Java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java index bbbde96c8e..42071428a7 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java +++ b/src/Java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java @@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.util.Utils; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.texture.TextureMap; @@ -19,7 +19,7 @@ public class RenderMiningExplosivesPrimed extends Render { public RenderMiningExplosivesPrimed(){ this.shadowSize = 0.5F; - Utils.LOG_INFO("Rendering Mining Explosion. 1"); + Logger.INFO("Rendering Mining Explosion. 1"); } /** @@ -29,7 +29,7 @@ public class RenderMiningExplosivesPrimed extends Render { * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that. */ public void doRender(final EntityTNTPrimed entity, final double p_76986_2_, final double p_76986_4_, final double p_76986_6_, final float p_76986_8_, final float p_76986_9_){ - Utils.LOG_INFO("Rendering Mining Explosion. 2"); + Logger.INFO("Rendering Mining Explosion. 2"); GL11.glPushMatrix(); GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); float f2; diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java b/src/Java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java index 378d03f1df..e86a3fa7ab 100644 --- a/src/Java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java +++ b/src/Java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java @@ -1,5 +1,8 @@ package gtPlusPlus.core.client.renderer; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.Tessellator; @@ -12,8 +15,6 @@ import net.minecraft.item.ItemPotion; import net.minecraft.potion.PotionHelper; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; @SideOnly(Side.CLIENT) public class RenderPotionthrow extends Render @@ -38,7 +39,8 @@ public class RenderPotionthrow extends Render * (Render> 16 & 255) / 255.0F; - float f3 = (float)(i >> 8 & 255) / 255.0F; - float f4 = (float)(i & 255) / 255.0F; + float f2 = (i >> 16 & 255) / 255.0F; + float f3 = (i >> 8 & 255) / 255.0F; + float f4 = (i & 255) / 255.0F; GL11.glColor3f(f2, f3, f4); GL11.glPushMatrix(); this.func_77026_a(tessellator, ItemPotion.func_94589_d("overlay")); @@ -73,7 +75,8 @@ public class RenderPotionthrow extend