diff options
| author | boubou19 <miisterunknown@gmail.com> | 2023-04-21 20:29:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-21 20:29:38 +0200 |
| commit | de864236f83dc31c53ca77a6939357a0959bca75 (patch) | |
| tree | ef739fd9426e7c2525b1560386faaa5bb893e30d /src/main/java/gregtech/common | |
| parent | 285a75535d07f2037967b1208a5840fb81719514 (diff) | |
| download | GT5-Unofficial-de864236f83dc31c53ca77a6939357a0959bca75.tar.gz GT5-Unofficial-de864236f83dc31c53ca77a6939357a0959bca75.tar.bz2 GT5-Unofficial-de864236f83dc31c53ca77a6939357a0959bca75.zip | |
Recipes ra2 (#1872)
* Recipes RA2 fixes
* Use \uXXXX for non-ASCII characters
* Misc cleanup (#1888)
* migrate away from addThermalCentrifugeRecipe
* split recipes of GT_Block_Stones_Abstract
* migrate away from addForgeHammerRecipe
* migrate away from addChemicalBathRecipe
* remove "DisableOldChemicalRecipes" and its usage, as it's disabled by default in NH and it increases recipe complexity for nothing
* Remove underground biomes ore classes, as it's not present in NH
* migrate away from addFluidCannerRecipe
* migrate away from addFluidExtractionRecipe
* migrate away from addChemicalRecipe
* migrate away from addMultiblockChemicalRecipe
* deprecate addChemicalRecipeForBasicMachineOnly
* migrate away from addCentrifugeRecipe
* spotlessApply
* fixing wrong merge conflict solving
* Add Tengam materials (#1891)
* Add Tengam materials
* Change new recipes to consume 15/16 Amp
* Remove now redundant `break` statements
* fix comb chances?
* fix centrifuge code not working
---------
Co-authored-by: glowredman <35727266+glowredman@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/common')
48 files changed, 769 insertions, 758 deletions
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java index f25240f8bc..de36c1f1c8 100644 --- a/src/main/java/gregtech/common/GT_Proxy.java +++ b/src/main/java/gregtech/common/GT_Proxy.java @@ -8,6 +8,8 @@ import static gregtech.api.enums.FluidState.PLASMA; import static gregtech.api.enums.GT_Values.W; import static gregtech.api.enums.GT_Values.debugEntityCramming; import static gregtech.api.enums.Mods.*; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; import static gregtech.api.util.GT_Util.LAST_BROKEN_TILEENTITY; import java.io.File; @@ -105,6 +107,7 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SoundResource; import gregtech.api.enums.SubTag; import gregtech.api.enums.TC_Aspects.TC_AspectStack; +import gregtech.api.enums.TierEU; import gregtech.api.enums.ToolDictNames; import gregtech.api.fluid.GT_FluidFactory; import gregtech.api.interfaces.IBlockOnWalkOver; @@ -582,10 +585,12 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG public boolean mLowGravProcessing = false; public boolean mAprilFool = false; public boolean mCropNeedBlock = true; + @Deprecated public boolean mDisableOldChemicalRecipes = false; public boolean mAMHInteraction = true; public boolean mForceFreeFace = true; public boolean mBrickedBlastFurnace = true; + @Deprecated public boolean mEasierIVPlusCables = false; public boolean mMixedOreOnlyYieldsTwoThirdsOfPureOre = false; public boolean enableBlackGraniteOres = true; @@ -2529,22 +2534,24 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG new FluidStack(crackedFluids[i], 1000), 20 + 20 * i, 240); - GT_Values.RA.addChemicalRecipe( - Materials.Hydrogen.getCells(hydrogenAmount), - GT_Utility.getIntegratedCircuit(i + 1), - new FluidStack(uncrackedFluid, 1000), - new FluidStack(crackedFluids[i], 800), - Materials.Empty.getCells(hydrogenAmount), - 160 + 80 * i, - 30); - GT_Values.RA.addChemicalRecipe( - aMaterial.getCells(1), - GT_Utility.getIntegratedCircuit(i + 1), - Materials.Hydrogen.getGas(hydrogenAmount * 1000), - new FluidStack(crackedFluids[i], 800), - Materials.Empty.getCells(1), - 160 + 80 * i, - 30); + + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Hydrogen.getCells(hydrogenAmount), GT_Utility.getIntegratedCircuit(i + 1)) + .itemOutputs(Materials.Empty.getCells(hydrogenAmount)) + .fluidInputs(new FluidStack(uncrackedFluid, 1000)) + .fluidOutputs(new FluidStack(crackedFluids[i], 800)) + .duration((8 + 4 * i) * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(aMaterial.getCells(1), GT_Utility.getIntegratedCircuit(i + 1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(Materials.Hydrogen.getGas(hydrogenAmount * 1000)) + .fluidOutputs(new FluidStack(crackedFluids[i], 800)) + .duration((8 + 4 * i) * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); } aMaterial.setHydroCrackedFluids(crackedFluids); } @@ -2579,22 +2586,24 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler, IG new FluidStack(crackedFluids[i], 1200), 20 + 20 * i, 240); - GT_Values.RA.addChemicalRecipe( - GT_ModHandler.getIC2Item("steamCell", 1L), - GT_Utility.getIntegratedCircuit(i + 1), - new FluidStack(uncrackedFluid, 1000), - new FluidStack(crackedFluids[i], 800), - Materials.Empty.getCells(1), - 160 + 80 * i, - 30); - GT_Values.RA.addChemicalRecipe( - aMaterial.getCells(1), - GT_Utility.getIntegratedCircuit(i + 1), - GT_ModHandler.getSteam(1000), - new FluidStack(crackedFluids[i], 800), - Materials.Empty.getCells(1), - 160 + 80 * i, - 30); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_ModHandler.getIC2Item("steamCell", 1L), GT_Utility.getIntegratedCircuit(i + 1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(new FluidStack(uncrackedFluid, 1000)) + .fluidOutputs(new FluidStack(crackedFluids[i], 800)) + .duration((8 + 4 * i) * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); + + GT_Values.RA.stdBuilder() + .itemInputs(aMaterial.getCells(1), GT_Utility.getIntegratedCircuit(i + 1)) + .itemOutputs(Materials.Empty.getCells(1)) + .fluidInputs(GT_ModHandler.getSteam(1000)) + .fluidOutputs(new FluidStack(crackedFluids[i], 800)) + .duration((8 + 4 * i) * SECONDS) + .eut(TierEU.RECIPE_LV) + .addTo(UniversalChemical); } aMaterial.setSteamCrackedFluids(crackedFluids); } diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 65ff60e9c3..c49408bb07 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -45,6 +45,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return false; } + @Deprecated @Override // Really? public boolean addFusionReactorRecipe(FluidStack aInput1, FluidStack aInput2, FluidStack aOutput1, int aDuration, int aEUt, int aStartEU) { @@ -68,6 +69,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addFusionReactorRecipe(FluidStack[] FluidInputArray, FluidStack[] FluidOutputArray, int aFusionDurationInTicks, int aFusionEnergyPerTick, int aEnergyNeededForStartingFusion) { @@ -98,6 +100,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addCentrifugeRecipe(ItemStack aInput1, int aInput2, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int aDuration) { @@ -117,6 +120,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { 5); } + @Deprecated @Override public boolean addCentrifugeRecipe(ItemStack aInput1, int aInput2, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int aDuration, int aEUt) { @@ -136,6 +140,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { aEUt); } + @Deprecated @Override public boolean addCentrifugeRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, @@ -157,6 +162,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { false); } + @Deprecated @Override public boolean addCentrifugeRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, @@ -230,6 +236,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addCompressorRecipe(ItemStack aInput1, ItemStack aOutput1, int aDuration, int aEUt) { if ((aInput1 == null) || (aOutput1 == null)) { @@ -251,6 +258,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addElectrolyzerRecipe(ItemStack aInput1, int aInput2, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, ItemStack aOutput5, ItemStack aOutput6, int aDuration, int aEUt) { @@ -270,6 +278,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { aEUt); } + @Deprecated @Override public boolean addElectrolyzerRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, ItemStack aOutput4, @@ -333,28 +342,33 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int aDuration) { return addChemicalRecipe(aInput1, aInput2, null, null, aOutput, aDuration); } + @Deprecated @Override public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int aDuration, int aEUt) { return addChemicalRecipe(aInput1, aInput2, null, null, aOutput, aDuration, aEUt); } + @Deprecated @Override public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration) { return addChemicalRecipe(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aDuration, 30); } + @Deprecated @Override public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration) { return addChemicalRecipe(aInput1, aInput2, aFluidInput, aFluidOutput, aOutput, aOutput2, aDuration, 30); } + @Deprecated @Override public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUTick) { @@ -369,6 +383,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { aEUTick); } + @Deprecated @Override public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick) { @@ -384,6 +399,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { false); } + @Deprecated @Override public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick, @@ -439,6 +455,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addMultiblockChemicalRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUtick) { @@ -453,6 +470,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addChemicalRecipeForBasicMachineOnly(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick) { @@ -488,6 +506,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public void addDefaultPolymerizationRecipes(Fluid aBasicMaterial, ItemStack aBasicMaterialCell, Fluid aPolymer) { // Oxygen/Titaniumtetrafluoride -> +50% Output each @@ -1119,6 +1138,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addBenderRecipe(ItemStack aInput1, ItemStack aOutput1, int aDuration, int aEUt) { if ((aInput1 == null) || (aOutput1 == null)) { @@ -1131,6 +1151,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addBenderRecipe(ItemStack aInput1, ItemStack aCircuit, ItemStack aOutput1, int aDuration, int aEUt) { if ((aInput1 == null) || (aOutput1 == null)) { @@ -1469,12 +1490,14 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addChemicalBathRecipe(ItemStack aInput, FluidStack aBathingFluid, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt) { return false; } + @Deprecated @Override public boolean addForgeHammerRecipe(ItemStack aInput1, ItemStack aOutput1, int aDuration, int aEUt) { if ((aInput1 == null) || (aOutput1 == null)) { @@ -1496,6 +1519,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addForgeHammerRecipe(ItemStack[] ItemInputArray, FluidStack[] FluidInputArray, ItemStack[] ItemOutputArray, FluidStack[] FluidOutputArray, int aDuration, int aEUt) { @@ -1557,6 +1581,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addThermalCentrifugeRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, int aDuration, int aEUt) { @@ -1579,6 +1604,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addThermalCentrifugeRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, int[] aChances, int aDuration, int aEUt) { @@ -1880,6 +1906,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addFluidExtractionRecipe(ItemStack aInput, ItemStack aRemains, FluidStack aOutput, int aChance, int aDuration, int aEUt) { @@ -1909,6 +1936,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addFluidCannerRecipe(ItemStack aInput, ItemStack aOutput, FluidStack aFluidInput, FluidStack aFluidOutput) { @@ -1936,6 +1964,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addFluidCannerRecipe(ItemStack aInput, ItemStack aOutput, FluidStack aFluidInput, FluidStack aFluidOutput, int aDuration, int aEUt) { @@ -1961,6 +1990,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addChemicalBathRecipe(ItemStack aInput, FluidStack aBathingFluid, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, int[] aChances, int aDuration, int aEUt) { @@ -1984,6 +2014,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addChemicalBathRecipe(ItemStack aInput, FluidStack aBathingFluid, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, int[] aChances, int aDuration, int aEUt) { @@ -2286,6 +2317,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addMixerRecipe(ItemStack[] ItemInputArray, FluidStack[] FluidInputArray, ItemStack[] ItemOutputArray, FluidStack[] FluidOutputArray, int aDuration, int aEUt) { @@ -2465,6 +2497,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addLaserEngraverRecipe(ItemStack[] ItemInputArray, FluidStack[] FluidInputArray, ItemStack[] OutputItemArray, FluidStack[] FluidOutputArray, int aDuration, int aEUt, boolean aCleanroom) { @@ -2482,6 +2515,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addFormingPressRecipe(ItemStack aItemToImprint, ItemStack aForm, ItemStack aImprintedItem, int aDuration, int aEUt) { @@ -2504,6 +2538,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addFormingPressRecipe(ItemStack[] ItemInputArray, ItemStack[] OutputItemArray, int aDuration, int aEUt) { @@ -2515,6 +2550,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addFluidHeaterRecipe(ItemStack aItem, FluidStack aOutput, int aDuration, int aEUt) { if ((aItem == null) || (aOutput == null)) { @@ -2540,6 +2576,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addFluidHeaterRecipe(ItemStack aCircuit, FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt) { @@ -2566,6 +2603,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addSifterRecipe(ItemStack aItemToSift, ItemStack[] aSiftedItems, int[] aChances, int aDuration, int aEUt) { @@ -2594,6 +2632,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return false; } + @Deprecated @Override public boolean addSifterRecipe(ItemStack[] ItemInputArray, FluidStack[] FluidInputArray, ItemStack[] OutputItemArray, FluidStack[] FluidOutputArray, int[] aChances, int aDuration, int aEUt, @@ -2612,12 +2651,14 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } + @Deprecated @Override public boolean addArcFurnaceRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt) { return addArcFurnaceRecipe(aInput, aOutputs, aChances, aDuration, aEUt, false); } + @Deprecated @Override public boolean addArcFurnaceRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt, boolean hidden) { @@ -2752,12 +2793,14 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return false; } + @Deprecated @Override public boolean addPulveriserRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt) { return addPulveriserRecipe(aInput, aOutputs, aChances, aDuration, aEUt, false); } + @Deprecated @Override public boolean addPulveriserRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt, boolean hidden) { diff --git a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java index 268f23bfe7..833e536757 100644 --- a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java +++ b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java @@ -84,31 +84,31 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { TC_Aspects.STRONTIO.mAspect = new Aspect( "strontio", - 15647411, + 0xEEC2B3, new Aspect[] { Aspect.MIND, Aspect.ENTROPY }, new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.STRONTIO.name() + ".png"), 1); TC_Aspects.NEBRISUM.mAspect = new Aspect( "nebrisum", - 15658622, + 0xEEEE7E, new Aspect[] { Aspect.MINE, Aspect.GREED }, new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.NEBRISUM.name() + ".png"), 1); TC_Aspects.ELECTRUM.mAspect = new Aspect( "electrum", - 12644078, + 0xC0EEEE, new Aspect[] { Aspect.ENERGY, Aspect.MECHANISM }, new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.ELECTRUM.name() + ".png"), 1); TC_Aspects.MAGNETO.mAspect = new Aspect( "magneto", - 12632256, + 0xC0C0C0, new Aspect[] { Aspect.METAL, Aspect.TRAVEL }, new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.MAGNETO.name() + ".png"), 1); TC_Aspects.RADIO.mAspect = new Aspect( "radio", - 12648384, + 0xC0FFC0, new Aspect[] { Aspect.LIGHT, Aspect.ENERGY }, new ResourceLocation("gregtech:textures/aspects/" + TC_Aspects.RADIO.name() + ".png"), 1); diff --git a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java b/src/main/java/gregtech/common/bees/GT_AlleleHelper.java index c9e37f7824..4609f11aa0 100644 --- a/src/main/java/gregtech/common/bees/GT_AlleleHelper.java +++ b/src/main/java/gregtech/common/bees/GT_AlleleHelper.java @@ -162,7 +162,8 @@ public class GT_AlleleHelper extends AlleleHelper { } @Override - public <T extends Enum<T> & IChromosomeType> void set(IAllele[] alleles, T chromosomeType, IAlleleValue value) { + public <T extends Enum<T> & IChromosomeType> void set(IAllele[] alleles, T chromosomeType, + @SuppressWarnings("rawtypes") IAlleleValue value) { set(alleles, chromosomeType, get(value)); } diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java index e0215e77eb..c9a93ecaec 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java @@ -228,7 +228,6 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo return tTileEntity != null && tTileEntity.receiveClientEvent(aData1, aData2); } - @SuppressWarnings("unchecked") // Old API uses raw List type @Override public void addCollisionBoxesToList(World aWorld, int aX, int aY, int aZ, AxisAlignedBB inputAABB, List<AxisAlignedBB> outputAABB, Entity collider) { @@ -605,7 +604,6 @@ public class GT_Block_Machines extends GT_Generic_Block implements IDebugableBlo @SideOnly(Side.CLIENT) @Override - @SuppressWarnings("unchecked") // Old API uses raw List type public void getSubBlocks(Item item, CreativeTabs aCreativeTab, List<ItemStack> outputSubBlocks) { for (int i = 1; i < GregTech_API.METATILEENTITIES.length; i++) { if (GregTech_API.METATILEENTITIES[i] != null) { diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java index 10fb15a77c..2a37aefa64 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java @@ -308,7 +308,6 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements public abstract ITexture[] getTextureSet(); // Must have 16 entries. - @SuppressWarnings({ "unchecked" }) @Override @SideOnly(Side.CLIENT) public void getSubBlocks(Item aItem, CreativeTabs aTab, List<ItemStack> aList) { diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java deleted file mode 100644 index cacf903c81..0000000000 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB1.java +++ /dev/null @@ -1,72 +0,0 @@ -package gregtech.common.blocks; - -import static gregtech.api.enums.Mods.UndergroundBiomes; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.interfaces.ITexture; -import gregtech.api.render.TextureFactory; - -public class GT_Block_Ores_UB1 extends GT_Block_Ores_Abstract { - - Block aUBBlock = GameRegistry.findBlock(UndergroundBiomes.ID, "igneousStone"); - - public GT_Block_Ores_UB1() { - super("gt.blockores.ub1", 8, true, Material.rock); - if (aUBBlock == null) aUBBlock = Blocks.stone; - } - - @Override - public String getUnlocalizedName() { - return "gt.blockores.ub1"; - } - - @Override - public OrePrefixes[] getProcessingPrefix() { // Must have 8 entries. - return new OrePrefixes[] { OrePrefixes.oreRedgranite, OrePrefixes.oreBlackgranite, OrePrefixes.ore, - OrePrefixes.ore, OrePrefixes.ore, OrePrefixes.oreBasalt, OrePrefixes.ore, OrePrefixes.ore }; - } - - @Override - public IIcon getIcon(int side, int meta) { - return aUBBlock.getIcon(side, (meta / 1000) % 8); - } - - @Override - public int getBaseBlockHarvestLevel(int aMeta) { - return aUBBlock.getHarvestLevel(aMeta); - } - - @Override - public Block getDroppedBlock() { - return GregTech_API.sBlockOresUb1; - } - - @Override - public Materials[] getDroppedDusts() { // Must have 8 entries; can be null. - return new Materials[] { Materials.Stone, Materials.Stone, Materials.Stone, Materials.Stone, Materials.Stone, - Materials.Stone, Materials.Stone, Materials.Stone }; - } - - @Override - public boolean[] getEnabledMetas() { - return new boolean[] { true, true, true, true, true, true, true, true }; - } - - @Override - public ITexture[] getTextureSet() { // Must have 16 entries. - return new ITexture[] { TextureFactory.of(aUBBlock, 0), TextureFactory.of(aUBBlock, 1), - TextureFactory.of(aUBBlock, 2), TextureFactory.of(aUBBlock, 3), TextureFactory.of(aUBBlock, 4), - TextureFactory.of(aUBBlock, 5), TextureFactory.of(aUBBlock, 6), TextureFactory.of(aUBBlock, 7), - TextureFactory.of(aUBBlock, 0), TextureFactory.of(aUBBlock, 1), TextureFactory.of(aUBBlock, 2), - TextureFactory.of(aUBBlock, 3), TextureFactory.of(aUBBlock, 4), TextureFactory.of(aUBBlock, 5), - TextureFactory.of(aUBBlock, 6), TextureFactory.of(aUBBlock, 7) }; - } -} diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java deleted file mode 100644 index db8dc4347c..0000000000 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB2.java +++ /dev/null @@ -1,73 +0,0 @@ -package gregtech.common.blocks; - -import static gregtech.api.enums.Mods.UndergroundBiomes; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.interfaces.ITexture; -import gregtech.api.render.TextureFactory; - -public class GT_Block_Ores_UB2 extends GT_Block_Ores_Abstract { - - Block aUBBlock = GameRegistry.findBlock(UndergroundBiomes.ID, "metamorphicStone"); - - public GT_Block_Ores_UB2() { - super("gt.blockores.ub2", 8, true, Material.rock); - if (aUBBlock == null) aUBBlock = Blocks.stone; - } - - @Override - public String getUnlocalizedName() { - return "gt.blockores.ub2"; - } - - @Override - public OrePrefixes[] getProcessingPrefix() { // Must have 8 entries; an entry can be null to disable automatic - // recipes. - return new OrePrefixes[] { OrePrefixes.ore, OrePrefixes.ore, OrePrefixes.oreMarble, OrePrefixes.ore, - OrePrefixes.ore, OrePrefixes.ore, OrePrefixes.ore, OrePrefixes.ore }; - } - - @Override - public IIcon getIcon(int side, int meta) { - return aUBBlock.getIcon(side, (meta / 1000) % 8); - } - - @Override - public int getBaseBlockHarvestLevel(int aMeta) { - return aUBBlock.getHarvestLevel(aMeta); - } - - @Override - public Block getDroppedBlock() { - return GregTech_API.sBlockOresUb2; - } - - @Override - public Materials[] getDroppedDusts() { // Must have 8 entries; can be null. - return new Materials[] { Materials.Stone, Materials.Stone, Materials.Stone, Materials.Stone, Materials.Stone, - Materials.Stone, Materials.Stone, Materials.Stone }; - } - - @Override - public boolean[] getEnabledMetas() { - return new boolean[] { true, true, true, true, true, true, true, true }; - } - - @Override - public ITexture[] getTextureSet() { // Must have 16 entries. - return new ITexture[] { TextureFactory.of(aUBBlock, 0), TextureFactory.of(aUBBlock, 1), - TextureFactory.of(aUBBlock, 2), TextureFactory.of(aUBBlock, 3), TextureFactory.of(aUBBlock, 4), - TextureFactory.of(aUBBlock, 5), TextureFactory.of(aUBBlock, 6), TextureFactory.of(aUBBlock, 7), - TextureFactory.of(aUBBlock, 0), TextureFactory.of(aUBBlock, 1), TextureFactory.of(aUBBlock, 2), - TextureFactory.of(aUBBlock, 3), TextureFactory.of(aUBBlock, 4), TextureFactory.of(aUBBlock, 5), - TextureFactory.of(aUBBlock, 6), TextureFactory.of(aUBBlock, 7) }; - } -} diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java deleted file mode 100644 index 1c8f433adf..0000000000 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_UB3.java +++ /dev/null @@ -1,73 +0,0 @@ -package gregtech.common.blocks; - -import static gregtech.api.enums.Mods.UndergroundBiomes; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.interfaces.ITexture; -import gregtech.api.render.TextureFactory; - -public class GT_Block_Ores_UB3 extends GT_Block_Ores_Abstract { - - Block aUBBlock = GameRegistry.findBlock(UndergroundBiomes.ID, "sedimentaryStone"); - - public GT_Block_Ores_UB3() { - super("gt.blockores.ub3", 8, true, Material.rock); - if (aUBBlock == null) aUBBlock = Blocks.stone; - } - - @Override - public String getUnlocalizedName() { - return "gt.blockores.ub3"; - } - - @Override - public OrePrefixes[] getProcessingPrefix() { // Must have 8 entries; an entry can be null to disable automatic - // recipes. - return new OrePrefixes[] { OrePrefixes.ore, OrePrefixes.ore, OrePrefixes.ore, OrePrefixes.ore, OrePrefixes.ore, - OrePrefixes.ore, OrePrefixes.ore, OrePrefixes.ore }; - } - - @Override - public IIcon getIcon(int side, int meta) { - return aUBBlock.getIcon(side, (meta / 1000) % 8); - } - - @Override - public int getBaseBlockHarvestLevel(int aMeta) { - return aUBBlock.getHarvestLevel(aMeta); - } - - @Override - public Block getDroppedBlock() { - return GregTech_API.sBlockOresUb3; - } - - @Override - public Materials[] getDroppedDusts() { // Must have 8 entries; can be null. - return new Materials[] { Materials.Stone, Materials.Stone, Materials.Stone, Materials.Stone, Materials.Stone, - Materials.Stone, Materials.Stone, Materials.Stone }; - } - - @Override - public boolean[] getEnabledMetas() { - return new boolean[] { true, true, true, true, true, true, true, true }; - } - - @Override - public ITexture[] getTextureSet() { // Must have 16 entries. - return new ITexture[] { TextureFactory.of(aUBBlock, 0), TextureFactory.of(aUBBlock, 1), - TextureFactory.of(aUBBlock, 2), TextureFactory.of(aUBBlock, 3), TextureFactory.of(aUBBlock, 4), - TextureFactory.of(aUBBlock, 5), TextureFactory.of(aUBBlock, 6), TextureFactory.of(aUBBlock, 7), - TextureFactory.of(aUBBlock, 0), TextureFactory.of(aUBBlock, 1), TextureFactory.of(aUBBlock, 2), - TextureFactory.of(aUBBlock, 3), TextureFactory.of(aUBBlock, 4), TextureFactory.of(aUBBlock, 5), - TextureFactory.of(aUBBlock, 6), TextureFactory.of(aUBBlock, 7) }; - } -} diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java index 23e55839bf..18f17fb336 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Reinforced.java @@ -330,6 +330,7 @@ public class GT_Block_Reinforced extends GT_Generic_Block { } } + @SuppressWarnings("deprecation") @Override public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) { if (!world.isRemote && world.getBlockMetadata(x, y, z) == 5) { diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java index 31b81eb5ff..45c0e38c30 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Stones_Abstract.java @@ -1,5 +1,10 @@ package gregtech.common.blocks; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeBuilder.TICKS; + import java.util.List; import net.minecraft.block.material.Material; @@ -31,6 +36,15 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe OrePrefixes.crafting.add(this); setStepSound(soundTypeStone); setCreativeTab(GregTech_API.TAB_GREGTECH_MATERIALS); + + this.registerSmeltingRecipes(); + this.registerAssemblerRecipes(); + this.registerCraftingRecipes(); + this.registerForgeHammerRecipes(); + + } + + private void registerSmeltingRecipes() { GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 0), new ItemStack(this, 1, 7)); GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 1), new ItemStack(this, 1, 0)); GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 2), new ItemStack(this, 1, 0)); @@ -47,6 +61,10 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 13), new ItemStack(this, 1, 8)); GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 14), new ItemStack(this, 1, 8)); GT_ModHandler.addSmeltingRecipe(new ItemStack(this, 1, 15), new ItemStack(this, 1, 8)); + + } + + private void registerAssemblerRecipes() { GT_Values.RA.addAssemblerRecipe( new ItemStack(this, 1, 0), ItemList.Circuit_Integrated.getWithDamage(0L, 4L), @@ -59,6 +77,9 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe new ItemStack(this, 1, 11), 50, 4); + } + + private void registerCraftingRecipes() { GT_ModHandler.addCraftingRecipe( new ItemStack(this, 1, 6), GT_ModHandler.RecipeBits.NOT_REMOVABLE, @@ -83,10 +104,6 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe new ItemStack(this, 1, 9), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "h", "X", 'X', new ItemStack(this, 1, 8) }); - GT_Values.RA.addForgeHammerRecipe(new ItemStack(this, 1, 3), new ItemStack(this, 1, 4), 16, 10); - GT_Values.RA.addForgeHammerRecipe(new ItemStack(this, 1, 11), new ItemStack(this, 1, 12), 16, 10); - GT_Values.RA.addForgeHammerRecipe(new ItemStack(this, 1, 0), new ItemStack(this, 1, 1), 16, 10); - GT_Values.RA.addForgeHammerRecipe(new ItemStack(this, 1, 8), new ItemStack(this, 1, 9), 16, 10); GT_ModHandler.addCraftingRecipe( new ItemStack(this, 4, 3), GT_ModHandler.RecipeBits.NOT_REMOVABLE, @@ -105,22 +122,67 @@ public class GT_Block_Stones_Abstract extends GT_Generic_Block implements IOreRe new Object[] { "XX", "XX", 'X', new ItemStack(this, 4, 15) }); } + private void registerForgeHammerRecipes() { + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(this, 1, 3)) + .itemOutputs(new ItemStack(this, 1, 4)) + .noFluidInputs() + .noFluidOutputs() + .duration(16 * TICKS) + .eut(10) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(this, 1, 11)) + .itemOutputs(new ItemStack(this, 1, 12)) + .noFluidInputs() + .noFluidOutputs() + .duration(16 * TICKS) + .eut(10) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(this, 1, 0)) + .itemOutputs(new ItemStack(this, 1, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(16 * TICKS) + .eut(10) + .addTo(sHammerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(this, 1, 8)) + .itemOutputs(new ItemStack(this, 1, 9)) + .noFluidInputs() + .noFluidOutputs() + .duration(16 * TICKS) + .eut(10) + .addTo(sHammerRecipes); + } + @Override public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, ItemStack aStack) { if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) { - GT_Values.RA.addLaserEngraverRecipe( - new ItemStack(this, 1, 7), - GT_Utility.copyAmount(0L, aStack), - new ItemStack(this, 1, 6), - 50, - 16); - GT_Values.RA.addLaserEngraverRecipe( - new ItemStack(this, 1, 15), - GT_Utility.copyAmount(0L, aStack), - new ItemStack(this, 1, 14), - 50, - 16); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(this, 1, 7), GT_Utility.copyAmount(0L, aStack)) + .itemOutputs(new ItemStack(this, 1, 6)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sLaserEngraverRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(this, 1, 15), GT_Utility.copyAmount(0L, aStack)) + .itemOutputs(new ItemStack(this, 1, 14)) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS + 10 * TICKS) + .eut(16) + .addTo(sLaserEngraverRecipes); + } } diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java index f8cda499f1..ae40636eaf 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Casings5.java @@ -24,7 +24,6 @@ public class GT_Item_Casings5 extends GT_Item_Casings_Abstract { @Override @SideOnly(Side.CLIENT) - @SuppressWarnings("unchecked") public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { super.addInformation(aStack, aPlayer, aList, aF3_H); HeatingCoilLevel coilLevel = GT_Block_Casings5.getCoilHeatFromDamage(aStack.getItemDamage()); diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java index 8cd4684664..2e275bc7b3 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java @@ -56,7 +56,6 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem { } @Override - @SuppressWarnings("unchecked") public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String> aList, boolean aF3_H) { try { final int tDamage = getDamage(aStack); diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java index d7600e0927..f2c2a65f3a 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java @@ -10,7 +10,6 @@ import com.gtnewhorizons.modularui.api.math.MathExpression; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.common.widget.TextWidget; import com.gtnewhorizons.modularui.common.widget.textfield.BaseTextFieldWidget; -import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget; import gregtech.api.gui.modularui.GT_CoverUIBuildContext; import gregtech.api.gui.modularui.GT_UITextures; @@ -86,25 +85,23 @@ public class GT_Cover_Arm extends GT_CoverBehavior { toSlot = aCoverVariable & SLOT_ID_MASK; } - byte movedItems = 0; if (fromSlot > 0 && toSlot > 0) { - if (fromTile instanceof IInventory && toTile instanceof IInventory) - movedItems = GT_Utility.moveFromSlotToSlot( - (IInventory) fromTile, - (IInventory) toTile, - fromSlot - 1, - toSlot - 1, - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); + if (fromTile instanceof IInventory && toTile instanceof IInventory) GT_Utility.moveFromSlotToSlot( + (IInventory) fromTile, + (IInventory) toTile, + fromSlot - 1, + toSlot - 1, + null, + false, + (byte) 64, + (byte) 1, + (byte) 64, + (byte) 1); } else if (toSlot > 0) { byte side; if ((aCoverVariable & EXPORT_MASK) > 0) side = aSide; else side = GT_Utility.getOppositeSide(aSide); - movedItems = GT_Utility.moveOneItemStackIntoSlot( + GT_Utility.moveOneItemStackIntoSlot( fromTile, toTile, side, @@ -119,7 +116,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior { byte toSide; if ((aCoverVariable & EXPORT_MASK) > 0) toSide = aSide; else toSide = GT_Utility.getOppositeSide(aSide); - if (fromTile instanceof IInventory) movedItems = GT_Utility.moveFromSlotToSide( + if (fromTile instanceof IInventory) GT_Utility.moveFromSlotToSide( (IInventory) fromTile, toTile, fromSlot - 1, @@ -139,7 +136,7 @@ public class GT_Cover_Arm extends GT_CoverBehavior { fromSide = GT_Utility.getOppositeSide(aSide); toSide = aSide; } - movedItems = GT_Utility.moveOneItemStack( + GT_Utility.moveOneItemStack( fromTile, toTile, fromSide, @@ -348,7 +345,8 @@ public class GT_Cover_Arm extends GT_CoverBehavior { .setValidator(val -> { final int valSlot = getIntFromText(val); if (valSlot > -1) { - return TextFieldWidget.format.format(Math.min(valSlot, maxSlot)); + return widget.getDecimalFormatter() + .format(Math.min(valSlot, maxSlot)); } else { return ANY_TEXT; } @@ -380,7 +378,8 @@ public class GT_Cover_Arm extends GT_CoverBehavior { adjacentMaxSlot = -1; } if (valSlot > -1) { - return TextFieldWidget.format.format(Math.min(valSlot, adjacentMaxSlot)); + return widget.getDecimalFormatter() + .format(Math.min(valSlot, adjacentMaxSlot)); } else { return ANY_TEXT; } @@ -389,7 +388,8 @@ public class GT_Cover_Arm extends GT_CoverBehavior { final int val = getIntFromText(text); int step = (GuiScreen.isShiftKeyDown() ? 50 : GuiScreen.isCtrlKeyDown() ? 5 : 1) * direction; - return TextFieldWidget.format.format(val + step); + return widget.getDecimalFormatter() + .format(val + step); }) .setPattern(BaseTextFieldWidget.NATURAL_NUMS) .setPos(spaceX * 0, spaceY * 2 + 2) diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java index e4459c06db..6af664b594 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java @@ -86,12 +86,6 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid return new FluidRegulatorData(); } - private static int generateNewCoverVariable(int aFlowRate, int aTickRate) { - int tToStoreRaw = aTickRate - TICK_RATE_MIN; - int tToStore = aFlowRate >= 0 ? tToStoreRaw : ~tToStoreRaw; - return aFlowRate & ~TICK_RATE_BITMASK | (tToStore << SPEED_LENGTH); - } - @Override protected boolean isRedstoneSensitiveImpl(byte aSide, int aCoverID, FluidRegulatorData aCoverVariable, ICoverable aTileEntity, long aTimer) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java index af5a4df927..99241731fc 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java @@ -15,7 +15,6 @@ import com.gtnewhorizons.modularui.api.math.MathExpression; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.common.widget.TextWidget; import com.gtnewhorizons.modularui.common.widget.textfield.BaseTextFieldWidget; -import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget; import gregtech.api.GregTech_API; import gregtech.api.gui.modularui.GT_CoverUIBuildContext; @@ -249,7 +248,8 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter. .setValidator(val -> { final int valSlot = getIntFromText(val); if (valSlot > -1) { - return TextFieldWidget.format.format(Math.min(valSlot, maxSlot)); + return widget.getDecimalFormatter() + .format(Math.min(valSlot, maxSlot)); } else { return ALL_TEXT; } diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java index e7d2ac1e02..b846fd3b72 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java @@ -51,10 +51,10 @@ public class GT_Cover_Shutter extends GT_CoverBehavior { aCoverVariable = 3; } switch (aCoverVariable) { - case 0 -> GT_Utility.sendChatToPlayer(aPlayer, trans("082", "Open if work enabled")); - case 1 -> GT_Utility.sendChatToPlayer(aPlayer, trans("083", "Open if work disabled")); - case 2 -> GT_Utility.sendChatToPlayer(aPlayer, trans("084", "Only Output allowed")); - case 3 -> GT_Utility.sendChatToPlayer(aPlayer, trans("085", "Only Input allowed")); + case 0 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("082", "Open if work enabled")); + case 1 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("083", "Open if work disabled")); + case 2 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("084", "Only Output allowed")); + case 3 -> GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("085", "Only Input allowed")); } if (aTileEntity instanceof BaseMetaPipeEntity) { ((BaseMetaPipeEntity) aTileEntity).reloadLocks(); diff --git a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java index 428b9b636d..8b8d047214 100644 --- a/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java +++ b/src/main/java/gregtech/common/covers/redstone/GT_Cover_WirelessItemDetector.java @@ -11,12 +11,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import com.google.common.io.ByteArrayDataInput; -import com.gtnewhorizons.modularui.api.forge.ItemStackHandler; import com.gtnewhorizons.modularui.api.math.MathExpression; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.common.widget.TextWidget; import com.gtnewhorizons.modularui.common.widget.textfield.BaseTextFieldWidget; -import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget; import gregtech.api.gui.modularui.GT_CoverUIBuildContext; import gregtech.api.interfaces.ITexture; @@ -153,7 +151,6 @@ public class GT_Cover_WirelessItemDetector private static final String ALL_TEXT = "All"; private int maxSlot; - private final ItemStackHandler targetSlotHandler = new ItemStackHandler(1); public WirelessItemDetectorUIFactory(GT_CoverUIBuildContext buildContext) { super(buildContext); @@ -209,7 +206,8 @@ public class GT_Cover_WirelessItemDetector .setValidator(val -> { final int valSlot = getIntFromText(val); if (valSlot > -1) { - return TextFieldWidget.format.format(Math.min(valSlot, maxSlot)); + return widget.getDecimalFormatter() + .format(Math.min(valSlot, maxSlot)); } else { return ALL_TEXT; } diff --git a/src/main/java/gregtech/common/fluid/GT_Fluid.java b/src/main/java/gregtech/common/fluid/GT_Fluid.java index 0ef44215f4..98210c0e62 100644 --- a/src/main/java/gregtech/common/fluid/GT_Fluid.java +++ b/src/main/java/gregtech/common/fluid/GT_Fluid.java @@ -1,5 +1,7 @@ package gregtech.common.fluid; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes; + import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; @@ -121,11 +123,14 @@ public class GT_Fluid extends Fluid implements IGT_Fluid, IGT_RegisteredFluid, R if (fullContainer != null && emptyContainer != null) { final FluidStack fluidStack = new FluidStack(registeredFluid, containerSize); if (!FluidContainerRegistry.registerFluidContainer(fluidStack, fullContainer, emptyContainer)) { - GT_Values.RA.addFluidCannerRecipe( - fullContainer, - GT_Utility.getContainerItem(fullContainer, false), - null, - fluidStack); + GT_Values.RA.stdBuilder() + .itemInputs(fullContainer) + .itemOutputs(GT_Utility.getContainerItem(fullContainer, false)) + .noFluidInputs() + .fluidOutputs(fluidStack) + .duration(fluidStack.amount / 62) + .eut(1) + .addTo(sFluidCannerRecipes); } } return this; diff --git a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_TextFieldWidget.java b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_TextFieldWidget.java index 13628eb80f..df2dfa48f7 100644 --- a/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_TextFieldWidget.java +++ b/src/main/java/gregtech/common/gui/modularui/widget/CoverDataFollower_TextFieldWidget.java @@ -88,7 +88,8 @@ public class CoverDataFollower_TextFieldWidget<T extends ISerializableObject> ex } catch (ArithmeticException ignored) { val = Integer.MAX_VALUE; } - return TextFieldWidget.format.format(val); + return this.getDecimalFormatter() + .format(val); }); return this; } diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java index 4aec0ed5c7..850fe21811 100644 --- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java +++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java @@ -28,7 +28,6 @@ import gregtech.api.enums.Materials; import gregtech.api.items.GT_Generic_Item; import gregtech.api.util.GT_Utility; -@SuppressWarnings({ "rawtypes", "unchecked" }) public class GT_FluidDisplayItem extends GT_Generic_Item { private static final Map<Fluid, String> sFluidTooltips = new HashMap<>(); @@ -132,11 +131,10 @@ public class GT_FluidDisplayItem extends GT_Generic_Item { // For GT++ Fluid Display // GT++ didn't register a Material in GT, so I have too find the Chemical Formula in its cell's // tooltip - List tTooltip = tContainer.getTooltip(null, true); - for (Object tInfo : tTooltip) { - if (!((String) tInfo).contains(" ") && !((String) tInfo).contains(":") - && tTooltip.indexOf(tInfo) != 0) { - return (String) tInfo; + List<String> tTooltip = tContainer.getTooltip(null, true); + for (String tInfo : tTooltip) { + if (!tInfo.contains(" ") && !tInfo.contains(":") && tTooltip.indexOf(tInfo) != 0) { + return tInfo; } } } diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java index 739a3c7b9e..53daa4d813 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java @@ -2,6 +2,8 @@ package gregtech.common.items; import static gregtech.api.enums.Mods.GalacticraftMars; import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.client.GT_TooltipHandler.Tier.*; import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; @@ -105,9 +107,19 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 { setBurnValue(17000 + Materials.Wood.mMetaItemSubID, 1600); GT_OreDictUnificator.addToBlacklist(new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID)); - GT_ModHandler.addCompressionRecipe( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 8L), - new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID)); + + // Compressor recipe + { + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 8L)) + .itemOutputs(new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + } + GregTech_API.registerCover( new ItemStack(this, 1, 17000 + Materials.Wood.mMetaItemSubID), TextureFactory.of(COVER_WOOD_PLATE), diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java index d419747c8a..da5f25a96f 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java @@ -2,6 +2,8 @@ package gregtech.common.items; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Textures.BlockIcons.*; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCompressorRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import net.minecraft.dispenser.IBlockSource; import net.minecraft.enchantment.Enchantment; @@ -36,6 +38,8 @@ import gregtech.common.covers.redstone.GT_Cover_WirelessFluidDetector; import gregtech.common.covers.redstone.GT_Cover_WirelessItemDetector; import gregtech.common.covers.redstone.GT_Cover_WirelessMaintenanceDetector; import gregtech.common.items.behaviors.Behaviour_Arrow; +import ic2.api.crops.CropCard; +import ic2.api.crops.Crops; public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { @@ -2619,27 +2623,116 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { ItemList.Crop_Drop_Tine.get(1L), GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tin, 1L)); - GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Coppon.get(4L), new ItemStack(Blocks.wool, 1, 1)); - GT_ModHandler - .addCompressionRecipe(ItemList.Crop_Drop_Plumbilia.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); - GT_ModHandler - .addCompressionRecipe(ItemList.Crop_Drop_Argentia.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); - GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Indigo.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); - GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Ferru.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); - GT_ModHandler - .addCompressionRecipe(ItemList.Crop_Drop_Aurelia.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); - GT_ModHandler - .addCompressionRecipe(ItemList.Crop_Drop_OilBerry.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); - GT_ModHandler.addCompressionRecipe( - ItemList.Crop_Drop_BobsYerUncleRanks.get(4L), - ItemList.IC2_PlantballCompressed.get(1L)); - GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Tine.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); - GT_ModHandler.addCompressionRecipe(ItemList.Crop_Drop_Rape.get(4L), ItemList.IC2_PlantballCompressed.get(1L)); - GT_ModHandler - .addCompressionRecipe(new ItemStack(Blocks.red_flower, 8, 32767), ItemList.IC2_PlantballCompressed.get(1L)); - GT_ModHandler.addCompressionRecipe( - new ItemStack(Blocks.yellow_flower, 8, 32767), - ItemList.IC2_PlantballCompressed.get(1L)); + // Compression recipes + { + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Coppon.get(4L)) + .itemOutputs(new ItemStack(Blocks.wool, 1, 1)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Plumbilia.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Argentia.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Indigo.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Ferru.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Aurelia.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_OilBerry.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_BobsYerUncleRanks.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Tine.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(ItemList.Crop_Drop_Rape.get(4L)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.red_flower, 8, 32767)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(new ItemStack(Blocks.yellow_flower, 8, 32767)) + .itemOutputs(ItemList.IC2_PlantballCompressed.get(1L)) + .noFluidInputs() + .noFluidOutputs() + .duration(15 * SECONDS) + .eut(2) + .addTo(sCompressorRecipes); + } GT_ModHandler.addPulverisationRecipe( ItemList.Food_Sliced_Cheese.get(1L), @@ -2699,10 +2792,10 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 { 32_000_000, 100); try { - ic2.api.crops.CropCard tCrop; - GT_Utility.getField(tCrop = ic2.api.crops.Crops.instance.getCropList()[13], "mDrop") + CropCard tCrop; + GT_Utility.getField(tCrop = Crops.instance.getCropList()[13], "mDrop") .set(tCrop, ItemList.Crop_Drop_Ferru.get(1L)); - GT_Utility.getField(tCrop = ic2.api.crops.Crops.instance.getCropList()[14], "mDrop") + GT_Utility.getField(tCrop = Crops.instance.getCropList()[14], "mDrop") .set(tCrop, ItemList.Crop_Drop_Aurelia.get(1L)); } catch (Throwable e) { if (GT_Values.D1) { diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 594c5841f5..015be426c8 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -26,7 +26,6 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { OrePrefixes.crateGtPlate, OrePrefixes.nanite); INSTANCE = this; - int tLastID = 0; Object[] o = new Object[0]; /** @@ -36,9 +35,9 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { * + sulfurci acid wetware lifesupport board / fiberglass CB + teflon + */ ItemList.Circuit_Board_Wetware - .set(addItem(tLastID = 6, "Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); - ItemList.Circuit_Board_Plastic.set(addItem(tLastID = 7, "Plastic Circuit Board", "A Good Board", o)); - ItemList.Circuit_Board_Bio.set(addItem(tLastID = 8, "Bio Circuit Board", "Bio genetic mutated Board", o)); + .set(addItem(6, "Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); + ItemList.Circuit_Board_Plastic.set(addItem(7, "Plastic Circuit Board", "A Good Board", o)); + ItemList.Circuit_Board_Bio.set(addItem(8, "Bio Circuit Board", "Bio genetic mutated Board", o)); /** * electronic components: vacuum tube (glass tube + red alloy cables) basic electronic circuits normal+smd coils @@ -46,68 +45,67 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { */ ItemList.Circuit_Parts_ResistorSMD.set( addItem( - tLastID = 11, + 11, "SMD Resistor", "Electronic Component", OrePrefixes.componentCircuit.get(Materials.Resistor), SubTag.NO_UNIFICATION)); - ItemList.Circuit_Parts_Glass_Tube.set(addItem(tLastID = 12, "Glass Tube", "", o)); - ItemList.Circuit_Parts_Coil.set(addItem(tLastID = 14, "Small Coil", "Basic Electronic Component", o)); + ItemList.Circuit_Parts_Glass_Tube.set(addItem(12, "Glass Tube", "", o)); + ItemList.Circuit_Parts_Coil.set(addItem(14, "Small Coil", "Basic Electronic Component", o)); ItemList.Circuit_Parts_DiodeSMD.set( addItem( - tLastID = 16, + 16, "SMD Diode", "Electronic Component", OrePrefixes.componentCircuit.get(Materials.Diode), SubTag.NO_UNIFICATION)); ItemList.Circuit_Parts_TransistorSMD.set( addItem( - tLastID = 18, + 18, "SMD Transistor", "Electronic Component", OrePrefixes.componentCircuit.get(Materials.Transistor), SubTag.NO_UNIFICATION)); ItemList.Circuit_Parts_CapacitorSMD.set( addItem( - tLastID = 20, + 20, "SMD Capacitor", "Electronic Component", OrePrefixes.componentCircuit.get(Materials.Capacitor), SubTag.NO_UNIFICATION)); ItemList.Circuit_Parts_GlassFiber - .set(addItem(tLastID = 21, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o)); - ItemList.Circuit_Parts_PetriDish.set(addItem(tLastID = 22, "Petri Dish", "For cultivating cells", o)); - ItemList.Circuit_Parts_Reinforced_Glass_Tube.set(addItem(tLastID = 23, "Reinforced Glass Tube", "", o)); + .set(addItem(21, "Glass Fiber", Materials.BorosilicateGlass.mChemicalFormula, o)); + ItemList.Circuit_Parts_PetriDish.set(addItem(22, "Petri Dish", "For cultivating cells", o)); + ItemList.Circuit_Parts_Reinforced_Glass_Tube.set(addItem(23, "Reinforced Glass Tube", "", o)); ItemList.Circuit_Parts_ResistorASMD - .set(addItem(tLastID = 24, "Advanced SMD Resistor", "Advanced Electronic Component", o)); - ItemList.Circuit_Parts_DiodeASMD - .set(addItem(tLastID = 25, "Advanced SMD Diode", "Advanced Electronic Component", o)); + .set(addItem(24, "Advanced SMD Resistor", "Advanced Electronic Component", o)); + ItemList.Circuit_Parts_DiodeASMD.set(addItem(25, "Advanced SMD Diode", "Advanced Electronic Component", o)); ItemList.Circuit_Parts_TransistorASMD - .set(addItem(tLastID = 26, "Advanced SMD Transistor", "Advanced Electronic Component", o)); + .set(addItem(26, "Advanced SMD Transistor", "Advanced Electronic Component", o)); ItemList.Circuit_Parts_CapacitorASMD - .set(addItem(tLastID = 27, "Advanced SMD Capacitor", "Advanced Electronic Component", o)); + .set(addItem(27, "Advanced SMD Capacitor", "Advanced Electronic Component", o)); ItemList.Circuit_Parts_ResistorXSMD - .set(addItem(tLastID = 178, "Optical SMD Resistor", "Highly Advanced Electronic Component", o)); + .set(addItem(178, "Optical SMD Resistor", "Highly Advanced Electronic Component", o)); ItemList.Circuit_Parts_DiodeXSMD - .set(addItem(tLastID = 179, "Optical SMD Diode", "Highly Advanced Electronic Component", o)); + .set(addItem(179, "Optical SMD Diode", "Highly Advanced Electronic Component", o)); ItemList.Circuit_Parts_TransistorXSMD - .set(addItem(tLastID = 180, "Optical SMD Transistor", "Highly Advanced Electronic Component", o)); + .set(addItem(180, "Optical SMD Transistor", "Highly Advanced Electronic Component", o)); ItemList.Circuit_Parts_CapacitorXSMD - .set(addItem(tLastID = 181, "Optical SMD Capacitor", "Highly Advanced Electronic Component", o)); + .set(addItem(181, "Optical SMD Capacitor", "Highly Advanced Electronic Component", o)); ItemList.Circuit_Parts_InductorSMD.set( addItem( - tLastID = 182, + 182, "SMD Inductor", "Electronic Component", OrePrefixes.componentCircuit.get(Materials.Inductor), SubTag.NO_UNIFICATION)); ItemList.Circuit_Parts_InductorASMD - .set(addItem(tLastID = 183, "Advanced SMD Inductor", "Advanced Electronic Component", o)); + .set(addItem(183, "Advanced SMD Inductor", "Advanced Electronic Component", o)); ItemList.Circuit_Parts_InductorXSMD - .set(addItem(tLastID = 184, "Optical SMD Inductor", "Highly Advanced Electronic Component", o)); + .set(addItem(184, "Optical SMD Inductor", "Highly Advanced Electronic Component", o)); GT_OreDictUnificator .set(OrePrefixes.componentCircuit, Materials.Resistor, ItemList.Circuit_Parts_Resistor.get(1L)); @@ -156,107 +154,104 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { * * quantum chips */ - ItemList.Circuit_Silicon_Ingot.set(addItem(tLastID = 30, "Monocrystalline Silicon Boule", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot.set(addItem(30, "Monocrystalline Silicon Boule", "Raw Circuit", o)); ItemList.Circuit_Silicon_Ingot2 - .set(addItem(tLastID = 31, "Phosphorus doped Monocrystalline Silicon Boule", "Raw Circuit", o)); + .set(addItem(31, "Phosphorus doped Monocrystalline Silicon Boule", "Raw Circuit", o)); ItemList.Circuit_Silicon_Ingot3 - .set(addItem(tLastID = 32, "Naquadah doped Monocrystalline Silicon Boule", "Raw Circuit", o)); + .set(addItem(32, "Naquadah doped Monocrystalline Silicon Boule", "Raw Circuit", o)); ItemList.Circuit_Silicon_Ingot4 - .set(addItem(tLastID = 150, "Europium doped Monocrystalline Silicon Boule", "Raw Circuit", o)); + .set(addItem(150, "Europium doped Monocrystalline Silicon Boule", "Raw Circuit", o)); ItemList.Circuit_Silicon_Ingot5 - .set(addItem(tLastID = 152, "Americium doped Monocrystalline Silicon Boule", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Ingot6 - .set(addItem(tLastID = 721, "Optically Enriched Crystalline Boule", "Raw Circuit", o)); + .set(addItem(152, "Americium doped Monocrystalline Silicon Boule", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Ingot6.set(addItem(721, "Optically Enriched Crystalline Boule", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Wafer.set(addItem(tLastID = 33, "Wafer", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Wafer2.set(addItem(tLastID = 34, "Phosphorus doped Wafer", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Wafer3.set(addItem(tLastID = 35, "Naquadah doped Wafer", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Wafer4.set(addItem(tLastID = 151, "Europium doped Wafer", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Wafer5.set(addItem(tLastID = 153, "Americium doped Wafer", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Wafer6.set(addItem(tLastID = 722, "Photonically Prepared Wafer", "Raw Circuit", o)); - ItemList.Circuit_Silicon_Wafer7.set(addItem(tLastID = 723, "Photonically Enhanced Wafer", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Wafer.set(addItem(33, "Wafer", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Wafer2.set(addItem(34, "Phosphorus doped Wafer", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Wafer3.set(addItem(35, "Naquadah doped Wafer", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Wafer4.set(addItem(151, "Europium doped Wafer", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Wafer5.set(addItem(153, "Americium doped Wafer", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Wafer6.set(addItem(722, "Photonically Prepared Wafer", "Raw Circuit", o)); + ItemList.Circuit_Silicon_Wafer7.set(addItem(723, "Photonically Enhanced Wafer", "Raw Circuit", o)); - ItemList.Circuit_Wafer_ILC.set(addItem(tLastID = 36, "Integrated Logic Circuit (Wafer)", "Raw Circuit", o)); - ItemList.Circuit_Chip_ILC.set(addItem(tLastID = 37, "Integrated Logic Circuit", "Integrated Circuit", o)); + ItemList.Circuit_Wafer_ILC.set(addItem(36, "Integrated Logic Circuit (Wafer)", "Raw Circuit", o)); + ItemList.Circuit_Chip_ILC.set(addItem(37, "Integrated Logic Circuit", "Integrated Circuit", o)); - ItemList.Circuit_Wafer_Ram.set(addItem(tLastID = 38, "Random Access Memory Chip (Wafer)", "Raw Circuit", o)); - ItemList.Circuit_Chip_Ram.set(addItem(tLastID = 39, "Random Access Memory Chip", "Integrated Circuit", o)); + ItemList.Circuit_Wafer_Ram.set(addItem(38, "Random Access Memory Chip (Wafer)", "Raw Circuit", o)); + ItemList.Circuit_Chip_Ram.set(addItem(39, "Random Access Memory Chip", "Integrated Circuit", o)); - ItemList.Circuit_Wafer_NAND.set(addItem(tLastID = 40, "NAND Memory Chip (Wafer)", "Raw Circuit", o)); - ItemList.Circuit_Chip_NAND.set(addItem(tLastID = 41, "NAND Memory Chip", "Integrated Circuit", o)); + ItemList.Circuit_Wafer_NAND.set(addItem(40, "NAND Memory Chip (Wafer)", "Raw Circuit", o)); + ItemList.Circuit_Chip_NAND.set(addItem(41, "NAND Memory Chip", "Integrated Circuit", o)); - ItemList.Circuit_Wafer_NOR.set(addItem(tLastID = 42, "NOR Memory Chip (Wafer)", "Raw Circuit", o)); - ItemList.Circuit_Chip_NOR.set(addItem(tLastID = 43, "NOR Memory Chip", "Integrated Circuit", o)); + ItemList.Circuit_Wafer_NOR.set(addItem(42, "NOR Memory Chip (Wafer)", "Raw Circuit", o)); + ItemList.Circuit_Chip_NOR.set(addItem(43, "NOR Memory Chip", "Integrated Circuit", o)); - ItemList.Circuit_Wafer_CPU.set(addItem(tLastID = 44, "Central Processing Unit (Wafer)", "Raw Circuit", o)); - ItemList.Circuit_Chip_CPU.set(addItem(tLastID = 45, "Central Processing Unit", "Integrated Circuit", o)); + ItemList.Circuit_Wafer_CPU.set(addItem(44, "Central Processing Unit (Wafer)", "Raw Circuit", o)); + ItemList.Circuit_Chip_CPU.set(addItem(45, "Central Processing Unit", "Integrated Circuit", o)); - ItemList.Circuit_Wafer_SoC.set(addItem(tLastID = 46, "SoC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_SoC.set(addItem(tLastID = 47, "SoC", "System on a Chip", o)); + ItemList.Circuit_Wafer_SoC.set(addItem(46, "SoC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_SoC.set(addItem(47, "SoC", "System on a Chip", o)); - ItemList.Circuit_Wafer_SoC2.set(addItem(tLastID = 48, "ASoC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_SoC2.set(addItem(tLastID = 49, "ASoC", "Advanced System on a Chip", o)); + ItemList.Circuit_Wafer_SoC2.set(addItem(48, "ASoC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_SoC2.set(addItem(49, "ASoC", "Advanced System on a Chip", o)); - ItemList.Circuit_Wafer_PIC.set(addItem(tLastID = 50, "PIC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_PIC.set(addItem(tLastID = 51, "Power IC", "Power Circuit", o)); + ItemList.Circuit_Wafer_PIC.set(addItem(50, "PIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_PIC.set(addItem(51, "Power IC", "Power Circuit", o)); - ItemList.Circuit_Wafer_HPIC.set(addItem(tLastID = 52, "HPIC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_HPIC.set(addItem(tLastID = 53, "High Power IC", "High Power Circuit", o)); + ItemList.Circuit_Wafer_HPIC.set(addItem(52, "HPIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_HPIC.set(addItem(53, "High Power IC", "High Power Circuit", o)); - ItemList.Circuit_Wafer_NanoCPU.set(addItem(tLastID = 54, "NanoCPU Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_NanoCPU - .set(addItem(tLastID = 55, "Nanocomponent Central Processing Unit", "Power Circuit", o)); + ItemList.Circuit_Wafer_NanoCPU.set(addItem(54, "NanoCPU Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_NanoCPU.set(addItem(55, "Nanocomponent Central Processing Unit", "Power Circuit", o)); - ItemList.Circuit_Wafer_QuantumCPU.set(addItem(tLastID = 56, "QBit Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_QuantumCPU.set(addItem(tLastID = 57, "QBit Processing Unit", "Quantum CPU", o)); + ItemList.Circuit_Wafer_QuantumCPU.set(addItem(56, "QBit Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_QuantumCPU.set(addItem(57, "QBit Processing Unit", "Quantum CPU", o)); - ItemList.Circuit_Wafer_UHPIC.set(addItem(tLastID = 58, "UHPIC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_UHPIC.set(addItem(tLastID = 59, "Ultra High Power IC", "Ultra High Power Circuit", o)); + ItemList.Circuit_Wafer_UHPIC.set(addItem(58, "UHPIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_UHPIC.set(addItem(59, "Ultra High Power IC", "Ultra High Power Circuit", o)); - ItemList.Circuit_Wafer_Simple_SoC.set(addItem(tLastID = 60, "Simple SoC Wafer", "Raw Primitive Circuit", o)); - ItemList.Circuit_Chip_Simple_SoC.set(addItem(tLastID = 61, "Simple SoC", "Simple System on a Chip", o)); + ItemList.Circuit_Wafer_Simple_SoC.set(addItem(60, "Simple SoC Wafer", "Raw Primitive Circuit", o)); + ItemList.Circuit_Chip_Simple_SoC.set(addItem(61, "Simple SoC", "Simple System on a Chip", o)); - ItemList.Circuit_Wafer_ULPIC.set(addItem(tLastID = 62, "ULPIC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_ULPIC.set(addItem(tLastID = 63, "Ultra Low Power IC", "Ultra Low Power Circuit", o)); + ItemList.Circuit_Wafer_ULPIC.set(addItem(62, "ULPIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_ULPIC.set(addItem(63, "Ultra Low Power IC", "Ultra Low Power Circuit", o)); - ItemList.Circuit_Wafer_LPIC.set(addItem(tLastID = 64, "LPIC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_LPIC.set(addItem(tLastID = 65, "Low Power IC", "Low Power Circuit", o)); + ItemList.Circuit_Wafer_LPIC.set(addItem(64, "LPIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_LPIC.set(addItem(65, "Low Power IC", "Low Power Circuit", o)); - ItemList.Circuit_Wafer_NPIC.set(addItem(tLastID = 160, "NPIC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_NPIC.set(addItem(tLastID = 161, "Nano Power IC", "Nano Power Circuit", o)); + ItemList.Circuit_Wafer_NPIC.set(addItem(160, "NPIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_NPIC.set(addItem(161, "Nano Power IC", "Nano Power Circuit", o)); - ItemList.Circuit_Wafer_PPIC.set(addItem(tLastID = 162, "PPIC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_PPIC.set(addItem(tLastID = 163, "Piko Power IC", "Piko Power Circuit", o)); + ItemList.Circuit_Wafer_PPIC.set(addItem(162, "PPIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_PPIC.set(addItem(163, "Piko Power IC", "Piko Power Circuit", o)); - ItemList.Circuit_Wafer_QPIC.set(addItem(tLastID = 164, "QPIC Wafer", "Raw Circuit", o)); - ItemList.Circuit_Chip_QPIC.set(addItem(tLastID = 165, "Quantum Power IC", "Quantum Power Circuit", o)); + ItemList.Circuit_Wafer_QPIC.set(addItem(164, "QPIC Wafer", "Raw Circuit", o)); + ItemList.Circuit_Chip_QPIC.set(addItem(165, "Quantum Power IC", "Quantum Power Circuit", o)); - ItemList.Circuit_Wafer_Bioware.set(addItem(tLastID = 188, "Living Bio Wafer", "Raw Circuit", o)); - ItemList.Circuit_Parts_Chip_Bioware.set(addItem(tLastID = 189, "Living Bio Chip", "Needed for Circuits", o)); + ItemList.Circuit_Wafer_Bioware.set(addItem(188, "Living Bio Wafer", "Raw Circuit", o)); + ItemList.Circuit_Parts_Chip_Bioware.set(addItem(189, "Living Bio Chip", "Needed for Circuits", o)); /** * Engraved Crystal Chip Engraved Lapotron Chip Crystal CPU SoCrystal stem cells (disassemble eggs) */ ItemList.Circuit_Chip_CrystalSoC2 - .set(addItem(tLastID = 68, "Raw Advanced Crystal Chip", "Raw Advanced Crystal Processor", o)); - ItemList.Circuit_Parts_RawCrystalChip - .set(addItem(tLastID = 69, "Raw Crystal Chip", "Raw Crystal Processor", o)); - ItemList.Circuit_Chip_CrystalCPU.set(addItem(tLastID = 70, "Crystal Processing Unit", "Crystal CPU", o)); // Crystal - // chip - // elite - // part - ItemList.Circuit_Chip_CrystalSoC.set(addItem(tLastID = 71, "Crystal SoC", "Crystal System on a Chip", o)); - ItemList.Circuit_Chip_NeuroCPU.set(addItem(tLastID = 72, "Neuro Processing Unit", "Neuro CPU", o)); - ItemList.Circuit_Chip_Stemcell.set(addItem(tLastID = 73, "Stemcells", "Raw inteligence", o)); + .set(addItem(68, "Raw Advanced Crystal Chip", "Raw Advanced Crystal Processor", o)); + ItemList.Circuit_Parts_RawCrystalChip.set(addItem(69, "Raw Crystal Chip", "Raw Crystal Processor", o)); + ItemList.Circuit_Chip_CrystalCPU.set(addItem(70, "Crystal Processing Unit", "Crystal CPU", o)); // Crystal + // chip + // elite + // part + ItemList.Circuit_Chip_CrystalSoC.set(addItem(71, "Crystal SoC", "Crystal System on a Chip", o)); + ItemList.Circuit_Chip_NeuroCPU.set(addItem(72, "Neuro Processing Unit", "Neuro CPU", o)); + ItemList.Circuit_Chip_Stemcell.set(addItem(73, "Stemcells", "Raw inteligence", o)); ItemList.Circuit_Parts_RawCrystalParts - .set(addItem(tLastID = 74, "Raw Crystal Chip Parts", "Raw Crystal Processor Parts", o)); - ItemList.Circuit_Chip_Biocell.set(addItem(tLastID = 76, "Biocells", "Mutated Raw inteligence", o)); - ItemList.Circuit_Chip_BioCPU.set(addItem(tLastID = 77, "Bio Processing Unit", "Bio CPU", o)); - ItemList.Circuit_Chip_Optical.set(addItem(tLastID = 724, "Raw Exposed Optical Chip", "Raw Optical Chip", o)); + .set(addItem(74, "Raw Crystal Chip Parts", "Raw Crystal Processor Parts", o)); + ItemList.Circuit_Chip_Biocell.set(addItem(76, "Biocells", "Mutated Raw inteligence", o)); + ItemList.Circuit_Chip_BioCPU.set(addItem(77, "Bio Processing Unit", "Bio CPU", o)); + ItemList.Circuit_Chip_Optical.set(addItem(724, "Raw Exposed Optical Chip", "Raw Optical Chip", o)); // Nand Chip ItemList.NandChip.set( addItem( - tLastID = 75, + 75, "NAND Chip", "A very simple Circuit", OrePrefixes.circuit.get(Materials.Primitive), @@ -269,7 +264,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { // Integrated Logic Circuit Item01 ItemList.Circuit_Integrated_Good.set( addItem( - tLastID = 79, + 79, "Good Integrated Circuit", "Good Circuit", OrePrefixes.circuit.get(Materials.Good), @@ -280,7 +275,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { ItemList.Circuit_Microprocessor.set( addItem( - tLastID = 78, + 78, "Microprocessor", "A Basic Circuit", OrePrefixes.circuit.get(Materials.Basic), @@ -288,7 +283,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_Microprocessor.get(1), LV); ItemList.Circuit_Processor.set( addItem( - tLastID = 80, + 80, "Integrated Processor", "A Good Circuit", OrePrefixes.circuit.get(Materials.Good), @@ -301,7 +296,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { ItemList.Circuit_Nanoprocessor.set( addItem( - tLastID = 82, + 82, "Nanoprocessor", "An Advanced Circuit", OrePrefixes.circuit.get(Materials.Advanced), @@ -309,7 +304,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_Nanoprocessor.get(1), HV); ItemList.Circuit_Nanocomputer.set( addItem( - tLastID = 83, + 83, "Nanoprocessor Assembly", "An Extreme Circuit", OrePrefixes.circuit.get(Materials.Data), @@ -317,7 +312,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_Nanocomputer.get(1), EV); ItemList.Circuit_Elitenanocomputer.set( addItem( - tLastID = 84, + 84, "Elite Nanocomputer", "An Elite Circuit", OrePrefixes.circuit.get(Materials.Elite), @@ -328,7 +323,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { // Quantum circuits ItemList.Circuit_Quantumprocessor.set( addItem( - tLastID = 85, + 85, "Quantumprocessor", "An Extreme Circuit", OrePrefixes.circuit.get(Materials.Data), @@ -336,7 +331,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_Quantumprocessor.get(1), EV); ItemList.Circuit_Quantumcomputer.set( addItem( - tLastID = 86, + 86, "Quantumprocessor Assembly", "An Elite Circuit", OrePrefixes.circuit.get(Materials.Elite), @@ -344,7 +339,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_Quantumcomputer.get(1), IV); ItemList.Circuit_Masterquantumcomputer.set( addItem( - tLastID = 87, + 87, "Master Quantumcomputer", "A Master Circuit", OrePrefixes.circuit.get(Materials.Master), @@ -352,7 +347,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_Masterquantumcomputer.get(1), LuV); ItemList.Circuit_Quantummainframe.set( addItem( - tLastID = 88, + 88, "Quantumprocessor Mainframe", "An Ultimate Circuit", OrePrefixes.circuit.get(Materials.Ultimate), @@ -362,7 +357,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { // Crystal circuits ItemList.Circuit_Crystalprocessor.set( addItem( - tLastID = 89, + 89, "Crystalprocessor", "An Elite Circuit", OrePrefixes.circuit.get(Materials.Elite), @@ -370,7 +365,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_Crystalprocessor.get(1), IV); ItemList.Circuit_Crystalcomputer.set( addItem( - tLastID = 96, + 96, "Crystalprocessor Assembly", "A Master Circuit", OrePrefixes.circuit.get(Materials.Master), @@ -378,7 +373,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_Crystalcomputer.get(1), LuV); ItemList.Circuit_Ultimatecrystalcomputer.set( addItem( - tLastID = 90, + 90, "Ultimate Crystalcomputer", "An Ultimate Circuit", OrePrefixes.circuit.get(Materials.Ultimate), @@ -386,10 +381,10 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_Ultimatecrystalcomputer.get(1), ZPM); ItemList.Circuit_Crystalmainframe.set( addItem( - tLastID = 91, + 91, "Crystalprocessor Mainframe", "A Super Circuit", - OrePrefixes.circuit.get(Materials.Superconductor), + OrePrefixes.circuit.get(Materials.SuperconductorUHV), SubTag.NO_UNIFICATION)); registerTieredTooltip(ItemList.Circuit_Crystalmainframe.get(1), UV); @@ -399,7 +394,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { // Wetware circuits ItemList.Circuit_Neuroprocessor.set( addItem( - tLastID = 92, + 92, "Wetwareprocessor", "A Master Circuit", OrePrefixes.circuit.get(Materials.Master), @@ -407,7 +402,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_Neuroprocessor.get(1), LuV); ItemList.Circuit_Wetwarecomputer.set( addItem( - tLastID = 93, + 93, "Wetwareprocessor Assembly", "An Ultimate Circuit", OrePrefixes.circuit.get(Materials.Ultimate), @@ -415,15 +410,15 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_Wetwarecomputer.get(1), ZPM); ItemList.Circuit_Wetwaresupercomputer.set( addItem( - tLastID = 94, + 94, "Wetware Supercomputer", "A Super Circuit", - OrePrefixes.circuit.get(Materials.Superconductor), + OrePrefixes.circuit.get(Materials.SuperconductorUHV), SubTag.NO_UNIFICATION)); registerTieredTooltip(ItemList.Circuit_Wetwaresupercomputer.get(1), UV); ItemList.Circuit_Wetwaremainframe.set( addItem( - tLastID = 95, + 95, "Wetware Mainframe", "An Infinite Circuit", OrePrefixes.circuit.get(Materials.Infinite), @@ -433,7 +428,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { // Bioware circuits. ItemList.Circuit_Bioprocessor.set( addItem( - tLastID = 97, + 97, "Bioprocessor", "An Ultimate Circuit", OrePrefixes.circuit.get(Materials.Ultimate), @@ -441,15 +436,15 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_Bioprocessor.get(1), ZPM); ItemList.Circuit_Biowarecomputer.set( addItem( - tLastID = 98, + 98, "Biowareprocessor Assembly", "A Super Circuit", - OrePrefixes.circuit.get(Materials.Superconductor), + OrePrefixes.circuit.get(Materials.SuperconductorUHV), SubTag.NO_UNIFICATION)); registerTieredTooltip(ItemList.Circuit_Biowarecomputer.get(1), UV); ItemList.Circuit_Biowaresupercomputer.set( addItem( - tLastID = 99, + 99, "Bioware Supercomputer", "An Infinite Circuit", OrePrefixes.circuit.get(Materials.Infinite), @@ -457,42 +452,40 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_Biowaresupercomputer.get(1), UHV); ItemList.Circuit_Biomainframe.set( addItem( - tLastID = 120, + 120, "Bio Mainframe", "A Bio Circuit", OrePrefixes.circuit.get(Materials.Bio), SubTag.NO_UNIFICATION)); registerTieredTooltip(ItemList.Circuit_Biomainframe.get(1), UEV); - ItemList.Circuit_Board_Coated_Basic.set(addItem(tLastID = 100, "Circuit Board", "A basic Circuit Board", o)); - ItemList.Circuit_Board_Phenolic_Good - .set(addItem(tLastID = 101, "Good Circuit Board", "A good Circuit Board", o)); + ItemList.Circuit_Board_Coated_Basic.set(addItem(100, "Circuit Board", "A basic Circuit Board", o)); + ItemList.Circuit_Board_Phenolic_Good.set(addItem(101, "Good Circuit Board", "A good Circuit Board", o)); ItemList.Circuit_Board_Epoxy_Advanced - .set(addItem(tLastID = 102, "Advanced Circuit Board", "A advanced Circuit Board", o)); + .set(addItem(102, "Advanced Circuit Board", "A advanced Circuit Board", o)); ItemList.Circuit_Board_Fiberglass_Advanced - .set(addItem(tLastID = 103, "More Advanced Circuit Board", "A more advanced Circuit Board", o)); + .set(addItem(103, "More Advanced Circuit Board", "A more advanced Circuit Board", o)); ItemList.Circuit_Board_Multifiberglass_Elite - .set(addItem(tLastID = 104, "Elite Circuit Board", "A elite Circuit Board", o)); + .set(addItem(104, "Elite Circuit Board", "A elite Circuit Board", o)); ItemList.Circuit_Board_Wetware_Extreme - .set(addItem(tLastID = 105, "Extreme Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); - ItemList.Circuit_Board_Plastic_Advanced.set(addItem(tLastID = 106, "Plastic Circuit Board", "A good Board", o)); + .set(addItem(105, "Extreme Wetware Lifesupport Circuit Board", "The Board that keeps life", o)); + ItemList.Circuit_Board_Plastic_Advanced.set(addItem(106, "Plastic Circuit Board", "A good Board", o)); ItemList.Circuit_Board_Bio_Ultra - .set(addItem(tLastID = 107, "Ultra Bio Mutated Circuit Board", "Bio genetic mutated Board", o)); - ItemList.Circuit_Board_Optical - .set(addItem(tLastID = 728, "Optical Circuit Board", "Optically Infused Board", o)); + .set(addItem(107, "Ultra Bio Mutated Circuit Board", "Bio genetic mutated Board", o)); + ItemList.Circuit_Board_Optical.set(addItem(728, "Optical Circuit Board", "Optically Infused Board", o)); // Optical circuits ItemList.Circuit_OpticalProcessor.set( addItem( - tLastID = 154, + 154, "Optical Processor", "An Optical Circuit", - OrePrefixes.circuit.get(Materials.Superconductor), + OrePrefixes.circuit.get(Materials.SuperconductorUHV), SubTag.NO_UNIFICATION)); registerTieredTooltip(ItemList.Circuit_OpticalProcessor.get(1), UV); ItemList.Circuit_OpticalAssembly.set( addItem( - tLastID = 155, + 155, "Optical Assembly", "An Optical Circuit", OrePrefixes.circuit.get(Materials.Infinite), @@ -500,7 +493,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_OpticalAssembly.get(1), UHV); ItemList.Circuit_OpticalComputer.set( addItem( - tLastID = 156, + 156, "Optical Computer", "An Optical Circuit", OrePrefixes.circuit.get(Materials.Bio), @@ -508,7 +501,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_OpticalComputer.get(1), UEV); ItemList.Circuit_OpticalMainframe.set( addItem( - tLastID = 157, + 157, "Optical Mainframe", "An Optical Circuit", OrePrefixes.circuit.get(Materials.Optical), @@ -518,7 +511,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { // Exotic circuits ItemList.Circuit_ExoticProcessor.set( addItem( - tLastID = 166, + 166, "Exotic Processor", "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Infinite), @@ -526,7 +519,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_ExoticProcessor.get(1), UHV); ItemList.Circuit_ExoticAssembly.set( addItem( - tLastID = 167, + 167, "Exotic Assembly", "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Bio), @@ -534,7 +527,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_ExoticAssembly.get(1), UEV); ItemList.Circuit_ExoticComputer.set( addItem( - tLastID = 168, + 168, "Exotic Computer", "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Optical), @@ -542,7 +535,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_ExoticComputer.get(1), UIV); ItemList.Circuit_ExoticMainframe.set( addItem( - tLastID = 169, + 169, "Exotic Mainframe", "An Exotic Circuit", OrePrefixes.circuit.get(Materials.Exotic), @@ -552,7 +545,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { // Cosmic circuits ItemList.Circuit_CosmicProcessor.set( addItem( - tLastID = 170, + 170, "Cosmic Processor", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Bio), @@ -560,7 +553,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_CosmicProcessor.get(1), UEV); ItemList.Circuit_CosmicAssembly.set( addItem( - tLastID = 171, + 171, "Cosmic Assembly", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Optical), @@ -568,7 +561,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_CosmicAssembly.get(1), UIV); ItemList.Circuit_CosmicComputer.set( addItem( - tLastID = 172, + 172, "Cosmic Computer", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Exotic), @@ -576,7 +569,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_CosmicComputer.get(1), UMV); ItemList.Circuit_CosmicMainframe.set( addItem( - tLastID = 173, + 173, "Cosmic Mainframe", "A Cosmic Circuit", OrePrefixes.circuit.get(Materials.Cosmic), @@ -586,7 +579,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { // Transcendent circuits ItemList.Circuit_TranscendentProcessor.set( addItem( - tLastID = 174, + 174, "Temporally Transcendent Processor", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Optical), @@ -594,7 +587,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_TranscendentProcessor.get(1), UIV); ItemList.Circuit_TranscendentAssembly.set( addItem( - tLastID = 175, + 175, "Temporally Transcendent Assembly", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Exotic), @@ -602,7 +595,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_TranscendentAssembly.get(1), UMV); ItemList.Circuit_TranscendentComputer.set( addItem( - tLastID = 176, + 176, "Temporally Transcendent Computer", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Cosmic), @@ -610,18 +603,18 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { registerTieredTooltip(ItemList.Circuit_TranscendentComputer.get(1), UXV); ItemList.Circuit_TranscendentMainframe.set( addItem( - tLastID = 177, + 177, "Temporally Transcendent Mainframe", "A circuit operating outside of known spacetime", OrePrefixes.circuit.get(Materials.Transcendent), SubTag.NO_UNIFICATION)); registerTieredTooltip(ItemList.Circuit_TranscendentMainframe.get(1), MAX); - ItemList.Tube_Wires.set(addItem(tLastID = 110, "Tube Wires", "For the Vacuum Tubes", o)); + ItemList.Tube_Wires.set(addItem(110, "Tube Wires", "For the Vacuum Tubes", o)); ItemList.Cover_SolarPanel_UHV.set( addItem( - tLastID = 130, + 130, "Solar Panel (UHV)", "Ultimate High Voltage Solar Panel (Needs cleaning with right click)", new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 128L), @@ -629,7 +622,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 128L))); ItemList.Cover_SolarPanel_UEV.set( addItem( - tLastID = 131, + 131, "Solar Panel (UEV)", "Ultimate Extreme Voltage Solar Panel (Needs cleaning with right click)", new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256L), @@ -637,7 +630,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 256L))); ItemList.Cover_SolarPanel_UIV.set( addItem( - tLastID = 132, + 132, "Solar Panel (UIV)", "Ultimate Insane Voltage Solar Panel (Needs cleaning with right click)", new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 512L), @@ -657,209 +650,209 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { TextureFactory.of(SOLARPANEL_UIV), new GT_Cover_SolarPanel(33554432)); - ItemList.ULV_Coil.set(addItem(tLastID = 140, "Ultra Low Voltage Coil", "Primitive Coil", o)); - ItemList.LV_Coil.set(addItem(tLastID = 141, "Low Voltage Coil", "Basic Coil", o)); - ItemList.MV_Coil.set(addItem(tLastID = 142, "Medium Voltage Coil", "Good Coil", o)); - ItemList.HV_Coil.set(addItem(tLastID = 143, "High Voltage Coil", "Advanced Coil", o)); - ItemList.EV_Coil.set(addItem(tLastID = 144, "Extreme Voltage Coil", "Extreme Coil", o)); - ItemList.IV_Coil.set(addItem(tLastID = 145, "Insane Voltage Coil", "Elite Coil", o)); - ItemList.LuV_Coil.set(addItem(tLastID = 146, "Ludicrous Voltage Coil", "Master Coil", o)); - ItemList.ZPM_Coil.set(addItem(tLastID = 147, "ZPM Voltage Coil", "Ultimate Coil", o)); - ItemList.UV_Coil.set(addItem(tLastID = 148, "Ultimate Voltage Coil", "Super Coil", o)); - ItemList.UHV_Coil.set(addItem(tLastID = 149, "Highly Ultimate Voltage Coil", "Infinite Coil", o)); + ItemList.ULV_Coil.set(addItem(140, "Ultra Low Voltage Coil", "Primitive Coil", o)); + ItemList.LV_Coil.set(addItem(141, "Low Voltage Coil", "Basic Coil", o)); + ItemList.MV_Coil.set(addItem(142, "Medium Voltage Coil", "Good Coil", o)); + ItemList.HV_Coil.set(addItem(143, "High Voltage Coil", "Advanced Coil", o)); + ItemList.EV_Coil.set(addItem(144, "Extreme Voltage Coil", "Extreme Coil", o)); + ItemList.IV_Coil.set(addItem(145, "Insane Voltage Coil", "Elite Coil", o)); + ItemList.LuV_Coil.set(addItem(146, "Ludicrous Voltage Coil", "Master Coil", o)); + ItemList.ZPM_Coil.set(addItem(147, "ZPM Voltage Coil", "Ultimate Coil", o)); + ItemList.UV_Coil.set(addItem(148, "Ultimate Voltage Coil", "Super Coil", o)); + ItemList.UHV_Coil.set(addItem(149, "Highly Ultimate Voltage Coil", "Infinite Coil", o)); - ItemList.GalliumArsenideCrystal.set(addItem(tLastID = 190, "Gallium Arsenide Crystal", "For making boules", o)); + ItemList.GalliumArsenideCrystal.set(addItem(190, "Gallium Arsenide Crystal", "For making boules", o)); ItemList.GalliumArsenideCrystalSmallPart - .set(addItem(tLastID = 191, "Small Gallium Arsenide Crystal", "For making boules", o)); - ItemList.KevlarFiber.set(addItem(tLastID = 192, "Kevlar Fiber", "For make Kevlar Plates", o)); - ItemList.WovenKevlar.set(addItem(tLastID = 193, "Woven Kevlar", "For make Kevlar Plates", o)); - ItemList.Spinneret.set(addItem(tLastID = 194, "Spinneret", "For make Kevlar Fiber", o)); + .set(addItem(191, "Small Gallium Arsenide Crystal", "For making boules", o)); + ItemList.KevlarFiber.set(addItem(192, "Kevlar Fiber", "For make Kevlar Plates", o)); + ItemList.WovenKevlar.set(addItem(193, "Woven Kevlar", "For make Kevlar Plates", o)); + ItemList.Spinneret.set(addItem(194, "Spinneret", "For make Kevlar Fiber", o)); - ItemList.IndustrialApiary_Upgrade_Frame.set(addItem(tLastID = 199, "Upgrade Frame", "Crafting component", o)); + ItemList.IndustrialApiary_Upgrade_Frame.set(addItem(199, "Upgrade Frame", "Crafting component", o)); ItemList.IndustrialApiary_Upgrade_Acceleration_1.set( addItem( - tLastID = 200, + 200, "Acceleration Upgrade x2", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 2x acceleration level/n * Energy Consumption +1 AMP LV", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_Acceleration_2.set( addItem( - tLastID = 201, + 201, "Acceleration Upgrade x4", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 4x acceleration level/n * Energy Consumption +1 AMP MV", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_Acceleration_3.set( addItem( - tLastID = 202, + 202, "Acceleration Upgrade x8", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 8x acceleration level/n * Energy Consumption +1 AMP HV", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_Acceleration_4.set( addItem( - tLastID = 203, + 203, "Acceleration Upgrade x16", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 16x acceleration level/n * Energy Consumption +1 AMP EV", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_Acceleration_5.set( addItem( - tLastID = 204, + 204, "Acceleration Upgrade x32", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 32x acceleration level/n * Energy Consumption +1 AMP IV", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_Acceleration_6.set( addItem( - tLastID = 205, + 205, "Acceleration Upgrade x64", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 64x acceleration level/n * Energy Consumption +1 AMP LuV", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_Acceleration_7.set( addItem( - tLastID = 206, + 206, "Acceleration Upgrade x128", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 128x acceleration level/n * Energy Consumption +1 AMP ZPM", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_Acceleration_8.set( addItem( - tLastID = 207, + 207, "Acceleration Upgrade x256", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 256x acceleration level/n * Energy Consumption +1 AMP UV", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_Acceleration_8_Upgraded.set( addItem( - tLastID = 208, + 208, "Upgraded Acceleration Upgrade x256", "Acceleration upgrade for Industrial Apiary/n Maximum Installed: 1/n * Unlocks 256x acceleration level/n * Will also grant 8x production upgrade/n * Energy Consumption +1 AMP UV", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_PRODUCTION.set( addItem( - tLastID = 209, + 209, "Production Upgrade", "Production upgrade for Industrial Apiary/n Maximum Installed: 8/n Increases production modifier by 0.25/n Energy Consumption +40%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_PLAINS.set( addItem( - tLastID = 210, + 210, "Plains Emulation Upgrade", "Plains emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: Plains/n * Energy Consumption +40%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_LIGHT.set( addItem( - tLastID = 211, + 211, "Light Upgrade", "Light upgrade for Industrial Apiary/n Maximum Installed: 1/n * Internal Lighting/n * Energy Consumption +5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_FLOWERING.set( addItem( - tLastID = 212, + 212, "Flowering Upgrade", "Flowering upgrade for Industrial Apiary/n Maximum Installed: 8/n * Flowering and Pollination +20%/n * Energy Consumption +10%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_WINTER.set( addItem( - tLastID = 213, + 213, "Winter Emulation Upgrade", "Winter emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: Taiga/n * Energy Consumption +50%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_DRYER.set( addItem( - tLastID = 214, + 214, "Dryer Upgrade", "Dryer upgrade for Industrial Apiary/n Maximum Installed: 8/n * Humidity -25%/n * Energy Consumption +5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_AUTOMATION.set( addItem( - tLastID = 215, + 215, "Automation Upgrade", "Automation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Automation/n * Energy Consumption +10%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_HUMIDIFIER.set( addItem( - tLastID = 216, + 216, "Humidifier Upgrade", "Humidifier upgrade for Industrial Apiary/n Maximum Installed: 8/n * Humidity +25%/n * Energy Consumption +5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_HELL.set( addItem( - tLastID = 217, + 217, "HELL Emulation Upgrade", "HELL emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: HELL/n * Energy Consumption +50%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_POLLEN.set( addItem( - tLastID = 218, + 218, "Pollen Scrubber Upgrade", "Pollen scrubber upgrade for Industrial Apiary/n Maximum Installed: 1/n * Flowering and Pollination -100%/n * Energy Consumption +30%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_DESERT.set( addItem( - tLastID = 219, + 219, "Desert Emulation Upgrade", "Desert emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: Desert/n * Energy Consumption +20%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_COOLER.set( addItem( - tLastID = 220, + 220, "Cooler Upgrade", "Cooler upgrade for Industrial Apiary/n Maximum Installed: 8/n * Temperature -25%/n * Energy Consumption +5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_LIFESPAN.set( addItem( - tLastID = 221, + 221, "Lifespan Upgrade", "Lifespan upgrade for Industrial Apiary/n Maximum Installed: 4/n * Lifespan -33%/n * Energy Consumption +5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_SEAL.set( addItem( - tLastID = 222, + 222, "Seal Upgrade", "Seal upgrade for Industrial Apiary/n Maximum Installed: 1/n * Rain Protection/n * Energy Consumption +5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_STABILIZER.set( addItem( - tLastID = 223, + 223, "Genetic Stabilizer Upgrade", "Genetic stabilizer upgrade for Industrial Apiary/n Maximum Installed: 1/n * Genetic Decay -100%/n * Energy Consumption +150%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_JUNGLE.set( addItem( - tLastID = 224, + 224, "Jungle Emulation Upgrade", "Jungle emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: Jungle/n * Energy Consumption +20%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_TERRITORY.set( addItem( - tLastID = 225, + 225, "Territory Upgrade", "Territory upgrade for Industrial Apiary/n Maximum Installed: 4/n * Territory +50%/n * Energy Consumption +5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_OCEAN.set( addItem( - tLastID = 226, + 226, "Ocean Emulation Upgrade", "Ocean emulation upgrade for Industrial Apiary/n Maximum Installed: 1/n * Biome Override: Ocean/n * Energy Consumption +20%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_SKY.set( addItem( - tLastID = 227, + 227, "Open Sky Upgrade", "Open sky upgrade for Industrial Apiary/n Maximum Installed: 1/n * Open Sky Simulation/n * Energy Consumption +5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_HEATER.set( addItem( - tLastID = 228, + 228, "Heater Upgrade", "Heater upgrade for Industrial Apiary/n Maximum Installed: 8/n * Temperature +25%/n * Energy Consumption +5%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_SIEVE.set( addItem( - tLastID = 229, + 229, "Sieve Upgrade", "Sieve upgrade for Industrial Apiary/n Maximum Installed: 1/n * Pollen Collection/n * Energy Consumption +25%", OrePrefixes.apiaryUpgrade.name())); ItemList.IndustrialApiary_Upgrade_UNLIGHT.set( addItem( - tLastID = 231, + 231, "Night Upgrade", "Night upgrade for Industrial Apiary/n Maximum Installed: 1/n * Internal Darkness/n * Energy Consumption +5%", OrePrefixes.apiaryUpgrade.name())); @@ -903,11 +896,9 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "BY THE POWERS OF NAUGHTINESS, I COMMAND THIS PARTICULAR STAR, TO BE REALLY, REALLY HOT", SubTag.NO_UNIFICATION)); - ItemList.Optical_Cpu_Containment_Housing - .set(addItem(tLastID = 727, "Optical CPU Containment Housing", "CPU Housing", o)); - ItemList.Optically_Perfected_CPU.set(addItem(tLastID = 726, "Optically Perfected CPU", "Perfected CPU!", o)); - ItemList.Optically_Compatible_Memory - .set(addItem(tLastID = 725, "Optically Compatible Memory", "Its in the name!", o)); + ItemList.Optical_Cpu_Containment_Housing.set(addItem(727, "Optical CPU Containment Housing", "CPU Housing", o)); + ItemList.Optically_Perfected_CPU.set(addItem(726, "Optically Perfected CPU", "Perfected CPU!", o)); + ItemList.Optically_Compatible_Memory.set(addItem(725, "Optically Compatible Memory", "Its in the name!", o)); int whiteDwarfIDs = 729; ItemList.White_Dwarf_Shape_Extruder_Plate.set( diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java index 8979d358f1..32f1d41197 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java @@ -176,12 +176,10 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item { /** Struct class holding data that we need to properly handle a registered fluid cell item. */ private static class RegisteredFluidData { - private final Fluid fluid; private final short[] rgba; private final IIconContainer iconContainer; - private RegisteredFluidData(Fluid fluid, short[] rgba, IIconContainer iconContainer) { - this.fluid = fluid; + private RegisteredFluidData(short[] rgba, IIconContainer iconContainer) { this.rgba = rgba; this.iconContainer = iconContainer; } @@ -279,7 +277,7 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item { int color = fluid.getColor(); short[] rgba = GT_Util.getRGBaArray(color); - registeredFluidDataMap.put(id, new RegisteredFluidData(fluid, rgba, iconContainerMap.get(cellType))); + registeredFluidDataMap.put(id, new RegisteredFluidData(rgba, iconContainerMap.get(cellType))); } private void registerOreDict() { @@ -309,7 +307,6 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item { return ItemList.Cell_Empty.get(1L); } - @SuppressWarnings("unchecked") @Override @SideOnly(Side.CLIENT) public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List<ItemStack> aList) { diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java index 60fbeb075a..8956aa4ae2 100644 --- a/src/main/java/gregtech/common/items/ItemComb.java +++ b/src/main/java/gregtech/common/items/ItemComb.java @@ -2,6 +2,10 @@ package gregtech.common.items; import static gregtech.api.enums.GT_Values.*; import static gregtech.api.enums.Mods.*; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes; +import static gregtech.api.util.GT_RecipeConstants.CLEANROOM; +import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; import java.util.Arrays; import java.util.List; @@ -24,6 +28,7 @@ import cpw.mods.fml.relauncher.SideOnly; import forestry.api.core.Tabs; import forestry.api.recipes.RecipeManagers; import gregtech.GT_Mod; +import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -1558,18 +1563,25 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { } public void addFluidExtractorProcess(CombType comb, FluidStack fluid, Voltage volt) { - if (fluid == null) return; - RA.addFluidExtractionRecipe( - GT_Utility.copyAmount(1, getStackForType(comb)), - null, - fluid, - 100 * 100, - (fluid.getFluid() - .getDensity() * 128 > 0 - ? (fluid.getFluid() - .getDensity() * 100) - : 128), - volt.getSimpleEnergy() / 2); + if (fluid == null) { + return; + } + + int duration = (fluid.getFluid() + .getDensity() * 128 > 0 + ? (fluid.getFluid() + .getDensity() * 100) + : 128); + int eut = volt.getSimpleEnergy() / 2; + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.copyAmount(1, getStackForType(comb))) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(fluid) + .duration(duration) + .eut(eut) + .addTo(sFluidExtractionRecipes); } /** @@ -1584,65 +1596,70 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { public void addProcessGT(CombType comb, Materials[] aMaterial, Voltage volt) { ItemStack tComb = getStackForType(comb); for (Materials materials : aMaterial) { - if (GT_OreDictUnificator.get(OrePrefixes.crushedPurified, materials, 4) != NI) { + if (GT_OreDictUnificator.get(OrePrefixes.crushedPurified, materials, 4) != null) { + ItemStack combInput; + ItemStack combOutput; + FluidStack fluidInput; + FluidStack fluidOutput; + int durationTicks; + int eut; + boolean requiresCleanroom; switch (comb) { - case NEUTRONIUM: - RA.addChemicalRecipe( - GT_Utility.copyAmount(4, tComb), - null, - volt.getFluidAccordingToCombTier(), - Materials.Neutronium.getMolten(576l), - Materials.Neutronium.getNuggets(1), - NI, - volt.getComplexTime() * 17, - volt.getChemicalEnergy(), - volt.compareTo(Voltage.IV) > 0); - case OSMIUM: - RA.addChemicalRecipe( - GT_Utility.copyAmount(4, tComb), - null, - volt.getFluidAccordingToCombTier(), - Materials.Osmium.getMolten(288l), - Materials.Osmium.getNuggets(1), - NI, - volt.getComplexTime() * 17, - volt.getChemicalEnergy(), - volt.compareTo(Voltage.IV) > 0); - case PLATINUM: - RA.addChemicalRecipe( - GT_Utility.copyAmount(4, tComb), - null, - volt.getFluidAccordingToCombTier(), - Materials.Platinum.getMolten(288l), - Materials.Platinum.getNuggets(1), - NI, - volt.getComplexTime() * 10, - volt.getChemicalEnergy(), - volt.compareTo(Voltage.HV) > 0); - case IRIDIUM: - RA.addChemicalRecipe( - GT_Utility.copyAmount(4, tComb), - null, - volt.getFluidAccordingToCombTier(), - Materials.Iridium.getMolten(288l), - Materials.Iridium.getNuggets(1), - NI, - volt.getComplexTime() * 14, - volt.getChemicalEnergy(), - volt.compareTo(Voltage.EV) > 0); - default: - RA.addChemicalRecipe( - GT_Utility.copyAmount(4, tComb), - null, - volt.getFluidAccordingToCombTier(), - null, - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, materials, 4), - NI, - volt.getComplexTime(), - volt.getChemicalEnergy(), - volt.compareTo(Voltage.IV) > 0); - break; + case NEUTRONIUM -> { + combInput = GT_Utility.copyAmount(4, tComb); + combOutput = Materials.Neutronium.getNuggets(1); + fluidInput = volt.getFluidAccordingToCombTier(); + fluidOutput = Materials.Neutronium.getMolten(576); + durationTicks = volt.getComplexTime() * 17; + eut = volt.getChemicalEnergy(); + requiresCleanroom = volt.compareTo(Voltage.IV) > 0; + } + case OSMIUM -> { + combInput = GT_Utility.copyAmount(4, tComb); + combOutput = Materials.Osmium.getNuggets(1); + fluidInput = volt.getFluidAccordingToCombTier(); + fluidOutput = Materials.Osmium.getMolten(288); + durationTicks = volt.getComplexTime() * 17; + eut = volt.getChemicalEnergy(); + requiresCleanroom = volt.compareTo(Voltage.IV) > 0; + } + case PLATINUM -> { + combInput = GT_Utility.copyAmount(4, tComb); + combOutput = Materials.Platinum.getNuggets(1); + fluidInput = volt.getFluidAccordingToCombTier(); + fluidOutput = Materials.Platinum.getMolten(288); + durationTicks = volt.getComplexTime() * 10; + eut = volt.getChemicalEnergy(); + requiresCleanroom = volt.compareTo(Voltage.HV) > 0; + } + case IRIDIUM -> { + combInput = GT_Utility.copyAmount(4, tComb); + combOutput = Materials.Iridium.getNuggets(1); + fluidInput = volt.getFluidAccordingToCombTier(); + fluidOutput = Materials.Iridium.getMolten(288); + durationTicks = volt.getComplexTime() * 14; + eut = volt.getChemicalEnergy(); + requiresCleanroom = volt.compareTo(Voltage.EV) > 0; + } + default -> { + combInput = GT_Utility.copyAmount(4, tComb); + combOutput = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, materials, 4); + fluidInput = volt.getFluidAccordingToCombTier(); + fluidOutput = null; + durationTicks = volt.getComplexTime(); + eut = volt.getChemicalEnergy(); + requiresCleanroom = volt.compareTo(Voltage.IV) > 0; + } } + GT_Values.RA.stdBuilder() + .itemInputs(combInput) + .itemOutputs(combOutput) + .fluidInputs(fluidInput) + .fluidOutputs(fluidOutput) + .duration(durationTicks) + .eut(eut) + .metadata(CLEANROOM, requiresCleanroom) + .addTo(UniversalChemical); } } } @@ -1719,25 +1736,15 @@ public class ItemComb extends Item implements IGT_ItemWithMaterialRenderer { RecipeManagers.centrifugeManager.addRecipe(40, tComb, Product.build()); } - aItem = Arrays.copyOf(aItem, 6); - if (aItem.length > 6) { - chance = Arrays.copyOf(chance, 6); - } - - RA.addCentrifugeRecipe( - tComb, - NI, - NF, - NF, - aItem[0], - aItem[1], - aItem[2], - aItem[3], - aItem[4], - aItem[5], - chance, - duration, - volt.getSimpleEnergy()); + GT_Values.RA.stdBuilder() + .itemInputs(tComb) + .itemOutputs(aItem) + .outputChances(chance) + .noFluidInputs() + .noFluidOutputs() + .duration(duration) + .eut(volt.getSimpleEnergy()) + .addTo(sCentrifugeRecipes); } public void registerOreDict() { diff --git a/src/main/java/gregtech/common/items/ItemDrop.java b/src/main/java/gregtech/common/items/ItemDrop.java index 6e62281812..2c32383d1f 100644 --- a/src/main/java/gregtech/common/items/ItemDrop.java +++ b/src/main/java/gregtech/common/items/ItemDrop.java @@ -6,6 +6,9 @@ import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.enums.Mods.MagicBees; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeBuilder.TICKS; import java.util.List; @@ -24,6 +27,7 @@ import forestry.api.core.Tabs; import forestry.api.recipes.RecipeManagers; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_ModHandler; public class ItemDrop extends Item { @@ -188,19 +192,51 @@ public class ItemDrop extends Item { } public void addProcessLV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aEUt) { - GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, 32, aEUt); + GT_Values.RA.stdBuilder() + .itemInputs(tDrop) + .itemOutputs(aOutput2) + .outputChances(aChance) + .noFluidInputs() + .fluidOutputs(aOutput) + .duration(1 * SECONDS + 12 * TICKS) + .eut(aEUt) + .addTo(sFluidExtractionRecipes); } public void addProcessLV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aDuration, int aEUt) { - GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, aDuration, aEUt); + GT_Values.RA.stdBuilder() + .itemInputs(tDrop) + .itemOutputs(aOutput2) + .outputChances(aChance) + .noFluidInputs() + .fluidOutputs(aOutput) + .duration(aDuration) + .eut(aEUt) + .addTo(sFluidExtractionRecipes); } public void addProcessMV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance, int aEUt) { - GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, 128, aEUt); + GT_Values.RA.stdBuilder() + .itemInputs(tDrop) + .itemOutputs(aOutput2) + .outputChances(aChance) + .noFluidInputs() + .fluidOutputs(aOutput) + .duration(6 * SECONDS + 8 * TICKS) + .eut(aEUt) + .addTo(sFluidExtractionRecipes); } public void addProcessHV(ItemStack tDrop, FluidStack aOutput, ItemStack aOutput2, int aChance) { - GT_Values.RA.addFluidExtractionRecipe(tDrop, aOutput2, aOutput, aChance, 480, 480); + GT_Values.RA.stdBuilder() + .itemInputs(tDrop) + .itemOutputs(aOutput2) + .outputChances(aChance) + .noFluidInputs() + .fluidOutputs(aOutput) + .duration(24 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sFluidExtractionRecipes); } } diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java index 8513c02e2a..5559de9013 100644 --- a/src/main/java/gregtech/common/items/ItemPropolis.java +++ b/src/main/java/gregtech/common/items/ItemPropolis.java @@ -3,6 +3,9 @@ package gregtech.common.items; import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.HardcoreEnderExpansion; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeBuilder.TICKS; import java.util.List; @@ -20,6 +23,7 @@ import forestry.api.core.Tabs; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -103,27 +107,38 @@ public class ItemPropolis extends Item { } public void addProcessHV(ItemStack tPropolis, ItemStack aOutput2) { - GT_Values.RA - .addFluidExtractionRecipe(tPropolis, aOutput2, FluidRegistry.getFluidStack("endergoo", 100), 5000, 50, 480); + GT_Values.RA.stdBuilder() + .itemInputs(tPropolis) + .itemOutputs(aOutput2) + .outputChances(5000) + .noFluidInputs() + .fluidOutputs(FluidRegistry.getFluidStack("endergoo", 100)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_HV) + .addTo(sFluidExtractionRecipes); } public void addProcessEV(ItemStack tPropolis, ItemStack aOutput2) { - GT_Values.RA.addFluidExtractionRecipe( - tPropolis, - aOutput2, - FluidRegistry.getFluidStack("endergoo", 200), - 2500, - 100, - 1920); + GT_Values.RA.stdBuilder() + .itemInputs(tPropolis) + .itemOutputs(aOutput2) + .outputChances(2500) + .noFluidInputs() + .fluidOutputs(FluidRegistry.getFluidStack("endergoo", 200)) + .duration(5 * SECONDS) + .eut(TierEU.RECIPE_EV) + .addTo(sFluidExtractionRecipes); } public void addProcessIV(ItemStack tPropolis, ItemStack aOutput2) { - GT_Values.RA.addFluidExtractionRecipe( - tPropolis, - aOutput2, - FluidRegistry.getFluidStack("endergoo", 300), - 1500, - 150, - 7680); + GT_Values.RA.stdBuilder() + .itemInputs(tPropolis) + .itemOutputs(aOutput2) + .outputChances(1500) + .noFluidInputs() + .fluidOutputs(FluidRegistry.getFluidStack("endergoo", 300)) + .duration(7 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_IV) + .addTo(sFluidExtractionRecipes); } } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java index fd7e1a7965..f9621a8da4 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Spray_Color.java @@ -113,6 +113,7 @@ public class Behaviour_Spray_Color extends Behaviour_None { case SOUTH -> aZ += 1; case WEST -> aX -= 1; case EAST -> aX += 1; + default -> throw new IllegalArgumentException("Unexpected value: " + lookSide); } } tNBT.removeTag("GT.RemainingPaint"); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java index 9025dd1f78..ccffb3cd3a 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java @@ -306,7 +306,7 @@ public class GT_MetaTileEntity_AssemblyLine if (GT_Values.D1) { GT_FML_LOGGER.info("Check overclock"); } - calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, getMaxInputVoltage()); + calculateOverclockedNessMultiInternal(tRecipe.mEUt, tRecipe.mDuration, 1, getMaxInputVoltage(), false); // In case recipe is too OP for that machine if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) { if (GT_Values.D1) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java index 300dba92e3..5a25507524 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java @@ -93,7 +93,7 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB public boolean checkRecipe(ItemStack aStack) { mEfficiencyIncrease = 100; // use the standard overclock mechanism to determine duration and estimate a maximum consumption - calculateOverclockedNessMulti(40, 45 * Math.max(1, mHeight - 1), 1, getMaxInputVoltage()); + calculateOverclockedNessMultiInternal(40, 45 * Math.max(1, mHeight - 1), 1, getMaxInputVoltage(), false); // negate it to trigger the special energy consumption function. divide by 10 to get the actual final // consumption. mEUt /= -10; @@ -393,19 +393,15 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB int percentage; int allowedCount; - int meta; - ConfigEntry(int percentage, int count, int meta) { + ConfigEntry(int percentage, int count) { this.percentage = percentage; this.allowedCount = count; - this.meta = meta; } } private static final HashMap<String, ConfigEntry> config = new HashMap<>(); - private static final String category = "cleanroom_allowed_blocks"; - private static final int wildcard_meta = Short.MAX_VALUE; private static void setDefaultConfigValues(Configuration cfg) { cfg.get("cleanroom_allowed_blocks.reinforced_glass", "Name", "blockAlloyGlass"); @@ -438,16 +434,13 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB new ConfigEntry( 0, cc.get("Count") - .getInt(), - cc.get("Meta") .getInt())); else config.put( name, new ConfigEntry( 0, cc.get("Count") - .getInt(), - wildcard_meta)); + .getInt())); } else if (cc.containsKey("Percentage")) { if (cc.containsKey("Meta")) config.put( name + ":" @@ -456,16 +449,13 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_TooltipMultiB new ConfigEntry( cc.get("Percentage") .getInt(), - 0, - cc.get("Meta") - .getInt())); + 0)); else config.put( name, new ConfigEntry( cc.get("Percentage") .getInt(), - 0, - wildcard_meta)); + 0)); } } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java index 069afffacf..4fdc2e7f03 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java @@ -283,13 +283,6 @@ public class GT_MetaTileEntity_DieselEngine return 50; } - private boolean addToMachineList(IGregTechTileEntity tTileEntity) { - return ((addMaintenanceToMachineList(tTileEntity, getCasingTextureIndex())) - || (addInputToMachineList(tTileEntity, getCasingTextureIndex())) - || (addOutputToMachineList(tTileEntity, getCasingTextureIndex())) - || (addMufflerToMachineList(tTileEntity, getCasingTextureIndex()))); - } - @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GT_MetaTileEntity_DieselEngine(this.mName); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java index ec616461a9..17b043ead2 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java @@ -235,7 +235,7 @@ public class GT_MetaTileEntity_DistillationTower extends if (tRecipe.isRecipeInputEqual(true, tFluids, inputs)) { this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; - calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage); + calculateOverclockedNessMultiInternal(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage, false); // In case recipe is too OP for that machine if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) return false; if (this.mEUt > 0) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java index f21d814838..0ba884ab8c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ImplosionCompressor.java @@ -129,7 +129,7 @@ public class GT_MetaTileEntity_ImplosionCompressor this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; // OC THAT EXPLOSIVE SHIT!!! - calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, getMaxInputVoltage()); + calculateOverclockedNessMultiInternal(tRecipe.mEUt, tRecipe.mDuration, 1, getMaxInputVoltage(), false); // In case recipe is too OP for that machine if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) return false; if (this.mEUt > 0) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java index 23fa445868..5b3db72c98 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IntegratedOreFactory.java @@ -351,7 +351,7 @@ public class GT_MetaTileEntity_IntegratedOreFactory extends this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; this.mOutputItems = sMidProduct; - calculateOverclockedNessMulti(30 * tRealUsed, getTime(sMode), 1, getMaxInputVoltage()); + calculateOverclockedNessMultiInternal(30 * tRealUsed, getTime(sMode), 1, getMaxInputVoltage(), false); if (this.mEUt > 0) { this.mEUt = -this.mEUt; } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java index de2f0ad24b..6fb7c6430a 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java @@ -204,7 +204,7 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; - calculatePerfectOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage); + calculateOverclockedNessMultiInternal(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage, true); // In case recipe is too OP for that machine if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) return false; if (this.mEUt > 0) { @@ -226,10 +226,6 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends mCasingAmount++; } - private void onCoilAdded() { - mCoilAmount++; - } - @Override public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { mCasingAmount = 0; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java index c6a4155b03..cfc565558b 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java @@ -215,13 +215,13 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar counter = 0; baseEff = GT_Utility.safeInt( (long) ((5F + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolCombatDamage(aStack)) * 1000F)); - optFlow = GT_Utility.safeInt( - (long) Math.max( - Float.MIN_NORMAL, - ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack) - .getSpeedMultiplier() - * ((GT_MetaGenerated_Tool) aStack.getItem()).getPrimaryMaterial(aStack).mToolSpeed - * 50)); + optFlow = GT_Utility + .safeInt( + (long) Math.max( + Float.MIN_NORMAL, + ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack) + .getSpeedMultiplier() * GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolSpeed + * 50)); overflowMultiplier = getOverflowMultiplier(aStack); flowMultipliers[0] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mSteamMultiplier; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java index c9f32c76f7..58d82f2901 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java @@ -30,10 +30,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; @@ -179,7 +176,7 @@ public class GT_MetaTileEntity_MultiFurnace if (this.mOutputItems.length > 0) { this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; - calculateOverclockedNessMulti(4, 512, 1, mVolatage); + calculateOverclockedNessMultiInternal(4, 512, 1, mVolatage, false); // In case recipe is too OP for that machine if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) return false; @@ -318,15 +315,6 @@ public class GT_MetaTileEntity_MultiFurnace buildPiece(STRUCTURE_PIECE_MAIN, stackSize, hintsOnly, 1, 2, 0); } - private boolean isBottomHatch(IGregTechTileEntity aTileEntity) { - if (aTileEntity == null) return false; - IMetaTileEntity tMTE = aTileEntity.getMetaTileEntity(); - if (tMTE == null) return false; - return tMTE instanceof GT_MetaTileEntity_Hatch_Energy || tMTE instanceof GT_MetaTileEntity_Hatch_InputBus - || tMTE instanceof GT_MetaTileEntity_Hatch_OutputBus - || tMTE instanceof GT_MetaTileEntity_Hatch_Maintenance; - } - @Override public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) { if (mMachine) return -1; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java index 389d1b84b6..384013459c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilCracker.java @@ -185,7 +185,7 @@ public class GT_MetaTileEntity_OilCracker extends GT_MetaTileEntity_EnhancedMult if (tRecipe.isRecipeInputEqual(true, tFluidInputs, mInventory[1])) { this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; - calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage); + calculateOverclockedNessMultiInternal(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage, false); // In case recipe is too OP for that machine if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) return false; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java index 6a1964df3e..90bfa18138 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java @@ -194,7 +194,7 @@ public class GT_MetaTileEntity_PyrolyseOven this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; - calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage); + calculateOverclockedNessMultiInternal(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage, false); // In case recipe is too OP for that machine if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) return false; if (this.mEUt > 0) this.mEUt = (-this.mEUt); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java index 520fc01de0..19bd46df5d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_VacuumFreezer.java @@ -114,7 +114,7 @@ public class GT_MetaTileEntity_VacuumFreezer this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); this.mEfficiencyIncrease = 10000; - calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage); + calculateOverclockedNessMultiInternal(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage, false); // In case recipe is too OP for that machine if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) return false; if (this.mEUt > 0) { diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java index c9a3ad7650..aeced754fe 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java @@ -21,6 +21,14 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; +import appeng.api.storage.IMEMonitor; +import appeng.api.storage.IMEMonitorHandlerReceiver; +import appeng.api.storage.StorageChannel; +import appeng.api.storage.data.IAEItemStack; +import appeng.api.storage.data.IItemList; +import appeng.util.item.AEItemStack; +import appeng.util.item.ItemList; + import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.DrawableWidget; @@ -41,11 +49,11 @@ import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Utility; public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEntity_TieredMachineBlock - implements appeng.api.storage.IMEMonitor<appeng.api.storage.data.IAEItemStack>, IAddUIWidgets { + implements IMEMonitor<IAEItemStack>, IAddUIWidgets { protected boolean mVoidOverflow = false; protected boolean mDisableFilter; - private Map<appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack>, Object> listeners = null; + private Map<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = null; public GT_MetaTileEntity_DigitalChestBase(int aID, String aName, String aNameRegional, int aTier) { super( @@ -116,16 +124,13 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti } @Override - public void addListener( - appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack> imeMonitorHandlerReceiver, - Object o) { + public void addListener(IMEMonitorHandlerReceiver<IAEItemStack> imeMonitorHandlerReceiver, Object o) { if (listeners == null) listeners = new HashMap<>(); listeners.put(imeMonitorHandlerReceiver, o); } @Override - public void removeListener( - appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack> imeMonitorHandlerReceiver) { + public void removeListener(IMEMonitorHandlerReceiver<IAEItemStack> imeMonitorHandlerReceiver) { if (listeners == null) listeners = new HashMap<>(); listeners.remove(imeMonitorHandlerReceiver); } @@ -136,14 +141,14 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti } @Override - public boolean isPrioritized(appeng.api.storage.data.IAEItemStack iaeItemStack) { + public boolean isPrioritized(IAEItemStack iaeItemStack) { ItemStack s = getItemStack(); if (s == null || iaeItemStack == null) return false; return iaeItemStack.isSameType(s); } @Override - public boolean canAccept(appeng.api.storage.data.IAEItemStack iaeItemStack) { + public boolean canAccept(IAEItemStack iaeItemStack) { ItemStack s = getItemStack(); if (s == null || iaeItemStack == null) return true; return iaeItemStack.isSameType(s); @@ -168,12 +173,12 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti protected abstract void setItemStack(ItemStack s); + @SuppressWarnings("unchecked") @Override - public appeng.api.storage.data.IItemList<appeng.api.storage.data.IAEItemStack> getAvailableItems( - final appeng.api.storage.data.IItemList out) { + public IItemList<IAEItemStack> getAvailableItems(@SuppressWarnings("rawtypes") final IItemList out) { ItemStack storedStack = getItemStack(); if (storedStack != null) { - appeng.util.item.AEItemStack s = appeng.util.item.AEItemStack.create(storedStack); + AEItemStack s = AEItemStack.create(storedStack); s.setStackSize(getItemCount()); out.add(s); } @@ -181,11 +186,11 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti } @Override - public appeng.api.storage.data.IItemList<appeng.api.storage.data.IAEItemStack> getStorageList() { - appeng.api.storage.data.IItemList<appeng.api.storage.data.IAEItemStack> res = new appeng.util.item.ItemList(); + public IItemList<IAEItemStack> getStorageList() { + IItemList<IAEItemStack> res = new ItemList(); ItemStack storedStack = getItemStack(); if (storedStack != null) { - appeng.util.item.AEItemStack s = appeng.util.item.AEItemStack.create(storedStack); + AEItemStack s = AEItemStack.create(storedStack); s.setStackSize(getItemCount()); res.add(s); } @@ -208,8 +213,8 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti } @Override - public appeng.api.storage.data.IAEItemStack injectItems(final appeng.api.storage.data.IAEItemStack input, - final appeng.api.config.Actionable mode, final appeng.api.networking.security.BaseActionSource src) { + public IAEItemStack injectItems(final IAEItemStack input, final appeng.api.config.Actionable mode, + final appeng.api.networking.security.BaseActionSource src) { final ItemStack inputStack = input.getItemStack(); if (inputStack == null) return null; if (getBaseMetaTileEntity() == null) return input; @@ -236,21 +241,21 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti return null; } - private appeng.api.storage.data.IAEItemStack createOverflowStack(long size, appeng.api.config.Actionable mode) { - final appeng.api.storage.data.IAEItemStack overflow = appeng.util.item.AEItemStack.create(getItemStack()); + private IAEItemStack createOverflowStack(long size, appeng.api.config.Actionable mode) { + final IAEItemStack overflow = AEItemStack.create(getItemStack()); overflow.setStackSize(size - getMaxItemCount()); if (mode != appeng.api.config.Actionable.SIMULATE) setItemCount(getMaxItemCount()); return overflow; } @Override - public appeng.api.storage.data.IAEItemStack extractItems(final appeng.api.storage.data.IAEItemStack request, - final appeng.api.config.Actionable mode, final appeng.api.networking.security.BaseActionSource src) { + public IAEItemStack extractItems(final IAEItemStack request, final appeng.api.config.Actionable mode, + final appeng.api.networking.security.BaseActionSource src) { if (request.isSameType(getItemStack())) { if (getBaseMetaTileEntity() == null) return null; if (mode != appeng.api.config.Actionable.SIMULATE) getBaseMetaTileEntity().markDirty(); if (request.getStackSize() >= getItemCount()) { - appeng.util.item.AEItemStack result = appeng.util.item.AEItemStack.create(getItemStack()); + AEItemStack result = AEItemStack.create(getItemStack()); result.setStackSize(getItemCount()); if (mode != appeng.api.config.Actionable.SIMULATE) setItemCount(0); return result; @@ -264,8 +269,8 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti } @Override - public appeng.api.storage.StorageChannel getChannel() { - return appeng.api.storage.StorageChannel.ITEMS; + public StorageChannel getChannel() { + return StorageChannel.ITEMS; } @Override @@ -421,8 +426,8 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti return; } if (count == 0 || stack == null) return; - appeng.util.item.ItemList change = new appeng.util.item.ItemList(); - appeng.util.item.AEItemStack s = appeng.util.item.AEItemStack.create(stack); + ItemList change = new ItemList(); + AEItemStack s = AEItemStack.create(stack); s.setStackSize(count); change.add(s); listeners.forEach((l, o) -> { @@ -433,8 +438,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti private boolean hasActiveMEConnection() { if (listeners == null || listeners.isEmpty()) return false; - for (Map.Entry<appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack>, Object> e : listeners - .entrySet()) { + for (Map.Entry<IMEMonitorHandlerReceiver<IAEItemStack>, Object> e : listeners.entrySet()) { if ((e.getKey() instanceof appeng.api.parts.IPart)) { appeng.api.networking.IGridNode n = ((appeng.api.parts.IPart) e.getKey()).getGridNode(); if (n != null && n.isActive()) return true; diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java index 4493d57bd3..4f0bdbc237 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java @@ -23,7 +23,7 @@ public class GT_MetaTileEntity_SuperTank extends GT_MetaTileEntity_DigitalTankBa @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_SuperTank(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_SuperTank(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java index a99d54993a..142b0c50d2 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java @@ -1,6 +1,5 @@ package gregtech.common.tools; -import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; @@ -112,8 +111,7 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw { if ((aBlock.getMaterial() == Material.leaves) && ((aBlock instanceof IShearable))) { aPlayer.worldObj.setBlock(aX, aY, aZ, aBlock, aMetaData, 0); if (((IShearable) aBlock).isShearable(aStack, aPlayer.worldObj, aX, aY, aZ)) { - ArrayList<ItemStack> tDrops = ((IShearable) aBlock) - .onSheared(aStack, aPlayer.worldObj, aX, aY, aZ, aFortune); + ((IShearable) aBlock).onSheared(aStack, aPlayer.worldObj, aX, aY, aZ, aFortune); aDrops.clear(); } aPlayer.worldObj.setBlock(aX, aY, aZ, Blocks.air, 0, 0); diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java b/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java index fa62c99ea8..3731f578db 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java @@ -53,8 +53,8 @@ public class GT_Tool_Drill_HV extends GT_Tool_Drill_LV { public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) { super.onToolCrafted(aStack, aPlayer); try { - GT_Mod.instance.achievements.issueAchievement(aPlayer, "highpowerdrill"); - GT_Mod.instance.achievements.issueAchievement(aPlayer, "buildDDrill"); + GT_Mod.achievements.issueAchievement(aPlayer, "highpowerdrill"); + GT_Mod.achievements.issueAchievement(aPlayer, "buildDDrill"); } catch (Exception ignored) {} } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java b/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java index d6c609236e..4f2c1a367b 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java @@ -105,7 +105,7 @@ public class GT_Tool_JackHammer extends GT_Tool_Drill_LV { public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) { super.onToolCrafted(aStack, aPlayer); try { - GT_Mod.instance.achievements.issueAchievement(aPlayer, "hammertime"); + GT_Mod.achievements.issueAchievement(aPlayer, "hammertime"); } catch (Exception ignored) {} } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java b/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java index 71bf9cfb17..e2857e4af1 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java @@ -122,7 +122,7 @@ public class GT_Tool_Pickaxe extends GT_Tool { aPlayer.triggerAchievement(AchievementList.buildPickaxe); aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe); try { - GT_Mod.instance.achievements.issueAchievement(aPlayer, "flintpick"); + GT_Mod.achievements.issueAchievement(aPlayer, "flintpick"); } catch (Exception ignored) {} } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java b/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java index dc550989a0..76c1ccbc24 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java @@ -11,6 +11,7 @@ import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.IItemBehaviour; +import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GT_ToolHarvestHelper; import gregtech.api.util.GT_Utility; @@ -73,7 +74,7 @@ public class GT_Tool_Plunger extends GT_Tool { false, getToolDamagePerDropConversion()); if ((tObject instanceof IItemBehaviour)) { - aItem.addItemBehavior(aID, (IItemBehaviour) tObject); + aItem.addItemBehavior(aID, (IItemBehaviour<GT_MetaBase_Item>) tObject); } } catch (Throwable ignored) {} } |