diff options
Diffstat (limited to 'src/main/java/goodgenerator')
-rw-r--r-- | src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerBackend.java | 4 | ||||
-rw-r--r-- | src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerFrontend.java | 8 | ||||
-rw-r--r-- | src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerRecipe.java | 4 | ||||
-rw-r--r-- | src/main/java/goodgenerator/api/recipe/GoodGeneratorRecipeMaps.java | 24 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java | 32 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/regularBlock/BlockCasing.java (renamed from src/main/java/goodgenerator/blocks/regularBlock/Casing.java) | 24 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/regularBlock/BlockComplexTextureCasing.java (renamed from src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java) | 4 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/regularBlock/BlockFrame.java (renamed from src/main/java/goodgenerator/blocks/regularBlock/Frame.java) | 6 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/regularBlock/BlockTEContainer.java (renamed from src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java) | 54 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/regularBlock/BlockTurbineCasing.java (renamed from src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java) | 10 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTEDieselGenerator.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java) | 24 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTENeutronAccelerator.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java) | 12 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTENeutronSensor.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java) | 28 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTEYOTTAHatch.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java) | 26 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java) | 86 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTECoolantTower.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java) | 63 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaHatch.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java) | 2 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaOutputHatch.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java) | 2 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaOutputHatchME.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java) | 2 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEExtremeHeatExchanger.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java) | 110 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java) | 89 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaGenerator.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java) | 92 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java) | 78 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer1.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java) | 33 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer2.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java) | 33 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer3.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java) | 33 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer4.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java) | 45 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer5.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java) | 45 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java) | 114 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTENeutronActivator.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java) | 123 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java) | 148 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTESupercriticalFluidTurbine.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java) | 38 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java) | 103 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/MTEYottaFluidTank.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java) | 86 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java) | 145 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputerPP.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java) | 19 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LargeTurbineBase.java) | 98 | ||||
-rw-r--r-- | src/main/java/goodgenerator/blocks/tileEntity/base/MTETooltipMultiBlockBaseEM.java (renamed from src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_TooltipMultiBlockBase_EM.java) | 20 | ||||
-rw-r--r-- | src/main/java/goodgenerator/client/GUI/GGUITextures.java (renamed from src/main/java/goodgenerator/client/GUI/GG_UITextures.java) | 2 | ||||
-rw-r--r-- | src/main/java/goodgenerator/client/render/BlockRenderHandler.java | 6 | ||||
-rw-r--r-- | src/main/java/goodgenerator/crossmod/nei/NEIConfig.java (renamed from src/main/java/goodgenerator/crossmod/nei/NEI_Config.java) | 6 | ||||
-rw-r--r-- | src/main/java/goodgenerator/crossmod/thaumcraft/Research.java | 443 | ||||
-rw-r--r-- | src/main/java/goodgenerator/items/GGItem.java (renamed from src/main/java/goodgenerator/items/MyItems.java) | 12 | ||||
-rw-r--r-- | src/main/java/goodgenerator/items/GGItemBlocks.java (renamed from src/main/java/goodgenerator/items/MyItemBlocks.java) | 20 | ||||
-rw-r--r-- | src/main/java/goodgenerator/items/GGMaterial.java (renamed from src/main/java/goodgenerator/items/MyMaterial.java) | 13 | ||||
-rw-r--r-- | src/main/java/goodgenerator/items/ItemDepletedFuelRod.java (renamed from src/main/java/goodgenerator/items/DepletedFuelRod.java) | 4 | ||||
-rw-r--r-- | src/main/java/goodgenerator/items/ItemFuelRod.java (renamed from src/main/java/goodgenerator/items/FuelRod.java) | 15 | ||||
-rw-r--r-- | src/main/java/goodgenerator/items/RadioactiveItem.java | 6 | ||||
-rw-r--r-- | src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java | 207 | ||||
-rw-r--r-- | src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java | 84 | ||||
-rw-r--r-- | src/main/java/goodgenerator/loader/FuelRecipeLoader.java | 163 | ||||
-rw-r--r-- | src/main/java/goodgenerator/loader/FuelRodLoader.java | 52 | ||||
-rw-r--r-- | src/main/java/goodgenerator/loader/Loaders.java | 295 | ||||
-rw-r--r-- | src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java | 497 | ||||
-rw-r--r-- | src/main/java/goodgenerator/loader/NeutronActivatorLoader.java | 34 | ||||
-rw-r--r-- | src/main/java/goodgenerator/loader/RecipeLoader.java | 1057 | ||||
-rw-r--r-- | src/main/java/goodgenerator/loader/RecipeLoader2.java (renamed from src/main/java/goodgenerator/loader/RecipeLoader_02.java) | 1053 | ||||
-rw-r--r-- | src/main/java/goodgenerator/main/GGConfigLoader.java (renamed from src/main/java/goodgenerator/main/GG_Config_Loader.java) | 2 | ||||
-rw-r--r-- | src/main/java/goodgenerator/main/GoodGenerator.java | 9 | ||||
-rw-r--r-- | src/main/java/goodgenerator/network/MessageMTEBase.java | 3 | ||||
-rw-r--r-- | src/main/java/goodgenerator/util/CrackRecipeAdder.java | 211 | ||||
-rw-r--r-- | src/main/java/goodgenerator/util/ItemRefer.java | 4 | ||||
-rw-r--r-- | src/main/java/goodgenerator/util/MaterialFix.java | 129 | ||||
-rw-r--r-- | src/main/java/goodgenerator/util/StackUtils.java | 38 | ||||
-rw-r--r-- | src/main/java/goodgenerator/util/StructureHelper.java | 10 |
65 files changed, 3111 insertions, 3131 deletions
diff --git a/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerBackend.java b/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerBackend.java index cdd3a4d57f..cfe6f7c371 100644 --- a/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerBackend.java +++ b/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerBackend.java @@ -4,7 +4,7 @@ import javax.annotation.ParametersAreNonnullByDefault; import gregtech.api.recipe.RecipeMapBackendPropertiesBuilder; import gregtech.api.recipe.maps.FuelBackend; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; import gregtech.api.util.MethodsReturnNonnullByDefault; @ParametersAreNonnullByDefault @@ -16,7 +16,7 @@ public class ExtremeHeatExchangerBackend extends FuelBackend { } @Override - public GT_Recipe compileRecipe(GT_Recipe recipe) { + public GTRecipe compileRecipe(GTRecipe recipe) { if (!(recipe instanceof ExtremeHeatExchangerRecipe)) { throw new RuntimeException("Recipe must be instance of ExtremeHeatExchangerRecipe"); } diff --git a/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerFrontend.java b/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerFrontend.java index b933802fc2..79459d3a5a 100644 --- a/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerFrontend.java +++ b/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerFrontend.java @@ -13,7 +13,7 @@ import com.gtnewhorizons.modularui.api.math.Pos2d; import gregtech.api.recipe.BasicUIPropertiesBuilder; import gregtech.api.recipe.NEIRecipePropertiesBuilder; import gregtech.api.recipe.RecipeMapFrontend; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gregtech.api.util.MethodsReturnNonnullByDefault; import gregtech.nei.RecipeDisplayInfo; import gregtech.nei.formatter.INEISpecialInfoFormatter; @@ -46,12 +46,12 @@ public class ExtremeHeatExchangerFrontend extends RecipeMapFrontend { int threshold = recipeInfo.recipe.mSpecialValue; return Arrays.asList( StatCollector.translateToLocal("value.extreme_heat_exchanger.0") + " " - + GT_Utility.formatNumbers(Inputs[0].amount) + + GTUtility.formatNumbers(Inputs[0].amount) + " L/s", StatCollector.translateToLocal("value.extreme_heat_exchanger.1"), - GT_Utility.formatNumbers(Outputs[0].amount / 160) + " L/s", + GTUtility.formatNumbers(Outputs[0].amount / 160) + " L/s", StatCollector.translateToLocal("value.extreme_heat_exchanger.2"), - GT_Utility.formatNumbers(Outputs[1].amount / 160) + " L/s", + GTUtility.formatNumbers(Outputs[1].amount / 160) + " L/s", StatCollector.translateToLocal("value.extreme_heat_exchanger.4") + " " + threshold + " L/s"); } } diff --git a/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerRecipe.java b/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerRecipe.java index 4a32e882f8..2887c74f2c 100644 --- a/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerRecipe.java +++ b/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerRecipe.java @@ -3,9 +3,9 @@ package goodgenerator.api.recipe; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; -public class ExtremeHeatExchangerRecipe extends GT_Recipe { +public class ExtremeHeatExchangerRecipe extends GTRecipe { public ExtremeHeatExchangerRecipe(FluidStack[] input, FluidStack[] output, int special) { super(false, null, null, null, null, input, output, 0, 0, special); diff --git a/src/main/java/goodgenerator/api/recipe/GoodGeneratorRecipeMaps.java b/src/main/java/goodgenerator/api/recipe/GoodGeneratorRecipeMaps.java index 7f3915d084..1da3545d78 100644 --- a/src/main/java/goodgenerator/api/recipe/GoodGeneratorRecipeMaps.java +++ b/src/main/java/goodgenerator/api/recipe/GoodGeneratorRecipeMaps.java @@ -6,13 +6,13 @@ import java.util.Comparator; import net.minecraft.util.StatCollector; -import goodgenerator.client.GUI.GG_UITextures; -import gregtech.api.enums.GT_Values; -import gregtech.api.gui.modularui.GT_UITextures; +import goodgenerator.client.GUI.GGUITextures; +import gregtech.api.enums.GTValues; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMapBackend; import gregtech.api.recipe.RecipeMapBuilder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gregtech.nei.formatter.SimpleSpecialValueFormatter; public class GoodGeneratorRecipeMaps { @@ -24,7 +24,7 @@ public class GoodGeneratorRecipeMaps { .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.naquadah_reactor")) .neiRecipeComparator(Comparator.comparing(recipe -> recipe.mSpecialValue)) .dontUseProgressBar() - .addSpecialTexture(59, 20, 58, 42, GG_UITextures.PICTURE_NAQUADAH_REACTOR) + .addSpecialTexture(59, 20, 58, 42, GGUITextures.PICTURE_NAQUADAH_REACTOR) .build(); public static final RecipeMap<RecipeMapBackend> naquadahFuelRefineFactoryRecipes = RecipeMapBuilder .of("gg.recipe.naquadah_fuel_refine_factory") @@ -35,28 +35,28 @@ public class GoodGeneratorRecipeMaps { public static final RecipeMap<?> neutronActivatorRecipes = RecipeMapBuilder.of("gg.recipe.neutron_activator") .maxIO(9, 9, 1, 1) .dontUseProgressBar() - .addSpecialTexture(73, 22, 31, 21, GG_UITextures.PICTURE_NEUTRON_ACTIVATOR) + .addSpecialTexture(73, 22, 31, 21, GGUITextures.PICTURE_NEUTRON_ACTIVATOR) .neiSpecialInfoFormatter(recipeInfo -> { int minNKE = recipeInfo.recipe.mSpecialValue % 10000; int maxNKE = recipeInfo.recipe.mSpecialValue / 10000; return Arrays.asList( StatCollector.translateToLocal("value.neutron_activator.0"), - GT_Utility.formatNumbers(minNKE) + StatCollector.translateToLocal("value.neutron_activator.2"), + GTUtility.formatNumbers(minNKE) + StatCollector.translateToLocal("value.neutron_activator.2"), StatCollector.translateToLocal("value.neutron_activator.1"), - GT_Utility.formatNumbers(maxNKE) + StatCollector.translateToLocal("value.neutron_activator.2")); + GTUtility.formatNumbers(maxNKE) + StatCollector.translateToLocal("value.neutron_activator.2")); }) .build(); public static final RecipeMap<ExtremeHeatExchangerBackend> extremeHeatExchangerFuels = RecipeMapBuilder .of("gg.recipe.extreme_heat_exchanger", ExtremeHeatExchangerBackend::new) .maxIO(0, 0, 2, 3) .dontUseProgressBar() - .addSpecialTexture(47, 13, 78, 59, GG_UITextures.PICTURE_EXTREME_HEAT_EXCHANGER) + .addSpecialTexture(47, 13, 78, 59, GGUITextures.PICTURE_EXTREME_HEAT_EXCHANGER) .frontend(ExtremeHeatExchangerFrontend::new) .build(); public static final RecipeMap<RecipeMapBackend> preciseAssemblerRecipes = RecipeMapBuilder .of("gg.recipe.precise_assembler") .maxIO(4, 1, 4, 0) - .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) + .progressBar(GTUITextures.PROGRESSBAR_ARROW_MULTIPLE) .progressBarPos(85, 30) .neiTransferRect(80, 30, 35, 18) .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.precise_assembler")) @@ -70,9 +70,9 @@ public class GoodGeneratorRecipeMaps { recipeInfo -> Collections.singletonList( StatCollector.translateToLocalFormatted( "value.component_assembly_line", - GT_Values.VN[recipeInfo.recipe.mSpecialValue]))) + GTValues.VN[recipeInfo.recipe.mSpecialValue]))) .dontUseProgressBar() - .addSpecialTexture(70, 11, 72, 40, GG_UITextures.PICTURE_COMPONENT_ASSLINE) + .addSpecialTexture(70, 11, 72, 40, GGUITextures.PICTURE_COMPONENT_ASSLINE) .frontend(ComponentAssemblyLineFrontend::new) .build(); } diff --git a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java index de8cca2b43..909a1272da 100644 --- a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java +++ b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java @@ -4,7 +4,7 @@ import net.minecraft.block.material.Material; import net.minecraftforge.fluids.Fluid; import cpw.mods.fml.common.registry.GameRegistry; -import goodgenerator.crossmod.nei.NEI_Config; +import goodgenerator.crossmod.nei.NEIConfig; public class FluidsBuilder { @@ -36,7 +36,7 @@ public class FluidsBuilder { tmp2.SetTexture("lightlyCrackedNaquadahGas"); tmp2.setBlockName("lightlyCrackedNaquadahGas"); GameRegistry.registerBlock(tmp2, "lightlyCrackedNaquadahGas"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedNaquadahGas_Moderately() { @@ -47,7 +47,7 @@ public class FluidsBuilder { tmp2.SetTexture("moderatelyCrackedNaquadahGas"); tmp2.setBlockName("moderatelyCrackedNaquadahGas"); GameRegistry.registerBlock(tmp2, "moderatelyCrackedNaquadahGas"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedNaquadahGas_Heavily() { @@ -58,7 +58,7 @@ public class FluidsBuilder { tmp2.SetTexture("heavilyCrackedNaquadahGas"); tmp2.setBlockName("heavilyCrackedNaquadahGas"); GameRegistry.registerBlock(tmp2, "heavilyCrackedNaquadahGas"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedLightNaquadahFuel_Lightly() { @@ -69,7 +69,7 @@ public class FluidsBuilder { tmp2.SetTexture("lightlyCrackedLightNaquadahFuel"); tmp2.setBlockName("lightlyCrackedLightNaquadahFuel"); GameRegistry.registerBlock(tmp2, "lightlyCrackedLightNaquadahFuel"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedLightNaquadahFuel_Moderately() { @@ -80,7 +80,7 @@ public class FluidsBuilder { tmp2.SetTexture("moderatelyCrackedLightNaquadahFuel"); tmp2.setBlockName("moderatelyCrackedLightNaquadahFuel"); GameRegistry.registerBlock(tmp2, "moderatelyCrackedLightNaquadahFuel"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedLightNaquadahFuel_Heavily() { @@ -91,7 +91,7 @@ public class FluidsBuilder { tmp2.SetTexture("heavilyCrackedLightNaquadahFuel"); tmp2.setBlockName("heavilyCrackedLightNaquadahFuel"); GameRegistry.registerBlock(tmp2, "heavilyCrackedLightNaquadahFuel"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedHeavyNaquadahFuel_Lightly() { @@ -102,7 +102,7 @@ public class FluidsBuilder { tmp2.SetTexture("lightlyCrackedHeavyNaquadahFuel"); tmp2.setBlockName("lightlyCrackedHeavyNaquadahFuel"); GameRegistry.registerBlock(tmp2, "lightlyCrackedHeavyNaquadahFuel"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedHeavyNaquadahFuel_Moderately() { @@ -113,7 +113,7 @@ public class FluidsBuilder { tmp2.SetTexture("moderatelyCrackedHeavyNaquadahFuel"); tmp2.setBlockName("moderatelyCrackedHeavyNaquadahFuel"); GameRegistry.registerBlock(tmp2, "moderatelyCrackedHeavyNaquadahFuel"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedHeavyNaquadahFuel_Heavily() { @@ -124,7 +124,7 @@ public class FluidsBuilder { tmp2.SetTexture("heavilyCrackedHeavyNaquadahFuel"); tmp2.setBlockName("heavilyCrackedHeavyNaquadahFuel"); GameRegistry.registerBlock(tmp2, "heavilyCrackedHeavyNaquadahFuel"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedNaquadahAsphalt_Lightly() { @@ -137,7 +137,7 @@ public class FluidsBuilder { tmp2.SetTexture("lightlyCrackedNaquadahAsphalt"); tmp2.setBlockName("lightlyCrackedNaquadahAsphalt"); GameRegistry.registerBlock(tmp2, "lightlyCrackedNaquadahAsphalt"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedNaquadahAsphalt_Moderately() { @@ -150,7 +150,7 @@ public class FluidsBuilder { tmp2.SetTexture("moderatelyCrackedNaquadahAsphalt"); tmp2.setBlockName("moderatelyCrackedNaquadahAsphalt"); GameRegistry.registerBlock(tmp2, "moderatelyCrackedNaquadahAsphalt"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void crackedNaquadahAsphalt_Heavily() { @@ -163,7 +163,7 @@ public class FluidsBuilder { tmp2.SetTexture("heavilyCrackedNaquadahAsphalt"); tmp2.setBlockName("heavilyCrackedNaquadahAsphalt"); GameRegistry.registerBlock(tmp2, "heavilyCrackedNaquadahAsphalt"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void combustionPromotor() { @@ -174,7 +174,7 @@ public class FluidsBuilder { tmp2.SetTexture("combustionPromotor"); tmp2.setBlockName("combustionPromotor"); GameRegistry.registerBlock(tmp2, "combustionPromotor"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void coalTar() { @@ -186,7 +186,7 @@ public class FluidsBuilder { tmp2.SetTexture("coalTar"); tmp2.setBlockTextureName("coalTar"); GameRegistry.registerBlock(tmp2, "coalTar"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } public static void supercriticalSteam() { @@ -198,6 +198,6 @@ public class FluidsBuilder { tmp2.SetTexture("supercriticalSteam"); tmp2.setBlockTextureName("supercriticalSteam"); GameRegistry.registerBlock(tmp2, "supercriticalSteam"); - NEI_Config.hide(tmp2); + NEIConfig.hide(tmp2); } } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockCasing.java index c10b0f7184..4f784b5501 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockCasing.java @@ -17,9 +17,9 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import goodgenerator.main.GoodGenerator; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; -public class Casing extends Block { +public class BlockCasing extends Block { @SideOnly(Side.CLIENT) protected IIcon[] texture; @@ -27,17 +27,17 @@ public class Casing extends Block { String[] textureNames; protected String name; - public Casing(String name) { + public BlockCasing(String name) { super(Material.iron); this.setHardness(9.0F); this.setResistance(5.0F); this.name = name; this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); - GregTech_API.registerMachineBlock(this, -1); + GregTechAPI.registerMachineBlock(this, -1); } - public Casing(String name, String[] texture) { + public BlockCasing(String name, String[] texture) { super(Material.iron); this.setHardness(9.0F); this.setResistance(5.0F); @@ -45,10 +45,10 @@ public class Casing extends Block { this.textureNames = texture; this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); - GregTech_API.registerMachineBlock(this, -1); + GregTechAPI.registerMachineBlock(this, -1); } - public Casing(String name, String[] texture, Material material) { + public BlockCasing(String name, String[] texture, Material material) { super(material); this.setHardness(9.0F); this.setResistance(5.0F); @@ -56,7 +56,7 @@ public class Casing extends Block { this.textureNames = texture; this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); - GregTech_API.registerMachineBlock(this, -1); + GregTechAPI.registerMachineBlock(this, -1); } @Override @@ -90,15 +90,15 @@ public class Casing extends Block { @Override public void onBlockAdded(World aWorld, int aX, int aY, int aZ) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ); } } @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aMetaData)) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + if (GregTechAPI.isMachineBlock(this, aMetaData)) { + GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ); } } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockComplexTextureCasing.java index 0a0169d0b4..03b7f61557 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockComplexTextureCasing.java @@ -11,14 +11,14 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class ComplexTextureCasing extends Casing { +public class BlockComplexTextureCasing extends BlockCasing { @SideOnly(Side.CLIENT) protected IIcon[] texture1, texture2; String[] textureSide; String[] textureTopAndDown; - public ComplexTextureCasing(String name, String[] textureSide, String[] textureTopAndDown) { + public BlockComplexTextureCasing(String name, String[] textureSide, String[] textureTopAndDown) { super(name); this.textureSide = textureSide; this.textureTopAndDown = textureTopAndDown; diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockFrame.java index b4acb03518..b29ef7f2f2 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockFrame.java @@ -6,9 +6,9 @@ import net.minecraft.world.IBlockAccess; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class Frame extends Casing { +public class BlockFrame extends BlockCasing { - public Frame(String name, String[] texture) { + public BlockFrame(String name, String[] texture) { super(name, texture, Material.iron); } @@ -20,7 +20,7 @@ public class Frame extends Casing { @Override @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess worldClient, int xCoord, int yCoord, int zCoord, int aSide) { - if (worldClient.getBlock(xCoord, yCoord, zCoord) instanceof Frame) return false; + if (worldClient.getBlock(xCoord, yCoord, zCoord) instanceof BlockFrame) return false; return super.shouldSideBeRendered(worldClient, xCoord, yCoord, zCoord, aSide); } diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockTEContainer.java index dcd2bdd801..9bf51b7377 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockTEContainer.java @@ -20,16 +20,16 @@ import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import goodgenerator.blocks.tileEntity.EssentiaHatch; -import goodgenerator.blocks.tileEntity.EssentiaOutputHatch; -import goodgenerator.blocks.tileEntity.EssentiaOutputHatch_ME; +import goodgenerator.blocks.tileEntity.MTEEssentiaHatch; +import goodgenerator.blocks.tileEntity.MTEEssentiaOutputHatch; +import goodgenerator.blocks.tileEntity.MTEEssentiaOutputHatchME; import goodgenerator.main.GoodGenerator; -import gregtech.api.GregTech_API; -import gregtech.api.util.GT_Utility; +import gregtech.api.GregTechAPI; +import gregtech.api.util.GTUtility; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.IEssentiaContainerItem; -public class TEBlock extends BlockContainer { +public class BlockTEContainer extends BlockContainer { @SideOnly(Side.CLIENT) protected IIcon[] texture; @@ -38,7 +38,7 @@ public class TEBlock extends BlockContainer { protected String name; protected int index; - public TEBlock(String name, String[] texture, CreativeTabs Tab) { + public BlockTEContainer(String name, String[] texture, CreativeTabs Tab) { super(Material.iron); this.setHardness(9.0F); this.setResistance(5.0F); @@ -46,10 +46,10 @@ public class TEBlock extends BlockContainer { this.textureNames = texture; this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); - GregTech_API.registerMachineBlock(this, -1); + GregTechAPI.registerMachineBlock(this, -1); } - public TEBlock(String name, String[] texture, int index) { + public BlockTEContainer(String name, String[] texture, int index) { super(Material.iron); this.setHardness(9.0F); this.setResistance(5.0F); @@ -58,10 +58,10 @@ public class TEBlock extends BlockContainer { this.setHarvestLevel("wrench", 2); this.index = index; this.setCreativeTab(GoodGenerator.GG); - GregTech_API.registerMachineBlock(this, -1); + GregTechAPI.registerMachineBlock(this, -1); } - public TEBlock(String name, String[] texture, Material material) { + public BlockTEContainer(String name, String[] texture, Material material) { super(material); this.setHardness(9.0F); this.setResistance(5.0F); @@ -69,7 +69,7 @@ public class TEBlock extends BlockContainer { this.textureNames = texture; this.setHarvestLevel("wrench", 2); this.setCreativeTab(GoodGenerator.GG); - GregTech_API.registerMachineBlock(this, -1); + GregTechAPI.registerMachineBlock(this, -1); } public int getIndex() { @@ -107,15 +107,15 @@ public class TEBlock extends BlockContainer { @Override public void onBlockAdded(World aWorld, int aX, int aY, int aZ) { - if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ); } } @Override public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { - if (GregTech_API.isMachineBlock(this, aMetaData)) { - GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + if (GregTechAPI.isMachineBlock(this, aMetaData)) { + GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ); } aWorld.removeTileEntity(aX, aY, aZ); } @@ -144,11 +144,11 @@ public class TEBlock extends BlockContainer { public TileEntity createTileEntity(World world, int meta) { switch (index) { case 1: - return new EssentiaHatch(); + return new MTEEssentiaHatch(); case 2: - return new EssentiaOutputHatch(); + return new MTEEssentiaOutputHatch(); case 3: - return new EssentiaOutputHatch_ME(); + return new MTEEssentiaOutputHatchME(); default: return null; } @@ -162,7 +162,7 @@ public class TEBlock extends BlockContainer { } else { TileEntity tile = world.getTileEntity(x, y, z); if (index == 1) { - if (tile instanceof EssentiaHatch) { + if (tile instanceof MTEEssentiaHatch) { ItemStack tItemStack = player.getHeldItem(); if (tItemStack != null) { Item tItem = tItemStack.getItem(); @@ -172,26 +172,26 @@ public class TEBlock extends BlockContainer { .size() > 0) { Aspect tLocked = ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) .getAspects()[0]; - ((EssentiaHatch) tile).setLockedAspect(tLocked); - GT_Utility.sendChatToPlayer( + ((MTEEssentiaHatch) tile).setLockedAspect(tLocked); + GTUtility.sendChatToPlayer( player, String.format( StatCollector.translateToLocal("essentiahatch.chat.0"), tLocked.getLocalizedDescription())); } } else { - ((EssentiaHatch) tile).setLockedAspect(null); - GT_Utility.sendChatToPlayer(player, StatCollector.translateToLocal("essentiahatch.chat.1")); + ((MTEEssentiaHatch) tile).setLockedAspect(null); + GTUtility.sendChatToPlayer(player, StatCollector.translateToLocal("essentiahatch.chat.1")); } world.markBlockForUpdate(x, y, z); return true; } else return false; } else if (index == 2) { - if (tile instanceof EssentiaOutputHatch && player.isSneaking()) { + if (tile instanceof MTEEssentiaOutputHatch && player.isSneaking()) { ItemStack tItemStack = player.getHeldItem(); if (tItemStack == null) { - ((EssentiaOutputHatch) tile).clear(); - GT_Utility + ((MTEEssentiaOutputHatch) tile).clear(); + GTUtility .sendChatToPlayer(player, StatCollector.translateToLocal("essentiaoutputhatch.chat.0")); } return true; diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockTurbineCasing.java index 986ab4e0c8..6b6de38161 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockTurbineCasing.java @@ -5,7 +5,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_LargeTurbineBase; +import goodgenerator.blocks.tileEntity.base.MTELargeTurbineBase; import goodgenerator.client.render.BlockRenderHandler; import goodgenerator.main.GoodGenerator; import gregtech.api.enums.Textures; @@ -14,7 +14,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; -public class TurbineCasing extends Casing implements ITextureBlock { +public class BlockTurbineCasing extends BlockCasing implements ITextureBlock { public static IIconContainer[][] turbineShape = new IIconContainer[3][9]; public IIconContainer base; @@ -24,7 +24,7 @@ public class TurbineCasing extends Casing implements ITextureBlock { turbineShape[i][j - 1] = new Textures.BlockIcons.CustomIcon("icons/turbines/TURBINE_" + i + "" + j); } - public TurbineCasing(String name, String texture) { + public BlockTurbineCasing(String name, String texture) { super(name, new String[] { GoodGenerator.MOD_ID + ":" + texture }); base = new Textures.BlockIcons.CustomIcon("icons/" + texture); } @@ -33,9 +33,9 @@ public class TurbineCasing extends Casing implements ITextureBlock { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); if (!(tTileEntity instanceof IGregTechTileEntity)) return 0; IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity; - if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbineBase && tTile.getFrontFacing() == side) { + if (tTile.getMetaTileEntity() instanceof MTELargeTurbineBase && tTile.getFrontFacing() == side) { if (tTile.isActive()) return 1; - return ((GT_MetaTileEntity_LargeTurbineBase) tTile.getMetaTileEntity()).hasTurbine() ? 2 : 3; + return ((MTELargeTurbineBase) tTile.getMetaTileEntity()).hasTurbine() ? 2 : 3; } return 0; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTEDieselGenerator.java index 5ed8a07ebe..c1294f2a91 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/DieselGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTEDieselGenerator.java @@ -7,35 +7,35 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.enums.ItemList; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicGenerator; +import gregtech.api.metatileentity.implementations.MTEBasicGenerator; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTUtility; -public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator { +public class MTEDieselGenerator extends MTEBasicGenerator { public int mEfficiency; - public DieselGenerator(int aID, String aName, String aNameRegional, int aTier) { + public MTEDieselGenerator(int aID, String aName, String aNameRegional, int aTier) { super( aID, aName, aNameRegional, aTier, new String[] { "Requires liquid Fuel", - "Causes " + (int) (GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond * (1.1 - aTier * 0.1)) + "Causes " + (int) (GTMod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond * (1.1 - aTier * 0.1)) + " Pollution per second" }); mEfficiency = 100 - aTier * 10; } - public DieselGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEDieselGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); mEfficiency = 100 - aTier * 10; } @@ -47,7 +47,7 @@ public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator { @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new DieselGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTEDieselGenerator(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -67,7 +67,7 @@ public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator { @Override public int getFuelValue(ItemStack aStack) { - if (GT_Utility.isStackInvalid(aStack) || getRecipeMap() == null) return 0; + if (GTUtility.isStackInvalid(aStack) || getRecipeMap() == null) return 0; long rValue = super.getFuelValue(aStack); if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) { rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3L); @@ -81,7 +81,7 @@ public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator { @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aTick % 100 == 0 && mFluid != null && mFluid.amount > this.getCapacity()) { - GT_Log.err.println( + GTLog.err.println( "Dupe Abuse: " + aBaseMetaTileEntity.getOwnerName() + " Coords: " + aBaseMetaTileEntity.getXCoord() @@ -208,6 +208,6 @@ public class DieselGenerator extends GT_MetaTileEntity_BasicGenerator { @Override public int getPollution() { - return (int) (GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond * (1.1 - mTier * 0.1)); + return (int) (GTMod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond * (1.1 - mTier * 0.1)); } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTENeutronAccelerator.java index 730374db66..a9c70d9284 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTENeutronAccelerator.java @@ -1,19 +1,19 @@ package goodgenerator.blocks.tileEntity.GTMetaTileEntity; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.V; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; -public class NeutronAccelerator extends GT_MetaTileEntity_Hatch_Energy { +public class MTENeutronAccelerator extends MTEHatchEnergy { - public NeutronAccelerator(int aID, String aName, String aNameRegional, int aTier) { + public MTENeutronAccelerator(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier); } - public NeutronAccelerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTENeutronAccelerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -23,7 +23,7 @@ public class NeutronAccelerator extends GT_MetaTileEntity_Hatch_Energy { @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new NeutronAccelerator(mName, mTier, this.getDescription(), mTextures); + return new MTENeutronAccelerator(mName, mTier, this.getDescription(), mTextures); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTENeutronSensor.java index 10a6814ddb..5513fcd7c6 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronSensor.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTENeutronSensor.java @@ -18,18 +18,18 @@ import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget; import crazypants.enderio.Log; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUIInfos; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.IIconContainer; 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; +import gregtech.api.metatileentity.implementations.MTEHatch; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gregtech.common.gui.modularui.widget.CoverCycleButtonWidget; -public class NeutronSensor extends GT_MetaTileEntity_Hatch { +public class MTENeutronSensor extends MTEHatch { private static final IIconContainer textureFont = new Textures.BlockIcons.CustomIcon("icons/NeutronSensorFont"); private static final IIconContainer textureFont_Glow = new Textures.BlockIcons.CustomIcon( @@ -39,11 +39,11 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { protected boolean inverted = false; boolean isOn = false; - public NeutronSensor(int aID, String aName, String aNameRegional, int aTier) { + public MTENeutronSensor(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, 0, "Detect Neutron Kinetic Energy."); } - public NeutronSensor(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTENeutronSensor(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); } @@ -172,7 +172,7 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, ForgeDirection side, float aX, float aY, float aZ) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -219,7 +219,7 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new NeutronSensor(mName, mTier, mDescriptionArray, mTextures); + return new MTENeutronSensor(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -236,14 +236,14 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - final String INVERTED = GT_Utility.trans("INVERTED", "Inverted"); - final String NORMAL = GT_Utility.trans("NORMAL", "Normal"); + final String INVERTED = GTUtility.trans("INVERTED", "Inverted"); + final String NORMAL = GTUtility.trans("NORMAL", "Normal"); builder.widget( new CoverCycleButtonWidget().setToggle(() -> inverted, (val) -> inverted = val) .setTextureGetter( - (state) -> state == 1 ? GT_UITextures.OVERLAY_BUTTON_REDSTONE_ON - : GT_UITextures.OVERLAY_BUTTON_REDSTONE_OFF) + (state) -> state == 1 ? GTUITextures.OVERLAY_BUTTON_REDSTONE_ON + : GTUITextures.OVERLAY_BUTTON_REDSTONE_OFF) .addTooltip(0, NORMAL) .addTooltip(1, INVERTED) .setPos(10, 8)) @@ -260,7 +260,7 @@ public class NeutronSensor extends GT_MetaTileEntity_Hatch { .setTextColor(Color.WHITE.dark(1)) .setTextAlignment(Alignment.CenterLeft) .setFocusOnGuiOpen(true) - .setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2)) + .setBackground(GTUITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2)) .setPos(10, 28) .setSize(77, 12)) .widget( diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTEYOTTAHatch.java index 52c7522c10..51dbc7f199 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/MTEYOTTAHatch.java @@ -32,7 +32,7 @@ import appeng.api.util.AECableType; import appeng.api.util.DimensionalCoord; import appeng.me.helpers.AENetworkProxy; import appeng.me.helpers.IGridProxyable; -import goodgenerator.blocks.tileEntity.YottaFluidTank; +import goodgenerator.blocks.tileEntity.MTEYottaFluidTank; import goodgenerator.loader.Loaders; import goodgenerator.util.StackUtils; import gregtech.api.enums.Textures; @@ -40,16 +40,16 @@ import gregtech.api.interfaces.IIconContainer; 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; +import gregtech.api.metatileentity.implementations.MTEHatch; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; -public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyable, IActionHost, ICellContainer, +public class MTEYOTTAHatch extends MTEHatch implements IGridProxyable, IActionHost, ICellContainer, IMEInventory<IAEFluidStack>, IMEInventoryHandler<IAEFluidStack> { private static final IIconContainer textureFont = new Textures.BlockIcons.CustomIcon("icons/YOTTAHatch"); - private YottaFluidTank host; + private MTEYottaFluidTank host; private AENetworkProxy gridProxy = null; private int priority; private byte tickRate = 20; @@ -61,7 +61,7 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl private static final BigInteger MAX_LONG_BIGINT = BigInteger.valueOf(Long.MAX_VALUE); - public YOTTAHatch(int aID, String aName, String aNameRegional, int aTier) { + public MTEYOTTAHatch(int aID, String aName, String aNameRegional, int aTier) { super( aID, aName, @@ -72,11 +72,11 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl "Use screwdriver to set storage priority", "Use soldering iron to set read/write mode" }); } - public YOTTAHatch(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEYOTTAHatch(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); } - public void setTank(YottaFluidTank te) { + public void setTank(MTEYottaFluidTank te) { this.host = te; } @@ -109,7 +109,7 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl ItemStack toolStack) { if (aPlayer.isSneaking()) this.priority -= 10; else this.priority += 10; - GT_Utility + GTUtility .sendChatToPlayer(aPlayer, String.format(StatCollector.translateToLocal("yothatch.chat.0"), this.priority)); } @@ -117,7 +117,7 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl public boolean onSolderingToolRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ, ItemStack toolStack) { this.readMode = AEModes[(readMode.ordinal() + 1) % 4]; - GT_Utility + GTUtility .sendChatToPlayer(aPlayer, String.format(StatCollector.translateToLocal("yothatch.chat.1"), this.readMode)); return true; } @@ -236,7 +236,7 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl || !host.getBaseMetaTileEntity() .isActive()) return 0; - if (host.mStorage.compareTo(YottaFluidTank.MAX_INT_BIGINT) >= 0) { + if (host.mStorage.compareTo(MTEYottaFluidTank.MAX_INT_BIGINT) >= 0) { return Integer.MAX_VALUE; } else return host.mStorage.intValue(); } @@ -308,7 +308,7 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl return null; if (host.mFluid == null || host.mFluid.getFluid() != resource.getFluid()) return null; int ready; - if (host.mStorageCurrent.compareTo(YottaFluidTank.MAX_INT_BIGINT) >= 0) { + if (host.mStorageCurrent.compareTo(MTEYottaFluidTank.MAX_INT_BIGINT) >= 0) { ready = Integer.MAX_VALUE; } else ready = host.mStorageCurrent.intValue(); ready = Math.min(ready, resource.amount); @@ -384,7 +384,7 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new YOTTAHatch(mName, mTier, mDescriptionArray, mTextures); + return new MTEYOTTAHatch(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java index 190b572046..6110cf6eeb 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/ComponentAssemblyLine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java @@ -2,7 +2,7 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.HatchElement.*; import static gregtech.api.enums.Textures.BlockIcons.*; import java.util.stream.Collectors; @@ -27,33 +27,33 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import goodgenerator.api.recipe.GoodGeneratorRecipeMaps; import goodgenerator.loader.Loaders; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase; +import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_StructureUtility; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTStructureUtility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; -public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<ComponentAssemblyLine> +public class MTEComponentAssemblyLine extends MTEExtendedPowerMultiBlockBase<MTEComponentAssemblyLine> implements ISurvivalConstructable { private int casingTier; private float speedBonus; protected static final String STRUCTURE_PIECE_MAIN = "main"; - private static final IStructureDefinition<ComponentAssemblyLine> STRUCTURE_DEFINITION = StructureDefinition - .<ComponentAssemblyLine>builder() + private static final IStructureDefinition<MTEComponentAssemblyLine> STRUCTURE_DEFINITION = StructureDefinition + .<MTEComponentAssemblyLine>builder() .addShape( STRUCTURE_PIECE_MAIN, new String[][] { @@ -131,12 +131,12 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 14), ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks", 15), ofBlockUnlocalizedName("bartworks", "BW_GlasBlocks2", 0))) - .addElement('H', ofBlock(GregTech_API.sBlockCasings8, 7)) - .addElement('C', ofBlock(GregTech_API.sBlockCasings2, 5)) - .addElement('D', ofBlock(GregTech_API.sBlockCasings2, 9)) - .addElement('G', ofBlock(GregTech_API.sBlockCasings9, 0)) - .addElement('E', ofBlock(GregTech_API.sBlockCasings9, 1)) - .addElement('F', ofBlock(GregTech_API.sBlockCasings4, 1)) + .addElement('H', ofBlock(GregTechAPI.sBlockCasings8, 7)) + .addElement('C', ofBlock(GregTechAPI.sBlockCasings2, 5)) + .addElement('D', ofBlock(GregTechAPI.sBlockCasings2, 9)) + .addElement('G', ofBlock(GregTechAPI.sBlockCasings9, 0)) + .addElement('E', ofBlock(GregTechAPI.sBlockCasings9, 1)) + .addElement('F', ofBlock(GregTechAPI.sBlockCasings4, 1)) .addElement( 'B', ofBlocksTiered( @@ -149,54 +149,54 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB t -> t.casingTier)) .addElement( 'J', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + GTStructureUtility.buildHatchAdder(MTEComponentAssemblyLine.class) .atLeast(InputBus) .dot(1) .casingIndex(183) - .buildAndChain(GregTech_API.sBlockCasings8, 7)) + .buildAndChain(GregTechAPI.sBlockCasings8, 7)) .addElement( 'N', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + GTStructureUtility.buildHatchAdder(MTEComponentAssemblyLine.class) .atLeast(InputBus) .dot(1) .casingIndex(183) - .buildAndChain(GT_StructureUtility.ofFrame(Materials.TungstenSteel))) + .buildAndChain(GTStructureUtility.ofFrame(Materials.TungstenSteel))) .addElement( 'K', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + GTStructureUtility.buildHatchAdder(MTEComponentAssemblyLine.class) .atLeast(OutputBus) .dot(2) .casingIndex(183) - .buildAndChain(GregTech_API.sBlockCasings8, 7)) + .buildAndChain(GregTechAPI.sBlockCasings8, 7)) .addElement( 'L', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + GTStructureUtility.buildHatchAdder(MTEComponentAssemblyLine.class) .atLeast(Energy, ExoticEnergy) .dot(3) .casingIndex(183) - .buildAndChain(GregTech_API.sBlockCasings8, 7)) + .buildAndChain(GregTechAPI.sBlockCasings8, 7)) .addElement( 'I', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + GTStructureUtility.buildHatchAdder(MTEComponentAssemblyLine.class) .atLeast(Maintenance) .dot(4) .casingIndex(183) - .buildAndChain(GregTech_API.sBlockCasings8, 7)) + .buildAndChain(GregTechAPI.sBlockCasings8, 7)) .addElement( 'M', - GT_StructureUtility.buildHatchAdder(ComponentAssemblyLine.class) + GTStructureUtility.buildHatchAdder(MTEComponentAssemblyLine.class) .atLeast(InputHatch) .dot(5) .casingIndex(183) - .buildAndChain(GregTech_API.sBlockCasings8, 7)) - .addElement('n', GT_StructureUtility.ofFrame(Materials.TungstenSteel)) + .buildAndChain(GregTechAPI.sBlockCasings8, 7)) + .addElement('n', GTStructureUtility.ofFrame(Materials.TungstenSteel)) .build(); - public ComponentAssemblyLine(int aID, String aName, String aNameRegional) { + public MTEComponentAssemblyLine(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public ComponentAssemblyLine(String aName) { + public MTEComponentAssemblyLine(String aName) { super(aName); } @@ -206,13 +206,13 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB } @Override - public IStructureDefinition<ComponentAssemblyLine> getStructureDefinition() { + public IStructureDefinition<MTEComponentAssemblyLine> getStructureDefinition() { return STRUCTURE_DEFINITION; } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("High-Capacity Component Assembler") .addInfo("Controller block for the Component Assembly Line.") .addInfo("Assembles basic components (motors, pumps, etc.) in large batches.") @@ -257,7 +257,7 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new ComponentAssemblyLine(mName); + return new MTEComponentAssemblyLine(mName); } /** @@ -269,7 +269,7 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB String[] ret = new String[origin.length + 1]; System.arraycopy(origin, 0, ret, 0, origin.length); ret[origin.length] = StatCollector.translateToLocal("scanner.info.CASS.tier") - + (casingTier >= 0 ? GT_Values.VN[casingTier + 1] : "None!"); + + (casingTier >= 0 ? GTValues.VN[casingTier + 1] : "None!"); return ret; } @@ -311,7 +311,7 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { if (recipe.mSpecialValue > casingTier + 1) { return CheckRecipeResultRegistry.insufficientMachineTier(recipe.mSpecialValue); } @@ -320,7 +320,7 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB @Nonnull @Override - protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe recipe) { + protected OverclockCalculator createOverclockCalculator(@Nonnull GTRecipe recipe) { speedBonus = (float) (1 / Math.pow(2, casingTier + 1 - recipe.mSpecialValue)); return super.createOverclockCalculator(recipe).setSpeedBoost(speedBonus); } @@ -349,7 +349,7 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB @Override public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { inputSeparation = !inputSeparation; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation); } @@ -360,9 +360,9 @@ public class ComponentAssemblyLine extends GT_MetaTileEntity_ExtendedPowerMultiB if (aPlayer.isSneaking()) { batchMode = !batchMode; if (batchMode) { - GT_Utility.sendChatToPlayer(aPlayer, "Batch recipes."); + GTUtility.sendChatToPlayer(aPlayer, "Batch recipes."); } else { - GT_Utility.sendChatToPlayer(aPlayer, "Don't batch recipes."); + GTUtility.sendChatToPlayer(aPlayer, "Don't batch recipes."); } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java b/src/main/java/goodgenerator/blocks/tileEntity/MTECoolantTower.java index bfa726952b..be0fe5b4ce 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTECoolantTower.java @@ -3,8 +3,8 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.api.util.GT_StructureUtility.*; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.util.GTStructureUtility.*; +import static gregtech.api.util.GTUtility.filterValidMTEs; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; @@ -12,48 +12,46 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.NotNull; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; import goodgenerator.util.DescTextLocalization; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_HatchElement; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; 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_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_MultiInput; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchMultiInput; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; -public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM - implements IConstructable, ISurvivalConstructable { +public class MTECoolantTower extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { - protected IStructureDefinition<CoolantTower> multiDefinition = null; + protected IStructureDefinition<MTECoolantTower> multiDefinition = null; private static final int CASING_INDEX = 1539; - public CoolantTower(int aID, String aName, String aNameRegional) { + public MTECoolantTower(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public CoolantTower(String name) { + public MTECoolantTower(String name) { super(name); } @Override - public IStructureDefinition<? extends GT_MetaTileEntity_MultiblockBase_EM> getStructure_EM() { + public IStructureDefinition<? extends TTMultiblockBase> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<CoolantTower>builder() + multiDefinition = StructureDefinition.<MTECoolantTower>builder() .addShape( mName, transpose( @@ -84,14 +82,17 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM "HB BH", "HB BH", " HB BH ", " HBBBBBH ", " HHHHH " }, { " CCCCC ", " C C ", " C C ", "C C", "C C", "C C", "C C", "C C", " C C ", " C C ", " CCCCC " }, })) - .addElement('B', ofBlockAnyMeta(GregTech_API.sBlockConcretes, 8)) + .addElement('B', ofBlockAnyMeta(GregTechAPI.sBlockConcretes, 8)) .addElement('C', ofFrame(Materials.TungstenCarbide)) .addElement( 'H', - buildHatchAdder(CoolantTower.class).atLeast(GT_HatchElement.InputHatch, GT_HatchElement.OutputHatch) + buildHatchAdder(MTECoolantTower.class) + .atLeast( + gregtech.api.enums.HatchElement.InputHatch, + gregtech.api.enums.HatchElement.OutputHatch) .casingIndex(CASING_INDEX) .dot(1) - .buildAndChain(ofBlockAnyMeta(GregTech_API.sBlockConcretes, 8))) + .buildAndChain(ofBlockAnyMeta(GregTechAPI.sBlockConcretes, 8))) .build(); } return multiDefinition; @@ -103,8 +104,8 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Coolant Tower") .addInfo("Controller block for the Coolant Tower.") .addInfo("Turn Steam back to Distilled Water.") @@ -129,7 +130,7 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new CoolantTower(mName); + return new MTECoolantTower(mName); } @Override @@ -147,17 +148,17 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM this.mMaxProgresstime = 20; int steam = 0; - for (GT_MetaTileEntity_Hatch_Input tHatch : filterValidMTEs(mInputHatches)) { + for (MTEHatchInput tHatch : filterValidMTEs(mInputHatches)) { steam += maybeDrainHatch(tHatch); } - addOutput(GT_ModHandler.getDistilledWater(steam / 160)); + addOutput(GTModHandler.getDistilledWater(steam / 160)); return CheckRecipeResultRegistry.SUCCESSFUL; } - private int maybeDrainHatch(GT_MetaTileEntity_Hatch_Input tHatch) { - if (tHatch instanceof GT_MetaTileEntity_Hatch_MultiInput) { + private int maybeDrainHatch(MTEHatchInput tHatch) { + if (tHatch instanceof MTEHatchMultiInput) { int drained = 0; - for (FluidStack maybeSteam : ((GT_MetaTileEntity_Hatch_MultiInput) tHatch).getStoredFluid()) { + for (FluidStack maybeSteam : ((MTEHatchMultiInput) tHatch).getStoredFluid()) { drained += maybeDrainSteam(tHatch, maybeSteam); } return drained; @@ -165,9 +166,9 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM return maybeDrainSteam(tHatch, tHatch.getFillableStack()); } - private int maybeDrainSteam(GT_MetaTileEntity_Hatch_Input tHatch, FluidStack maybeSteam) { + private int maybeDrainSteam(MTEHatchInput tHatch, FluidStack maybeSteam) { if (maybeSteam == null) return 0; - if (!GT_Utility.areFluidsEqual(maybeSteam, GT_ModHandler.getSteam(1))) return 0; + if (!GTUtility.areFluidsEqual(maybeSteam, GTModHandler.getSteam(1))) return 0; FluidStack defoSteam = tHatch.drain(ForgeDirection.UNKNOWN, maybeSteam, true); return defoSteam.amount; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaHatch.java index f9eab80f03..d8680f5efd 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaHatch.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaHatch.java @@ -17,7 +17,7 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.api.aspects.IEssentiaTransport; -public class EssentiaHatch extends TileEntity implements IAspectContainer, IEssentiaTransport { +public class MTEEssentiaHatch extends TileEntity implements IAspectContainer, IEssentiaTransport { private Aspect mLocked; private AspectList current = new AspectList(); diff --git a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaOutputHatch.java index 93cec4672c..23a0a7f093 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaOutputHatch.java @@ -12,7 +12,7 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.api.aspects.IEssentiaTransport; -public class EssentiaOutputHatch extends TileThaumcraft implements IAspectContainer, IEssentiaTransport { +public class MTEEssentiaOutputHatch extends TileThaumcraft implements IAspectContainer, IEssentiaTransport { public static final int CAPACITY = 256; protected AspectList mAspects = new AspectList(); diff --git a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaOutputHatchME.java index b576b44e7f..4e8bba61ec 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/EssentiaOutputHatch_ME.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEEssentiaOutputHatchME.java @@ -21,7 +21,7 @@ import thaumcraft.api.aspects.AspectList; import thaumicenergistics.api.grid.IEssentiaGrid; import thaumicenergistics.api.grid.IMEEssentiaMonitor; -public class EssentiaOutputHatch_ME extends EssentiaOutputHatch implements IActionHost, IGridProxyable { +public class MTEEssentiaOutputHatchME extends MTEEssentiaOutputHatch implements IActionHost, IGridProxyable { private AENetworkProxy gridProxy = null; private IMEEssentiaMonitor monitor = null; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEExtremeHeatExchanger.java index 3589acba60..c37a2026d4 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEExtremeHeatExchanger.java @@ -2,9 +2,9 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.enums.GT_Values.V; +import static gregtech.api.enums.GTValues.V; import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.Arrays; import java.util.Collections; @@ -30,54 +30,53 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import goodgenerator.api.recipe.ExtremeHeatExchangerRecipe; import goodgenerator.api.recipe.GoodGeneratorRecipeMaps; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_HatchElement; +import gregtech.api.GregTechAPI; import gregtech.api.interfaces.IHatchElement; 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; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; import gregtech.api.multitileentity.multiblock.casing.Glasses; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; -import gregtech.api.util.IGT_HatchAdder; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; +import gregtech.api.util.IGTHatchAdder; +import gregtech.api.util.MultiblockTooltipBuilder; -public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBase_EM +public class MTEExtremeHeatExchanger extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { - protected IStructureDefinition<ExtremeHeatExchanger> multiDefinition = null; + protected IStructureDefinition<MTEExtremeHeatExchanger> multiDefinition = null; public static double penalty_per_config = 0.015d; protected int casingAmount = 0; - protected GT_MetaTileEntity_Hatch_Input mHotFluidHatch; - protected GT_MetaTileEntity_Hatch_Output mCooledFluidHatch; + protected MTEHatchInput mHotFluidHatch; + protected MTEHatchOutput mCooledFluidHatch; private boolean transformed = false; private String hotName; private ExtremeHeatExchangerRecipe tRunningRecipe; - public ExtremeHeatExchanger(String name) { + public MTEExtremeHeatExchanger(String name) { super(name); } - public ExtremeHeatExchanger(int id, String name, String nameRegional) { + public MTEExtremeHeatExchanger(int id, String name, String nameRegional) { super(id, name, nameRegional); } @Override - public IStructureDefinition<ExtremeHeatExchanger> getStructure_EM() { + public IStructureDefinition<MTEExtremeHeatExchanger> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<ExtremeHeatExchanger>builder() + multiDefinition = StructureDefinition.<MTEExtremeHeatExchanger>builder() .addShape( mName, transpose( @@ -94,33 +93,38 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas .addElement( 'B', ofChain( - buildHatchAdder(ExtremeHeatExchanger.class) - .atLeast(GT_HatchElement.InputHatch, GT_HatchElement.Maintenance) + buildHatchAdder(MTEExtremeHeatExchanger.class) + .atLeast( + gregtech.api.enums.HatchElement.InputHatch, + gregtech.api.enums.HatchElement.Maintenance) .casingIndex(48) .dot(1) .build(), - onElementPass(x -> x.casingAmount++, ofBlock(GregTech_API.sBlockCasings4, 0)))) + onElementPass(x -> x.casingAmount++, ofBlock(GregTechAPI.sBlockCasings4, 0)))) .addElement( 'T', ofChain( - buildHatchAdder(ExtremeHeatExchanger.class) - .atLeast(GT_HatchElement.OutputHatch, GT_HatchElement.Maintenance) + buildHatchAdder(MTEExtremeHeatExchanger.class) + .atLeast( + gregtech.api.enums.HatchElement.OutputHatch, + gregtech.api.enums.HatchElement.Maintenance) .casingIndex(48) .dot(2) .build(), - onElementPass(x -> x.casingAmount++, ofBlock(GregTech_API.sBlockCasings4, 0)))) + onElementPass(x -> x.casingAmount++, ofBlock(GregTechAPI.sBlockCasings4, 0)))) .addElement('F', EHEHatches.HotInputHatch.newAny(48, 3)) .addElement('E', EHEHatches.ColdOutputHatch.newAny(48, 4)) .addElement( 'C', ofChain( - buildHatchAdder(ExtremeHeatExchanger.class).atLeast(GT_HatchElement.Maintenance) + buildHatchAdder(MTEExtremeHeatExchanger.class) + .atLeast(gregtech.api.enums.HatchElement.Maintenance) .casingIndex(48) .dot(5) .build(), - onElementPass(x -> x.casingAmount++, ofBlock(GregTech_API.sBlockCasings4, 0)))) + onElementPass(x -> x.casingAmount++, ofBlock(GregTechAPI.sBlockCasings4, 0)))) .addElement('G', Glasses.chainAllGlasses()) - .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 15)) + .addElement('P', ofBlock(GregTechAPI.sBlockCasings2, 15)) .addElement('W', ofBlock(Loaders.pressureResistantWalls, 0)) .build(); } @@ -131,9 +135,9 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas if (aTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - mHotFluidHatch = (GT_MetaTileEntity_Hatch_Input) aMetaTileEntity; + if (aMetaTileEntity instanceof MTEHatchInput) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + mHotFluidHatch = (MTEHatchInput) aMetaTileEntity; return true; } return false; @@ -143,9 +147,9 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas if (aTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - mCooledFluidHatch = (GT_MetaTileEntity_Hatch_Output) aMetaTileEntity; + if (aMetaTileEntity instanceof MTEHatchOutput) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + mCooledFluidHatch = (MTEHatchOutput) aMetaTileEntity; return true; } return false; @@ -196,8 +200,8 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Heat Exchanger/Plasma Heat Exchanger") .addInfo("Controller block for the Extreme Heat Exchanger.") .addInfo("Accept Hot fluid like lava, hot coolant or plasma.") @@ -264,10 +268,10 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas Fluid tReadySteam = transformed ? tRunningRecipe.getHeatedSteam() : tRunningRecipe.getNormalSteam(); int waterAmount = (int) (this.mEUt / getUnitSteamPower(tReadySteam.getName())) / 160; if (waterAmount < 0) return false; - if (depleteInput(GT_ModHandler.getDistilledWater(waterAmount))) { + if (depleteInput(GTModHandler.getDistilledWater(waterAmount))) { addOutput(new FluidStack(tReadySteam, waterAmount * 160)); } else { - GT_Log.exp.println(this.mName + " had no more Distilled water!"); + GTLog.exp.println(this.mName + " had no more Distilled water!"); mHotFluidHatch.getBaseMetaTileEntity() .doExplosion(V[8]); return false; @@ -301,7 +305,7 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new ExtremeHeatExchanger(mName); + return new MTEExtremeHeatExchanger(mName); } @Override @@ -315,11 +319,11 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas return new String[] { StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(mProgresstime / 20) + + GTUtility.formatNumbers(mProgresstime / 20) + EnumChatFormatting.RESET + " s / " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(mMaxProgresstime / 20) + + GTUtility.formatNumbers(mMaxProgresstime / 20) + EnumChatFormatting.RESET + " s", StatCollector.translateToLocal("GT5U.multiblock.problems") + ": " @@ -335,12 +339,12 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas + " %", StatCollector.translateToLocal("scanner.info.XHE.0") + " " + (transformed ? EnumChatFormatting.RED : EnumChatFormatting.YELLOW) - + GT_Utility.formatNumbers(this.mEUt) + + GTUtility.formatNumbers(this.mEUt) + EnumChatFormatting.RESET + " EU/t", StatCollector.translateToLocal("scanner.info.XHE.1") + " " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(tThreshold) + + GTUtility.formatNumbers(tThreshold) + EnumChatFormatting.RESET + " L/s" }; } @@ -377,29 +381,29 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas return survivialBuildPiece(mName, stackSize, 2, 5, 0, elementBudget, env, false, true); } - private enum EHEHatches implements IHatchElement<ExtremeHeatExchanger> { + private enum EHEHatches implements IHatchElement<MTEExtremeHeatExchanger> { - HotInputHatch(ExtremeHeatExchanger::addHotFluidInputToMachineList, GT_MetaTileEntity_Hatch_Input.class) { + HotInputHatch(MTEExtremeHeatExchanger::addHotFluidInputToMachineList, MTEHatchInput.class) { @Override - public long count(ExtremeHeatExchanger t) { + public long count(MTEExtremeHeatExchanger t) { if (t.mHotFluidHatch == null) return 0; return 1; } }, - ColdOutputHatch(ExtremeHeatExchanger::addColdFluidOutputToMachineList, GT_MetaTileEntity_Hatch_Output.class) { + ColdOutputHatch(MTEExtremeHeatExchanger::addColdFluidOutputToMachineList, MTEHatchOutput.class) { @Override - public long count(ExtremeHeatExchanger t) { + public long count(MTEExtremeHeatExchanger t) { if (t.mCooledFluidHatch == null) return 0; return 1; } }; private final List<Class<? extends IMetaTileEntity>> mteClasses; - private final IGT_HatchAdder<ExtremeHeatExchanger> adder; + private final IGTHatchAdder<MTEExtremeHeatExchanger> adder; - EHEHatches(IGT_HatchAdder<ExtremeHeatExchanger> adder, Class<? extends IMetaTileEntity>... mteClasses) { + EHEHatches(IGTHatchAdder<MTEExtremeHeatExchanger> adder, Class<? extends IMetaTileEntity>... mteClasses) { this.mteClasses = Collections.unmodifiableList(Arrays.asList(mteClasses)); this.adder = adder; } @@ -409,7 +413,7 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_TooltipMultiBlockBas return mteClasses; } - public IGT_HatchAdder<? super ExtremeHeatExchanger> adder() { + public IGTHatchAdder<? super MTEExtremeHeatExchanger> adder() { return adder; } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java index 8d1720c8f2..9c25f98d30 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java @@ -5,7 +5,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -16,7 +16,6 @@ import net.minecraftforge.common.util.ForgeDirection; import org.jetbrains.annotations.NotNull; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; import com.gtnewhorizon.structurelib.StructureLibAPI; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; @@ -28,44 +27,43 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureUtility; import goodgenerator.api.recipe.GoodGeneratorRecipeMaps; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; -import gregtech.api.enums.GT_HatchElement; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; +import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; -public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_EM - implements IConstructable, ISurvivalConstructable { +public class MTEFuelRefineFactory extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { - private IStructureDefinition<FuelRefineFactory> multiDefinition = null; + private IStructureDefinition<MTEFuelRefineFactory> multiDefinition = null; private int Tier = -1; private int[] cnt = new int[] { 0, 0, 0, 0 }; private static final Block[] coils = new Block[] { Loaders.FRF_Coil_1, Loaders.FRF_Coil_2, Loaders.FRF_Coil_3, Loaders.FRF_Coil_4 }; - public FuelRefineFactory(String name) { + public MTEFuelRefineFactory(String name) { super(name); useLongPower = true; } - public FuelRefineFactory(int id, String name, String nameRegional) { + public MTEFuelRefineFactory(int id, String name, String nameRegional) { super(id, name, nameRegional); useLongPower = true; } @@ -81,9 +79,9 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E } @Override - public IStructureDefinition<FuelRefineFactory> getStructure_EM() { + public IStructureDefinition<MTEFuelRefineFactory> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<FuelRefineFactory>builder() + multiDefinition = StructureDefinition.<MTEFuelRefineFactory>builder() .addShape( mName, transpose( @@ -104,13 +102,14 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E { " ", " CCC ", " " } })) .addElement( 'X', - buildHatchAdder(FuelRefineFactory.class) + buildHatchAdder(MTEFuelRefineFactory.class) .atLeast( - GT_HatchElement.Maintenance, - GT_HatchElement.InputHatch, - GT_HatchElement.InputBus, - GT_HatchElement.OutputHatch, - HatchElement.EnergyMulti.or(GT_HatchElement.Energy)) + gregtech.api.enums.HatchElement.Maintenance, + gregtech.api.enums.HatchElement.InputHatch, + gregtech.api.enums.HatchElement.InputBus, + gregtech.api.enums.HatchElement.OutputHatch, + tectech.thing.metaTileEntity.multi.base.TTMultiblockBase.HatchElement.EnergyMulti + .or(gregtech.api.enums.HatchElement.Energy)) .casingIndex(179) .dot(1) .buildAndChain(ofBlock(Loaders.FRF_Casings, 0))) @@ -179,8 +178,8 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Naquadah Fuel Refinery") .addInfo("Controller block for the Naquadah Fuel Refinery") .addInfo("But at what cost?") @@ -247,7 +246,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { if (recipe.mSpecialValue > Tier) { return CheckRecipeResultRegistry.insufficientMachineTier(recipe.mSpecialValue); } @@ -256,7 +255,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E @NotNull @Override - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { int overclockAmount = Tier - recipe.mSpecialValue; return super.createOverclockCalculator(recipe).limitOverclockCount(overclockAmount); } @@ -277,19 +276,19 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E if (aMetaTileEntity == null) { return false; } else { - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + if (aMetaTileEntity instanceof MTEHatch) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { - return this.mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) { - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_EnergyMulti) { - return this.eEnergyMulti.add((GT_MetaTileEntity_Hatch_EnergyMulti) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchInput) { + return this.mInputHatches.add((MTEHatchInput) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchOutput) { + return this.mOutputHatches.add((MTEHatchOutput) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchInputBus) { + return this.mInputBusses.add((MTEHatchInputBus) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchEnergy) { + return this.mEnergyHatches.add((MTEHatchEnergy) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchEnergyMulti) { + return this.eEnergyMulti.add((MTEHatchEnergyMulti) aMetaTileEntity); } else { return false; } @@ -299,7 +298,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new FuelRefineFactory(this.mName); + return new MTEFuelRefineFactory(this.mName); } @Override @@ -351,12 +350,12 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E int colorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(179), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE), TextureFactory.builder() + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE), TextureFactory.builder() .addIcon(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_ACTIVE_GLOW) .glow() .build() }; return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(179), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE), TextureFactory.builder() + new GTRenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE), TextureFactory.builder() .addIcon(Textures.BlockIcons.OVERLAY_FRONT_ASSEMBLY_LINE_GLOW) .glow() .build() }; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaGenerator.java index b7ab940b2f..bff8da6fa2 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaGenerator.java @@ -2,7 +2,7 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; @@ -16,57 +16,56 @@ import net.minecraftforge.fluids.FluidRegistry; import org.jetbrains.annotations.NotNull; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoTunnel; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; +import bartworks.system.material.WerkstoffLoader; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; import goodgenerator.crossmod.thaumcraft.LargeEssentiaEnergyData; -import goodgenerator.items.MyMaterial; +import goodgenerator.items.GGMaterial; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; import goodgenerator.util.ItemRefer; -import gregtech.api.enums.GT_HatchElement; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; 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; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchDynamo; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.objects.XSTR; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import tectech.thing.metaTileEntity.hatch.MTEHatchDynamoMulti; +import tectech.thing.metaTileEntity.hatch.MTEHatchDynamoTunnel; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.config.ConfigBlocks; -public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM +public class MTELargeEssentiaGenerator extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { - private IStructureDefinition<LargeEssentiaGenerator> multiDefinition = null; + private IStructureDefinition<MTELargeEssentiaGenerator> multiDefinition = null; protected int mStableValue = 0; protected int mTierLimit = -1; protected long mLeftEnergy; private int mUpgrade = 1; final XSTR R = new XSTR(); - protected ArrayList<EssentiaHatch> mEssentiaHatch = new ArrayList<>(); + protected ArrayList<MTEEssentiaHatch> mEssentiaHatch = new ArrayList<>(); - public LargeEssentiaGenerator(String name) { + public MTELargeEssentiaGenerator(String name) { super(name); } - public LargeEssentiaGenerator(int id, String name, String nameRegional) { + public MTELargeEssentiaGenerator(int id, String name, String nameRegional) { super(id, name, nameRegional); } @@ -91,8 +90,8 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB } private boolean checkNoLaser() { - for (GT_MetaTileEntity_Hatch_DynamoMulti tHatch : eDynamoMulti) { - if (tHatch instanceof GT_MetaTileEntity_Hatch_DynamoTunnel) { + for (MTEHatchDynamoMulti tHatch : eDynamoMulti) { + if (tHatch instanceof MTEHatchDynamoTunnel) { return false; } } @@ -100,13 +99,13 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB } public boolean checkHatchTier() { - for (GT_MetaTileEntity_Hatch_Input tHatch : mInputHatches) { + for (MTEHatchInput tHatch : mInputHatches) { if (tHatch.mTier > mTierLimit) return false; } - for (GT_MetaTileEntity_Hatch_Dynamo tHatch : mDynamoHatches) { + for (MTEHatchDynamo tHatch : mDynamoHatches) { if (tHatch.mTier > mTierLimit) return false; } - for (GT_MetaTileEntity_Hatch_DynamoMulti tHatch : eDynamoMulti) { + for (MTEHatchDynamoMulti tHatch : eDynamoMulti) { if (tHatch.mTier > mTierLimit) return false; } return true; @@ -129,7 +128,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB } public boolean updateEssentiaHatchState() { - for (EssentiaHatch hatch : mEssentiaHatch) { + for (MTEEssentiaHatch hatch : mEssentiaHatch) { hatch.mState = mUpgrade; } return true; @@ -148,7 +147,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB if ((mUpgrade & (1 << tMeta)) == 0 && tMeta != 0) { tCurrentItem.stackSize--; mUpgrade = mUpgrade | (1 << tMeta); - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, tCurrentItem.getDisplayName() + StatCollector.translateToLocal("largeessentiagenerator.chat")); } @@ -161,9 +160,9 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB } @Override - public IStructureDefinition<LargeEssentiaGenerator> getStructure_EM() { + public IStructureDefinition<MTELargeEssentiaGenerator> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<LargeEssentiaGenerator>builder() + multiDefinition = StructureDefinition.<MTELargeEssentiaGenerator>builder() .addShape( mName, transpose( @@ -193,18 +192,19 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB .addElement( 'X', ofChain( - buildHatchAdder(LargeEssentiaGenerator.class) + buildHatchAdder(MTELargeEssentiaGenerator.class) .atLeast( - HatchElement.DynamoMulti.or(GT_HatchElement.Dynamo), - GT_HatchElement.Maintenance, - GT_HatchElement.InputHatch) + tectech.thing.metaTileEntity.multi.base.TTMultiblockBase.HatchElement.DynamoMulti + .or(gregtech.api.enums.HatchElement.Dynamo), + gregtech.api.enums.HatchElement.Maintenance, + gregtech.api.enums.HatchElement.InputHatch) .casingIndex(1536) .dot(1) .build(), ofBlock(Loaders.magicCasing, 0), ofSpecificTileAdder( - LargeEssentiaGenerator::addEssentiaHatch, - EssentiaHatch.class, + MTELargeEssentiaGenerator::addEssentiaHatch, + MTEEssentiaHatch.class, Loaders.magicCasing, 0))) .build(); @@ -212,7 +212,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB return multiDefinition; } - public final boolean addEssentiaHatch(EssentiaHatch aTileEntity) { + public final boolean addEssentiaHatch(MTEEssentiaHatch aTileEntity) { return this.mEssentiaHatch.add(aTileEntity); } @@ -226,10 +226,10 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB public int getVoltageLimit() { long voltage = 0; - for (GT_MetaTileEntity_Hatch tHatch : this.eDynamoMulti) { + for (MTEHatch tHatch : this.eDynamoMulti) { voltage += tHatch.maxEUOutput(); } - for (GT_MetaTileEntity_Hatch tHatch : this.mDynamoHatches) { + for (MTEHatch tHatch : this.mDynamoHatches) { voltage += tHatch.maxEUOutput(); } if (voltage > Integer.MAX_VALUE) voltage = Integer.MAX_VALUE; @@ -238,10 +238,10 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB public int getAmpLimit() { long amp = 0; - for (GT_MetaTileEntity_Hatch tHatch : this.eDynamoMulti) { + for (MTEHatch tHatch : this.eDynamoMulti) { amp += tHatch.maxAmperesOut(); } - for (GT_MetaTileEntity_Hatch tHatch : this.mDynamoHatches) { + for (MTEHatch tHatch : this.mDynamoHatches) { amp += tHatch.maxAmperesOut(); } if (amp > Integer.MAX_VALUE) amp = Integer.MAX_VALUE; @@ -402,7 +402,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB ceoOutput = 3.0D; } else if (depleteInput(Materials.Naquadah.getMolten(ceoInput))) { ceoOutput = 4.0D; - } else if (depleteInput(MyMaterial.atomicSeparationCatalyst.getMolten(ceoInput))) { + } else if (depleteInput(GGMaterial.atomicSeparationCatalyst.getMolten(ceoInput))) { ceoOutput = 16.0D; } return (long) (baseValue * ceoOutput); @@ -410,7 +410,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB public long electricEssentia(Aspect aspect) { long baseValue = LargeEssentiaEnergyData.getAspectFuelValue(aspect); - double ceoOutput = Math.pow(3.0, GT_Utility.getTier(getVoltageLimit())); + double ceoOutput = Math.pow(3.0, GTUtility.getTier(getVoltageLimit())); return (long) (baseValue * ceoOutput); } @@ -418,7 +418,7 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB long EUt = mLeftEnergy; long EUVoltage = voltageLimit, EUAmp = 1; - for (EssentiaHatch hatch : this.mEssentiaHatch) { + for (MTEEssentiaHatch hatch : this.mEssentiaHatch) { AspectList aspects = hatch.getAspects(); for (Aspect aspect : aspects.aspects.keySet()) { if (!isValidEssentia(aspect)) continue; @@ -459,12 +459,12 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new LargeEssentiaGenerator(this.mName); + return new MTELargeEssentiaGenerator(this.mName); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Essentia Generator") .addInfo("Controller block for the Large Essentia Generator") .addInfo("Maybe some Thaumaturges are upset by it. . .") @@ -489,12 +489,12 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_TooltipMultiBlockB int colorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1536), - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG), TextureFactory.builder() + new GTRenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG), TextureFactory.builder() .addIcon(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG_GLOW) .glow() .build() }; return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1536), - new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG) }; + new GTRenderedTexture(Textures.BlockIcons.MACHINE_CASING_DRAGONEGG) }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(1536) }; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java index 82838322ce..40f01fbde4 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java @@ -3,7 +3,7 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.enums.Mods.ThaumicBases; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; import java.util.Map; @@ -19,38 +19,37 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.NotNull; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; -import gregtech.api.enums.GT_HatchElement; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; 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_Muffler; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchMuffler; import gregtech.api.objects.XSTR; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.MultiblockTooltipBuilder; +import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; +import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.visnet.VisNetHandler; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.lib.crafting.ThaumcraftCraftingManager; -public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBase_EM +public class MTELargeEssentiaSmeltery extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { private static final IIconContainer textureFontOn = new Textures.BlockIcons.CustomIcon( @@ -80,16 +79,16 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa protected int nodePurificationEfficiency = 0; protected int nodeIncrease = 0; - private IStructureDefinition<LargeEssentiaSmeltery> multiDefinition = null; - private ArrayList<EssentiaOutputHatch> mEssentiaOutputHatches = new ArrayList<>(); + private IStructureDefinition<MTELargeEssentiaSmeltery> multiDefinition = null; + private ArrayList<MTEEssentiaOutputHatch> mEssentiaOutputHatches = new ArrayList<>(); private int pTier = 0; private XSTR xstr = new XSTR(); - public LargeEssentiaSmeltery(String name) { + public MTELargeEssentiaSmeltery(String name) { super(name); } - public LargeEssentiaSmeltery(int aID, String aName, String aNameRegional) { + public MTELargeEssentiaSmeltery(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } @@ -140,9 +139,9 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa } @Override - public IStructureDefinition<? extends GT_MetaTileEntity_MultiblockBase_EM> getStructure_EM() { + public IStructureDefinition<? extends TTMultiblockBase> getStructure_EM() { if (this.multiDefinition == null) { - this.multiDefinition = StructureDefinition.<LargeEssentiaSmeltery>builder() + this.multiDefinition = StructureDefinition.<MTELargeEssentiaSmeltery>builder() .addShape( "first", transpose(new String[][] { { " A " }, { " AAA " }, { "AA~AA" }, { " AAA " }, { " A " } })) @@ -168,30 +167,30 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa .addElement( 'A', ofChain( - buildHatchAdder(LargeEssentiaSmeltery.class) + buildHatchAdder(MTELargeEssentiaSmeltery.class) .atLeast( - GT_HatchElement.Maintenance, - GT_HatchElement.Energy, - GT_HatchElement.InputBus, - GT_HatchElement.InputHatch) + gregtech.api.enums.HatchElement.Maintenance, + gregtech.api.enums.HatchElement.Energy, + gregtech.api.enums.HatchElement.InputBus, + gregtech.api.enums.HatchElement.InputHatch) .casingIndex(CASING_INDEX) .dot(1) .build(), ofSpecificTileAdder( - LargeEssentiaSmeltery::addEssentiaOutputHatchToMachineList, - EssentiaOutputHatch.class, + MTELargeEssentiaSmeltery::addEssentiaOutputHatchToMachineList, + MTEEssentiaOutputHatch.class, Loaders.essentiaOutputHatch, 0), - onElementPass(LargeEssentiaSmeltery::onCasingFound, ofBlock(Loaders.magicCasing, 0)))) - .addElement('B', GT_HatchElement.Muffler.newAny(CASING_INDEX, 2)) + onElementPass(MTELargeEssentiaSmeltery::onCasingFound, ofBlock(Loaders.magicCasing, 0)))) + .addElement('B', gregtech.api.enums.HatchElement.Muffler.newAny(CASING_INDEX, 2)) .build(); } return this.multiDefinition; } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Essentia Smeltery") .addInfo("Controller block for the Large Essentia Smeltery") .addInfo("Necessary evil.") @@ -273,22 +272,22 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) { return false; - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) { - if (((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity).mTier < 3) return false; - ((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_EnergyMulti) { - ((GT_MetaTileEntity_Hatch_EnergyMulti) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.eEnergyMulti.add(((GT_MetaTileEntity_Hatch_EnergyMulti) aMetaTileEntity)); + } else if (aMetaTileEntity instanceof MTEHatchEnergy) { + if (((MTEHatchEnergy) aMetaTileEntity).mTier < 3) return false; + ((MTEHatchEnergy) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mEnergyHatches.add((MTEHatchEnergy) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchEnergyMulti) { + ((MTEHatchEnergyMulti) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.eEnergyMulti.add(((MTEHatchEnergyMulti) aMetaTileEntity)); } else { return false; } } } - private boolean addEssentiaOutputHatchToMachineList(EssentiaOutputHatch aTileEntity) { - if (aTileEntity instanceof EssentiaOutputHatch) { - return this.mEssentiaOutputHatches.add((EssentiaOutputHatch) aTileEntity); + private boolean addEssentiaOutputHatchToMachineList(MTEEssentiaOutputHatch aTileEntity) { + if (aTileEntity instanceof MTEEssentiaOutputHatch) { + return this.mEssentiaOutputHatches.add((MTEEssentiaOutputHatch) aTileEntity); } return false; } @@ -397,7 +396,7 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa } private void fillEssentiaOutputHatch() { - for (EssentiaOutputHatch outputHatch : this.mEssentiaOutputHatches) { + for (MTEEssentiaOutputHatch outputHatch : this.mEssentiaOutputHatches) { for (Map.Entry<Aspect, Integer> entry : this.mOutputAspects.copy().aspects.entrySet()) { Aspect aspect = entry.getKey(); int amount = entry.getValue(); @@ -511,8 +510,7 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa if (xstr.nextInt(100) < Math.max(100 - this.nodePurificationEfficiency, 0)) { final World WORLD = this.getBaseMetaTileEntity() .getWorld(); - GT_MetaTileEntity_Hatch_Muffler mufflerHatch = this.mMufflerHatches - .get(xstr.nextInt(this.mMufflerHatches.size())); + MTEHatchMuffler mufflerHatch = this.mMufflerHatches.get(xstr.nextInt(this.mMufflerHatches.size())); int x = mufflerHatch.getBaseMetaTileEntity() .getXCoord(); int y = mufflerHatch.getBaseMetaTileEntity() @@ -571,7 +569,7 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { - return new LargeEssentiaSmeltery(this.mName); + return new MTELargeEssentiaSmeltery(this.mName); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer1.java index cad1cb001c..536ec4b39c 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer1.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer1.java @@ -8,21 +8,20 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; - -import goodgenerator.blocks.tileEntity.base.LargeFusionComputer; +import bartworks.common.loaders.ItemRegistry; +import goodgenerator.blocks.tileEntity.base.MTELargeFusionComputer; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; -public class LargeFusionComputer1 extends LargeFusionComputer { +public class MTELargeFusionComputer1 extends MTELargeFusionComputer { private static final ITexture textureOverlay = TextureFactory.of( TextureFactory.builder() @@ -35,33 +34,33 @@ public class LargeFusionComputer1 extends LargeFusionComputer { .glow() .build()); - public LargeFusionComputer1(int id, String name, String nameRegional) { + public MTELargeFusionComputer1(int id, String name, String nameRegional) { super(id, name, nameRegional); } - public LargeFusionComputer1(String name) { + public MTELargeFusionComputer1(String name) { super(name); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("Millions of nuclear.") .addInfo("Controller block for the Compact Fusion Reactor MK-I Prototype.") .addInfo( - EnumChatFormatting.AQUA + GT_Utility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.AQUA + GTUtility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.GRAY + " EU/t and " + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(capableStartupCanonical() / 32 / M) + + GTUtility.formatNumbers(capableStartupCanonical() / 32 / M) + "M" + EnumChatFormatting.GRAY + " EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addInfo( - "If the recipe requires a voltage tier over " + GT_Utility.getColoredTierNameFromTier((byte) tier()) + "If the recipe requires a voltage tier over " + GTUtility.getColoredTierNameFromTier((byte) tier()) + EnumChatFormatting.GRAY + " , you can't do it either") .addInfo("Make sure the whole structure is built in the 3x3") @@ -86,7 +85,7 @@ public class LargeFusionComputer1 extends LargeFusionComputer { .addOutputHatch("1-16, Hint block with dot 1", 1) .addStructureInfo("Supports Crafting Input Buffer") .addStructureInfo( - "ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier()) + "ALL Hatches must be " + GTUtility.getColoredTierNameFromTier((byte) hatchTier()) + EnumChatFormatting.GRAY + " or better") .toolTipFinisher("Good Generator"); @@ -105,7 +104,7 @@ public class LargeFusionComputer1 extends LargeFusionComputer { @Override public Block getCasingBlock() { - return GregTech_API.sBlockCasings1; + return GregTechAPI.sBlockCasings1; } @Override @@ -165,6 +164,6 @@ public class LargeFusionComputer1 extends LargeFusionComputer { @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new LargeFusionComputer1(mName); + return new MTELargeFusionComputer1(mName); } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer2.java index 7a72e7842f..e8840d6446 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer2.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer2.java @@ -8,21 +8,20 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; - -import goodgenerator.blocks.tileEntity.base.LargeFusionComputer; +import bartworks.common.loaders.ItemRegistry; +import goodgenerator.blocks.tileEntity.base.MTELargeFusionComputer; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; -public class LargeFusionComputer2 extends LargeFusionComputer { +public class MTELargeFusionComputer2 extends MTELargeFusionComputer { private static final ITexture textureOverlay = TextureFactory.of( TextureFactory.builder() @@ -35,33 +34,33 @@ public class LargeFusionComputer2 extends LargeFusionComputer { .glow() .build()); - public LargeFusionComputer2(int id, String name, String nameRegional) { + public MTELargeFusionComputer2(int id, String name, String nameRegional) { super(id, name, nameRegional); } - public LargeFusionComputer2(String name) { + public MTELargeFusionComputer2(String name) { super(name); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("Millions of nuclear.") .addInfo("Controller block for the Compact Fusion Reactor MK-II.") .addInfo( - EnumChatFormatting.AQUA + GT_Utility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.AQUA + GTUtility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.GRAY + " EU/t and " + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(capableStartupCanonical() / 32 / M) + + GTUtility.formatNumbers(capableStartupCanonical() / 32 / M) + "M" + EnumChatFormatting.GRAY + " EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addInfo( - "If the recipe requires a voltage tier over " + GT_Utility.getColoredTierNameFromTier((byte) tier()) + "If the recipe requires a voltage tier over " + GTUtility.getColoredTierNameFromTier((byte) tier()) + EnumChatFormatting.GRAY + " , you can't do it either") .addInfo("Make sure the whole structure is built in the 3x3") @@ -87,7 +86,7 @@ public class LargeFusionComputer2 extends LargeFusionComputer { .addOutputHatch("1-16, Hint block with dot 1", 1) .addStructureInfo("Supports Crafting Input Buffer") .addStructureInfo( - "ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier()) + "ALL Hatches must be " + GTUtility.getColoredTierNameFromTier((byte) hatchTier()) + EnumChatFormatting.GRAY + " or better") .toolTipFinisher("Good Generator"); @@ -106,7 +105,7 @@ public class LargeFusionComputer2 extends LargeFusionComputer { @Override public Block getCasingBlock() { - return GregTech_API.sBlockCasings4; + return GregTechAPI.sBlockCasings4; } @Override @@ -166,6 +165,6 @@ public class LargeFusionComputer2 extends LargeFusionComputer { @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new LargeFusionComputer2(mName); + return new MTELargeFusionComputer2(mName); } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer3.java index 4a4f9832d0..94d98c3484 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer3.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer3.java @@ -8,21 +8,20 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; - -import goodgenerator.blocks.tileEntity.base.LargeFusionComputer; +import bartworks.common.loaders.ItemRegistry; +import goodgenerator.blocks.tileEntity.base.MTELargeFusionComputer; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; -public class LargeFusionComputer3 extends LargeFusionComputer { +public class MTELargeFusionComputer3 extends MTELargeFusionComputer { private static final ITexture textureOverlay = TextureFactory.of( TextureFactory.builder() @@ -35,33 +34,33 @@ public class LargeFusionComputer3 extends LargeFusionComputer { .glow() .build()); - public LargeFusionComputer3(int id, String name, String nameRegional) { + public MTELargeFusionComputer3(int id, String name, String nameRegional) { super(id, name, nameRegional); } - public LargeFusionComputer3(String name) { + public MTELargeFusionComputer3(String name) { super(name); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("Millions of nuclear.") .addInfo("Controller block for the Compact Fusion Reactor MK-III.") .addInfo( - EnumChatFormatting.AQUA + GT_Utility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.AQUA + GTUtility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.GRAY + " EU/t and " + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(capableStartupCanonical() / 32 / M) + + GTUtility.formatNumbers(capableStartupCanonical() / 32 / M) + "M" + EnumChatFormatting.GRAY + " EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addInfo( - "If the recipe requires a voltage tier over " + GT_Utility.getColoredTierNameFromTier((byte) tier()) + "If the recipe requires a voltage tier over " + GTUtility.getColoredTierNameFromTier((byte) tier()) + EnumChatFormatting.GRAY + " , you can't do it either") .addInfo("Make sure the whole structure is built in the 3x3") @@ -88,7 +87,7 @@ public class LargeFusionComputer3 extends LargeFusionComputer { .addOutputHatch("1-16, Hint block with dot 1", 1) .addStructureInfo("Supports Crafting Input Buffer") .addStructureInfo( - "ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier()) + "ALL Hatches must be " + GTUtility.getColoredTierNameFromTier((byte) hatchTier()) + EnumChatFormatting.GRAY + " or better") .toolTipFinisher("Good Generator"); @@ -107,7 +106,7 @@ public class LargeFusionComputer3 extends LargeFusionComputer { @Override public Block getCasingBlock() { - return GregTech_API.sBlockCasings4; + return GregTechAPI.sBlockCasings4; } @Override @@ -167,6 +166,6 @@ public class LargeFusionComputer3 extends LargeFusionComputer { @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new LargeFusionComputer3(mName); + return new MTELargeFusionComputer3(mName); } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer4.java index 96a9662475..c10747cad0 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer4.java @@ -8,10 +8,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; -import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; - -import goodgenerator.blocks.tileEntity.base.LargeFusionComputerPP; +import bartworks.common.loaders.ItemRegistry; +import goodgenerator.blocks.tileEntity.base.MTELargeFusionComputerPP; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; import gregtech.api.enums.Materials; @@ -20,45 +18,46 @@ import gregtech.api.enums.Textures; 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_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.tileentities.machines.IDualInputHatch; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; -public class LargeFusionComputer4 extends LargeFusionComputerPP { +public class MTELargeFusionComputer4 extends MTELargeFusionComputerPP { - public LargeFusionComputer4(int id, String name, String nameRegional) { + public MTELargeFusionComputer4(int id, String name, String nameRegional) { super(id, name, nameRegional); } - public LargeFusionComputer4(String name) { + public MTELargeFusionComputer4(String name) { super(name); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("Galaxy Collapse.") .addInfo("Controller block for the Compact Fusion Reactor MK-IV Prototype.") .addInfo( - EnumChatFormatting.AQUA + GT_Utility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.AQUA + GTUtility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.GRAY + " EU/t and " + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(capableStartupCanonical() / 32 / M) + + GTUtility.formatNumbers(capableStartupCanonical() / 32 / M) + "M" + EnumChatFormatting.GRAY + " EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addInfo( - "If the recipe requires a voltage tier over " + GT_Utility.getColoredTierNameFromTier((byte) tier()) + "If the recipe requires a voltage tier over " + GTUtility.getColoredTierNameFromTier((byte) tier()) + EnumChatFormatting.GRAY + " , you can't do it either") .addInfo("Make sure the whole structure is built in the 3x3") @@ -87,7 +86,7 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { .addOutputHatch("1-16, Hint block with dot 1", 1) .addStructureInfo("Supports Crafting Input Buffer") .addStructureInfo( - "ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier()) + "ALL Hatches must be " + GTUtility.getColoredTierNameFromTier((byte) hatchTier()) + EnumChatFormatting.GRAY + " or better") .toolTipFinisher("Good Generator"); @@ -179,22 +178,22 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { @Override public boolean turnCasingActive(boolean status) { if (this.mEnergyHatches != null) { - for (GT_MetaTileEntity_Hatch_Energy hatch : this.mEnergyHatches) { + for (MTEHatchEnergy hatch : this.mEnergyHatches) { hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53); } } if (this.eEnergyMulti != null) { - for (GT_MetaTileEntity_Hatch_EnergyMulti hatch : this.eEnergyMulti) { + for (MTEHatchEnergyMulti hatch : this.eEnergyMulti) { hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53); } } if (this.mOutputHatches != null) { - for (GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) { + for (MTEHatchOutput hatch : this.mOutputHatches) { hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53); } } if (this.mInputHatches != null) { - for (GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) { + for (MTEHatchInput hatch : this.mInputHatches) { hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53); } } @@ -222,6 +221,6 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP { @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new LargeFusionComputer4(mName); + return new MTELargeFusionComputer4(mName); } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer5.java index aa4766a01a..8ed9e27f13 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeFusionComputer5.java @@ -8,10 +8,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.ForgeDirection; -import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; - -import goodgenerator.blocks.tileEntity.base.LargeFusionComputerPP; +import bartworks.common.loaders.ItemRegistry; +import goodgenerator.blocks.tileEntity.base.MTELargeFusionComputerPP; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; import gregtech.api.enums.Materials; @@ -20,45 +18,46 @@ import gregtech.api.enums.Textures; 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_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.common.tileentities.machines.IDualInputHatch; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; +import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; -public class LargeFusionComputer5 extends LargeFusionComputerPP { +public class MTELargeFusionComputer5 extends MTELargeFusionComputerPP { - public LargeFusionComputer5(int id, String name, String nameRegional) { + public MTELargeFusionComputer5(int id, String name, String nameRegional) { super(id, name, nameRegional); } - public LargeFusionComputer5(String name) { + public MTELargeFusionComputer5(String name) { super(name); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fusion Reactor") .addInfo("Galaxy Collapse.") .addInfo("Controller block for the Compact Fusion Reactor MK-V.") .addInfo( - EnumChatFormatting.AQUA + GT_Utility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.AQUA + GTUtility.formatNumbers(getSingleHatchPower()) + EnumChatFormatting.GRAY + " EU/t and " + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(capableStartupCanonical() / 32 / M) + + GTUtility.formatNumbers(capableStartupCanonical() / 32 / M) + "M" + EnumChatFormatting.GRAY + " EU capacity per Energy Hatch") .addInfo("If the recipe has a startup cost greater than the") .addInfo("number of energy hatches * cap, you can't do it") .addInfo( - "If the recipe requires a voltage tier over " + GT_Utility.getColoredTierNameFromTier((byte) tier()) + "If the recipe requires a voltage tier over " + GTUtility.getColoredTierNameFromTier((byte) tier()) + EnumChatFormatting.GRAY + " , you can't do it either") .addInfo("Make sure the whole structure is built in the 3x3") @@ -88,7 +87,7 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { .addOutputHatch("1-16, Hint block with dot 1", 1) .addStructureInfo("Supports Crafting Input Buffer") .addStructureInfo( - "ALL Hatches must be " + GT_Utility.getColoredTierNameFromTier((byte) hatchTier()) + "ALL Hatches must be " + GTUtility.getColoredTierNameFromTier((byte) hatchTier()) + EnumChatFormatting.GRAY + " or better") .toolTipFinisher("Good Generator"); @@ -183,22 +182,22 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { @Override public boolean turnCasingActive(boolean status) { if (this.mEnergyHatches != null) { - for (GT_MetaTileEntity_Hatch_Energy hatch : this.mEnergyHatches) { + for (MTEHatchEnergy hatch : this.mEnergyHatches) { hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53); } } if (this.eEnergyMulti != null) { - for (GT_MetaTileEntity_Hatch_EnergyMulti hatch : this.eEnergyMulti) { + for (MTEHatchEnergyMulti hatch : this.eEnergyMulti) { hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53); } } if (this.mOutputHatches != null) { - for (GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) { + for (MTEHatchOutput hatch : this.mOutputHatches) { hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53); } } if (this.mInputHatches != null) { - for (GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) { + for (MTEHatchInput hatch : this.mInputHatches) { hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53); } } @@ -226,6 +225,6 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP { @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new LargeFusionComputer5(mName); + return new MTELargeFusionComputer5(mName); } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java index 19b04637fe..aac9386ecc 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEMultiNqGenerator.java @@ -1,9 +1,9 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; -import static goodgenerator.main.GG_Config_Loader.*; +import static goodgenerator.main.GGConfigLoader.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import java.util.ArrayList; import java.util.Arrays; @@ -18,46 +18,44 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.NotNull; -import com.github.bartimaeusnek.bartworks.util.Pair; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; +import bartworks.util.Pair; import goodgenerator.api.recipe.GoodGeneratorRecipeMaps; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; -import goodgenerator.items.MyMaterial; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; +import goodgenerator.items.GGMaterial; import goodgenerator.loader.Loaders; import goodgenerator.util.CrackRecipeAdder; import goodgenerator.util.DescTextLocalization; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_HatchElement; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.Textures; 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; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchDynamo; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchMaintenance; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; +import gregtech.api.objects.GTRenderedTexture; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; +import tectech.thing.metaTileEntity.hatch.MTEHatchDynamoMulti; -public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM - implements IConstructable, ISurvivalConstructable { +public class MTEMultiNqGenerator extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { - protected IStructureDefinition<MultiNqGenerator> multiDefinition = null; + protected IStructureDefinition<MTEMultiNqGenerator> multiDefinition = null; protected long leftEnergy = 0; protected long trueOutput = 0; protected int trueEff = 0; @@ -72,7 +70,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM static { excitedLiquid = Arrays.asList( new Pair<>(MaterialsUEVplus.Space.getMolten(20L), ExcitedLiquidCoe[0]), - new Pair<>(MyMaterial.atomicSeparationCatalyst.getMolten(20), ExcitedLiquidCoe[1]), + new Pair<>(GGMaterial.atomicSeparationCatalyst.getMolten(20), ExcitedLiquidCoe[1]), new Pair<>(Materials.Naquadah.getMolten(20L), ExcitedLiquidCoe[2]), new Pair<>(Materials.Uranium235.getMolten(180L), ExcitedLiquidCoe[3]), new Pair<>(Materials.Caesium.getMolten(180L), ExcitedLiquidCoe[4])); @@ -101,19 +99,19 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM if (aMetaTileEntity == null) { return false; } else { - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + if (aMetaTileEntity instanceof MTEHatch) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { - return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DynamoMulti) { - return this.eDynamoMulti.add((GT_MetaTileEntity_Hatch_DynamoMulti) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchInput) { + return this.mInputHatches.add((MTEHatchInput) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchOutput) { + return this.mOutputHatches.add((MTEHatchOutput) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchDynamo) { + return this.mDynamoHatches.add((MTEHatchDynamo) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchMaintenance) { + return this.mMaintenanceHatches.add((MTEHatchMaintenance) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchDynamoMulti) { + return this.eDynamoMulti.add((MTEHatchDynamoMulti) aMetaTileEntity); } else { return false; } @@ -122,9 +120,9 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } @Override - public IStructureDefinition<MultiNqGenerator> getStructure_EM() { + public IStructureDefinition<MTEMultiNqGenerator> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<MultiNqGenerator>builder() + multiDefinition = StructureDefinition.<MTEMultiNqGenerator>builder() .addShape( mName, transpose( @@ -140,30 +138,31 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM .addElement( 'X', ofChain( - buildHatchAdder(MultiNqGenerator.class) + buildHatchAdder(MTEMultiNqGenerator.class) .atLeast( - HatchElement.DynamoMulti.or(GT_HatchElement.Dynamo), - GT_HatchElement.InputHatch, - GT_HatchElement.OutputHatch, - GT_HatchElement.Maintenance) + tectech.thing.metaTileEntity.multi.base.TTMultiblockBase.HatchElement.DynamoMulti + .or(gregtech.api.enums.HatchElement.Dynamo), + gregtech.api.enums.HatchElement.InputHatch, + gregtech.api.enums.HatchElement.OutputHatch, + gregtech.api.enums.HatchElement.Maintenance) .casingIndex(44) .dot(1) .build(), - ofBlock(GregTech_API.sBlockCasings3, 12))) - .addElement('A', ofBlock(GregTech_API.sBlockCasings3, 12)) + ofBlock(GregTechAPI.sBlockCasings3, 12))) + .addElement('A', ofBlock(GregTechAPI.sBlockCasings3, 12)) .addElement('N', ofBlock(Loaders.radiationProtectionSteelFrame, 0)) .addElement('C', ofBlock(Loaders.MAR_Casing, 0)) - .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 15)) + .addElement('P', ofBlock(GregTechAPI.sBlockCasings2, 15)) .build(); } return multiDefinition; } - public MultiNqGenerator(String name) { + public MTEMultiNqGenerator(String name) { super(name); } - public MultiNqGenerator(int id, String name, String nameRegional) { + public MTEMultiNqGenerator(int id, String name, String nameRegional) { super(id, name, nameRegional); } @@ -215,7 +214,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM ArrayList<FluidStack> tFluids = getStoredFluids(); for (int i = 0; i < tFluids.size() - 1; i++) { for (int j = i + 1; j < tFluids.size(); j++) { - if (GT_Utility.areFluidsEqual(tFluids.get(i), tFluids.get(j))) { + if (GTUtility.areFluidsEqual(tFluids.get(i), tFluids.get(j))) { if ((tFluids.get(i)).amount >= (tFluids.get(j)).amount) { tFluids.remove(j--); } else { @@ -226,7 +225,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } } - GT_Recipe tRecipe = GoodGeneratorRecipeMaps.naquadahReactorFuels + GTRecipe tRecipe = GoodGeneratorRecipeMaps.naquadahReactorFuels .findRecipe(this.getBaseMetaTileEntity(), true, 1 << 30, tFluids.toArray(new FluidStack[0])); if (tRecipe != null) { Pair<FluidStack, Integer> excitedInfo = getExcited(tFluids.toArray(new FluidStack[0]), false); @@ -280,7 +279,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM public String[] getInfoData() { String[] info = super.getInfoData(); info[4] = "Probably makes: " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(Math.abs(this.trueOutput)) + + GTUtility.formatNumbers(Math.abs(this.trueOutput)) + EnumChatFormatting.RESET + " EU/t"; info[6] = "Problems: " + EnumChatFormatting.RED @@ -338,11 +337,11 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } public void addAutoEnergy(long outputPower) { - if (this.eDynamoMulti.size() > 0) for (GT_MetaTileEntity_Hatch tHatch : this.eDynamoMulti) { + if (this.eDynamoMulti.size() > 0) for (MTEHatch tHatch : this.eDynamoMulti) { long voltage = tHatch.maxEUOutput(); long power = voltage * tHatch.maxAmperesOut(); long outputAmperes; - if (outputPower > power) doExplosion(8 * GT_Utility.getTier(power)); + if (outputPower > power) doExplosion(8 * GTUtility.getTier(power)); if (outputPower >= voltage) { leftEnergy += outputPower; outputAmperes = leftEnergy / voltage; @@ -352,11 +351,11 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM addEnergyOutput_EM(outputPower, 1); } } - if (this.mDynamoHatches.size() > 0) for (GT_MetaTileEntity_Hatch tHatch : this.mDynamoHatches) { + if (this.mDynamoHatches.size() > 0) for (MTEHatch tHatch : this.mDynamoHatches) { long voltage = tHatch.maxEUOutput(); long power = voltage * tHatch.maxAmperesOut(); long outputAmperes; - if (outputPower > power) doExplosion(8 * GT_Utility.getTier(power)); + if (outputPower > power) doExplosion(8 * GTUtility.getTier(power)); if (outputPower >= voltage) { leftEnergy += outputPower; outputAmperes = leftEnergy / voltage; @@ -396,12 +395,12 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new MultiNqGenerator(this.mName); + return new MTEMultiNqGenerator(this.mName); } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Naquadah Reactor") .addInfo("Controller block for the Naquadah Reactor") .addInfo("Environmentally Friendly!") @@ -449,13 +448,12 @@ public class MultiNqGenerator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM int colorIndex, boolean aActive, boolean aRedstone) { if (side == facing) { if (aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(44), - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE), - TextureFactory.builder() + new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE), TextureFactory.builder() .addIcon(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE_GLOW) .glow() .build() }; return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(44), - new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT) }; + new GTRenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT) }; } return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(44) }; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java b/src/main/java/goodgenerator/blocks/tileEntity/MTENeutronActivator.java index f3a4fd7d3c..97efc45ba7 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTENeutronActivator.java @@ -2,8 +2,8 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.ofFrame; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.ofFrame; import java.util.ArrayList; import java.util.Arrays; @@ -31,14 +31,13 @@ import com.gtnewhorizons.modularui.common.widget.SlotWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; import goodgenerator.api.recipe.GoodGeneratorRecipeMaps; -import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronAccelerator; -import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; +import goodgenerator.blocks.tileEntity.GTMetaTileEntity.MTENeutronAccelerator; +import goodgenerator.blocks.tileEntity.GTMetaTileEntity.MTENeutronSensor; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; import goodgenerator.util.ItemRefer; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_HatchElement; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IHatchElement; @@ -47,28 +46,27 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; +import gregtech.api.metatileentity.implementations.MTEHatch; import gregtech.api.multitileentity.multiblock.casing.Glasses; import gregtech.api.objects.XSTR; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gregtech.api.util.IGT_HatchAdder; - -public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM - implements IConstructable, ISurvivalConstructable { - - protected static IStructureDefinition<NeutronActivator> multiDefinition = null; - protected final ArrayList<NeutronAccelerator> mNeutronAccelerator = new ArrayList<>(); - protected final ArrayList<NeutronSensor> mNeutronSensor = new ArrayList<>(); +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.IGTHatchAdder; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; + +public class MTENeutronActivator extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { + + protected static IStructureDefinition<MTENeutronActivator> multiDefinition = null; + protected final ArrayList<MTENeutronAccelerator> mNeutronAccelerator = new ArrayList<>(); + protected final ArrayList<MTENeutronSensor> mNeutronSensor = new ArrayList<>(); protected int casingAmount = 0; protected int height = 0; protected int eV = 0, mCeil = 0, mFloor = 0; - private GT_Recipe lastRecipe; + private GTRecipe lastRecipe; protected static final NumberFormatMUI numberFormat; static { numberFormat = new NumberFormatMUI(); @@ -89,11 +87,11 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM protected final String NA_MID = mName + "mid"; protected final String NA_TOP = mName + "top"; - public NeutronActivator(String name) { + public MTENeutronActivator(String name) { super(name); } - public NeutronActivator(int id, String name, String nameRegional) { + public MTENeutronActivator(int id, String name, String nameRegional) { super(id, name, nameRegional); } @@ -103,8 +101,8 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @NotNull @Override - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { - return GT_OverclockCalculator.ofNoOverclock(recipe) + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { + return OverclockCalculator.ofNoOverclock(recipe) .setDuration((int) Math.ceil(recipe.mDuration * Math.pow(0.9f, height - 4))) .setDurationUnderOneTickSupplier(() -> recipe.mDuration * Math.pow(0.9f, height - 4)); } @@ -141,9 +139,9 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM float aX, float aY, float aZ) { batchMode = !batchMode; if (batchMode) { - GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn")); + GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn")); } else { - GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff")); + GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff")); } return true; } @@ -181,8 +179,8 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM return GoodGeneratorRecipeMaps.neutronActivatorRecipes; } - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Neutron Activator") .addInfo("Controller block for the Neutron Activator") .addInfo("Superluminal-velocity Motion.") @@ -220,39 +218,42 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } @Override - public IStructureDefinition<NeutronActivator> getStructure_EM() { + public IStructureDefinition<MTENeutronActivator> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<NeutronActivator>builder() + multiDefinition = StructureDefinition.<MTENeutronActivator>builder() .addShape(NA_TOP, transpose(new String[][] { { "CCCCC", "CDDDC", "CDDDC", "CDDDC", "CCCCC" } })) .addShape(NA_MID, transpose(new String[][] { { "F F", " GGG ", " GPG ", " GGG ", "F F" } })) .addShape(NA_BOTTOM, transpose(new String[][] { { "XX~XX", "XDDDX", "XDDDX", "XDDDX", "XXXXX" } })) .addElement( 'C', ofChain( - buildHatchAdder(NeutronActivator.class) - .atLeast(GT_HatchElement.InputHatch, GT_HatchElement.InputBus, GT_HatchElement.Maintenance) + buildHatchAdder(MTENeutronActivator.class) + .atLeast( + gregtech.api.enums.HatchElement.InputHatch, + gregtech.api.enums.HatchElement.InputBus, + gregtech.api.enums.HatchElement.Maintenance) .casingIndex(49) .dot(1) .build(), - onElementPass(NeutronActivator::onCasingFound, ofBlock(GregTech_API.sBlockCasings4, 1)))) - .addElement('D', ofBlock(GregTech_API.sBlockCasings2, 6)) + onElementPass(MTENeutronActivator::onCasingFound, ofBlock(GregTechAPI.sBlockCasings4, 1)))) + .addElement('D', ofBlock(GregTechAPI.sBlockCasings2, 6)) .addElement('F', ofFrame(Materials.Steel)) .addElement('G', Glasses.chainAllGlasses()) .addElement('P', ofBlock(Loaders.speedingPipe, 0)) .addElement( 'X', ofChain( - buildHatchAdder(NeutronActivator.class) + buildHatchAdder(MTENeutronActivator.class) .atLeast( - GT_HatchElement.OutputHatch, - GT_HatchElement.OutputBus, - GT_HatchElement.Maintenance, + gregtech.api.enums.HatchElement.OutputHatch, + gregtech.api.enums.HatchElement.OutputBus, + gregtech.api.enums.HatchElement.Maintenance, NeutronHatchElement.NeutronAccelerator, NeutronHatchElement.NeutronSensor) .casingIndex(49) .dot(2) .build(), - onElementPass(NeutronActivator::onCasingFound, ofBlock(GregTech_API.sBlockCasings4, 1)))) + onElementPass(MTENeutronActivator::onCasingFound, ofBlock(GregTechAPI.sBlockCasings4, 1)))) .build(); } return multiDefinition; @@ -282,12 +283,12 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof NeutronAccelerator) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mNeutronAccelerator.add((NeutronAccelerator) aMetaTileEntity); - } else if (aMetaTileEntity instanceof NeutronSensor) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mNeutronSensor.add((NeutronSensor) aMetaTileEntity); + if (aMetaTileEntity instanceof MTENeutronAccelerator) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mNeutronAccelerator.add((MTENeutronAccelerator) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTENeutronSensor) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mNeutronSensor.add((MTENeutronSensor) aMetaTileEntity); } } return false; @@ -323,7 +324,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new NeutronActivator(this.mName); + return new MTENeutronActivator(this.mName); } @Override @@ -335,7 +336,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM tryUseModerator(); } - for (NeutronAccelerator tHatch : mNeutronAccelerator) { + for (MTENeutronAccelerator tHatch : mNeutronAccelerator) { if (tHatch.getBaseMetaTileEntity() .isActive() && this.getRepairStatus() == this.getIdealStatus()) { anyWorking = true; @@ -355,7 +356,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM if (this.eV < 0) this.eV = 0; if (this.eV > maxNeutronKineticEnergy()) doExplosion(4 * 32); - for (NeutronSensor tHatch : mNeutronSensor) { + for (MTENeutronSensor tHatch : mNeutronSensor) { tHatch.updateRedstoneOutput(this.eV); } @@ -371,7 +372,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM for (ItemStack input : getStoredInputs()) { if (input.isItemEqual(Materials.Graphite.getDust(1)) || input.isItemEqual(Materials.Beryllium.getDust(1))) { int consume = Math.min(this.eV / 10000000, input.stackSize); - depleteInput(GT_Utility.copyAmount(consume, input)); + depleteInput(GTUtility.copyAmount(consume, input)); this.eV -= 10000000 * consume; } } @@ -398,7 +399,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM public String[] getInfoData() { int currentNKEInput = 0; boolean anyWorking = false; - for (NeutronAccelerator tHatch : mNeutronAccelerator) { + for (MTENeutronAccelerator tHatch : mNeutronAccelerator) { if (tHatch.getBaseMetaTileEntity() .isActive()) { currentNKEInput += (R.nextInt(tHatch.getMaxEUConsume() + 1) + tHatch.getMaxEUConsume()) * 10 @@ -416,12 +417,12 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM + EnumChatFormatting.RESET + " s", "Current Neutron Kinetic Energy Input: " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(currentNKEInput) + + GTUtility.formatNumbers(currentNKEInput) + EnumChatFormatting.RESET + "eV", StatCollector.translateToLocal("scanner.info.NA") + " " + EnumChatFormatting.LIGHT_PURPLE - + GT_Utility.formatNumbers(getCurrentNeutronKineticEnergy()) + + GTUtility.formatNumbers(getCurrentNeutronKineticEnergy()) + EnumChatFormatting.RESET + "eV" }; } @@ -477,28 +478,28 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM .widget(new FakeSyncWidget.IntegerSyncer(() -> eV, val -> eV = val)); } - private enum NeutronHatchElement implements IHatchElement<NeutronActivator> { + private enum NeutronHatchElement implements IHatchElement<MTENeutronActivator> { - NeutronSensor(NeutronActivator::addAcceleratorAndSensor, NeutronSensor.class) { + NeutronSensor(MTENeutronActivator::addAcceleratorAndSensor, MTENeutronSensor.class) { @Override - public long count(NeutronActivator t) { + public long count(MTENeutronActivator t) { return t.mNeutronSensor.size(); } }, - NeutronAccelerator(NeutronActivator::addAcceleratorAndSensor, NeutronAccelerator.class) { + NeutronAccelerator(MTENeutronActivator::addAcceleratorAndSensor, MTENeutronAccelerator.class) { @Override - public long count(NeutronActivator t) { + public long count(MTENeutronActivator t) { return t.mNeutronAccelerator.size(); } }; private final List<Class<? extends IMetaTileEntity>> mteClasses; - private final IGT_HatchAdder<NeutronActivator> adder; + private final IGTHatchAdder<MTENeutronActivator> adder; @SafeVarargs - NeutronHatchElement(IGT_HatchAdder<NeutronActivator> adder, Class<? extends IMetaTileEntity>... mteClasses) { + NeutronHatchElement(IGTHatchAdder<MTENeutronActivator> adder, Class<? extends IMetaTileEntity>... mteClasses) { this.mteClasses = Collections.unmodifiableList(Arrays.asList(mteClasses)); this.adder = adder; } @@ -508,7 +509,7 @@ public class NeutronActivator extends GT_MetaTileEntity_TooltipMultiBlockBase_EM return mteClasses; } - public IGT_HatchAdder<? super NeutronActivator> adder() { + public IGTHatchAdder<? super MTENeutronActivator> adder() { return adder; } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java index 3d8c0df58c..840688dff7 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java @@ -1,12 +1,12 @@ package goodgenerator.blocks.tileEntity; -import static com.github.bartimaeusnek.bartworks.util.BW_Util.ofGlassTieredMixed; +import static bartworks.util.BWUtil.ofGlassTieredMixed; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; -import static gregtech.api.enums.GT_HatchElement.*; +import static gregtech.api.enums.HatchElement.*; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; -import static gregtech.api.util.GT_StructureUtility.ofFrame; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.util.GTStructureUtility.ofFrame; +import static gregtech.api.util.GTUtility.filterValidMTEs; import java.util.Arrays; import java.util.Collection; @@ -29,7 +29,6 @@ import net.minecraftforge.common.util.ForgeDirection; import org.apache.commons.lang3.tuple.Pair; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; import com.google.common.collect.ImmutableList; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; @@ -42,14 +41,14 @@ import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.common.widget.CycleButtonWidget; import goodgenerator.api.recipe.GoodGeneratorRecipeMaps; -import goodgenerator.client.GUI.GG_UITextures; +import goodgenerator.client.GUI.GGUITextures; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -57,30 +56,31 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.logic.ProcessingLogic; import gregtech.api.metatileentity.GregTechTileClientEvents; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -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_Output; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; +import gregtech.api.metatileentity.implementations.MTEExtendedPowerMultiBlockBase; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; +import gregtech.api.metatileentity.implementations.MTEHatchMaintenance; +import gregtech.api.metatileentity.implementations.MTEHatchMuffler; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; +import gregtech.api.metatileentity.implementations.MTEHatchOutputBus; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_HatchElementBuilder; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.HatchElementBuilder; +import gregtech.api.util.MultiblockTooltipBuilder; +import gregtech.api.util.OverclockCalculator; import gregtech.common.tileentities.machines.IDualInputHatch; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; +import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; -public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<PreciseAssembler> +public class MTEPreciseAssembler extends MTEExtendedPowerMultiBlockBase<MTEPreciseAssembler> implements IConstructable, ISurvivalConstructable { private static final IIconContainer textureFontOn = new Textures.BlockIcons.CustomIcon("iconsets/OVERLAY_QTANK"); @@ -90,7 +90,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB private static final IIconContainer textureFontOff_Glow = new Textures.BlockIcons.CustomIcon( "iconsets/OVERLAY_QCHEST_GLOW"); - protected IStructureDefinition<PreciseAssembler> multiDefinition = null; + protected IStructureDefinition<MTEPreciseAssembler> multiDefinition = null; protected int casingAmount; protected int casingTier; protected int machineTier; @@ -98,18 +98,18 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB protected int energyHatchTier; private static final int CASING_INDEX = 1541; - public PreciseAssembler(String name) { + public MTEPreciseAssembler(String name) { super(name); } - public PreciseAssembler(int id, String name, String nameRegional) { + public MTEPreciseAssembler(int id, String name, String nameRegional) { super(id, name, nameRegional); } @Override - public IStructureDefinition<PreciseAssembler> getStructureDefinition() { + public IStructureDefinition<MTEPreciseAssembler> getStructureDefinition() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<PreciseAssembler>builder() + multiDefinition = StructureDefinition.<MTEPreciseAssembler>builder() .addShape( mName, transpose( @@ -122,7 +122,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB 'C', withChannel( "unit casing", - GT_HatchElementBuilder.<PreciseAssembler>builder() + HatchElementBuilder.<MTEPreciseAssembler>builder() .atLeast( InputBus, InputHatch, @@ -131,7 +131,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB Maintenance, Muffler, ExoticEnergy.or(Energy)) - .adder(PreciseAssembler::addToPAssList) + .adder(MTEPreciseAssembler::addToPAssList) .casingIndex(CASING_INDEX) .dot(1) .buildAndChain( @@ -147,8 +147,8 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB Pair.of(Loaders.preciseUnitCasing, 2), Pair.of(Loaders.preciseUnitCasing, 3)), -3, - PreciseAssembler::setCasingTier, - PreciseAssembler::getCasingTier))))) + MTEPreciseAssembler::setCasingTier, + MTEPreciseAssembler::getCasingTier))))) .addElement('F', ofFrame(Materials.TungstenSteel)) .addElement('G', withChannel("glass", ofGlassTieredMixed((byte) 4, (byte) 127, 2))) .addElement( @@ -156,14 +156,14 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB withChannel( "machine casing", StructureUtility.ofBlocksTiered( - (block, meta) -> block == GregTech_API.sBlockCasings1 ? meta : -2, + (block, meta) -> block == GregTechAPI.sBlockCasings1 ? meta : -2, IntStream.range(0, 10) .mapToObj( - meta -> org.apache.commons.lang3.tuple.Pair.of(GregTech_API.sBlockCasings1, meta)) + meta -> org.apache.commons.lang3.tuple.Pair.of(GregTechAPI.sBlockCasings1, meta)) .collect(Collectors.toList()), -1, - PreciseAssembler::setMachineTier, - PreciseAssembler::getMachineTier))) + MTEPreciseAssembler::setMachineTier, + MTEPreciseAssembler::getMachineTier))) .build(); } return multiDefinition; @@ -177,32 +177,32 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - return mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchInput) { + return mInputHatches.add((MTEHatchInput) aMetaTileEntity); } if (aMetaTileEntity instanceof IDualInputHatch) { return mDualInputHatches.add((IDualInputHatch) aMetaTileEntity); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { - return mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchInputBus) { + return mInputBusses.add((MTEHatchInputBus) aMetaTileEntity); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - return mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchOutput) { + return mOutputHatches.add((MTEHatchOutput) aMetaTileEntity); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) { - return mOutputBusses.add((GT_MetaTileEntity_Hatch_OutputBus) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchOutputBus) { + return mOutputBusses.add((MTEHatchOutputBus) aMetaTileEntity); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy) { - return mEnergyHatches.add((GT_MetaTileEntity_Hatch_Energy) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchEnergy) { + return mEnergyHatches.add((MTEHatchEnergy) aMetaTileEntity); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { - return mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchMaintenance) { + return mMaintenanceHatches.add((MTEHatchMaintenance) aMetaTileEntity); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - return mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchMuffler) { + return mMufflerHatches.add((MTEHatchMuffler) aMetaTileEntity); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_EnergyMulti) { - return mExoticEnergyHatches.add((GT_MetaTileEntity_Hatch_EnergyMulti) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchEnergyMulti) { + return mExoticEnergyHatches.add((MTEHatchEnergyMulti) aMetaTileEntity); } return false; } @@ -232,7 +232,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB public final void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (getBaseMetaTileEntity().isServerSide()) { this.mode = (this.mode + 1) % 2; - GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("preciseassembler.chat." + this.mode)); + GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("preciseassembler.chat." + this.mode)); } super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ); } @@ -243,7 +243,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB @Nonnull @Override - protected CheckRecipeResult validateRecipe(@Nonnull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@Nonnull GTRecipe recipe) { if (mode == 0) { if (recipe.mSpecialValue > (casingTier + 1)) { return CheckRecipeResultRegistry.insufficientMachineTier(recipe.mSpecialValue); @@ -257,7 +257,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB @Nonnull @Override - protected GT_OverclockCalculator createOverclockCalculator(@Nonnull GT_Recipe recipe) { + protected OverclockCalculator createOverclockCalculator(@Nonnull GTRecipe recipe) { return super.createOverclockCalculator(recipe).setSpeedBoost(mode == 0 ? 1 : 0.5F); } }.setMaxParallelSupplier(() -> mode == 0 ? 1 : (int) Math.pow(2, 4 + (casingTier + 1))); @@ -278,8 +278,8 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB public long getMachineVoltageLimit() { if (machineTier < 0) return 0; - if (machineTier >= 9) return GT_Values.V[energyHatchTier]; - else return GT_Values.V[Math.min(machineTier, energyHatchTier)]; + if (machineTier >= 9) return GTValues.V[energyHatchTier]; + else return GTValues.V[Math.min(machineTier, energyHatchTier)]; } @Override @@ -326,8 +326,8 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Precise Assembler/Assembler") .addInfo("Controller block for the Precise Assembler") .addInfo("The error is no more than 7nm.") @@ -382,15 +382,15 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new PreciseAssembler(this.mName); + return new MTEPreciseAssembler(this.mName); } private int checkEnergyHatchTier() { int tier = 0; - for (GT_MetaTileEntity_Hatch_Energy tHatch : filterValidMTEs(mEnergyHatches)) { + for (MTEHatchEnergy tHatch : filterValidMTEs(mEnergyHatches)) { tier = Math.max(tHatch.mTier, tier); } - for (GT_MetaTileEntity_Hatch tHatch : filterValidMTEs(mExoticEnergyHatches)) { + for (MTEHatch tHatch : filterValidMTEs(mExoticEnergyHatches)) { tier = Math.max(tHatch.mTier, tier); } return tier; @@ -418,28 +418,28 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB hatch.updateTexture(texture); } } - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(mInputHatches)) { + for (MTEHatch hatch : filterValidMTEs(mInputHatches)) { hatch.updateTexture(texture); } - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(mInputBusses)) { + for (MTEHatch hatch : filterValidMTEs(mInputBusses)) { hatch.updateTexture(texture); } - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(mOutputHatches)) { + for (MTEHatch hatch : filterValidMTEs(mOutputHatches)) { hatch.updateTexture(texture); } - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(mOutputBusses)) { + for (MTEHatch hatch : filterValidMTEs(mOutputBusses)) { hatch.updateTexture(texture); } - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(mEnergyHatches)) { + for (MTEHatch hatch : filterValidMTEs(mEnergyHatches)) { hatch.updateTexture(texture); } - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(mMaintenanceHatches)) { + for (MTEHatch hatch : filterValidMTEs(mMaintenanceHatches)) { hatch.updateTexture(texture); } - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(mMufflerHatches)) { + for (MTEHatch hatch : filterValidMTEs(mMufflerHatches)) { hatch.updateTexture(texture); } - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(mExoticEnergyHatches)) { + for (MTEHatch hatch : filterValidMTEs(mExoticEnergyHatches)) { hatch.updateTexture(texture); } } @@ -481,9 +481,9 @@ public class PreciseAssembler extends GT_MetaTileEntity_ExtendedPowerMultiBlockB builder.widget( new CycleButtonWidget().setToggle(() -> mode == 1, val -> mode = val ? 1 : 0) .setTextureGetter( - state -> state == 1 ? GG_UITextures.OVERLAY_BUTTON_ASSEMBLER_MODE - : GG_UITextures.OVERLAY_BUTTON_PRECISE_MODE) - .setBackground(GT_UITextures.BUTTON_STANDARD) + state -> state == 1 ? GGUITextures.OVERLAY_BUTTON_ASSEMBLER_MODE + : GGUITextures.OVERLAY_BUTTON_PRECISE_MODE) + .setBackground(GTUITextures.BUTTON_STANDARD) .setPos(80, 91) .setSize(16, 16) .dynamicTooltip( diff --git a/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java b/src/main/java/goodgenerator/blocks/tileEntity/MTESupercriticalFluidTurbine.java index f04cf2eecb..a78046909a 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/SupercriticalFluidTurbine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTESupercriticalFluidTurbine.java @@ -1,6 +1,6 @@ package goodgenerator.blocks.tileEntity; -import static gregtech.api.util.GT_Utility.trans; +import static gregtech.api.util.GTUtility.trans; import java.util.ArrayList; @@ -12,7 +12,7 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_LargeTurbineBase; +import goodgenerator.blocks.tileEntity.base.MTELargeTurbineBase; import goodgenerator.loader.Loaders; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; @@ -21,11 +21,11 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.XSTR; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; -public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBase { +public class MTESupercriticalFluidTurbine extends MTELargeTurbineBase { private boolean looseFit = false; @@ -33,11 +33,11 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas private static final IIconContainer turbineOff = new Textures.BlockIcons.CustomIcon("icons/turbines/TURBINE_15"); private static final IIconContainer turbineEmpty = new Textures.BlockIcons.CustomIcon("icons/turbines/TURBINE_25"); - public SupercriticalFluidTurbine(int aID, String aName, String aNameRegional) { + public MTESupercriticalFluidTurbine(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public SupercriticalFluidTurbine(String aName) { + public MTESupercriticalFluidTurbine(String aName) { super(aName); } @@ -59,8 +59,8 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas int tEU = 0; int totalFlow = 0; // Byproducts are based on actual flow int flow = 0; - int remainingFlow = GT_Utility.safeInt((long) (aOptFlow * 1.25f)); // Allowed to use up to 125% of optimal flow. - // Variable required outside of loop for + int remainingFlow = GTUtility.safeInt((long) (aOptFlow * 1.25f)); // Allowed to use up to 125% of optimal flow. + // Variable required outside of loop for // multi-hatch scenarios. this.realOptFlow = aOptFlow; @@ -74,23 +74,23 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas this.storedFluid += aFluidStack.amount; remainingFlow -= flow; totalFlow += flow; - } else if (GT_ModHandler.isAnySteam(aFluidStack)) { + } else if (GTModHandler.isAnySteam(aFluidStack)) { depleteInput(new FluidStack(aFluidStack, aFluidStack.amount)); } } if (totalFlow <= 0) return 0; tEU = totalFlow; - addOutput(GT_ModHandler.getSteam(totalFlow * 100)); + addOutput(GTModHandler.getSteam(totalFlow * 100)); if (totalFlow == aOptFlow) { - tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); + tEU = GTUtility.safeInt((long) tEU * (long) aBaseEff / 10000L); } else { float efficiency = 1.0f - Math.abs((totalFlow - aOptFlow) / (float) aOptFlow); tEU *= efficiency; - tEU = Math.max(1, GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L)); + tEU = Math.max(1, GTUtility.safeInt((long) tEU * (long) aBaseEff / 10000L)); } if (tEU > maxPower) { - tEU = GT_Utility.safeInt(maxPower); + tEU = GTUtility.safeInt(maxPower); } return tEU * 100; @@ -100,7 +100,7 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (side == getBaseMetaTileEntity().getFrontFacing()) { looseFit ^= true; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, looseFit ? trans("500", "Fitting: Loose - More Flow") : trans("501", "Fitting: Tight - More Efficiency")); @@ -147,8 +147,8 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Supercritical Steam Turbine") .addInfo("Controller block for Supercritical Fluid Turbine") .addInfo("Needs a Turbine, place inside controller") @@ -171,7 +171,7 @@ public class SupercriticalFluidTurbine extends GT_MetaTileEntity_LargeTurbineBas @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new SupercriticalFluidTurbine(mName); + return new MTESupercriticalFluidTurbine(mName); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java index 88f1edaacc..5d20427756 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEUniversalChemicalFuelEngine.java @@ -16,39 +16,38 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.NotNull; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; import goodgenerator.loader.Loaders; import goodgenerator.util.DescTextLocalization; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_HatchElement; +import gregtech.api.GregTechAPI; import gregtech.api.enums.TickTime; 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; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchDynamo; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchMaintenance; +import gregtech.api.metatileentity.implementations.MTEHatchMuffler; import gregtech.api.recipe.RecipeMap; import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.recipe.maps.FuelBackend; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.MultiblockTooltipBuilder; import gtPlusPlus.api.recipe.GTPPRecipeMaps; +import tectech.thing.metaTileEntity.hatch.MTEHatchDynamoMulti; -public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiBlockBase_EM +public class MTEUniversalChemicalFuelEngine extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { protected final double DIESEL_EFFICIENCY_COEFFICIENT = 0.04D; @@ -61,14 +60,14 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB private int heatingTicks; private boolean isStoppingSafe; - private IStructureDefinition<UniversalChemicalFuelEngine> multiDefinition = null; + private IStructureDefinition<MTEUniversalChemicalFuelEngine> multiDefinition = null; - public UniversalChemicalFuelEngine(String name) { + public MTEUniversalChemicalFuelEngine(String name) { super(name); super.useLongPower = true; } - public UniversalChemicalFuelEngine(int id, String name, String nameRegional) { + public MTEUniversalChemicalFuelEngine(int id, String name, String nameRegional) { super(id, name, nameRegional); super.useLongPower = true; } @@ -78,9 +77,9 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Maintenance) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchMaintenance) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mMaintenanceHatches.add((MTEHatchMaintenance) aMetaTileEntity); } } return false; @@ -91,9 +90,9 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Muffler) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mMufflerHatches.add((GT_MetaTileEntity_Hatch_Muffler) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchMuffler) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mMufflerHatches.add((MTEHatchMuffler) aMetaTileEntity); } } return false; @@ -104,9 +103,9 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchInput) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mInputHatches.add((MTEHatchInput) aMetaTileEntity); } } return false; @@ -117,21 +116,21 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Dynamo) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mDynamoHatches.add((GT_MetaTileEntity_Hatch_Dynamo) aMetaTileEntity); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DynamoMulti) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.eDynamoMulti.add((GT_MetaTileEntity_Hatch_DynamoMulti) aMetaTileEntity); + if (aMetaTileEntity instanceof MTEHatchDynamo) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mDynamoHatches.add((MTEHatchDynamo) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEHatchDynamoMulti) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.eDynamoMulti.add((MTEHatchDynamoMulti) aMetaTileEntity); } } return false; } @Override - public IStructureDefinition<UniversalChemicalFuelEngine> getStructure_EM() { + public IStructureDefinition<MTEUniversalChemicalFuelEngine> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<UniversalChemicalFuelEngine>builder() + multiDefinition = StructureDefinition.<MTEUniversalChemicalFuelEngine>builder() .addShape( mName, transpose( @@ -140,15 +139,15 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB { "TTTTT", "SPCCI-", "SPCCI-", "SPCCI-", "SPCCI-", "SPCCI-", "SPCCI-", "SPCCI-", "TTTTT" }, { "TT~TT", "SPGGI-", "SPGGI-", "SPGGI-", "SPGGI-", "SPGGI-", "SPGGI-", "SPGGI-", "TTETT" }, { "TTWTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT", "TTTTT" } })) - .addElement('T', ofBlock(GregTech_API.sBlockCasings4, 2)) - .addElement('W', GT_HatchElement.Maintenance.newAny(50, 1)) - .addElement('M', GT_HatchElement.Muffler.newAny(50, 2)) - .addElement('S', GT_HatchElement.InputHatch.newAny(50, 3)) - .addElement('E', GT_HatchElement.Dynamo.newAny(50, 4)) - .addElement('P', ofBlock(GregTech_API.sBlockCasings2, 14)) + .addElement('T', ofBlock(GregTechAPI.sBlockCasings4, 2)) + .addElement('W', gregtech.api.enums.HatchElement.Maintenance.newAny(50, 1)) + .addElement('M', gregtech.api.enums.HatchElement.Muffler.newAny(50, 2)) + .addElement('S', gregtech.api.enums.HatchElement.InputHatch.newAny(50, 3)) + .addElement('E', gregtech.api.enums.HatchElement.Dynamo.newAny(50, 4)) + .addElement('P', ofBlock(GregTechAPI.sBlockCasings2, 14)) .addElement('C', ofBlock(Loaders.titaniumPlatedCylinder, 0)) - .addElement('G', ofBlock(GregTech_API.sBlockCasings2, 4)) - .addElement('I', ofBlock(GregTech_API.sBlockCasings4, 13)) + .addElement('G', ofBlock(GregTechAPI.sBlockCasings2, 4)) + .addElement('I', ofBlock(GregTechAPI.sBlockCasings4, 13)) .build(); } return multiDefinition; @@ -180,8 +179,8 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Chemical Engine") .addInfo("Controller block for the Chemical Engine") .addInfo("BURNING BURNING BURNING") @@ -237,7 +236,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB protected CheckRecipeResult processFuel(ArrayList<FluidStack> tFluids, RecipeMap<FuelBackend> recipeMap, long PromoterAmount, double efficiencyCoefficient, double FuelsValueBonus) { - for (GT_Recipe recipe : recipeMap.getAllRecipes()) { + for (GTRecipe recipe : recipeMap.getAllRecipes()) { FluidStack tFuel = findFuel(recipe); if (tFuel == null) continue; long FuelAmount = findLiquidAmount(tFuel, tFluids); @@ -282,15 +281,15 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB public String[] getInfoData() { String[] info = super.getInfoData(); info[4] = "Probably makes: " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(this.getPowerFlow()) + + GTUtility.formatNumbers(this.getPowerFlow()) + EnumChatFormatting.RESET + " EU/t"; info[6] = "Problems: " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(this.getIdealStatus() - this.getRepairStatus()) + + GTUtility.formatNumbers(this.getIdealStatus() - this.getRepairStatus()) + EnumChatFormatting.RESET + " Efficiency: " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(tEff / 100D) + + GTUtility.formatNumbers(tEff / 100D) + EnumChatFormatting.RESET + " %"; return info; @@ -299,7 +298,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB void addAutoEnergy() { long exEU = this.getPowerFlow() * tEff / 10000; if (!mDynamoHatches.isEmpty()) { - GT_MetaTileEntity_Hatch_Dynamo tHatch = mDynamoHatches.get(0); + MTEHatchDynamo tHatch = mDynamoHatches.get(0); if (tHatch.maxEUOutput() * tHatch.maxAmperesOut() >= exEU) { tHatch.setEUVar( Math.min( @@ -311,7 +310,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB } } if (!eDynamoMulti.isEmpty()) { - GT_MetaTileEntity_Hatch_DynamoMulti tHatch = eDynamoMulti.get(0); + MTEHatchDynamoMulti tHatch = eDynamoMulti.get(0); if (tHatch.maxEUOutput() * tHatch.maxAmperesOut() >= exEU) { tHatch.setEUVar( Math.min( @@ -328,9 +327,9 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB return FluidRegistry.getFluidStack("combustionpromotor", 1); } - public FluidStack findFuel(GT_Recipe aFuel) { + public FluidStack findFuel(GTRecipe aFuel) { if (aFuel.mInputs != null && aFuel.mInputs.length > 0) - return GT_Utility.getFluidForFilledItem(aFuel.mInputs[0], true); + return GTUtility.getFluidForFilledItem(aFuel.mInputs[0], true); else return aFuel.mFluidInputs[0]; } @@ -379,7 +378,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_TooltipMultiB @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new UniversalChemicalFuelEngine(this.mName); + return new MTEUniversalChemicalFuelEngine(this.mName); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEYottaFluidTank.java index b2635d9c2b..1d8620ad4d 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEYottaFluidTank.java @@ -3,7 +3,7 @@ package goodgenerator.blocks.tileEntity; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; -import static gregtech.api.util.GT_StructureUtility.*; +import static gregtech.api.util.GTStructureUtility.*; import static net.minecraft.util.StatCollector.translateToLocal; import java.math.BigInteger; @@ -24,13 +24,6 @@ import net.minecraftforge.fluids.FluidTankInfo; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; -import com.github.bartimaeusnek.bartworks.API.BorosilicateGlass; -import com.github.technus.tectech.TecTech; -import com.github.technus.tectech.thing.gui.TecTechUITextures; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; @@ -46,28 +39,33 @@ import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; import com.gtnewhorizons.modularui.common.widget.SlotWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; -import goodgenerator.blocks.tileEntity.GTMetaTileEntity.YOTTAHatch; -import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_TooltipMultiBlockBase_EM; -import goodgenerator.client.GUI.GG_UITextures; +import bartworks.API.BorosilicateGlass; +import goodgenerator.blocks.tileEntity.GTMetaTileEntity.MTEYOTTAHatch; +import goodgenerator.blocks.tileEntity.base.MTETooltipMultiBlockBaseEM; +import goodgenerator.client.GUI.GGUITextures; import goodgenerator.loader.Loaders; import goodgenerator.util.CharExchanger; import goodgenerator.util.DescTextLocalization; -import gregtech.api.enums.GT_HatchElement; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; 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; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.SimpleCheckRecipeResult; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.MultiblockTooltipBuilder; +import tectech.TecTech; +import tectech.thing.gui.TecTechUITextures; +import tectech.thing.metaTileEntity.multi.base.INameFunction; +import tectech.thing.metaTileEntity.multi.base.IStatusFunction; +import tectech.thing.metaTileEntity.multi.base.LedStatus; +import tectech.thing.metaTileEntity.multi.base.Parameters; -public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM - implements IConstructable, ISurvivalConstructable { +public class MTEYottaFluidTank extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable { private static final IIconContainer textureFontOn = new Textures.BlockIcons.CustomIcon("iconsets/OVERLAY_QTANK"); private static final IIconContainer textureFontOn_Glow = new Textures.BlockIcons.CustomIcon( @@ -76,8 +74,8 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM private static final IIconContainer textureFontOff_Glow = new Textures.BlockIcons.CustomIcon( "iconsets/OVERLAY_QCHEST_GLOW"); - protected IStructureDefinition<YottaFluidTank> multiDefinition = null; - protected final ArrayList<YOTTAHatch> mYottaHatch = new ArrayList<>(); + protected IStructureDefinition<MTEYottaFluidTank> multiDefinition = null; + protected final ArrayList<MTEYOTTAHatch> mYottaHatch = new ArrayList<>(); private static final BigInteger ONE_HUNDRED = BigInteger.valueOf(100); @@ -111,10 +109,10 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM protected Parameters.Group.ParameterIn tickRateSettings; /** Name of the tick rate setting */ - private static final INameFunction<YottaFluidTank> TICK_RATE_SETTING_NAME = (base, + private static final INameFunction<MTEYottaFluidTank> TICK_RATE_SETTING_NAME = (base, p) -> translateToLocal("gt.blockmachines.YottaFluidTank.cfgi.0"); /** Status of the tick rate setting */ - private static final IStatusFunction<YottaFluidTank> TICK_RATE_STATUS = (base, p) -> LedStatus + private static final IStatusFunction<MTEYottaFluidTank> TICK_RATE_STATUS = (base, p) -> LedStatus .fromLimitsInclusiveOuterBoundary(p.get(), 1, 0, 100, 100); @Override @@ -123,11 +121,11 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM .makeInParameter(1, 20, TICK_RATE_SETTING_NAME, TICK_RATE_STATUS); } - public YottaFluidTank(int id, String name, String nameRegional) { + public MTEYottaFluidTank(int id, String name, String nameRegional) { super(id, name, nameRegional); } - public YottaFluidTank(String name) { + public MTEYottaFluidTank(String name) { super(name); } @@ -295,9 +293,9 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } @Override - public IStructureDefinition<YottaFluidTank> getStructure_EM() { + public IStructureDefinition<MTEYottaFluidTank> getStructure_EM() { if (multiDefinition == null) { - multiDefinition = StructureDefinition.<YottaFluidTank>builder() + multiDefinition = StructureDefinition.<MTEYottaFluidTank>builder() .addShape( YOTTANK_BOTTOM, transpose( @@ -318,26 +316,26 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM (byte) 0, (byte) 1, Byte.MAX_VALUE, - YottaFluidTank::setMeta, + MTEYottaFluidTank::setMeta, te -> (byte) te.getMeta()))) .addElement('R', ofChain(cells(10))) .addElement('F', ofFrame(Materials.Steel)) .addElement( 'I', - buildHatchAdder(YottaFluidTank.class).atLeast(GT_HatchElement.InputHatch) + buildHatchAdder(MTEYottaFluidTank.class).atLeast(gregtech.api.enums.HatchElement.InputHatch) .casingIndex(1537) .dot(1) .buildAndChain(Loaders.yottaFluidTankCasing, 0)) .addElement( 'M', - buildHatchAdder(YottaFluidTank.class).atLeast(GT_HatchElement.Maintenance) + buildHatchAdder(MTEYottaFluidTank.class).atLeast(gregtech.api.enums.HatchElement.Maintenance) .casingIndex(1537) .dot(2) .buildAndChain(Loaders.yottaFluidTankCasing, 0)) .addElement( 'O', - buildHatchAdder(YottaFluidTank.class).atLeast(GT_HatchElement.OutputHatch) - .adder(YottaFluidTank::addOutput) + buildHatchAdder(MTEYottaFluidTank.class).atLeast(gregtech.api.enums.HatchElement.OutputHatch) + .adder(MTEYottaFluidTank::addOutput) .casingIndex(1537) .dot(1) .buildAndChain(Loaders.yottaFluidTankCasing, 0)) @@ -346,8 +344,8 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM return multiDefinition; } - public List<IStructureElement<YottaFluidTank>> cells(int num) { - List<IStructureElement<YottaFluidTank>> out = new ArrayList<>(); + public List<IStructureElement<MTEYottaFluidTank>> cells(int num) { + List<IStructureElement<MTEYottaFluidTank>> out = new ArrayList<>(); for (int i = 0; i < num; ++i) { int finalI = i; out.add(onElementPass(x -> { @@ -366,15 +364,15 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM if (aMetaTileEntity == null) { return false; } else { - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) { - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - return this.mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); - } else if (aMetaTileEntity instanceof YOTTAHatch) { + if (aMetaTileEntity instanceof MTEHatchOutput) { + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + return this.mOutputHatches.add((MTEHatchOutput) aMetaTileEntity); + } else if (aMetaTileEntity instanceof MTEYOTTAHatch) { // only one yothatch allowed if (!this.mYottaHatch.isEmpty()) return false; - ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); - ((YOTTAHatch) aMetaTileEntity).setTank(this); - return this.mYottaHatch.add((YOTTAHatch) aMetaTileEntity); + ((MTEHatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); + ((MTEYOTTAHatch) aMetaTileEntity).setTank(this); + return this.mYottaHatch.add((MTEYOTTAHatch) aMetaTileEntity); } } } @@ -417,8 +415,8 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM } @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + protected MultiblockTooltipBuilder createTooltip() { + final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder(); tt.addMachineType("Fluid Tank") .addInfo("Controller block for the YOTTank.") .addInfo("The max output speed is decided by the amount of stored liquid and the output hatch's capacity.") @@ -514,7 +512,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM final int originalOutputAmount = outputAmount; - for (final GT_MetaTileEntity_Hatch outputHatch : mOutputHatches) { + for (final MTEHatch outputHatch : mOutputHatches) { final FluidStack fluidInHatch = outputHatch.mFluid; final int remainingHatchSpace; @@ -605,7 +603,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new YottaFluidTank(this.mName); + return new MTEYottaFluidTank(this.mName); } @Override @@ -715,7 +713,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM .setBackground(() -> { List<UITexture> ret = new ArrayList<>(); ret.add(TecTechUITextures.BUTTON_STANDARD_16x16); - ret.add(isFluidLocked ? GG_UITextures.OVERLAY_BUTTON_LOCK_ON : GG_UITextures.OVERLAY_BUTTON_LOCK_OFF); + ret.add(isFluidLocked ? GGUITextures.OVERLAY_BUTTON_LOCK_ON : GGUITextures.OVERLAY_BUTTON_LOCK_OFF); return ret.toArray(new IDrawable[0]); }) .setPos(174, doesBindPlayerInventory() ? 116 : 140) diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java index 5c31d55b16..b14395dc20 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputer.java @@ -2,10 +2,10 @@ package goodgenerator.blocks.tileEntity.base; import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; -import static gregtech.api.util.GT_StructureUtility.filterByMTETier; -import static gregtech.api.util.GT_StructureUtility.ofFrame; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.util.GTStructureUtility.buildHatchAdder; +import static gregtech.api.util.GTStructureUtility.filterByMTETier; +import static gregtech.api.util.GTStructureUtility.ofFrame; +import static gregtech.api.util.GTUtility.filterValidMTEs; import java.util.List; @@ -24,7 +24,6 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.NotNull; -import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; @@ -38,8 +37,7 @@ import com.gtnewhorizons.modularui.common.widget.TextWidget; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_HatchElement; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; @@ -48,12 +46,12 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IOverclockDescriptionProvider; import gregtech.api.logic.ProcessingLogic; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.objects.GT_ChunkManager; -import gregtech.api.objects.GT_ItemStack; +import gregtech.api.metatileentity.implementations.MTEHatch; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; +import gregtech.api.objects.GTChunkManager; +import gregtech.api.objects.GTItemStack; import gregtech.api.objects.overclockdescriber.FusionOverclockDescriber; import gregtech.api.objects.overclockdescriber.OverclockDescriber; import gregtech.api.recipe.RecipeMap; @@ -61,28 +59,29 @@ import gregtech.api.recipe.RecipeMaps; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_HatchElementBuilder; -import gregtech.api.util.GT_OverclockCalculator; -import gregtech.api.util.GT_ParallelHelper; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.api.util.HatchElementBuilder; +import gregtech.api.util.OverclockCalculator; +import gregtech.api.util.ParallelHelper; import gregtech.common.tileentities.machines.IDualInputHatch; -import gregtech.common.tileentities.machines.multi.drone.GT_MetaTileEntity_Hatch_DroneDownLink; +import gregtech.common.tileentities.machines.multi.drone.MTEHatchDroneDownLink; +import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; -public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMultiBlockBase_EM +public abstract class MTELargeFusionComputer extends MTETooltipMultiBlockBaseEM implements IConstructable, ISurvivalConstructable, IOverclockDescriptionProvider { public static final String MAIN_NAME = "largeFusion"; public static final int M = 1_000_000; private boolean isLoadedChunk; - public GT_Recipe mLastRecipe; + public GTRecipe mLastRecipe; public int para; protected OverclockDescriber overclockDescriber; - private static final ClassValue<IStructureDefinition<LargeFusionComputer>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<LargeFusionComputer>>() { + private static final ClassValue<IStructureDefinition<MTELargeFusionComputer>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<MTELargeFusionComputer>>() { @Override - protected IStructureDefinition<LargeFusionComputer> computeValue(Class<?> type) { - return StructureDefinition.<LargeFusionComputer>builder() + protected IStructureDefinition<MTELargeFusionComputer> computeValue(Class<?> type) { + return StructureDefinition.<MTELargeFusionComputer>builder() .addShape(MAIN_NAME, transpose(new String[][] { L0, L1, L2, L3, L2, L1, L0 })) .addElement('H', lazy(x -> ofBlock(x.getCoilBlock(), x.getCoilMeta()))) .addElement('C', lazy(x -> ofBlock(x.getCasingBlock(), x.getCasingMeta()))) @@ -90,11 +89,11 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti .addElement( 'I', lazy( - x -> GT_HatchElementBuilder.<LargeFusionComputer>builder() + x -> HatchElementBuilder.<MTELargeFusionComputer>builder() .atLeast( - GT_HatchElement.InputHatch.or(GT_HatchElement.InputBus), - GT_HatchElement.OutputHatch) - .adder(LargeFusionComputer::addFluidIO) + gregtech.api.enums.HatchElement.InputHatch.or(gregtech.api.enums.HatchElement.InputBus), + gregtech.api.enums.HatchElement.OutputHatch) + .adder(MTELargeFusionComputer::addFluidIO) .casingIndex(x.textureIndex()) .dot(1) .hatchItemFilterAnd(x2 -> filterByMTETier(x2.hatchTier(), Integer.MAX_VALUE)) @@ -102,9 +101,11 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti .addElement( 'E', lazy( - x -> GT_HatchElementBuilder.<LargeFusionComputer>builder() - .anyOf(HatchElement.EnergyMulti.or(GT_HatchElement.Energy)) - .adder(LargeFusionComputer::addEnergyInjector) + x -> HatchElementBuilder.<MTELargeFusionComputer>builder() + .anyOf( + tectech.thing.metaTileEntity.multi.base.TTMultiblockBase.HatchElement.EnergyMulti + .or(gregtech.api.enums.HatchElement.Energy)) + .adder(MTELargeFusionComputer::addEnergyInjector) .casingIndex(x.textureIndex()) .hatchItemFilterAnd(x2 -> filterByMTETier(x2.hatchTier(), Integer.MAX_VALUE)) .dot(2) @@ -113,7 +114,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti .addElement( 'D', lazy( - x -> buildHatchAdder(LargeFusionComputer.class).adder(LargeFusionComputer::addDroneHatch) + x -> buildHatchAdder(MTELargeFusionComputer.class).adder(MTELargeFusionComputer::addDroneHatch) .hatchId(9401) .casingIndex(x.textureIndex()) .dot(3) @@ -137,13 +138,13 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti .build())); } - public LargeFusionComputer(String name) { + public MTELargeFusionComputer(String name) { super(name); useLongPower = true; this.overclockDescriber = createOverclockDescriber(); } - public LargeFusionComputer(int id, String name, String nameRegional) { + public MTELargeFusionComputer(int id, String name, String nameRegional) { super(id, name, nameRegional); useLongPower = true; this.overclockDescriber = createOverclockDescriber(); @@ -199,7 +200,7 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti public abstract ITexture getTextureOverlay(); @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { + public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) { return side != getBaseMetaTileEntity().getFrontFacing(); } @@ -236,38 +237,38 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide() && !aBaseMetaTileEntity.isAllowedToWork()) { // if machine has stopped, stop chunkloading - GT_ChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity); + GTChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity); this.isLoadedChunk = false; } else if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && !this.isLoadedChunk) { // load a 3x3 area when machine is running - GT_ChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity); + GTChunkManager.releaseTicket((TileEntity) aBaseMetaTileEntity); int offX = aBaseMetaTileEntity.getFrontFacing().offsetX; int offZ = aBaseMetaTileEntity.getFrontFacing().offsetZ; - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() + offZ)); - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() + 1 + offZ)); - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() + offZ)); - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + 1 + offX, getChunkZ() - 1 + offZ)); - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() + 1 + offZ)); - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() + offZ)); - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() - 1 + offX, getChunkZ() - 1 + offZ)); - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() + 1 + offZ)); - GT_ChunkManager.requestChunkLoad( + GTChunkManager.requestChunkLoad( (TileEntity) aBaseMetaTileEntity, new ChunkCoordIntPair(getChunkX() + offX, getChunkZ() - 1 + offZ)); this.isLoadedChunk = true; @@ -298,8 +299,8 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti } long energyLimit = getSingleHatchPower(); - List<GT_MetaTileEntity_Hatch> hatches = getExoticAndNormalEnergyHatchList(); - for (GT_MetaTileEntity_Hatch hatch : filterValidMTEs(hatches)) { + List<MTEHatch> hatches = getExoticAndNormalEnergyHatchList(); + for (MTEHatch hatch : filterValidMTEs(hatches)) { long consumableEnergy = Math.min(hatch.getEUVar(), energyLimit); long receivedEnergy = Math .min(consumableEnergy, maxEUStore() - aBaseMetaTileEntity.getStoredEU()); @@ -365,27 +366,27 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti * @return The power one hatch can deliver to the reactor */ protected long getSingleHatchPower() { - return GT_Values.V[tier()] * getMaxPara() * extraPara(100) / 32; + return GTValues.V[tier()] * getMaxPara() * extraPara(100) / 32; } public boolean turnCasingActive(boolean status) { if (this.mEnergyHatches != null) { - for (GT_MetaTileEntity_Hatch_Energy hatch : this.mEnergyHatches) { + for (MTEHatchEnergy hatch : this.mEnergyHatches) { hatch.updateTexture(status ? 52 : 53); } } if (this.eEnergyMulti != null) { - for (GT_MetaTileEntity_Hatch_EnergyMulti hatch : this.eEnergyMulti) { + for (MTEHatchEnergyMulti hatch : this.eEnergyMulti) { hatch.updateTexture(status ? 52 : 53); } } if (this.mOutputHatches != null) { - for (GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) { + for (MTEHatchOutput hatch : this.mOutputHatches) { hatch.updateTexture(status ? 52 : 53); } } if (this.mInputHatches != null) { - for (GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) { + for (MTEHatchInput hatch : this.mInputHatches) { hatch.updateTexture(status ? 52 : 53); } } @@ -437,25 +438,25 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti @NotNull @Override - protected GT_ParallelHelper createParallelHelper(@NotNull GT_Recipe recipe) { + protected ParallelHelper createParallelHelper(@NotNull GTRecipe recipe) { // When the fusion first loads and is still processing, it does the recipe check without consuming. return super.createParallelHelper(recipe).setConsumption(!mRunningOnLoad); } @NotNull @Override - protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { + protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return overclockDescriber.createCalculator(super.createOverclockCalculator(recipe), recipe); } @NotNull @Override - protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) { + protected CheckRecipeResult validateRecipe(@NotNull GTRecipe recipe) { if (!mRunningOnLoad) { if (recipe.mSpecialValue > maxEUStore()) { return CheckRecipeResultRegistry.insufficientStartupPower(recipe.mSpecialValue); } - if (recipe.mEUt > GT_Values.V[tier()]) { + if (recipe.mEUt > GTValues.V[tier()]) { return CheckRecipeResultRegistry.insufficientPower(recipe.mEUt); } } @@ -482,13 +483,13 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti @Override protected void setProcessingLogicPower(ProcessingLogic logic) { - logic.setAvailableVoltage(GT_Values.V[tier()]); - logic.setAvailableAmperage(getSingleHatchPower() * 32 / GT_Values.V[tier()]); + logic.setAvailableVoltage(GTValues.V[tier()]); + logic.setAvailableAmperage(getSingleHatchPower() * 32 / GTValues.V[tier()]); } @Override public void onRemoval() { - if (this.isLoadedChunk) GT_ChunkManager.releaseTicket((TileEntity) getBaseMetaTileEntity()); + if (this.isLoadedChunk) GTChunkManager.releaseTicket((TileEntity) getBaseMetaTileEntity()); super.onRemoval(); } @@ -503,11 +504,11 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti private boolean addEnergyInjector(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Energy tHatch) { + if (aMetaTileEntity instanceof MTEHatchEnergy tHatch) { if (tHatch.getTierForStructure() < hatchTier()) return false; tHatch.updateTexture(aBaseCasingIndex); return mEnergyHatches.add(tHatch); - } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_EnergyMulti tHatch) { + } else if (aMetaTileEntity instanceof MTEHatchEnergyMulti tHatch) { if (tHatch.getTierForStructure() < hatchTier()) return false; tHatch.updateTexture(aBaseCasingIndex); return eEnergyMulti.add(tHatch); @@ -518,16 +519,16 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti private boolean addFluidIO(IGregTechTileEntity aBaseMetaTileEntity, int aBaseCasingIndex) { IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch hatch) { + if (aMetaTileEntity instanceof MTEHatch hatch) { hatch.updateTexture(aBaseCasingIndex); hatch.updateCraftingIcon(this.getMachineCraftingIcon()); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input tInput) { + if (aMetaTileEntity instanceof MTEHatchInput tInput) { if (tInput.getTierForStructure() < hatchTier()) return false; tInput.mRecipeMap = getRecipeMap(); return mInputHatches.add(tInput); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output tOutput) { + if (aMetaTileEntity instanceof MTEHatchOutput tOutput) { if (tOutput.getTierForStructure() < hatchTier()) return false; return mOutputHatches.add(tOutput); } @@ -542,13 +543,13 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti if (aBaseMetaTileEntity == null) return false; IMetaTileEntity aMetaTileEntity = aBaseMetaTileEntity.getMetaTileEntity(); if (aMetaTileEntity == null) return false; - if (!(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DroneDownLink tHatch)) return false; + if (!(aMetaTileEntity instanceof MTEHatchDroneDownLink tHatch)) return false; tHatch.updateTexture(aBaseCasingIndex); return addToMachineList(aBaseMetaTileEntity, aBaseCasingIndex); } @Override - public IStructureDefinition<LargeFusionComputer> getStructure_EM() { + public IStructureDefinition<MTELargeFusionComputer> getStructure_EM() { return STRUCTURE_DEFINITION.get(getClass()); } @@ -589,25 +590,25 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti return new String[] { EnumChatFormatting.BLUE + "Fusion Reactor MK " + EnumChatFormatting.RESET + tier, StatCollector.translateToLocal("scanner.info.UX.0") + ": " + EnumChatFormatting.LIGHT_PURPLE - + GT_Utility.formatNumbers(this.para) + + GTUtility.formatNumbers(this.para) + EnumChatFormatting.RESET, StatCollector.translateToLocal("GT5U.fusion.req") + ": " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(-lEUt) + + GTUtility.formatNumbers(-lEUt) + EnumChatFormatting.RESET + "EU/t", StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(baseMetaTileEntity != null ? baseMetaTileEntity.getStoredEU() : 0) + + GTUtility.formatNumbers(baseMetaTileEntity != null ? baseMetaTileEntity.getStoredEU() : 0) + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(maxEUStore()) + + GTUtility.formatNumbers(maxEUStore()) + EnumChatFormatting.RESET + " EU", StatCollector.translateToLocal("GT5U.fusion.plasma") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(plasmaOut) + + GTUtility.formatNumbers(plasmaOut) + EnumChatFormatting.RESET + "L/t" }; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputerPP.java index 7d87e6fdd1..7089616911 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputerPP.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeFusionComputerPP.java @@ -2,30 +2,29 @@ package goodgenerator.blocks.tileEntity.base; import static net.minecraft.util.StatCollector.translateToLocal; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.INameFunction; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.IStatusFunction; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.Parameters; - import gregtech.api.objects.overclockdescriber.OverclockDescriber; import gregtech.api.util.AdvancedFusionOverclockDescriber; +import tectech.thing.metaTileEntity.multi.base.INameFunction; +import tectech.thing.metaTileEntity.multi.base.IStatusFunction; +import tectech.thing.metaTileEntity.multi.base.LedStatus; +import tectech.thing.metaTileEntity.multi.base.Parameters; -public abstract class LargeFusionComputerPP extends LargeFusionComputer { +public abstract class MTELargeFusionComputerPP extends MTELargeFusionComputer { protected Parameters.Group.ParameterIn batchSetting; /** Name of the batch setting */ - private static final INameFunction<LargeFusionComputerPP> BATCH_SETTING_NAME = (base, + private static final INameFunction<MTELargeFusionComputerPP> BATCH_SETTING_NAME = (base, p) -> translateToLocal("gt.blockmachines.LargeFusionComputerPP.cfgi.0"); // Batch size /** Status of the batch setting */ - private static final IStatusFunction<LargeFusionComputerPP> BATCH_STATUS = (base, p) -> LedStatus + private static final IStatusFunction<MTELargeFusionComputerPP> BATCH_STATUS = (base, p) -> LedStatus .fromLimitsInclusiveOuterBoundary(p.get(), 1, 0, 32, 128); - public LargeFusionComputerPP(String name) { + public MTELargeFusionComputerPP(String name) { super(name); } - public LargeFusionComputerPP(int id, String name, String nameRegional) { + public MTELargeFusionComputerPP(int id, String name, String nameRegional) { super(id, name, nameRegional); } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LargeTurbineBase.java b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java index 3df71aa25a..1c298d2b9a 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_LargeTurbineBase.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/MTELargeTurbineBase.java @@ -5,9 +5,9 @@ package goodgenerator.blocks.tileEntity.base; import static com.gtnewhorizon.structurelib.structure.StructureUtility.lazy; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.*; -import static gregtech.api.util.GT_StructureUtility.*; -import static gregtech.api.util.GT_Utility.filterValidMTEs; +import static gregtech.api.enums.HatchElement.*; +import static gregtech.api.util.GTStructureUtility.*; +import static gregtech.api.util.GTUtility.filterValidMTEs; import java.util.ArrayList; @@ -28,24 +28,24 @@ import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; +import gregtech.api.items.MetaGeneratedTool; +import gregtech.api.metatileentity.implementations.MTEEnhancedMultiBlockBase; +import gregtech.api.metatileentity.implementations.MTEHatchDynamo; +import gregtech.api.metatileentity.implementations.MTEHatchMuffler; import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; -import gregtech.api.util.GT_Utility; -import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.api.util.GTUtility; +import gregtech.common.items.MetaGeneratedTool01; -public abstract class GT_MetaTileEntity_LargeTurbineBase extends - GT_MetaTileEntity_EnhancedMultiBlockBase<GT_MetaTileEntity_LargeTurbineBase> implements ISurvivalConstructable { +public abstract class MTELargeTurbineBase extends MTEEnhancedMultiBlockBase<MTELargeTurbineBase> + implements ISurvivalConstructable { private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GT_MetaTileEntity_LargeTurbineBase>>() { + private static final ClassValue<IStructureDefinition<MTELargeTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<MTELargeTurbineBase>>() { @Override - protected IStructureDefinition<GT_MetaTileEntity_LargeTurbineBase> computeValue(Class<?> type) { - return StructureDefinition.<GT_MetaTileEntity_LargeTurbineBase>builder() + protected IStructureDefinition<MTELargeTurbineBase> computeValue(Class<?> type) { + return StructureDefinition.<MTELargeTurbineBase>builder() .addShape( STRUCTURE_PIECE_MAIN, transpose( @@ -59,18 +59,16 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends .addElement( 'h', lazy( - t -> buildHatchAdder(GT_MetaTileEntity_LargeTurbineBase.class) + t -> buildHatchAdder(MTELargeTurbineBase.class) .atLeast(Maintenance, InputHatch, OutputHatch, OutputBus, InputBus, Muffler) .casingIndex(t.getCasingTextureIndex()) .dot(2) .buildAndChain(t.getCasingBlock(), t.getCasingMeta()))) - .addElement( - 'x', - (IStructureElementCheckOnly<GT_MetaTileEntity_LargeTurbineBase>) (aContext, aWorld, aX, aY, aZ) -> { - TileEntity tTile = aWorld.getTileEntity(aX, aY, aZ); - return !(tTile instanceof IGregTechTileEntity) || !(((IGregTechTileEntity) tTile) - .getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbineBase); - }) + .addElement('x', (IStructureElementCheckOnly<MTELargeTurbineBase>) (aContext, aWorld, aX, aY, aZ) -> { + TileEntity tTile = aWorld.getTileEntity(aX, aY, aZ); + return !(tTile instanceof IGregTechTileEntity) + || !(((IGregTechTileEntity) tTile).getMetaTileEntity() instanceof MTELargeTurbineBase); + }) .build(); } }; @@ -83,11 +81,11 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends protected boolean looseFit = false; protected long maxPower = 0; - public GT_MetaTileEntity_LargeTurbineBase(int aID, String aName, String aNameRegional) { + public MTELargeTurbineBase(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - public GT_MetaTileEntity_LargeTurbineBase(String aName) { + public MTELargeTurbineBase(String aName) { super(aName); } @@ -97,7 +95,7 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends } @Override - public IStructureDefinition<GT_MetaTileEntity_LargeTurbineBase> getStructureDefinition() { + public IStructureDefinition<MTELargeTurbineBase> getStructureDefinition() { return STRUCTURE_DEFINITION.get(getClass()); } @@ -139,10 +137,9 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends @Override public @NotNull CheckRecipeResult checkProcessing() { ItemStack controllerSlot = getControllerSlot(); - if ((counter & 7) == 0 - && (controllerSlot == null || !(controllerSlot.getItem() instanceof GT_MetaGenerated_Tool) - || controllerSlot.getItemDamage() < 170 - || controllerSlot.getItemDamage() > 179)) { + if ((counter & 7) == 0 && (controllerSlot == null || !(controllerSlot.getItem() instanceof MetaGeneratedTool) + || controllerSlot.getItemDamage() < 170 + || controllerSlot.getItemDamage() > 179)) { stopMachine(); return CheckRecipeResultRegistry.NO_TURBINE_FOUND; } @@ -155,15 +152,14 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends || this.getBaseMetaTileEntity() .hasInventoryBeenModified()) { counter = 0; - baseEff = GT_Utility.safeInt( - (long) ((5F - + ((GT_MetaGenerated_Tool) controllerSlot.getItem()).getToolCombatDamage(controllerSlot)) + baseEff = GTUtility.safeInt( + (long) ((5F + ((MetaGeneratedTool) controllerSlot.getItem()).getToolCombatDamage(controllerSlot)) * 1000F)); - optFlow = GT_Utility.safeInt( + optFlow = GTUtility.safeInt( (long) Math.max( Float.MIN_NORMAL, - ((GT_MetaGenerated_Tool) controllerSlot.getItem()).getToolStats(controllerSlot) - .getSpeedMultiplier() * GT_MetaGenerated_Tool.getPrimaryMaterial(controllerSlot).mToolSpeed + ((MetaGeneratedTool) controllerSlot.getItem()).getToolStats(controllerSlot) + .getSpeedMultiplier() * MetaGeneratedTool.getPrimaryMaterial(controllerSlot).mToolSpeed * 50)); if (optFlow <= 0 || baseEff <= 0) { stopMachine(); // in case the turbine got removed @@ -181,7 +177,7 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends // Magic numbers: can always change by at least 10 eu/t, but otherwise by at most 1 percent of the difference in // power level (per tick) // This is how much the turbine can actually change during this tick - int maxChangeAllowed = Math.max(10, GT_Utility.safeInt((long) Math.abs(difference) / 100)); + int maxChangeAllowed = Math.max(10, GTUtility.safeInt((long) Math.abs(difference) / 100)); if (Math.abs(difference) > maxChangeAllowed) { // If this difference is too big, use the maximum allowed change int change = maxChangeAllowed * (difference > 0 ? 1 : -1); // Make the change positive or negative. @@ -210,10 +206,10 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends @Override public int getMaxEfficiency(ItemStack aStack) { - if (GT_Utility.isStackInvalid(aStack)) { + if (GTUtility.isStackInvalid(aStack)) { return 0; } - if (aStack.getItem() instanceof GT_MetaGenerated_Tool_01) { + if (aStack.getItem() instanceof MetaGeneratedTool01) { return 10000; } return 0; @@ -226,7 +222,7 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends public long getMaximumOutput() { long aTotal = 0; - for (GT_MetaTileEntity_Hatch_Dynamo aDynamo : filterValidMTEs(mDynamoHatches)) { + for (MTEHatchDynamo aDynamo : filterValidMTEs(mDynamoHatches)) { long aVoltage = aDynamo.maxEUOutput(); aTotal = aDynamo.maxAmperesOut() * aVoltage; break; @@ -237,7 +233,7 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends @Override public String[] getInfoData() { int mPollutionReduction = 0; - for (GT_MetaTileEntity_Hatch_Muffler tHatch : filterValidMTEs(mMufflerHatches)) { + for (MTEHatchMuffler tHatch : filterValidMTEs(mMufflerHatches)) { mPollutionReduction = Math.max(tHatch.calculatePollutionReduction(100), mPollutionReduction); } @@ -253,15 +249,15 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends + EnumChatFormatting.RESET; int tDura = 0; - if (mInventory[1] != null && mInventory[1].getItem() instanceof GT_MetaGenerated_Tool_01) { - tDura = GT_Utility.safeInt( - (long) (100.0f / GT_MetaGenerated_Tool.getToolMaxDamage(mInventory[1]) - * (GT_MetaGenerated_Tool.getToolDamage(mInventory[1])) + 1)); + if (mInventory[1] != null && mInventory[1].getItem() instanceof MetaGeneratedTool01) { + tDura = GTUtility.safeInt( + (long) (100.0f / MetaGeneratedTool.getToolMaxDamage(mInventory[1]) + * (MetaGeneratedTool.getToolDamage(mInventory[1])) + 1)); } long storedEnergy = 0; long maxEnergy = 0; - for (GT_MetaTileEntity_Hatch_Dynamo tHatch : filterValidMTEs(mDynamoHatches)) { + for (MTEHatchDynamo tHatch : filterValidMTEs(mDynamoHatches)) { storedEnergy += tHatch.getBaseMetaTileEntity() .getStoredEU(); maxEnergy += tHatch.getBaseMetaTileEntity() @@ -271,7 +267,7 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends // 8 Lines available for information panels tRunning + ": " + EnumChatFormatting.RED - + GT_Utility.formatNumbers(mEUt) + + GTUtility.formatNumbers(mEUt) + EnumChatFormatting.RESET + " EU/t", /* 1 */ tMaintainance, /* 2 */ @@ -282,16 +278,16 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends + "%", /* 2 */ StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(storedEnergy) + + GTUtility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " + /* 3 */ EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(maxEnergy) + + GTUtility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET + " EU", StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(GT_Utility.safeInt((long) realOptFlow)) + + GTUtility.formatNumbers(GTUtility.safeInt((long) realOptFlow)) + EnumChatFormatting.RESET + " L/t" + /* 4 */ EnumChatFormatting.YELLOW @@ -301,7 +297,7 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends + ")", /* 5 */ StatCollector.translateToLocal("GT5U.turbine.fuel") + ": " + EnumChatFormatting.GOLD - + GT_Utility.formatNumbers(storedFluid) + + GTUtility.formatNumbers(storedFluid) + EnumChatFormatting.RESET + "L", /* 6 */ StatCollector.translateToLocal( @@ -317,7 +313,7 @@ public abstract class GT_MetaTileEntity_LargeTurbineBase extends .contains("Steam")) ret[4] = StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.safeInt((long) realOptFlow) + + GTUtility.safeInt((long) realOptFlow) + EnumChatFormatting.RESET + " L/t"; return ret; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_TooltipMultiBlockBase_EM.java b/src/main/java/goodgenerator/blocks/tileEntity/base/MTETooltipMultiBlockBaseEM.java index 010dc1db88..90d0cc5395 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/base/GT_MetaTileEntity_TooltipMultiBlockBase_EM.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/base/MTETooltipMultiBlockBaseEM.java @@ -7,27 +7,25 @@ import net.minecraft.item.ItemStack; import org.lwjgl.input.Keyboard; -import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; - import gregtech.api.interfaces.ISecondaryDescribable; -import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.MultiblockTooltipBuilder; +import tectech.thing.metaTileEntity.multi.base.TTMultiblockBase; -public abstract class GT_MetaTileEntity_TooltipMultiBlockBase_EM extends GT_MetaTileEntity_MultiblockBase_EM - implements ISecondaryDescribable { +public abstract class MTETooltipMultiBlockBaseEM extends TTMultiblockBase implements ISecondaryDescribable { - private static final Map<Integer, GT_Multiblock_Tooltip_Builder> tooltips = new ConcurrentHashMap<>(); + private static final Map<Integer, MultiblockTooltipBuilder> tooltips = new ConcurrentHashMap<>(); - protected GT_MetaTileEntity_TooltipMultiBlockBase_EM(int aID, String aName, String aNameRegional) { + protected MTETooltipMultiBlockBaseEM(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); } - protected GT_MetaTileEntity_TooltipMultiBlockBase_EM(String aName) { + protected MTETooltipMultiBlockBaseEM(String aName) { super(aName); } - protected GT_Multiblock_Tooltip_Builder getTooltip() { + protected MultiblockTooltipBuilder getTooltip() { int tId = getBaseMetaTileEntity().getMetaTileID(); - GT_Multiblock_Tooltip_Builder tooltip = tooltips.get(tId); + MultiblockTooltipBuilder tooltip = tooltips.get(tId); if (tooltip == null) { tooltip = createTooltip(); tooltips.put(tId, tooltip); @@ -35,7 +33,7 @@ public abstract class GT_MetaTileEntity_TooltipMultiBlockBase_EM extends GT_Meta return tooltip; } - protected abstract GT_Multiblock_Tooltip_Builder createTooltip(); + protected abstract MultiblockTooltipBuilder createTooltip(); @Override public String[] getDescription() { diff --git a/src/main/java/goodgenerator/client/GUI/GG_UITextures.java b/src/main/java/goodgenerator/client/GUI/GGUITextures.java index 2b9bc8df84..068b70d46b 100644 --- a/src/main/java/goodgenerator/client/GUI/GG_UITextures.java +++ b/src/main/java/goodgenerator/client/GUI/GGUITextures.java @@ -2,7 +2,7 @@ package goodgenerator.client.GUI; import com.gtnewhorizons.modularui.api.drawable.UITexture; -public class GG_UITextures { +public class GGUITextures { private static final String MODID = "goodgenerator"; diff --git a/src/main/java/goodgenerator/client/render/BlockRenderHandler.java b/src/main/java/goodgenerator/client/render/BlockRenderHandler.java index 01893339f5..c8e8bfacb8 100644 --- a/src/main/java/goodgenerator/client/render/BlockRenderHandler.java +++ b/src/main/java/goodgenerator/client/render/BlockRenderHandler.java @@ -1,6 +1,6 @@ package goodgenerator.client.render; -import static gregtech.common.render.GT_Renderer_Block.*; +import static gregtech.common.render.GTRendererBlock.*; import static net.minecraftforge.common.util.ForgeDirection.*; import static net.minecraftforge.common.util.ForgeDirection.EAST; @@ -14,7 +14,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; import goodgenerator.blocks.regularBlock.ITextureBlock; -import gregtech.GT_Mod; +import gregtech.GTMod; public class BlockRenderHandler implements ISimpleBlockRenderingHandler { @@ -59,7 +59,7 @@ public class BlockRenderHandler implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID, RenderBlocks aRenderer) { - aRenderer.enableAO = Minecraft.isAmbientOcclusionEnabled() && GT_Mod.gregtechproxy.mRenderTileAmbientOcclusion; + aRenderer.enableAO = Minecraft.isAmbientOcclusionEnabled() && GTMod.gregtechproxy.mRenderTileAmbientOcclusion; aRenderer.useInventoryTint = false; if (aBlock instanceof ITextureBlock) { aBlock.setBlockBounds(blockMin, blockMin, blockMin, blockMax, blockMax, blockMax); diff --git a/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java b/src/main/java/goodgenerator/crossmod/nei/NEIConfig.java index e28f09885e..20c492fc7d 100644 --- a/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java +++ b/src/main/java/goodgenerator/crossmod/nei/NEIConfig.java @@ -8,14 +8,14 @@ import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; import goodgenerator.main.GoodGenerator; -public class NEI_Config implements IConfigureNEI { +public class NEIConfig implements IConfigureNEI { public static boolean isAdded = true; @Override public void loadConfig() { - NEI_Config.isAdded = false; - NEI_Config.isAdded = true; + NEIConfig.isAdded = false; + NEIConfig.isAdded = true; } public static void hide(Block aBlock) { diff --git a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java index e5b9f350a3..2cb0f00051 100644 --- a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java +++ b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java @@ -16,18 +16,17 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; - +import bartworks.common.loaders.ItemRegistry; +import bartworks.system.material.WerkstoffLoader; import goodgenerator.util.DescTextLocalization; import goodgenerator.util.ItemRefer; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.TC_Aspects; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.enums.TCAspects; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; import ic2.core.Ic2Items; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -49,7 +48,7 @@ public class Research { DescTextLocalization.addText("research.ESSENTIA_UPGRADE_SPRITE.page", 3); DescTextLocalization.addText("research.ESSENTIA_UPGRADE_RADIATION.page", 3); DescTextLocalization.addText("research.ESSENTIA_UPGRADE_ELECTRIC.page", 2); - GregTech_API.sThaumcraftCompat.addResearch( + GregTechAPI.sThaumcraftCompat.addResearch( "ESSENTIA_GENERATOR", "Combustion Engine in Magic World", "Will it cause Flux pollution?", @@ -61,14 +60,14 @@ public class Research { -9, 3, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L)), + new TCAspects.TC_AspectStack(TCAspects.MACHINA, 10L), + new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 10L), + new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 10L), + new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 10L), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 10L)), null, new Object[] { "research.ESSENTIA_GENERATOR.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_GENERATOR", ItemList.Hatch_Input_HV.get(1), new ItemStack[] { new ItemStack(ConfigBlocks.blockJar, 1), ItemRefer.Magic_Casing.get(1), @@ -76,24 +75,24 @@ public class Research { ItemRefer.Essentia_Hatch.get(1), 6, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 64), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 32), - new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 32))), - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + new TCAspects.TC_AspectStack(TCAspects.AQUA, 128), + new TCAspects.TC_AspectStack(TCAspects.VACUOS, 64), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 32), + new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 32))), + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_GENERATOR", - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Thaumium, 1), - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectricalSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectricalSteel, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Thaumium, 1), + new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Titanium, 1), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.ElectricalSteel, 1), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.ElectricalSteel, 1), ItemList.Electric_Pump_EV.get(1L), new ItemStack(ConfigBlocks.blockTube, 1, 4), new ItemStack(ConfigBlocks.blockCosmeticOpaque, 1, 2), }, ItemRefer.Essentia_Cell_T1.get(1), 4, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 32), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 32), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 16))), + new TCAspects.TC_AspectStack(TCAspects.AQUA, 32), + new TCAspects.TC_AspectStack(TCAspects.VACUOS, 32), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 16))), addArcaneCraftingRecipe( "ESSENTIA_GENERATOR", ItemRefer.Magic_Casing.get(1), @@ -106,14 +105,14 @@ public class Research { 'S', new ItemStack(ConfigItems.itemResource, 1, 14), 'C', - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Thaumium, 1), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Thaumium, 1), 'G', Ic2Items.reinforcedGlass, 'A', Ic2Items.advancedMachine), "research.ESSENTIA_GENERATOR.page.1", "research.ESSENTIA_GENERATOR.page.2", "research.ESSENTIA_GENERATOR.page.3" }); - GregTech_API.sThaumcraftCompat.addResearch( + GregTechAPI.sThaumcraftCompat.addResearch( "ESSENTIA_CELL", "Better Cells", "And higher efficiency.", @@ -125,57 +124,57 @@ public class Research { -10, 3, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L)), + new TCAspects.TC_AspectStack(TCAspects.AQUA, 10L), + new TCAspects.TC_AspectStack(TCAspects.VACUOS, 10L), + new TCAspects.TC_AspectStack(TCAspects.ORDO, 10L), + new TCAspects.TC_AspectStack(TCAspects.PRAECANTATIO, 10L), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 10L)), null, new Object[] { "research.ESSENTIA_CELL.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_CELL", ItemRefer.Essentia_Cell_T1.get(1), - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1), + new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1), ItemList.Electric_Pump_IV.get(1L), ItemList.QuantumStar.get(1L), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 3), ItemList.Reactor_Coolant_Sp_1.get(1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Plutonium241, 1), }, + GTOreDictUnificator.get(OrePrefixes.bolt, Materials.Plutonium241, 1), }, ItemRefer.Essentia_Cell_T2.get(1), 6, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 64), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 64), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 32))), - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + new TCAspects.TC_AspectStack(TCAspects.AQUA, 64), + new TCAspects.TC_AspectStack(TCAspects.VACUOS, 64), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 32))), + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_CELL", ItemRefer.Essentia_Cell_T2.get(1), new ItemStack[] { ItemList.Field_Generator_IV.get(1L), ItemList.Electric_Pump_LuV.get(1L), new ItemStack(ConfigItems.itemResource, 1, 14), Ic2Items.fluidregulator, new ItemStack(ConfigBlocks.blockJar, 1, 0), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Ichorium, 1) }, + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Ichorium, 1) }, ItemRefer.Essentia_Cell_T3.get(1), 8, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 64))), - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + new TCAspects.TC_AspectStack(TCAspects.AQUA, 128), + new TCAspects.TC_AspectStack(TCAspects.VACUOS, 128), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 64))), + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_CELL", ItemRefer.Essentia_Cell_T3.get(1), - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Europium, 1), + new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.ring, Materials.Europium, 1), ItemList.Emitter_LuV.get(1L), new ItemStack(ItemRegistry.bw_realglas, 1, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Helium, 1), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.StellarAlloy, 1), + GTOreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Helium, 1), new ItemStack(ConfigItems.itemShard, 1, 6), }, ItemRefer.Essentia_Cell_T4.get(1), 10, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 128))) }); + new TCAspects.TC_AspectStack(TCAspects.AQUA, 256), + new TCAspects.TC_AspectStack(TCAspects.VACUOS, 256), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 128))) }); ItemStack broad = new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6); if (NewHorizonsCoreMod.isModLoaded()) - broad = GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ArcaneSlate", 1); - GregTech_API.sThaumcraftCompat.addResearch( + broad = GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ArcaneSlate", 1); + GregTechAPI.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_BLANK", "Upgrade your generator", "Let's try some more dangerous essentia.", @@ -187,10 +186,10 @@ public class Research { -9, 4, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), + new TCAspects.TC_AspectStack(TCAspects.AURAM, 10L), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 10L), + new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 10L), + new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 10L)), null, new Object[] { "research.ESSENTIA_UPGRADE_BLANK.page.0", addArcaneCraftingRecipe( @@ -204,24 +203,24 @@ public class Research { "CZD", "EIF", 'A', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedAir, 1), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.InfusedAir, 1), 'B', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedEarth, 1), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.InfusedEarth, 1), 'C', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedFire, 1), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.InfusedFire, 1), 'D', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedWater, 1), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.InfusedWater, 1), 'E', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedOrder, 1), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.InfusedOrder, 1), 'F', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.InfusedEntropy, 1), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.InfusedEntropy, 1), 'M', new ItemStack(ConfigItems.itemResource, 1, 10), 'Z', broad, 'I', - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.PulsatingIron, 1)), }); - GregTech_API.sThaumcraftCompat.addResearch( + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.PulsatingIron, 1)), }); + GregTechAPI.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_AIR", "Essentia: AIR", "I can feel it on the wind.", @@ -233,28 +232,28 @@ public class Research { -9, 5, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AER, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), + new TCAspects.TC_AspectStack(TCAspects.AER, 10L), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 10L), + new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 10L), + new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 10L)), null, - new Object[] { "research.ESSENTIA_UPGRADE_AIR.page.0", GregTech_API.sThaumcraftCompat.addInfusionRecipe( + new Object[] { "research.ESSENTIA_UPGRADE_AIR.page.0", GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_UPGRADE_AIR", ItemRefer.Essentia_Upgrade_Empty.get(1), - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1), + new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1), WerkstoffLoader.Neon.get(OrePrefixes.cell, 1), WerkstoffLoader.Krypton.get(OrePrefixes.cell, 1), }, ItemRefer.Essentia_Upgrade_Air.get(1), 5, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AER, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.VOLATUS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.MOTUS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 128))), + new TCAspects.TC_AspectStack(TCAspects.AER, 128), + new TCAspects.TC_AspectStack(TCAspects.VOLATUS, 128), + new TCAspects.TC_AspectStack(TCAspects.MOTUS, 128), + new TCAspects.TC_AspectStack(TCAspects.AURAM, 128))), "research.ESSENTIA_UPGRADE_AIR.page.1" }); - GregTech_API.sThaumcraftCompat.addResearch( + GregTechAPI.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_THERMAL", "Essentia: THERMAL", "Melting down.", @@ -266,24 +265,24 @@ public class Research { -10, 5, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), + new TCAspects.TC_AspectStack(TCAspects.IGNIS, 10L), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 10L), + new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 10L), + new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 10L)), null, new Object[] { "research.ESSENTIA_UPGRADE_THERMAL.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_UPGRADE_THERMAL", ItemRefer.Essentia_Upgrade_Empty.get(1), - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Firestone, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Netherrack, 1), - Ic2Items.reactorPlatingHeat, ItemList.Casing_Coil_Nichrome.get(1), - new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack(ConfigItems.itemResource, 1, 0), }, + new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.lens, Materials.Firestone, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Netherrack, 1), Ic2Items.reactorPlatingHeat, + ItemList.Casing_Coil_Nichrome.get(1), new ItemStack(ConfigItems.itemResource, 1, 1), + new ItemStack(ConfigItems.itemResource, 1, 0), }, ItemRefer.Essentia_Upgrade_Thermal.get(1), 5, - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1024))), + Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.IGNIS, 1024))), "research.ESSENTIA_UPGRADE_THERMAL.page.1", "research.ESSENTIA_UPGRADE_THERMAL.page.2" }); - GregTech_API.sThaumcraftCompat.addResearch( + GregTechAPI.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_UNSTABLE", "Essentia: UNSTABLE", "Heart of chaos.", @@ -295,32 +294,32 @@ public class Research { -11, 5, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), + new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 10L), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 10L), + new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 10L), + new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 10L)), null, new Object[] { "research.ESSENTIA_UPGRADE_UNSTABLE.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_UPGRADE_UNSTABLE", ItemRefer.Essentia_Upgrade_Empty.get(1), - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.cell, Materials.GasolinePremium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Unstable, 1), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Void, 1), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1), Ic2Items.industrialTnt, - GT_ModHandler.getModItem(ExtraUtilities.ID, "trashcan", 1, 0) }, + new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.cell, Materials.GasolinePremium, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Unstable, 1), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Void, 1), + GTOreDictUnificator.get(OrePrefixes.gem, Materials.InfusedEntropy, 1), Ic2Items.industrialTnt, + GTModHandler.getModItem(ExtraUtilities.ID, "trashcan", 1, 0) }, ItemRefer.Essentia_Upgrade_Unstable.get(1), 6, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.TELUM, 128))), + new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 128), + new TCAspects.TC_AspectStack(TCAspects.VACUOS, 128), + new TCAspects.TC_AspectStack(TCAspects.VENENUM, 128), + new TCAspects.TC_AspectStack(TCAspects.TELUM, 128))), "research.ESSENTIA_UPGRADE_UNSTABLE.page.1", "research.ESSENTIA_UPGRADE_UNSTABLE.page.2" }); - ItemStack meatDust = GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1); + ItemStack meatDust = GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 1); if (NewHorizonsCoreMod.isModLoaded()) - meatDust = GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "GTNHBioItems", 1, 2); - GregTech_API.sThaumcraftCompat.addResearch( + meatDust = GTModHandler.getModItem(NewHorizonsCoreMod.ID, "GTNHBioItems", 1, 2); + GregTechAPI.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_VICTUS", "Essentia: VICTUS", "Will it bleed?", @@ -332,29 +331,29 @@ public class Research { -12, 5, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.VICTUS, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), + new TCAspects.TC_AspectStack(TCAspects.VICTUS, 10L), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 10L), + new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 10L), + new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 10L)), null, new Object[] { "research.ESSENTIA_UPGRADE_VICTUS.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_UPGRADE_VICTUS", ItemRefer.Essentia_Upgrade_Empty.get(1), new ItemStack[] { meatDust, ItemList.Food_Dough_Sugar.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Calcium, 1), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Calcium, 1), new ItemStack(Item.getItemById(367), 1), new ItemStack(ConfigItems.itemResource, 1, 4), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 8), }, ItemRefer.Essentia_Upgrade_Victus.get(1), 5, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.VICTUS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.SPIRITUS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.SANO, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.CORPUS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.HUMANUS, 128))), + new TCAspects.TC_AspectStack(TCAspects.VICTUS, 128), + new TCAspects.TC_AspectStack(TCAspects.SPIRITUS, 128), + new TCAspects.TC_AspectStack(TCAspects.SANO, 128), + new TCAspects.TC_AspectStack(TCAspects.CORPUS, 128), + new TCAspects.TC_AspectStack(TCAspects.HUMANUS, 128))), "research.ESSENTIA_UPGRADE_VICTUS.page.1", "research.ESSENTIA_UPGRADE_VICTUS.page.2" }); - GregTech_API.sThaumcraftCompat.addResearch( + GregTechAPI.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_TAINTED", "Essentia: TAINTED", "Dirty Deeds Done Dirt Cheap", @@ -366,30 +365,30 @@ public class Research { -13, 5, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.MORTUUS, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), + new TCAspects.TC_AspectStack(TCAspects.MORTUUS, 10L), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 10L), + new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 10L), + new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 10L)), null, new Object[] { "research.ESSENTIA_UPGRADE_TAINTED.page.0", "research.ESSENTIA_UPGRADE_TAINTED.page.1", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_UPGRADE_TAINTED", ItemRefer.Essentia_Upgrade_Empty.get(1), new ItemStack[] { new ItemStack(ConfigBlocks.blockTaintFibres, 1, 0), new ItemStack(ConfigBlocks.blockTaintFibres, 1, 2), new ItemStack(ConfigItems.itemResource, 1, 11), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.NaquadahEnriched, 1), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.EndSteel, 1), + GTOreDictUnificator.get(OrePrefixes.spring, Materials.NaquadahEnriched, 1), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.EndSteel, 1), new ItemStack(Block.getBlockById(138), 1), }, ItemRefer.Essentia_Upgrade_Tainted.get(1), 7, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.MORTUUS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.EXANIMIS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.VITIUM, 128))), + new TCAspects.TC_AspectStack(TCAspects.MORTUUS, 128), + new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 128), + new TCAspects.TC_AspectStack(TCAspects.EXANIMIS, 128), + new TCAspects.TC_AspectStack(TCAspects.VITIUM, 128))), "research.ESSENTIA_UPGRADE_TAINTED.page.2", "research.ESSENTIA_UPGRADE_TAINTED.page.3" }); - GregTech_API.sThaumcraftCompat.addResearch( + GregTechAPI.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_MECHANICS", "Essentia: MECHANICS", "Driven by Ether.", @@ -401,28 +400,28 @@ public class Research { -14, 5, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), + new TCAspects.TC_AspectStack(TCAspects.MACHINA, 10L), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 10L), + new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 10L), + new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 10L)), null, new Object[] { "research.ESSENTIA_UPGRADE_MECHANICS.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_UPGRADE_MECHANICS", ItemRefer.Essentia_Upgrade_Empty.get(1), new ItemStack[] { new ItemStack(ConfigBlocks.blockTube, 1, 4), new ItemStack(ConfigBlocks.blockTube, 1, 2), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VividAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 1), + GTOreDictUnificator.get(OrePrefixes.rotor, Materials.VividAlloy, 1), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 1), ItemList.Electric_Motor_IV.get(1), ItemList.Electric_Pump_IV.get(1), }, ItemRefer.Essentia_Upgrade_Mechanics.get(1), 5, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.ITER, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.LIMUS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 128))), + new TCAspects.TC_AspectStack(TCAspects.ITER, 128), + new TCAspects.TC_AspectStack(TCAspects.LIMUS, 128), + new TCAspects.TC_AspectStack(TCAspects.MACHINA, 128))), "research.ESSENTIA_UPGRADE_MECHANICS.page.1", "research.ESSENTIA_UPGRADE_MECHANICS.page.2" }); - GregTech_API.sThaumcraftCompat.addResearch( + GregTechAPI.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_SPRITE", "Essentia: SPRITE", "Brain in a Machine.", @@ -434,29 +433,29 @@ public class Research { -15, 5, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), + new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 10L), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 10L), + new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 10L), + new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 10L)), null, - new Object[] { "research.ESSENTIA_UPGRADE_SPRITE.page.0", GregTech_API.sThaumcraftCompat.addInfusionRecipe( + new Object[] { "research.ESSENTIA_UPGRADE_SPRITE.page.0", GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_UPGRADE_SPRITE", ItemRefer.Essentia_Upgrade_Empty.get(1), new ItemStack[] { new ItemStack(ConfigBlocks.blockJar, 1, 1), - GT_OreDictUnificator.get(OrePrefixes.food, Materials.Cheese, 1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Shadow, 1), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.FierySteel, 1), - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Milk, 1), ItemList.Machine_EV_Scanner.get(1) }, + GTOreDictUnificator.get(OrePrefixes.food, Materials.Cheese, 1), + GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Shadow, 1), + GTOreDictUnificator.get(OrePrefixes.spring, Materials.FierySteel, 1), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Milk, 1), ItemList.Machine_EV_Scanner.get(1) }, ItemRefer.Essentia_Upgrade_Spirit.get(1), 5, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.SENSUS, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.NEBRISUM, 128))), + new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 128), + new TCAspects.TC_AspectStack(TCAspects.SENSUS, 128), + new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 128), + new TCAspects.TC_AspectStack(TCAspects.STRONTIO, 128), + new TCAspects.TC_AspectStack(TCAspects.NEBRISUM, 128))), "research.ESSENTIA_UPGRADE_SPRITE.page.1", "research.ESSENTIA_UPGRADE_SPRITE.page.2" }); - GregTech_API.sThaumcraftCompat.addResearch( + GregTechAPI.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_RADIATION", "Essentia: RADIATION", "Atomic Heart", @@ -468,13 +467,13 @@ public class Research { -16, 5, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), + new TCAspects.TC_AspectStack(TCAspects.RADIO, 10L), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 10L), + new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 10L), + new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 10L)), null, new Object[] { "research.ESSENTIA_UPGRADE_RADIATION.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_UPGRADE_RADIATION", ItemRefer.Essentia_Upgrade_Empty.get(1), new ItemStack[] { ItemRefer.High_Density_Plutonium.get(1), ItemRefer.High_Density_Uranium.get(1), @@ -482,9 +481,9 @@ public class Research { WerkstoffLoader.Tiberium.get(OrePrefixes.gem, 1) }, ItemRefer.Essentia_Upgrade_Radiation.get(1), 8, - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.RADIO, 1024))), + Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.RADIO, 1024))), "research.ESSENTIA_UPGRADE_RADIATION.page.1", "research.ESSENTIA_UPGRADE_RADIATION.page.2" }); - GregTech_API.sThaumcraftCompat.addResearch( + GregTechAPI.sThaumcraftCompat.addResearch( "ESSENTIA_UPGRADE_ELECTRIC", "Essentia: ELECTRIC", "Get electricity from... electricity?", @@ -498,43 +497,43 @@ public class Research { -12, 7, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 10L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 10L)), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 10L), + new TCAspects.TC_AspectStack(TCAspects.INSTRUMENTUM, 10L), + new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 10L)), null, new Object[] { "research.ESSENTIA_UPGRADE_ELECTRIC.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_UPGRADE_RADIATION", ItemRefer.Essentia_Upgrade_Empty.get(1), - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 1) }, + new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorMV, 1), + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 1), + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorEV, 1), + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorIV, 1), + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorLuV, 1), + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 1) }, ItemRefer.Essentia_Upgrade_Electric.get(1), 10, - Collections.singletonList(new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 32768))), + Collections.singletonList(new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 32768))), "research.ESSENTIA_UPGRADE_ELECTRIC.page.1" }); ItemStack nodeLinkDevice = ThaumicBases.isModLoaded() - ? GT_ModHandler.getModItem(ThaumicBases.ID, "nodeLinker", 1, 0) + ? GTModHandler.getModItem(ThaumicBases.ID, "nodeLinker", 1, 0) : new ItemStack(ConfigBlocks.blockStoneDevice, 1, 11); ItemStack alchemicalFurnace = ThaumicBases.isModLoaded() - ? GT_ModHandler.getModItem(ThaumicBases.ID, "advAlchFurnace", 1, 0) + ? GTModHandler.getModItem(ThaumicBases.ID, "advAlchFurnace", 1, 0) : new ItemStack(ConfigBlocks.blockStoneDevice, 1, 0); ItemStack nitor = ThaumicTinkerer.isModLoaded() - ? GT_ModHandler.getModItem(ThaumicTinkerer.ID, "brightNitor", 1, 0) + ? GTModHandler.getModItem(ThaumicTinkerer.ID, "brightNitor", 1, 0) : new ItemStack(ConfigItems.itemResource, 1, 1); - ItemStack alchemicalBoiler = Automagy.isModLoaded() ? GT_ModHandler.getModItem(Automagy.ID, "blockBoiler", 1, 0) + ItemStack alchemicalBoiler = Automagy.isModLoaded() ? GTModHandler.getModItem(Automagy.ID, "blockBoiler", 1, 0) : new ItemStack(ConfigBlocks.blockStoneDevice, 1, 1); ItemStack essentiaLocus = Automagy.isModLoaded() - ? GT_ModHandler.getModItem(Automagy.ID, "blockEssentiaLocus", 1, 0) + ? GTModHandler.getModItem(Automagy.ID, "blockEssentiaLocus", 1, 0) : new ItemStack(ConfigBlocks.blockJar, 1, 1); ItemStack thauminiteBlock = ThaumicBases.isModLoaded() - ? GT_ModHandler.getModItem(ThaumicBases.ID, "thauminiteBlock", 1, 0) + ? GTModHandler.getModItem(ThaumicBases.ID, "thauminiteBlock", 1, 0) : new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 4); - GregTech_API.sThaumcraftCompat + GregTechAPI.sThaumcraftCompat .addResearch( "ESSENTIA_SMELTERY", "Large Essentia Smeltery", @@ -547,36 +546,36 @@ public class Research { -16, 3, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 10), - new TC_Aspects.TC_AspectStack(TC_Aspects.TENEBRAE, 10), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 10), - new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 10), - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 10), - new TC_Aspects.TC_AspectStack(TC_Aspects.LIMUS, 10)), + new TCAspects.TC_AspectStack(TCAspects.IGNIS, 10), + new TCAspects.TC_AspectStack(TCAspects.TENEBRAE, 10), + new TCAspects.TC_AspectStack(TCAspects.MACHINA, 10), + new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 10), + new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 10), + new TCAspects.TC_AspectStack(TCAspects.LIMUS, 10)), null, new Object[] { "research.ESSENTIA_SMELTERY.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_SMELTERY", ItemList.Casing_Firebox_TungstenSteel.get(1), new ItemStack[] { nodeLinkDevice, nitor, alchemicalFurnace, essentiaLocus, alchemicalBoiler, new ItemStack(ConfigBlocks.blockCrystal, 1, 1), new ItemStack(ConfigBlocks.blockMetalDevice, 1, 3), ItemList.Electric_Piston_IV.get(1), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.FierySteel, 1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L) }, + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.FierySteel, 1L), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L) }, ItemRefer.Large_Essentia_Smeltery.get(1), 16, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 256))), + new TCAspects.TC_AspectStack(TCAspects.AQUA, 256), + new TCAspects.TC_AspectStack(TCAspects.IGNIS, 256), + new TCAspects.TC_AspectStack(TCAspects.PERDITIO, 256), + new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 256), + new TCAspects.TC_AspectStack(TCAspects.LUCRUM, 256), + new TCAspects.TC_AspectStack(TCAspects.ELECTRUM, 256))), "research.ESSENTIA_SMELTERY.page.1", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_GENERATOR", ItemList.Hatch_Output_HV.get(1), new ItemStack[] { new ItemStack(ConfigBlocks.blockJar, 1), ItemRefer.Magic_Casing.get(1), @@ -584,10 +583,10 @@ public class Research { ItemRefer.Essentia_Output_Hatch.get(1), 6, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 128), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 64), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 32), - new TC_Aspects.TC_AspectStack(TC_Aspects.COGNITIO, 32))), + new TCAspects.TC_AspectStack(TCAspects.AQUA, 128), + new TCAspects.TC_AspectStack(TCAspects.VACUOS, 64), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 32), + new TCAspects.TC_AspectStack(TCAspects.COGNITIO, 32))), "research.ESSENTIA_SMELTERY.page.2", addArcaneCraftingRecipe( "ESSENTIA_SMELTERY", @@ -606,22 +605,22 @@ public class Research { 'B', new ItemStack(ConfigBlocks.blockStoneDevice, 1, 14), 'C', - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Void, 1), + GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Void, 1), 'D', - new ItemStack(GregTech_API.sBlockCasings3, 1, 11), + new ItemStack(GregTechAPI.sBlockCasings3, 1, 11), 'E', - GT_OreDictUnificator.get(OrePrefixes.pipeSmall, Materials.NetherStar, 1), + GTOreDictUnificator.get(OrePrefixes.pipeSmall, Materials.NetherStar, 1), 'F', thauminiteBlock) }); if (ThaumicEnergistics.isModLoaded()) { ItemStack essentiaPump = WitchingGadgets.isModLoaded() - ? GT_ModHandler.getModItem(WitchingGadgets.ID, "WG_MetalDevice", 1, 0) + ? GTModHandler.getModItem(WitchingGadgets.ID, "WG_MetalDevice", 1, 0) : new ItemStack(ConfigBlocks.blockTube, 1, 4); ItemStack inter = ThaumicTinkerer.isModLoaded() - ? GT_ModHandler.getModItem(ThaumicTinkerer.ID, "interface", 1, 0) + ? GTModHandler.getModItem(ThaumicTinkerer.ID, "interface", 1, 0) : new ItemStack(ConfigItems.itemResource, 1, 15); - GregTech_API.sThaumcraftCompat.addResearch( + GregTechAPI.sThaumcraftCompat.addResearch( "ESSENTIA_OUTPUT_HATCH_ME", "Essentia Output Hatch (ME)", "It must exist.", @@ -633,27 +632,27 @@ public class Research { -15, 3, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 10), - new TC_Aspects.TC_AspectStack(TC_Aspects.VINCULUM, 10), - new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 10), - new TC_Aspects.TC_AspectStack(TC_Aspects.VACUOS, 10), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10)), + new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 10), + new TCAspects.TC_AspectStack(TCAspects.VINCULUM, 10), + new TCAspects.TC_AspectStack(TCAspects.STRONTIO, 10), + new TCAspects.TC_AspectStack(TCAspects.VACUOS, 10), + new TCAspects.TC_AspectStack(TCAspects.PERMUTATIO, 10)), null, new Object[] { "research.ESSENTIA_OUTPUT_HATCH_ME.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( + GregTechAPI.sThaumcraftCompat.addInfusionRecipe( "ESSENTIA_OUTPUT_HATCH_ME", ItemRefer.Essentia_Output_Hatch.get(1), new ItemStack[] { - GT_ModHandler + GTModHandler .getModItem(ThaumicEnergistics.ID, "thaumicenergistics.block.essentia.provider", 1), new ItemStack(ConfigBlocks.blockEssentiaReservoir, 1, 0), essentiaPump, inter, }, ItemRefer.Essentia_Output_Hatch_ME.get(1), 8, Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.ALIENIS, 256), - new TC_Aspects.TC_AspectStack(TC_Aspects.STRONTIO, 256))) }); + new TCAspects.TC_AspectStack(TCAspects.POTENTIA, 256), + new TCAspects.TC_AspectStack(TCAspects.MACHINA, 256), + new TCAspects.TC_AspectStack(TCAspects.ALIENIS, 256), + new TCAspects.TC_AspectStack(TCAspects.STRONTIO, 256))) }); } } } diff --git a/src/main/java/goodgenerator/items/MyItems.java b/src/main/java/goodgenerator/items/GGItem.java index 71a67d4fd6..627cf1c59b 100644 --- a/src/main/java/goodgenerator/items/MyItems.java +++ b/src/main/java/goodgenerator/items/GGItem.java @@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import goodgenerator.main.GoodGenerator; -public class MyItems extends Item { +public class GGItem extends Item { @SideOnly(Side.CLIENT) protected IIcon[] texture; @@ -26,14 +26,14 @@ public class MyItems extends Item { private List<String> tooltips = new ArrayList<>(); private List<String> tooltipses = new ArrayList<>(); - public MyItems(String name, CreativeTabs Tab) { + public GGItem(String name, CreativeTabs Tab) { this.setUnlocalizedName(name); this.setCreativeTab(Tab); this.tex = name; this.Name = name; } - public MyItems(String name, CreativeTabs Tab, String[] textures) { + public GGItem(String name, CreativeTabs Tab, String[] textures) { this.setUnlocalizedName(name); this.setCreativeTab(Tab); this.setHasSubtypes(true); @@ -41,7 +41,7 @@ public class MyItems extends Item { this.Name = name; } - public MyItems(String name, String[] tooltip, CreativeTabs Tab, String[] textures) { + public GGItem(String name, String[] tooltip, CreativeTabs Tab, String[] textures) { this.setUnlocalizedName(name); this.setCreativeTab(Tab); this.setHasSubtypes(true); @@ -50,7 +50,7 @@ public class MyItems extends Item { this.tooltipses = Arrays.asList(tooltip); } - public MyItems(String name, String tooltip, CreativeTabs Tab) { + public GGItem(String name, String tooltip, CreativeTabs Tab) { this.setUnlocalizedName(name); this.setCreativeTab(Tab); this.tex = name; @@ -58,7 +58,7 @@ public class MyItems extends Item { this.Name = name; } - public MyItems(String name, String[] tooltip, CreativeTabs Tab) { + public GGItem(String name, String[] tooltip, CreativeTabs Tab) { this.setUnlocalizedName(name); this.setCreativeTab(Tab); this.tex = name; diff --git a/src/main/java/goodgenerator/items/MyItemBlocks.java b/src/main/java/goodgenerator/items/GGItemBlocks.java index 3ee7347e97..2d13d7a7af 100644 --- a/src/main/java/goodgenerator/items/MyItemBlocks.java +++ b/src/main/java/goodgenerator/items/GGItemBlocks.java @@ -16,21 +16,21 @@ import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import goodgenerator.blocks.regularBlock.TEBlock; -import goodgenerator.blocks.tileEntity.EssentiaOutputHatch; +import goodgenerator.blocks.regularBlock.BlockTEContainer; +import goodgenerator.blocks.tileEntity.MTEEssentiaOutputHatch; import goodgenerator.main.GoodGenerator; import goodgenerator.util.CharExchanger; import goodgenerator.util.DescTextLocalization; -import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GTLanguageManager; -public class MyItemBlocks extends ItemBlock { +public class GGItemBlocks extends ItemBlock { - private final String mNoMobsToolTip = GT_LanguageManager + private final String mNoMobsToolTip = GTLanguageManager .addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); - private final String mNoTileEntityToolTip = GT_LanguageManager + private final String mNoTileEntityToolTip = GTLanguageManager .addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!"); - public MyItemBlocks(Block block) { + public GGItemBlocks(Block block) { super(block); this.setMaxDamage(0); this.setHasSubtypes(true); @@ -71,15 +71,15 @@ public class MyItemBlocks extends ItemBlock { public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { if (stack == null) return; tooltip.add(mNoMobsToolTip); - if (Block.getBlockFromItem(stack.getItem()) instanceof TEBlock) { - TEBlock tile = (TEBlock) Block.getBlockFromItem(stack.getItem()); + if (Block.getBlockFromItem(stack.getItem()) instanceof BlockTEContainer) { + BlockTEContainer tile = (BlockTEContainer) Block.getBlockFromItem(stack.getItem()); if (tile.getIndex() == 1) tooltip.addAll(Arrays.asList(DescTextLocalization.addText("EssentiaHatch.tooltip", 2))); if (tile.getIndex() == 2) { tooltip.add(StatCollector.translateToLocal("EssentiaOutputHatch.tooltip.0")); tooltip.add( StatCollector.translateToLocal("EssentiaOutputHatch.tooltip.1") + " " - + EssentiaOutputHatch.CAPACITY); + + MTEEssentiaOutputHatch.CAPACITY); } } else { tooltip.add(mNoTileEntityToolTip); diff --git a/src/main/java/goodgenerator/items/MyMaterial.java b/src/main/java/goodgenerator/items/GGMaterial.java index 9d0dfc7b6e..aeade9eb00 100644 --- a/src/main/java/goodgenerator/items/MyMaterial.java +++ b/src/main/java/goodgenerator/items/GGMaterial.java @@ -1,17 +1,16 @@ package goodgenerator.items; -import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; +import static bartworks.util.BWUtil.subscriptNumbers; import static gregtech.api.enums.Materials.*; -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.bartimaeusnek.bartworks.util.Pair; - +import bartworks.system.material.Werkstoff; +import bartworks.system.material.WerkstoffLoader; +import bartworks.util.Pair; import goodgenerator.util.CharExchanger; import gregtech.api.enums.TextureSet; @SuppressWarnings({ "unchecked" }) -public class MyMaterial implements Runnable { +public class GGMaterial implements Runnable { protected static final int OffsetID = 10001; @@ -289,7 +288,7 @@ public class MyMaterial implements Runnable { .addMultipleIngotMetalWorkingItems(), OffsetID + 21, TextureSet.SET_SHINY, - new Pair<>(MyMaterial.orundum, 2), + new Pair<>(GGMaterial.orundum, 2), new Pair<>(Plutonium, 1), new Pair<>(Naquadah, 2)); diff --git a/src/main/java/goodgenerator/items/DepletedFuelRod.java b/src/main/java/goodgenerator/items/ItemDepletedFuelRod.java index 308f149933..b08df4d5a3 100644 --- a/src/main/java/goodgenerator/items/DepletedFuelRod.java +++ b/src/main/java/goodgenerator/items/ItemDepletedFuelRod.java @@ -7,9 +7,9 @@ import ic2.api.item.IBoxable; import ic2.api.reactor.IReactor; import ic2.api.reactor.IReactorComponent; -public class DepletedFuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { +public class ItemDepletedFuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { - public DepletedFuelRod(String name, String[] tooltip, CreativeTabs Tab, int Rad) { + public ItemDepletedFuelRod(String name, String[] tooltip, CreativeTabs Tab, int Rad) { super(name, tooltip, Tab, Rad); } diff --git a/src/main/java/goodgenerator/items/FuelRod.java b/src/main/java/goodgenerator/items/ItemFuelRod.java index 00ca8b3491..89acdf6933 100644 --- a/src/main/java/goodgenerator/items/FuelRod.java +++ b/src/main/java/goodgenerator/items/ItemFuelRod.java @@ -14,14 +14,14 @@ import net.minecraft.util.StatCollector; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import ic2.api.item.IBoxable; import ic2.api.reactor.IReactor; import ic2.api.reactor.IReactorComponent; import ic2.core.util.StackUtil; import ic2.core.util.Util; -public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { +public class ItemFuelRod extends RadioactiveItem implements IReactorComponent, IBoxable { private final int numberOfCells; private final int maxDmg; @@ -30,7 +30,7 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa private float HeatBonus = 0; private final ItemStack result; - public FuelRod(String aName, int aCells, int aEUt, int aHeat, int aRads, int aDuration, ItemStack aResult, + public ItemFuelRod(String aName, int aCells, int aEUt, int aHeat, int aRads, int aDuration, ItemStack aResult, CreativeTabs Tab) { super(aName, Tab, aRads); this.setMaxStackSize(64); @@ -42,7 +42,7 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa setMaxDamage(100); } - public FuelRod(String aName, int aCells, int aEUt, int aHeat, int aRads, int aDuration, float aHeatBonus, + public ItemFuelRod(String aName, int aCells, int aEUt, int aHeat, int aRads, int aDuration, float aHeatBonus, ItemStack aResult, CreativeTabs Tab) { super(aName, Tab, aRads); this.setMaxStackSize(64); @@ -74,7 +74,7 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa + checkPulseable(reactor, x, y - 1, stack, x, y, heatRun) + checkPulseable(reactor, x, y + 1, stack, x, y, heatRun); heat = sumUp(pulses) * this.Heat; - ArrayList<FuelRod.ItemStackCoord> heatAcceptors = new ArrayList<>(); + ArrayList<ItemFuelRod.ItemStackCoord> heatAcceptors = new ArrayList<>(); this.checkHeatAcceptor(reactor, x - 1, y, heatAcceptors); this.checkHeatAcceptor(reactor, x + 1, y, heatAcceptors); this.checkHeatAcceptor(reactor, x, y - 1, heatAcceptors); @@ -99,7 +99,7 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa } } if (this.getCustomDamage(stack) >= this.getMaxCustomDamage(stack) - 1) { - reactor.setItemAt(x, y, GT_Utility.copyAmount(1, result)); + reactor.setItemAt(x, y, GTUtility.copyAmount(1, result)); } else if (heatRun) { this.applyCustomDamage(stack, 1, null); } @@ -117,7 +117,8 @@ public class FuelRod extends RadioactiveItem implements IReactorComponent, IBoxa return (x * x + x) / 2; } - private void checkHeatAcceptor(IReactor reactor, int x, int y, ArrayList<FuelRod.ItemStackCoord> heatAcceptors) { + private void checkHeatAcceptor(IReactor reactor, int x, int y, + ArrayList<ItemFuelRod.ItemStackCoord> heatAcceptors) { ItemStack thing = reactor.getItemAt(x, y); if (thing != null && thing.getItem() instanceof IReactorComponent && ((IReactorComponent) thing.getItem()).canStoreHeat(reactor, thing, x, y)) { diff --git a/src/main/java/goodgenerator/items/RadioactiveItem.java b/src/main/java/goodgenerator/items/RadioactiveItem.java index ab6c003268..3ce175bd78 100644 --- a/src/main/java/goodgenerator/items/RadioactiveItem.java +++ b/src/main/java/goodgenerator/items/RadioactiveItem.java @@ -8,10 +8,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import ic2.core.IC2Potion; -public class RadioactiveItem extends MyItems { +public class RadioactiveItem extends GGItem { protected final int mRadio; @@ -34,7 +34,7 @@ public class RadioactiveItem extends MyItems { public void onUpdate(ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand) { super.onUpdate(aStack, aWorld, aPlayer, aTimer, aIsInHand); EntityLivingBase tPlayer = (EntityPlayer) aPlayer; - if (!GT_Utility.isWearingFullRadioHazmat(tPlayer)) + if (!GTUtility.isWearingFullRadioHazmat(tPlayer)) tPlayer.addPotionEffect(new PotionEffect(IC2Potion.radiation.id, mRadio, 4)); } } diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java index ecbb67fbf8..36ce938a04 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java @@ -15,12 +15,12 @@ import static goodgenerator.util.ItemRefer.Compassline_Casing_UXV; import static goodgenerator.util.ItemRefer.Compassline_Casing_ZPM; import static goodgenerator.util.ItemRefer.Component_Assembly_Line; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.HOURS; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; -import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM; -import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; +import static gregtech.api.util.GTRecipeBuilder.HOURS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.AssemblyLine; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME; import java.util.HashMap; @@ -31,21 +31,20 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.technus.tectech.recipe.TT_recipeAdder; - +import bartworks.system.material.WerkstoffLoader; import cpw.mods.fml.common.registry.GameRegistry; -import goodgenerator.items.MyMaterial; +import goodgenerator.items.GGMaterial; import goodgenerator.util.StackUtils; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.recipe.common.CI; +import tectech.recipe.TTRecipeAdder; public class ComponentAssemblyLineMiscRecipes { @@ -63,7 +62,7 @@ public class ComponentAssemblyLineMiscRecipes { generateWrapRecipes(); // The controller itself - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, Compassline_Casing_EV.get(1)) .metadata(RESEARCH_TIME, 1 * HOURS) .itemInputs( @@ -76,8 +75,8 @@ public class ComponentAssemblyLineMiscRecipes { .get(32), ComponentType.Electric_Motor.getComponent(7) .get(32), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 16), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 32), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Polybenzimidazole, 16), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 32), ItemList.FluidSolidifierZPM.get(16L), getALCircuit(8, 16), getALCircuit(7, 20), @@ -96,118 +95,118 @@ public class ComponentAssemblyLineMiscRecipes { private static void generateCasingRecipes() { int t = 1; // lv 1 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Steel, 4), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Steel, 4), ComponentType.Robot_Arm.getComponent(t) .get(4), ComponentType.Electric_Piston.getComponent(t) .get(8), ComponentType.Electric_Motor.getComponent(t) .get(10), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Steel, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tin, 6), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Steel, 4), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tin, 6), getCircuit(t, 16)) .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) .itemOutputs(Compassline_Casing_LV.get(1)) .duration(16 * SECONDS) - .eut(GT_Values.VP[t]) + .eut(GTValues.VP[t]) .addTo(assemblerRecipes); // mv 2 t++; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Aluminium, 4), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Aluminium, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Aluminium, 4), ComponentType.Robot_Arm.getComponent(t) .get(4), ComponentType.Electric_Piston.getComponent(t) .get(8), ComponentType.Electric_Motor.getComponent(t) .get(10), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Aluminium, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.AnyCopper, 6), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Aluminium, 4), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.AnyCopper, 6), getCircuit(t, 8), getCircuit(t - 1, 16)) .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) .itemOutputs(Compassline_Casing_MV.get(1)) .duration(16 * SECONDS) - .eut(GT_Values.VP[t]) + .eut(GTValues.VP[t]) .addTo(assemblerRecipes); // hv 3 t++; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.StainlessSteel, 4), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.StainlessSteel, 4), ComponentType.Robot_Arm.getComponent(t) .get(4), ComponentType.Electric_Piston.getComponent(t) .get(8), ComponentType.Electric_Motor.getComponent(t) .get(10), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.StainlessSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Gold, 6), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.StainlessSteel, 4), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Gold, 6), getCircuit(t, 8), getCircuit(t - 1, 16)) .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) .itemOutputs(Compassline_Casing_HV.get(1)) .duration(16 * SECONDS) - .eut(GT_Values.VP[t]) + .eut(GTValues.VP[t]) .addTo(assemblerRecipes); // ev 4 t++; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 4), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 4), ComponentType.Robot_Arm.getComponent(t) .get(4), ComponentType.Electric_Piston.getComponent(t) .get(8), ComponentType.Electric_Motor.getComponent(t) .get(10), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 6), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 4), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Aluminium, 6), getCircuit(t, 8), getCircuit(t - 1, 16)) .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) .itemOutputs(Compassline_Casing_EV.get(1)) .duration(16 * SECONDS) - .eut(GT_Values.VP[t]) + .eut(GTValues.VP[t]) .addTo(assemblerRecipes); // iv 5 t++; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 4), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.TungstenSteel, 4), ComponentType.Robot_Arm.getComponent(t) .get(4), ComponentType.Electric_Piston.getComponent(t) .get(8), ComponentType.Electric_Motor.getComponent(t) .get(10), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TungstenSteel, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 6), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.TungstenSteel, 4), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Tungsten, 6), getCircuit(t, 8), getCircuit(t - 1, 16)) .fluidInputs(Materials.SolderingAlloy.getMolten(144 * (t + 1))) .itemOutputs(Compassline_Casing_IV.get(1)) .duration(16 * SECONDS) - .eut(GT_Values.VP[t]) + .eut(GTValues.VP[t]) .addTo(assemblerRecipes); Fluid sold = FluidRegistry.getFluid("molten.indalloy140"); // Assline Recipes! // luv 6 t++; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, Compassline_Casing_IV.get(1)) .metadata(RESEARCH_TIME, (2250 << t) * TICKS) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1), WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plateDense, 6), ComponentType.Robot_Arm.getComponent(t) .get(8), @@ -217,7 +216,7 @@ public class ComponentAssemblyLineMiscRecipes { .get(16), WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGt, 4), WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.gearGtSmall, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.VanadiumGallium, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16)) .fluidInputs( @@ -231,21 +230,21 @@ public class ComponentAssemblyLineMiscRecipes { .addTo(AssemblyLine); // zpm 7 t++; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, Compassline_Casing_LuV.get(1)) .metadata(RESEARCH_TIME, (2250 << t) * TICKS) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 6), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 6), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) .get(10), ComponentType.Electric_Motor.getComponent(t) .get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Iridium, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Naquadah, 8), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Iridium, 4), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Iridium, 16), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Naquadah, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16)) .fluidInputs( @@ -260,21 +259,21 @@ public class ComponentAssemblyLineMiscRecipes { // uv 8 t++; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, Compassline_Casing_ZPM.get(1)) .metadata(RESEARCH_TIME, (2250 << t) * TICKS) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 6), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 6), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) .get(10), ComponentType.Electric_Motor.getComponent(t) .get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmium, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmium, 4), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Osmium, 16), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NaquadahAlloy, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16)) .fluidInputs( @@ -288,23 +287,23 @@ public class ComponentAssemblyLineMiscRecipes { .addTo(AssemblyLine); // uhv 9 t++; - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( Compassline_Casing_UV.get(1), 375 << (t - 2), 1 << (t - 3), (int) TierEU.RECIPE_UV, 1, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6), + new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.CosmicNeutronium, 6), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) .get(10), ComponentType.Electric_Motor.getComponent(t) .get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.CosmicNeutronium, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 8), getALCircuit(t, 8), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.CosmicNeutronium, 4), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.CosmicNeutronium, 16), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, @@ -314,23 +313,23 @@ public class ComponentAssemblyLineMiscRecipes { sold = FluidRegistry.getFluid("molten.mutatedlivingsolder"); // uev 10 t++; - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( Compassline_Casing_UHV.get(1), 375 << (t - 2), 1 << (t - 3), (int) TierEU.RECIPE_UHV, 1, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6), + new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 6), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) .get(10), ComponentType.Electric_Motor.getComponent(t) .get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Infinity, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Infinity, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 8), getALCircuit(t, 8), + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Infinity, 4), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Infinity, 16), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Draconium, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, @@ -339,23 +338,23 @@ public class ComponentAssemblyLineMiscRecipes { (int) TierEU.RECIPE_UHV); // uiv 11 t++; - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( Compassline_Casing_UEV.get(1), 375 << (t - 2), 1 << (t - 3), (int) TierEU.RECIPE_UEV, 1, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 6), + new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 6), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) .get(10), ComponentType.Electric_Motor.getComponent(t) .get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.TranscendentMetal, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 8), getALCircuit(t, 8), + GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.TranscendentMetal, 4), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.TranscendentMetal, 16), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, @@ -364,23 +363,23 @@ public class ComponentAssemblyLineMiscRecipes { (int) TierEU.RECIPE_UEV); // umv 12 t++; - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( Compassline_Casing_UIV.get(1), 375 << (t - 2), 1 << (t - 3), (int) TierEU.RECIPE_UIV, 1, - new Object[] { GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 6), + new Object[] { GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1), + GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 6), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) .get(10), ComponentType.Electric_Motor.getComponent(t) .get(16), - GT_OreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.SpaceTime, 4), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, 16), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8), getALCircuit(t, 8), + GTOreDictUnificator.get(OrePrefixes.gearGt, MaterialsUEVplus.SpaceTime, 4), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, MaterialsUEVplus.SpaceTime, 16), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Quantium, 8), getALCircuit(t, 8), getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t - 1, 144 * t * 2), StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, @@ -389,31 +388,31 @@ public class ComponentAssemblyLineMiscRecipes { (int) TierEU.RECIPE_UIV); // uxv 13 t++; - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( Compassline_Casing_UMV.get(1), 375 << (t - 2), 1 << (t - 3), (int) TierEU.RECIPE_UMV, 1, new Object[] { - GT_OreDictUnificator + GTOreDictUnificator .get(OrePrefixes.frameGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 1), - GT_OreDictUnificator + GTOreDictUnificator .get(OrePrefixes.plateDense, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 3), - MyMaterial.shirabon.get(OrePrefixes.plateDense, 3), ComponentType.Robot_Arm.getComponent(t) + GGMaterial.shirabon.get(OrePrefixes.plateDense, 3), ComponentType.Robot_Arm.getComponent(t) .get(8), ComponentType.Electric_Piston.getComponent(t) .get(10), ComponentType.Electric_Motor.getComponent(t) .get(16), - GT_OreDictUnificator + GTOreDictUnificator .get(OrePrefixes.gearGt, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 2), - MyMaterial.shirabon.get(OrePrefixes.gearGt, 2), - GT_OreDictUnificator + GGMaterial.shirabon.get(OrePrefixes.gearGt, 2), + GTOreDictUnificator .get(OrePrefixes.gearGtSmall, MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, 8), - MyMaterial.shirabon.get(OrePrefixes.gearGtSmall, 8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 4), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 4), getALCircuit(t, 8), + GGMaterial.shirabon.get(OrePrefixes.gearGtSmall, 8), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.Infinity, 4), + GTOreDictUnificator.get(OrePrefixes.wireGt04, MaterialsUEVplus.SpaceTime, 4), getALCircuit(t, 8), getALCircuit(t - 1, 16) }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), MaterialsUEVplus.BlackDwarfMatter.getMolten(144 * t * 2), MaterialsUEVplus.Eternity.getMolten(144 * t), @@ -425,27 +424,27 @@ public class ComponentAssemblyLineMiscRecipes { private static void generateWrapRecipes() { for (int i = 0; i <= 11; i++) { - GT_Values.RA.stdBuilder() - .itemInputs(getCircuit(i, 16), GT_Utility.getIntegratedCircuit(16)) + GTValues.RA.stdBuilder() + .itemInputs(getCircuit(i, 16), GTUtility.getIntegratedCircuit(16)) .fluidInputs(Materials.SolderingAlloy.getMolten(72L)) .itemOutputs(new ItemStack(Loaders.circuitWrap, 1, i)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( GameRegistry.findItemStack("dreamcraft", "item.PikoCircuit", 16), - GT_Utility.getIntegratedCircuit(16)) + GTUtility.getIntegratedCircuit(16)) .fluidInputs(Materials.SolderingAlloy.getMolten(72L)) .itemOutputs(new ItemStack(Loaders.circuitWrap, 1, 12)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( GameRegistry.findItemStack("dreamcraft", "item.QuantumCircuit", 16), - GT_Utility.getIntegratedCircuit(16)) + GTUtility.getIntegratedCircuit(16)) .fluidInputs(Materials.SolderingAlloy.getMolten(72L)) .itemOutputs(new ItemStack(Loaders.circuitWrap, 1, 13)) .duration(30 * SECONDS) @@ -466,13 +465,13 @@ public class ComponentAssemblyLineMiscRecipes { Sensor; public ItemList getComponent(int tier) { - if (tier < 0 || tier > GT_Values.VN.length) throw new IllegalArgumentException("Tier is out of range!"); - return ItemList.valueOf(this.name() + "_" + GT_Values.VN[tier]); + if (tier < 0 || tier > GTValues.VN.length) throw new IllegalArgumentException("Tier is out of range!"); + return ItemList.valueOf(this.name() + "_" + GTValues.VN[tier]); } } private static ItemStack getCircuit(int tier, long amount) { - return GT_OreDictUnificator.get(OrePrefixes.circuit, getCircuitMaterial(tier), amount); + return GTOreDictUnificator.get(OrePrefixes.circuit, getCircuitMaterial(tier), amount); } private static Object[] getALCircuit(int tier, int amount) { diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java index f72a31ed65..9de6926cf3 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineRecipeLoader.java @@ -3,7 +3,7 @@ package goodgenerator.loader; import static goodgenerator.util.StackUtils.getTotalItems; import static goodgenerator.util.StackUtils.mergeStacks; import static goodgenerator.util.StackUtils.multiplyAndSplitIntoStacks; -import static gregtech.api.util.GT_RecipeConstants.COAL_CASING_TIER; +import static gregtech.api.util.GTRecipeConstants.COAL_CASING_TIER; import java.util.ArrayList; import java.util.Arrays; @@ -22,17 +22,17 @@ import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.tuple.Pair; import goodgenerator.api.recipe.GoodGeneratorRecipeMaps; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.ItemData; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; -import gregtech.common.items.GT_IntegratedCircuit_Item; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; +import gregtech.common.items.ItemIntegratedCircuit; public class ComponentAssemblyLineRecipeLoader { @@ -42,8 +42,8 @@ public class ComponentAssemblyLineRecipeLoader { private static final String[] softBlacklistedDictPrefixes = { "Any", "crafting", "nanite" }; private static final String moltenMHDCSM = "molten.magnetohydrodynamicallyconstrainedstarmatter"; - private static LinkedHashMap<List<GT_Recipe>, Pair<ItemList, Integer>> allAssemblerRecipes; - private static LinkedHashMap<List<GT_Recipe.GT_Recipe_AssemblyLine>, Pair<ItemList, Integer>> allAsslineRecipes; + private static LinkedHashMap<List<GTRecipe>, Pair<ItemList, Integer>> allAssemblerRecipes; + private static LinkedHashMap<List<GTRecipe.RecipeAssemblyLine>, Pair<ItemList, Integer>> allAsslineRecipes; private static final HashMap<OrePrefixes, Double> magnetoConversionMultipliers = new HashMap<>(); private static final HashMap<OrePrefixes, OrePrefixes> conversion = new HashMap<>(); @@ -88,14 +88,14 @@ public class ComponentAssemblyLineRecipeLoader { /** Normal assembler recipes (LV-IV) */ private static void generateAssemblerRecipes() { allAssemblerRecipes.forEach((recipeList, info) -> { - for (GT_Recipe recipe : recipeList) { + for (GTRecipe recipe : recipeList) { if (recipe != null) { ArrayList<ItemStack> fixedInputs = new ArrayList<>(); ArrayList<FluidStack> fixedFluids = new ArrayList<>(); for (int j = 0; j < recipe.mInputs.length; j++) { ItemStack input = recipe.mInputs[j]; - if (GT_Utility.isStackValid(input) && !(input.getItem() instanceof GT_IntegratedCircuit_Item)) + if (GTUtility.isStackValid(input) && !(input.getItem() instanceof ItemIntegratedCircuit)) fixedInputs.addAll(multiplyAndSplitIntoStacks(input, INPUT_MULTIPLIER)); } for (int j = 0; j < recipe.mFluidInputs.length; j++) { @@ -107,8 +107,8 @@ public class ComponentAssemblyLineRecipeLoader { fixedInputs = compactItems(fixedInputs, info.getRight()); replaceIntoFluids(fixedInputs, fixedFluids, 64); int tier = info.getRight(); - int energy = (int) Math.min(Integer.MAX_VALUE - 7, GT_Values.VP[tier - 1]); - GT_Values.RA.stdBuilder() + int energy = (int) Math.min(Integer.MAX_VALUE - 7, GTValues.VP[tier - 1]); + GTValues.RA.stdBuilder() .itemInputs(fixedInputs.toArray(new ItemStack[0])) .itemOutputs( info.getLeft() @@ -127,7 +127,7 @@ public class ComponentAssemblyLineRecipeLoader { /** Assembly Line Recipes (LuV+) **/ private static void generateAsslineRecipes() { allAsslineRecipes.forEach((recipeList, info) -> { - for (GT_Recipe.GT_Recipe_AssemblyLine recipe : recipeList) { + for (GTRecipe.RecipeAssemblyLine recipe : recipeList) { if (recipe != null) { int componentCircuit = -1; for (int i = 0; i < compPrefixes.length; i++) if (info.getLeft() @@ -153,17 +153,17 @@ public class ComponentAssemblyLineRecipeLoader { // First pass. for (ItemStack input : recipe.mInputs) { - if (GT_Utility.isStackValid(input)) { + if (GTUtility.isStackValid(input)) { int count = input.stackSize; // Mulitplies the input by its multiplier, and adjusts the stacks accordingly - if (!(input.getItem() instanceof GT_IntegratedCircuit_Item)) { + if (!(input.getItem() instanceof ItemIntegratedCircuit)) { - ItemData data = GT_OreDictUnificator.getAssociation(input); + ItemData data = GTOreDictUnificator.getAssociation(input); // trying to fix some circuit oredicting issues if (data != null && data.mPrefix == OrePrefixes.circuit) fixedInputs.addAll( multiplyAndSplitIntoStacks( - GT_OreDictUnificator.get(data.mPrefix, data.mMaterial.mMaterial, count), + GTOreDictUnificator.get(data.mPrefix, data.mMaterial.mMaterial, count), INPUT_MULTIPLIER)); else fixedInputs.addAll(multiplyAndSplitIntoStacks(input, INPUT_MULTIPLIER)); } @@ -174,10 +174,10 @@ public class ComponentAssemblyLineRecipeLoader { // If it overflows then it tries REALLY HARD to cram as much stuff into there. if (fixedInputs.size() > (addProgrammedCircuit ? 8 : 9)) replaceIntoFluids(fixedInputs, fixedFluids, FLUID_CONVERSION_STACKSIZE_THRESHOLD / 2); - if (addProgrammedCircuit) fixedInputs.add(GT_Utility.getIntegratedCircuit(componentCircuit)); + if (addProgrammedCircuit) fixedInputs.add(GTUtility.getIntegratedCircuit(componentCircuit)); addEternityForMHDCSM(fixedFluids); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(fixedInputs.toArray(new ItemStack[0])) .itemOutputs( info.getLeft() @@ -195,7 +195,7 @@ public class ComponentAssemblyLineRecipeLoader { // @allSyntheticRubber so it's quite fragile, but // it's also the least invasive change. if (swapSiliconeForStyreneButadiene(fixedFluids)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(fixedInputs.toArray(new ItemStack[0])) .itemOutputs( info.getLeft() @@ -225,15 +225,15 @@ public class ComponentAssemblyLineRecipeLoader { if (OreDictionary.getOreIDs(input).length > 0 && count > threshold) { FluidStack foundFluidStack = tryConvertItemStackToFluidMaterial(input); - ItemData data = GT_OreDictUnificator.getAssociation(input); + ItemData data = GTOreDictUnificator.getAssociation(input); // Prevents the uncraftable molten magnetic samarium from being converted into fluid during auto // generation if (data != null && data.mMaterial.mMaterial == Materials.SamariumMagnetic) { - input = GT_OreDictUnificator.get(data.mPrefix, Materials.Samarium, 1); + input = GTOreDictUnificator.get(data.mPrefix, Materials.Samarium, 1); foundFluidStack = tryConvertItemStackToFluidMaterial(input); } else if (data != null && data.mMaterial.mMaterial == Materials.TengamAttuned) { - input = GT_OreDictUnificator.get(data.mPrefix, Materials.TengamPurified, 1); + input = GTOreDictUnificator.get(data.mPrefix, Materials.TengamPurified, 1); foundFluidStack = tryConvertItemStackToFluidMaterial(input); } @@ -255,7 +255,7 @@ public class ComponentAssemblyLineRecipeLoader { } } if (!isConverted) { - newInputs.add(GT_Utility.copyAmountUnsafe(count, input)); + newInputs.add(GTUtility.copyAmountUnsafe(count, input)); } } inputs.clear(); @@ -299,10 +299,10 @@ public class ComponentAssemblyLineRecipeLoader { if (strippedOreDict.contains("Any")) continue; if (strippedOreDict.contains("PTMEG")) return FluidRegistry.getFluidStack( "molten.silicone", - (int) (orePrefix.mMaterialAmount / (GT_Values.M / 144)) * input.stackSize); + (int) (orePrefix.mMaterialAmount / (GTValues.M / 144)) * input.stackSize); return FluidRegistry.getFluidStack( "molten." + strippedOreDict.toLowerCase(), - (int) (orePrefix.mMaterialAmount / (GT_Values.M / 144)) * input.stackSize); + (int) (orePrefix.mMaterialAmount / (GTValues.M / 144)) * input.stackSize); } return null; } @@ -341,7 +341,7 @@ public class ComponentAssemblyLineRecipeLoader { HashMap<ItemStack, Integer> totals = getTotalItems(items); for (ItemStack itemstack : totals.keySet()) { int totalItems = totals.get(itemstack); - ItemData data = GT_OreDictUnificator.getAssociation(itemstack); + ItemData data = GTOreDictUnificator.getAssociation(itemstack); boolean isCompacted = false; for (String dict : Arrays.stream(OreDictionary.getOreIDs(itemstack)) @@ -361,20 +361,20 @@ public class ComponentAssemblyLineRecipeLoader { if (data != null && !isCompacted) { OrePrefixes goInto = conversion.get(data.mPrefix); - if (goInto != null && GT_OreDictUnificator.get(goInto, data.mMaterial.mMaterial, 1) != null) { + if (goInto != null && GTOreDictUnificator.get(goInto, data.mMaterial.mMaterial, 1) != null) { compactorHelper(data, goInto, stacks, totalItems); isCompacted = true; } } - if (GT_Utility.areStacksEqual(itemstack, ItemList.Gravistar.get(1)) && tier >= 9) { + if (GTUtility.areStacksEqual(itemstack, ItemList.Gravistar.get(1)) && tier >= 9) { stacks.addAll(multiplyAndSplitIntoStacks(ItemList.NuclearStar.get(1), totalItems / 16)); isCompacted = true; } - if (GT_Utility - .areStacksEqual(itemstack, GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.Neutronium, 1))) { + if (GTUtility + .areStacksEqual(itemstack, GTOreDictUnificator.get(OrePrefixes.nanite, Materials.Neutronium, 1))) { stacks.addAll( multiplyAndSplitIntoStacks( - GT_OreDictUnificator.get(OrePrefixes.nanite, Materials.Gold, 1), + GTOreDictUnificator.get(OrePrefixes.nanite, Materials.Gold, 1), totalItems / 16)); isCompacted = true; } @@ -390,7 +390,7 @@ public class ComponentAssemblyLineRecipeLoader { int materialRatio = (int) ((double) compactInto.mMaterialAmount / data.mPrefix.mMaterialAmount); output.addAll( multiplyAndSplitIntoStacks( - GT_OreDictUnificator.get(compactInto, data.mMaterial.mMaterial, 1), + GTOreDictUnificator.get(compactInto, data.mMaterial.mMaterial, 1), total / materialRatio)); } @@ -402,21 +402,21 @@ public class ComponentAssemblyLineRecipeLoader { allAsslineRecipes = new LinkedHashMap<>(); for (String compPrefix : compPrefixes) { for (int t = 1; t <= 13; t++) { - String vName = GT_Values.VN[t]; + String vName = GTValues.VN[t]; ItemList currentComponent = ItemList.valueOf(compPrefix + vName); if (currentComponent.hasBeenSet()) { if (t < 6) { - ArrayList<GT_Recipe> foundRecipes = new ArrayList<>(); - for (GT_Recipe recipe : RecipeMaps.assemblerRecipes.getAllRecipes()) { - if (GT_Utility.areStacksEqual(currentComponent.get(1), recipe.mOutputs[0])) { + ArrayList<GTRecipe> foundRecipes = new ArrayList<>(); + for (GTRecipe recipe : RecipeMaps.assemblerRecipes.getAllRecipes()) { + if (GTUtility.areStacksEqual(currentComponent.get(1), recipe.mOutputs[0])) { foundRecipes.add(recipe); } } allAssemblerRecipes.put(foundRecipes, Pair.of(currentComponent, t)); } else { - ArrayList<GT_Recipe.GT_Recipe_AssemblyLine> foundRecipes = new ArrayList<>(); - for (GT_Recipe.GT_Recipe_AssemblyLine recipe : GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes) { - if (GT_Utility.areStacksEqual(currentComponent.get(1), recipe.mOutput)) { + ArrayList<GTRecipe.RecipeAssemblyLine> foundRecipes = new ArrayList<>(); + for (GTRecipe.RecipeAssemblyLine recipe : GTRecipe.RecipeAssemblyLine.sAssemblylineRecipes) { + if (GTUtility.areStacksEqual(currentComponent.get(1), recipe.mOutput)) { foundRecipes.add(recipe); } } @@ -440,7 +440,7 @@ public class ComponentAssemblyLineRecipeLoader { private static List<ItemStack> getMagnetoConversion(ItemStack item, int total) { ArrayList<ItemStack> stacks = new ArrayList<>(); - ItemData data = GT_OreDictUnificator.getAssociation(item); + ItemData data = GTOreDictUnificator.getAssociation(item); if (data == null) { return stacks; } @@ -448,7 +448,7 @@ public class ComponentAssemblyLineRecipeLoader { double multiplier = magnetoConversionMultipliers.get(data.mPrefix); stacks.addAll( getWrappedCircuits( - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 1), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 1), (int) (total * multiplier), "circuitInfinite")); } diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java index fd1950c6ef..120c509d08 100644 --- a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java @@ -2,50 +2,49 @@ package goodgenerator.loader; import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.naquadahFuelRefineFactoryRecipes; import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.naquadahReactorFuels; -import static goodgenerator.main.GG_Config_Loader.NaquadahFuelTime; -import static goodgenerator.main.GG_Config_Loader.NaquadahFuelVoltage; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.LNG_BASIC_OUTPUT; -import static gregtech.api.util.GT_RecipeConstants.NFR_COIL_TIER; -import static gtPlusPlus.core.material.ELEMENT.STANDALONE.CHRONOMATIC_GLASS; +import static goodgenerator.main.GGConfigLoader.NaquadahFuelTime; +import static goodgenerator.main.GGConfigLoader.NaquadahFuelVoltage; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.LNG_BASIC_OUTPUT; +import static gregtech.api.util.GTRecipeConstants.NFR_COIL_TIER; +import static gtPlusPlus.core.material.MaterialsElements.STANDALONE.CHRONOMATIC_GLASS; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; - -import goodgenerator.items.MyMaterial; +import bartworks.system.material.WerkstoffLoader; +import goodgenerator.items.GGMaterial; import goodgenerator.util.ItemRefer; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.core.material.ELEMENT; +import gregtech.api.util.GTOreDictUnificator; +import gtPlusPlus.core.material.MaterialsElements; public class FuelRecipeLoader { public static void RegisterFuel() { - FluidStack[] inputs = new FluidStack[] { MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(1), - MyMaterial.thoriumBasedLiquidFuelExcited.getFluidOrGas(1), - MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(1), MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(1), MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(1), MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(1) }; - - FluidStack[] outputs = new FluidStack[] { MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1), - MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1), - MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkIIIDepleted.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkIVDepleted.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1), - MyMaterial.naquadahBasedFuelMkVIDepleted.getFluidOrGas(1) }; + FluidStack[] inputs = new FluidStack[] { GGMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(1), + GGMaterial.thoriumBasedLiquidFuelExcited.getFluidOrGas(1), + GGMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkI.getFluidOrGas(1), GGMaterial.naquadahBasedFuelMkII.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkIII.getFluidOrGas(1), GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkV.getFluidOrGas(1), GGMaterial.naquadahBasedFuelMkVI.getFluidOrGas(1) }; + + FluidStack[] outputs = new FluidStack[] { GGMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1), + GGMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1), + GGMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkIIIDepleted.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkIVDepleted.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1), + GGMaterial.naquadahBasedFuelMkVIDepleted.getFluidOrGas(1) }; for (int i = 0; i < 9; i++) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(inputs[i]) .fluidOutputs(outputs[i]) .duration(NaquadahFuelTime[i]) @@ -55,16 +54,16 @@ public class FuelRecipeLoader { } // MK III Naquadah Fuel - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 4), + GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 4), WerkstoffLoader.Tiberium.get(OrePrefixes.dust, 27), ItemRefer.High_Density_Uranium.get(2), ItemRefer.High_Density_Plutonium.get(1)) .fluidInputs( - MyMaterial.heavyNaquadahFuel.getFluidOrGas(800), - MyMaterial.lightNaquadahFuel.getFluidOrGas(1000)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(100)) + GGMaterial.heavyNaquadahFuel.getFluidOrGas(800), + GGMaterial.lightNaquadahFuel.getFluidOrGas(1000)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkIII.getFluidOrGas(100)) .duration(5 * SECONDS) .eut(1_100_000) .metadata(NFR_COIL_TIER, 1) @@ -72,16 +71,16 @@ public class FuelRecipeLoader { .addTo(naquadahFuelRefineFactoryRecipes); // Alternative higher tier recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 8), + GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 8), CHRONOMATIC_GLASS.getDust(9), ItemRefer.High_Density_Uranium.get(2), ItemRefer.High_Density_Plutonium.get(1)) .fluidInputs( - MyMaterial.heavyNaquadahFuel.getFluidOrGas(800), - MyMaterial.lightNaquadahFuel.getFluidOrGas(1000)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(200)) + GGMaterial.heavyNaquadahFuel.getFluidOrGas(800), + GGMaterial.lightNaquadahFuel.getFluidOrGas(1000)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkIII.getFluidOrGas(200)) .duration(5 * SECONDS) .eut(2_100_000) .metadata(NFR_COIL_TIER, 1) @@ -89,14 +88,14 @@ public class FuelRecipeLoader { .addTo(naquadahFuelRefineFactoryRecipes); // MK IV Naquadah Fuel - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - MyMaterial.orundum.get(OrePrefixes.dust, 32)) - .fluidInputs(MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), Materials.Praseodymium.getMolten(9216L)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250)) + GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GGMaterial.orundum.get(OrePrefixes.dust, 32)) + .fluidInputs(GGMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), Materials.Praseodymium.getMolten(9216L)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250)) .duration(8 * SECONDS) .eut(46_000_000) .metadata(NFR_COIL_TIER, 2) @@ -104,16 +103,16 @@ public class FuelRecipeLoader { .addTo(naquadahFuelRefineFactoryRecipes); // Alternate higher tier recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), - MyMaterial.orundum.get(OrePrefixes.dust, 64)) + GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 27), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.DraconiumAwakened, 64), + GGMaterial.orundum.get(OrePrefixes.dust, 64)) .fluidInputs( - MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), + GGMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000), new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 720)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(500)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(500)) .duration(8 * SECONDS) .eut(75_000_000) .metadata(NFR_COIL_TIER, 2) @@ -121,18 +120,18 @@ public class FuelRecipeLoader { .addTo(naquadahFuelRefineFactoryRecipes); // One-step recipe to allow easier scaling for MK VI - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 54), - MyMaterial.orundum.get(OrePrefixes.dust, 32), + GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 54), + GGMaterial.orundum.get(OrePrefixes.dust, 32), ItemRefer.High_Density_Uranium.get(10), ItemRefer.High_Density_Plutonium.get(5)) .fluidInputs( - MyMaterial.heavyNaquadahFuel.getFluidOrGas(4000), - MyMaterial.lightNaquadahFuel.getFluidOrGas(5000), + GGMaterial.heavyNaquadahFuel.getFluidOrGas(4000), + GGMaterial.lightNaquadahFuel.getFluidOrGas(5000), new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 360), new FluidStack(FluidRegistry.getFluid("molten.chromaticglass"), 6480)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250)) .duration(10 * TICKS) .eut(350_000_000) .metadata(NFR_COIL_TIER, 4) @@ -140,14 +139,14 @@ public class FuelRecipeLoader { .addTo(naquadahFuelRefineFactoryRecipes); // MK V Naquadah Fuel - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 8), - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 32)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 8), + GGMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 32)) .fluidInputs( - MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), + GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), FluidRegistry.getFluidStack("heavyradox", 250)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(500)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkV.getFluidOrGas(500)) .duration(10 * SECONDS) .eut(100_000_000) .metadata(NFR_COIL_TIER, 2) @@ -155,15 +154,15 @@ public class FuelRecipeLoader { .addTo(naquadahFuelRefineFactoryRecipes); // Alternate higher tier recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.SpaceTime, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.TranscendentMetal, 16), - MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 48)) + GTOreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.SpaceTime, 4), + GTOreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.TranscendentMetal, 16), + GGMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 48)) .fluidInputs( - MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), + GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), FluidRegistry.getFluidStack("heavyradox", 250)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(750)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkV.getFluidOrGas(750)) .duration(5 * SECONDS) .eut(300_000_000) .metadata(NFR_COIL_TIER, 3) @@ -171,14 +170,14 @@ public class FuelRecipeLoader { .addTo(naquadahFuelRefineFactoryRecipes); // MK VI Naquadah Fuel - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - ELEMENT.STANDALONE.ASTRAL_TITANIUM.getDust(64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 32)) + MaterialsElements.STANDALONE.ASTRAL_TITANIUM.getDust(64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 32)) .fluidInputs( - MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(2000), + GGMaterial.naquadahBasedFuelMkV.getFluidOrGas(2000), FluidRegistry.getFluidStack("molten.shirabon", 360)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(500)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkVI.getFluidOrGas(500)) .duration(12 * SECONDS) .eut(320_000_000) .metadata(NFR_COIL_TIER, 3) @@ -186,15 +185,15 @@ public class FuelRecipeLoader { .addTo(naquadahFuelRefineFactoryRecipes); // Alternate higher tier recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.WhiteDwarfMatter, 4), - ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getDust(64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 48)) + GTOreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.WhiteDwarfMatter, 4), + MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getDust(64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 48)) .fluidInputs( - MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(2000), + GGMaterial.naquadahBasedFuelMkV.getFluidOrGas(2000), FluidRegistry.getFluidStack("molten.shirabon", 1440)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(750)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkVI.getFluidOrGas(750)) .duration(4 * SECONDS) .eut(TierEU.RECIPE_UXV) .metadata(NFR_COIL_TIER, 4) diff --git a/src/main/java/goodgenerator/loader/FuelRodLoader.java b/src/main/java/goodgenerator/loader/FuelRodLoader.java index 9654479861..5241c45bb7 100644 --- a/src/main/java/goodgenerator/loader/FuelRodLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRodLoader.java @@ -6,8 +6,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.GameRegistry; -import goodgenerator.items.DepletedFuelRod; -import goodgenerator.items.FuelRod; +import goodgenerator.items.ItemDepletedFuelRod; +import goodgenerator.items.ItemFuelRod; import goodgenerator.main.GoodGenerator; public class FuelRodLoader { @@ -38,62 +38,62 @@ public class FuelRodLoader { public static Item rodLiquidPlutonium_4; public static void RegisterRod() { - rodCompressedUraniumDepleted = new DepletedFuelRod( + rodCompressedUraniumDepleted = new ItemDepletedFuelRod( "rodCompressedUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 100); - rodCompressedUraniumDepleted_2 = new DepletedFuelRod( + rodCompressedUraniumDepleted_2 = new ItemDepletedFuelRod( "rodCompressedUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 200); - rodCompressedUraniumDepleted_4 = new DepletedFuelRod( + rodCompressedUraniumDepleted_4 = new ItemDepletedFuelRod( "rodCompressedUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 400); - rodCompressedPlutoniumDepleted = new DepletedFuelRod( + rodCompressedPlutoniumDepleted = new ItemDepletedFuelRod( "rodCompressedPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 120); - rodCompressedPlutoniumDepleted_2 = new DepletedFuelRod( + rodCompressedPlutoniumDepleted_2 = new ItemDepletedFuelRod( "rodCompressedPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 240); - rodCompressedPlutoniumDepleted_4 = new DepletedFuelRod( + rodCompressedPlutoniumDepleted_4 = new ItemDepletedFuelRod( "rodCompressedPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 480); - rodLiquidUraniumDepleted = new DepletedFuelRod( + rodLiquidUraniumDepleted = new ItemDepletedFuelRod( "rodLiquidUraniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 800); - rodLiquidUraniumDepleted_2 = new DepletedFuelRod( + rodLiquidUraniumDepleted_2 = new ItemDepletedFuelRod( "rodLiquidUraniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 1600); - rodLiquidUraniumDepleted_4 = new DepletedFuelRod( + rodLiquidUraniumDepleted_4 = new ItemDepletedFuelRod( "rodLiquidUraniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 3200); - rodLiquidPlutoniumDepleted = new DepletedFuelRod( + rodLiquidPlutoniumDepleted = new ItemDepletedFuelRod( "rodLiquidPlutoniumDepleted", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 1000); - rodLiquidPlutoniumDepleted_2 = new DepletedFuelRod( + rodLiquidPlutoniumDepleted_2 = new ItemDepletedFuelRod( "rodLiquidPlutoniumDepleted2", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, 2000); - rodLiquidPlutoniumDepleted_4 = new DepletedFuelRod( + rodLiquidPlutoniumDepleted_4 = new ItemDepletedFuelRod( "rodLiquidPlutoniumDepleted4", addText("depletedfuelrod.tooltip", 1), GoodGenerator.GG, @@ -117,7 +117,7 @@ public class FuelRodLoader { GameRegistry.registerItem(rodLiquidPlutoniumDepleted_2, "rodLiquidPlutoniumDepleted2", GoodGenerator.MOD_ID); GameRegistry.registerItem(rodLiquidPlutoniumDepleted_4, "rodLiquidPlutoniumDepleted4", GoodGenerator.MOD_ID); - rodCompressedUranium = new FuelRod( + rodCompressedUranium = new ItemFuelRod( "rodCompressedUranium", 1, 100, @@ -126,7 +126,7 @@ public class FuelRodLoader { 70000, new ItemStack(rodCompressedUraniumDepleted, 1), GoodGenerator.GG); - rodCompressedUranium_2 = new FuelRod( + rodCompressedUranium_2 = new ItemFuelRod( "rodCompressedUranium2", 2, 100, @@ -135,7 +135,7 @@ public class FuelRodLoader { 70000, new ItemStack(rodCompressedUraniumDepleted_2, 1), GoodGenerator.GG); - rodCompressedUranium_4 = new FuelRod( + rodCompressedUranium_4 = new ItemFuelRod( "rodCompressedUranium4", 4, 100, @@ -144,7 +144,7 @@ public class FuelRodLoader { 70000, new ItemStack(rodCompressedUraniumDepleted_4, 1), GoodGenerator.GG); - rodCompressedPlutonium = new FuelRod( + rodCompressedPlutonium = new ItemFuelRod( "rodCompressedPlutonium", 1, 50, @@ -154,7 +154,7 @@ public class FuelRodLoader { 6, new ItemStack(rodCompressedPlutoniumDepleted, 1), GoodGenerator.GG); - rodCompressedPlutonium_2 = new FuelRod( + rodCompressedPlutonium_2 = new ItemFuelRod( "rodCompressedPlutonium2", 2, 50, @@ -164,7 +164,7 @@ public class FuelRodLoader { 6, new ItemStack(rodCompressedPlutoniumDepleted_2, 1), GoodGenerator.GG); - rodCompressedPlutonium_4 = new FuelRod( + rodCompressedPlutonium_4 = new ItemFuelRod( "rodCompressedPlutonium4", 4, 50, @@ -174,7 +174,7 @@ public class FuelRodLoader { 6, new ItemStack(rodCompressedPlutoniumDepleted_4, 1), GoodGenerator.GG); - rodLiquidUranium = new FuelRod( + rodLiquidUranium = new ItemFuelRod( "rodLiquidUranium", 1, 1200, @@ -183,7 +183,7 @@ public class FuelRodLoader { 6000, new ItemStack(rodLiquidUraniumDepleted, 1), GoodGenerator.GG); - rodLiquidUranium_2 = new FuelRod( + rodLiquidUranium_2 = new ItemFuelRod( "rodLiquidUranium2", 2, 1200, @@ -192,7 +192,7 @@ public class FuelRodLoader { 6000, new ItemStack(rodLiquidUraniumDepleted_2, 1), GoodGenerator.GG); - rodLiquidUranium_4 = new FuelRod( + rodLiquidUranium_4 = new ItemFuelRod( "rodLiquidUranium4", 4, 1200, @@ -201,7 +201,7 @@ public class FuelRodLoader { 6000, new ItemStack(rodLiquidUraniumDepleted_4, 1), GoodGenerator.GG); - rodLiquidPlutonium = new FuelRod( + rodLiquidPlutonium = new ItemFuelRod( "rodLiquidPlutonium", 1, 1600, @@ -211,7 +211,7 @@ public class FuelRodLoader { 2, new ItemStack(rodLiquidPlutoniumDepleted, 1), GoodGenerator.GG); - rodLiquidPlutonium_2 = new FuelRod( + rodLiquidPlutonium_2 = new ItemFuelRod( "rodLiquidPlutonium2", 2, 1600, @@ -221,7 +221,7 @@ public class FuelRodLoader { 2, new ItemStack(rodLiquidPlutoniumDepleted_2, 1), GoodGenerator.GG); - rodLiquidPlutonium_4 = new FuelRod( + rodLiquidPlutonium_4 = new ItemFuelRod( "rodLiquidPlutonium4", 4, 1600, diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java index d72ee2fabb..adc636ae34 100644 --- a/src/main/java/goodgenerator/loader/Loaders.java +++ b/src/main/java/goodgenerator/loader/Loaders.java @@ -11,48 +11,48 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import goodgenerator.blocks.myFluids.FluidsBuilder; -import goodgenerator.blocks.regularBlock.Casing; -import goodgenerator.blocks.regularBlock.ComplexTextureCasing; -import goodgenerator.blocks.regularBlock.Frame; -import goodgenerator.blocks.regularBlock.TEBlock; -import goodgenerator.blocks.regularBlock.TurbineCasing; -import goodgenerator.blocks.tileEntity.ComponentAssemblyLine; -import goodgenerator.blocks.tileEntity.CoolantTower; -import goodgenerator.blocks.tileEntity.EssentiaHatch; -import goodgenerator.blocks.tileEntity.EssentiaOutputHatch; -import goodgenerator.blocks.tileEntity.EssentiaOutputHatch_ME; -import goodgenerator.blocks.tileEntity.ExtremeHeatExchanger; -import goodgenerator.blocks.tileEntity.FuelRefineFactory; -import goodgenerator.blocks.tileEntity.GTMetaTileEntity.DieselGenerator; -import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronAccelerator; -import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor; -import goodgenerator.blocks.tileEntity.GTMetaTileEntity.YOTTAHatch; -import goodgenerator.blocks.tileEntity.LargeEssentiaGenerator; -import goodgenerator.blocks.tileEntity.LargeEssentiaSmeltery; -import goodgenerator.blocks.tileEntity.LargeFusionComputer1; -import goodgenerator.blocks.tileEntity.LargeFusionComputer2; -import goodgenerator.blocks.tileEntity.LargeFusionComputer3; -import goodgenerator.blocks.tileEntity.LargeFusionComputer4; -import goodgenerator.blocks.tileEntity.LargeFusionComputer5; -import goodgenerator.blocks.tileEntity.MultiNqGenerator; -import goodgenerator.blocks.tileEntity.NeutronActivator; -import goodgenerator.blocks.tileEntity.PreciseAssembler; -import goodgenerator.blocks.tileEntity.SupercriticalFluidTurbine; -import goodgenerator.blocks.tileEntity.UniversalChemicalFuelEngine; -import goodgenerator.blocks.tileEntity.YottaFluidTank; +import goodgenerator.blocks.regularBlock.BlockCasing; +import goodgenerator.blocks.regularBlock.BlockComplexTextureCasing; +import goodgenerator.blocks.regularBlock.BlockFrame; +import goodgenerator.blocks.regularBlock.BlockTEContainer; +import goodgenerator.blocks.regularBlock.BlockTurbineCasing; +import goodgenerator.blocks.tileEntity.GTMetaTileEntity.MTEDieselGenerator; +import goodgenerator.blocks.tileEntity.GTMetaTileEntity.MTENeutronAccelerator; +import goodgenerator.blocks.tileEntity.GTMetaTileEntity.MTENeutronSensor; +import goodgenerator.blocks.tileEntity.GTMetaTileEntity.MTEYOTTAHatch; +import goodgenerator.blocks.tileEntity.MTEComponentAssemblyLine; +import goodgenerator.blocks.tileEntity.MTECoolantTower; +import goodgenerator.blocks.tileEntity.MTEEssentiaHatch; +import goodgenerator.blocks.tileEntity.MTEEssentiaOutputHatch; +import goodgenerator.blocks.tileEntity.MTEEssentiaOutputHatchME; +import goodgenerator.blocks.tileEntity.MTEExtremeHeatExchanger; +import goodgenerator.blocks.tileEntity.MTEFuelRefineFactory; +import goodgenerator.blocks.tileEntity.MTELargeEssentiaGenerator; +import goodgenerator.blocks.tileEntity.MTELargeEssentiaSmeltery; +import goodgenerator.blocks.tileEntity.MTELargeFusionComputer1; +import goodgenerator.blocks.tileEntity.MTELargeFusionComputer2; +import goodgenerator.blocks.tileEntity.MTELargeFusionComputer3; +import goodgenerator.blocks.tileEntity.MTELargeFusionComputer4; +import goodgenerator.blocks.tileEntity.MTELargeFusionComputer5; +import goodgenerator.blocks.tileEntity.MTEMultiNqGenerator; +import goodgenerator.blocks.tileEntity.MTENeutronActivator; +import goodgenerator.blocks.tileEntity.MTEPreciseAssembler; +import goodgenerator.blocks.tileEntity.MTESupercriticalFluidTurbine; +import goodgenerator.blocks.tileEntity.MTEUniversalChemicalFuelEngine; +import goodgenerator.blocks.tileEntity.MTEYottaFluidTank; import goodgenerator.client.render.BlockRenderHandler; import goodgenerator.crossmod.ic2.CropsLoader; -import goodgenerator.crossmod.nei.NEI_Config; +import goodgenerator.crossmod.nei.NEIConfig; import goodgenerator.crossmod.thaumcraft.LargeEssentiaEnergyData; -import goodgenerator.items.MyItemBlocks; -import goodgenerator.items.MyItems; -import goodgenerator.items.MyMaterial; +import goodgenerator.items.GGItem; +import goodgenerator.items.GGItemBlocks; +import goodgenerator.items.GGMaterial; import goodgenerator.items.RadioactiveItem; import goodgenerator.main.GoodGenerator; import goodgenerator.util.CrackRecipeAdder; import goodgenerator.util.MaterialFix; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.MetaTileEntityIDs; import gregtech.api.enums.Textures; import gregtech.api.interfaces.ITexture; @@ -62,55 +62,55 @@ public class Loaders { public static final byte GoodGeneratorTexturePage = 12; - public static final Item _null_ = new MyItems("_null_", null); + public static final Item _null_ = new GGItem("_null_", null); - public static final Item radiationProtectionPlate = new MyItems("radiationProtectionPlate", GoodGenerator.GG); - public static final Item wrappedUraniumIngot = new MyItems("wrappedUraniumIngot", GoodGenerator.GG); + public static final Item radiationProtectionPlate = new GGItem("radiationProtectionPlate", GoodGenerator.GG); + public static final Item wrappedUraniumIngot = new GGItem("wrappedUraniumIngot", GoodGenerator.GG); public static final Item highDensityUraniumNugget = new RadioactiveItem( "highDensityUraniumNugget", GoodGenerator.GG, 200); public static final Item highDensityUranium = new RadioactiveItem("highDensityUranium", GoodGenerator.GG, 1800); - public static final Item wrappedThoriumIngot = new MyItems("wrappedThoriumIngot", GoodGenerator.GG); + public static final Item wrappedThoriumIngot = new GGItem("wrappedThoriumIngot", GoodGenerator.GG); public static final Item highDensityThoriumNugget = new RadioactiveItem( "highDensityThoriumNugget", GoodGenerator.GG, 50); public static final Item highDensityThorium = new RadioactiveItem("highDensityThorium", GoodGenerator.GG, 450); - public static final Item wrappedPlutoniumIngot = new MyItems("wrappedPlutoniumIngot", GoodGenerator.GG); + public static final Item wrappedPlutoniumIngot = new GGItem("wrappedPlutoniumIngot", GoodGenerator.GG); public static final Item highDensityPlutoniumNugget = new RadioactiveItem( "highDensityPlutoniumNugget", GoodGenerator.GG, 450); public static final Item highDensityPlutonium = new RadioactiveItem("highDensityPlutonium", GoodGenerator.GG, 4050); - public static final Item rawAtomicSeparationCatalyst = new MyItems("rawAtomicSeparationCatalyst", GoodGenerator.GG); - public static final Item advancedRadiationProtectionPlate = new MyItems( + public static final Item rawAtomicSeparationCatalyst = new GGItem("rawAtomicSeparationCatalyst", GoodGenerator.GG); + public static final Item advancedRadiationProtectionPlate = new GGItem( "advancedRadiationProtectionPlate", GoodGenerator.GG); - public static final Item aluminumNitride = new MyItems("aluminumNitride", "AlN", GoodGenerator.GG); - public static final Item specialCeramics = new MyItems("specialCeramics", GoodGenerator.GG); - public static final Item specialCeramicsPlate = new MyItems("specialCeramicsPlate", GoodGenerator.GG); + public static final Item aluminumNitride = new GGItem("aluminumNitride", "AlN", GoodGenerator.GG); + public static final Item specialCeramics = new GGItem("specialCeramics", GoodGenerator.GG); + public static final Item specialCeramicsPlate = new GGItem("specialCeramicsPlate", GoodGenerator.GG); public static final Item radioactiveWaste = new RadioactiveItem("radioactiveWaste", GoodGenerator.GG, 400); - public static final Item plasticCase = new MyItems("plasticCase", GoodGenerator.GG); - public static final Item quartzWafer = new MyItems("quartzWafer", GoodGenerator.GG); - public static final Item microHeater = new MyItems("microHeater", GoodGenerator.GG); - public static final Item quartzCrystalResonator = new MyItems("quartzCrystalResonator", GoodGenerator.GG); - public static final Item inverter = new MyItems("inverter", addText("inverter.tooltip", 1), GoodGenerator.GG); - public static final Item neutronSource = new MyItems("neutronSource", GoodGenerator.GG); - public static final Item naquadahMass = new MyItems( + public static final Item plasticCase = new GGItem("plasticCase", GoodGenerator.GG); + public static final Item quartzWafer = new GGItem("quartzWafer", GoodGenerator.GG); + public static final Item microHeater = new GGItem("microHeater", GoodGenerator.GG); + public static final Item quartzCrystalResonator = new GGItem("quartzCrystalResonator", GoodGenerator.GG); + public static final Item inverter = new GGItem("inverter", addText("inverter.tooltip", 1), GoodGenerator.GG); + public static final Item neutronSource = new GGItem("neutronSource", GoodGenerator.GG); + public static final Item naquadahMass = new GGItem( "naquadahMass", addText("naquadahMass.tooltip", 1), GoodGenerator.GG); - public static final Item enrichedNaquadahMass = new MyItems( + public static final Item enrichedNaquadahMass = new GGItem( "enrichedNaquadahMass", addText("enrichedNaquadahMass.tooltip", 1), GoodGenerator.GG); - public static final Item naquadriaMass = new MyItems( + public static final Item naquadriaMass = new GGItem( "naquadriaMass", addText("naquadriaMass.tooltip", 1), GoodGenerator.GG); - public static final Item advancedFuelRod = new MyItems("advancedFuelRod", GoodGenerator.GG); - public static final Item fluidCore = new MyItems( + public static final Item advancedFuelRod = new GGItem("advancedFuelRod", GoodGenerator.GG); + public static final Item fluidCore = new GGItem( "fluidCore", GoodGenerator.GG, new String[] { GoodGenerator.MOD_ID + ":fluidCore/1", GoodGenerator.MOD_ID + ":fluidCore/2", @@ -118,7 +118,7 @@ public class Loaders { GoodGenerator.MOD_ID + ":fluidCore/5", GoodGenerator.MOD_ID + ":fluidCore/6", GoodGenerator.MOD_ID + ":fluidCore/7", GoodGenerator.MOD_ID + ":fluidCore/8", GoodGenerator.MOD_ID + ":fluidCore/9", GoodGenerator.MOD_ID + ":fluidCore/10" }); - public static final Item upgradeEssentia = new MyItems( + public static final Item upgradeEssentia = new GGItem( "upgradeEssentia", GoodGenerator.GG, new String[] { GoodGenerator.MOD_ID + ":upgradeEssentia/null", GoodGenerator.MOD_ID + ":upgradeEssentia/air", @@ -126,15 +126,15 @@ public class Loaders { GoodGenerator.MOD_ID + ":upgradeEssentia/victus", GoodGenerator.MOD_ID + ":upgradeEssentia/tainted", GoodGenerator.MOD_ID + ":upgradeEssentia/mechanics", GoodGenerator.MOD_ID + ":upgradeEssentia/spirit", GoodGenerator.MOD_ID + ":upgradeEssentia/radiation", GoodGenerator.MOD_ID + ":upgradeEssentia/electric" }); - public static final Item highEnergyMixture = new MyItems( + public static final Item highEnergyMixture = new GGItem( "highEnergyMixture", GoodGenerator.GG, new String[] { GoodGenerator.MOD_ID + ":highEnergyMixture" }); - public static final Item saltyRoot = new MyItems( + public static final Item saltyRoot = new GGItem( "saltyRoot", GoodGenerator.GG, new String[] { GoodGenerator.MOD_ID + ":saltyRoot" }); - public static final Item huiCircuit = new MyItems( + public static final Item huiCircuit = new GGItem( "huiCircuit", addText("huiCircuit.tooltip", 5), GoodGenerator.GG, @@ -142,7 +142,7 @@ public class Loaders { GoodGenerator.MOD_ID + ":ciruits/3", GoodGenerator.MOD_ID + ":ciruits/4", GoodGenerator.MOD_ID + ":ciruits/5", }); - public static final Item circuitWrap = new MyItems( + public static final Item circuitWrap = new GGItem( "circuitWrap", GoodGenerator.GG, new String[] { GoodGenerator.MOD_ID + ":wraps/0", GoodGenerator.MOD_ID + ":wraps/1", @@ -152,83 +152,83 @@ public class Loaders { GoodGenerator.MOD_ID + ":wraps/11", GoodGenerator.MOD_ID + ":wraps/12", GoodGenerator.MOD_ID + ":wraps/13", GoodGenerator.MOD_ID + ":wraps/14" }); - public static final Block MAR_Casing = new Casing( + public static final Block MAR_Casing = new BlockCasing( "MAR_Casing", new String[] { GoodGenerator.MOD_ID + ":MAR_Casing" }); - public static final Block FRF_Casings = new Casing( + public static final Block FRF_Casings = new BlockCasing( "FRF_Casing", new String[] { "gregtech:iconsets/MACHINE_CASING_MINING_BLACKPLUTONIUM" }); - public static final Block FRF_Coil_1 = new Casing( + public static final Block FRF_Coil_1 = new BlockCasing( "FRF_Coil_1", new String[] { GoodGenerator.MOD_ID + ":FRF_Coils/1" }); - public static final Block FRF_Coil_2 = new Casing( + public static final Block FRF_Coil_2 = new BlockCasing( "FRF_Coil_2", new String[] { GoodGenerator.MOD_ID + ":FRF_Coils/2" }); - public static final Block FRF_Coil_3 = new Casing( + public static final Block FRF_Coil_3 = new BlockCasing( "FRF_Coil_3", new String[] { GoodGenerator.MOD_ID + ":FRF_Coils/3" }); - public static final Block FRF_Coil_4 = new Casing( + public static final Block FRF_Coil_4 = new BlockCasing( "FRF_Coil_4", new String[] { GoodGenerator.MOD_ID + ":FRF_Coils/4" }); - public static final Block radiationProtectionSteelFrame = new Frame( + public static final Block radiationProtectionSteelFrame = new BlockFrame( "radiationProtectionSteelFrame", new String[] { GoodGenerator.MOD_ID + ":radiationProtectionSteelFrame" }); - public static final Block fieldRestrictingGlass = new Frame( + public static final Block fieldRestrictingGlass = new BlockFrame( "fieldRestrictingGlass", new String[] { GoodGenerator.MOD_ID + ":fieldRestrictingGlass" }); - public static final Block rawCylinder = new Casing( + public static final Block rawCylinder = new BlockCasing( "rawCylinder", new String[] { GoodGenerator.MOD_ID + ":rawCylinder" }); - public static final Block titaniumPlatedCylinder = new Casing( + public static final Block titaniumPlatedCylinder = new BlockCasing( "titaniumPlatedCylinder", new String[] { GoodGenerator.MOD_ID + ":titaniumPlatedCylinder" }); - public static final Block magicCasing = new Casing( + public static final Block magicCasing = new BlockCasing( "magicCasing", new String[] { GoodGenerator.MOD_ID + ":MagicCasing" }); - public static final Block essentiaCell = new Casing( + public static final Block essentiaCell = new BlockCasing( "essentiaCell", new String[] { GoodGenerator.MOD_ID + ":essentiaCell/1", GoodGenerator.MOD_ID + ":essentiaCell/2", GoodGenerator.MOD_ID + ":essentiaCell/3", GoodGenerator.MOD_ID + ":essentiaCell/4" }); - public static final Block speedingPipe = new ComplexTextureCasing( + public static final Block speedingPipe = new BlockComplexTextureCasing( "speedingPipe", new String[] { GoodGenerator.MOD_ID + ":speedingPipe_SIDE" }, new String[] { GoodGenerator.MOD_ID + ":speedingPipe_TOP" }); - public static final Block yottaFluidTankCell = new Casing( + public static final Block yottaFluidTankCell = new BlockCasing( "yottaFluidTankCell", new String[] { GoodGenerator.MOD_ID + ":yottaFluidTankCell/1", GoodGenerator.MOD_ID + ":yottaFluidTankCell/2", GoodGenerator.MOD_ID + ":yottaFluidTankCell/3", GoodGenerator.MOD_ID + ":yottaFluidTankCell/4", GoodGenerator.MOD_ID + ":yottaFluidTankCell/5", GoodGenerator.MOD_ID + ":yottaFluidTankCell/6", GoodGenerator.MOD_ID + ":yottaFluidTankCell/7", GoodGenerator.MOD_ID + ":yottaFluidTankCell/8", GoodGenerator.MOD_ID + ":yottaFluidTankCell/9", GoodGenerator.MOD_ID + ":yottaFluidTankCell/10", }); - public static final Block yottaFluidTankCasing = new ComplexTextureCasing( + public static final Block yottaFluidTankCasing = new BlockComplexTextureCasing( "yottaFluidTankCasing", new String[] { GoodGenerator.MOD_ID + ":yottaFluidTankCasing_SIDE" }, new String[] { GoodGenerator.MOD_ID + ":yottaFluidTankCasing_TOP" }); - public static final Block supercriticalFluidTurbineCasing = new TurbineCasing( + public static final Block supercriticalFluidTurbineCasing = new BlockTurbineCasing( "supercriticalFluidTurbineCasing", "supercriticalFluidTurbineCasing"); - public static final Block pressureResistantWalls = new Casing( + public static final Block pressureResistantWalls = new BlockCasing( "pressureResistantWalls", new String[] { GoodGenerator.MOD_ID + ":pressureResistantWalls" }); - public static final Block impreciseUnitCasing = new Casing( + public static final Block impreciseUnitCasing = new BlockCasing( "impreciseUnitCasing", new String[] { GoodGenerator.MOD_ID + ":preciseUnitCasing/0" }); - public static final Block preciseUnitCasing = new Casing( + public static final Block preciseUnitCasing = new BlockCasing( "preciseUnitCasing", new String[] { GoodGenerator.MOD_ID + ":preciseUnitCasing/1", GoodGenerator.MOD_ID + ":preciseUnitCasing/2", GoodGenerator.MOD_ID + ":preciseUnitCasing/3", GoodGenerator.MOD_ID + ":preciseUnitCasing/4" }); - public static final Block compactFusionCoil = new Casing( + public static final Block compactFusionCoil = new BlockCasing( "compactFusionCoil", new String[] { GoodGenerator.MOD_ID + ":fuison/1", GoodGenerator.MOD_ID + ":fuison/2", GoodGenerator.MOD_ID + ":fuison/3", GoodGenerator.MOD_ID + ":fuison/4", GoodGenerator.MOD_ID + ":fuison/5" }); - public static final Block essentiaFilterCasing = new Casing( + public static final Block essentiaFilterCasing = new BlockCasing( "essentiaFilterCasing", new String[] { GoodGenerator.MOD_ID + ":essentiaFilterCasing" }); public static Block essentiaHatch; public static Block essentiaOutputHatch; public static Block essentiaOutputHatch_ME; - public static final Block componentAssemblylineCasing = new Casing( + public static final Block componentAssemblylineCasing = new BlockCasing( "componentAssemblyLineCasing", new String[] { GoodGenerator.MOD_ID + ":compAsslineCasing/0", // LV GoodGenerator.MOD_ID + ":compAsslineCasing/1", // MV @@ -267,11 +267,11 @@ public class Loaders { // public static Item Isotope = new NuclearMetaItemGenerator(); public static void GTMetaTileRegister() { - Loaders.MAR = new MultiNqGenerator(MetaTileEntityIDs.MultiNqGenerator.ID, "NaG", "Large Naquadah Reactor") + Loaders.MAR = new MTEMultiNqGenerator(MetaTileEntityIDs.MultiNqGenerator.ID, "NaG", "Large Naquadah Reactor") .getStackForm(1L); - Loaders.FRF = new FuelRefineFactory(MetaTileEntityIDs.FuelRefineFactory.ID, "FRF", "Naquadah Fuel Refinery") + Loaders.FRF = new MTEFuelRefineFactory(MetaTileEntityIDs.FuelRefineFactory.ID, "FRF", "Naquadah Fuel Refinery") .getStackForm(1L); - Loaders.UCFE = new UniversalChemicalFuelEngine( + Loaders.UCFE = new MTEUniversalChemicalFuelEngine( MetaTileEntityIDs.UniversalChemicalFuelEngine.ID, "UniversalChemicalFuelEngine", "Universal Chemical Fuel Engine").getStackForm(1L); @@ -281,100 +281,100 @@ public class Loaders { MetaTileEntityIDs.NeutronAcceleratorIV.ID, MetaTileEntityIDs.NeutronAcceleratorLuV.ID, MetaTileEntityIDs.NeutronAcceleratorZPM.ID, MetaTileEntityIDs.NeutronAcceleratorUV.ID, }; for (int i = 0; i < 9; i++) { - Loaders.NeutronAccelerators[i] = new NeutronAccelerator( + Loaders.NeutronAccelerators[i] = new MTENeutronAccelerator( neutronAcceleratorIDs[i], - "Neutron Accelerator " + GT_Values.VN[i], - "Neutron Accelerator " + GT_Values.VN[i], + "Neutron Accelerator " + GTValues.VN[i], + "Neutron Accelerator " + GTValues.VN[i], i).getStackForm(1L); } - Loaders.NS = new NeutronSensor(MetaTileEntityIDs.NeutronSensor.ID, "Neutron Sensor", "Neutron Sensor", 5) + Loaders.NS = new MTENeutronSensor(MetaTileEntityIDs.NeutronSensor.ID, "Neutron Sensor", "Neutron Sensor", 5) .getStackForm(1L); - Loaders.NA = new NeutronActivator( + Loaders.NA = new MTENeutronActivator( MetaTileEntityIDs.NeutronActivator.ID, "NeutronActivator", "Neutron Activator").getStackForm(1L); - Loaders.YFT = new YottaFluidTank(MetaTileEntityIDs.YottaFluidTank.ID, "YottaFluidTank", "YOTTank") + Loaders.YFT = new MTEYottaFluidTank(MetaTileEntityIDs.YottaFluidTank.ID, "YottaFluidTank", "YOTTank") .getStackForm(1L); - Loaders.YFH = new YOTTAHatch(MetaTileEntityIDs.YottaHatch.ID, "YottaFluidTankHatch", "YOTHatch", 5) + Loaders.YFH = new MTEYOTTAHatch(MetaTileEntityIDs.YottaHatch.ID, "YottaFluidTankHatch", "YOTHatch", 5) .getStackForm(1L); - Loaders.SCTurbine = new SupercriticalFluidTurbine( + Loaders.SCTurbine = new MTESupercriticalFluidTurbine( MetaTileEntityIDs.SupercriticalFluidTurbine.ID, "SupercriticalSteamTurbine", "SC Steam Turbine").getStackForm(1L); - Loaders.XHE = new ExtremeHeatExchanger( + Loaders.XHE = new MTEExtremeHeatExchanger( MetaTileEntityIDs.ExtremeHeatExchanger.ID, "ExtremeHeatExchanger", "Extreme Heat Exchanger").getStackForm(1L); - Loaders.PA = new PreciseAssembler( + Loaders.PA = new MTEPreciseAssembler( MetaTileEntityIDs.PreciseAssembler.ID, "PreciseAssembler", "Precise Auto-Assembler MT-3662").getStackForm(1L); - Loaders.LFC[0] = new LargeFusionComputer1( + Loaders.LFC[0] = new MTELargeFusionComputer1( MetaTileEntityIDs.LargeFusionComputer1.ID, "LargeFusionComputer1", "Compact Fusion Computer MK-I Prototype").getStackForm(1); - Loaders.LFC[1] = new LargeFusionComputer2( + Loaders.LFC[1] = new MTELargeFusionComputer2( MetaTileEntityIDs.LargeFusionComputer2.ID, "LargeFusionComputer2", "Compact Fusion Computer MK-II").getStackForm(1L); - Loaders.LFC[2] = new LargeFusionComputer3( + Loaders.LFC[2] = new MTELargeFusionComputer3( MetaTileEntityIDs.LargeFusionComputer3.ID, "LargeFusionComputer3", "Compact Fusion Computer MK-III").getStackForm(1L); - Loaders.LFC[3] = new LargeFusionComputer4( + Loaders.LFC[3] = new MTELargeFusionComputer4( MetaTileEntityIDs.LargeFusionComputer4.ID, "LargeFusionComputer4", "Compact Fusion Computer MK-IV Prototype").getStackForm(1L); - Loaders.LFC[4] = new LargeFusionComputer5( + Loaders.LFC[4] = new MTELargeFusionComputer5( MetaTileEntityIDs.LargeFusionComputer5.ID, "LargeFusionComputer5", "Compact Fusion Computer MK-V").getStackForm(1L); - Loaders.Generator_Diesel[0] = new DieselGenerator( + Loaders.Generator_Diesel[0] = new MTEDieselGenerator( MetaTileEntityIDs.DieselGeneratorEV.ID, "basicgenerator.diesel.tier.04", "Turbo Supercharging Combustion Generator", 4).getStackForm(1L); - Loaders.Generator_Diesel[1] = new DieselGenerator( + Loaders.Generator_Diesel[1] = new MTEDieselGenerator( MetaTileEntityIDs.DieselGeneratorIV.ID, "basicgenerator.diesel.tier.05", "Ultimate Chemical Energy Releaser", 5).getStackForm(1L); - Loaders.CT = new CoolantTower(MetaTileEntityIDs.CoolantTower.ID, "CoolantTower", "Coolant Tower") + Loaders.CT = new MTECoolantTower(MetaTileEntityIDs.CoolantTower.ID, "CoolantTower", "Coolant Tower") .getStackForm(1L); - Loaders.CompAssline = new ComponentAssemblyLine( + Loaders.CompAssline = new MTEComponentAssemblyLine( MetaTileEntityIDs.ComponentAssemblyLine.ID, "ComponentAssemblyLine", "Component Assembly Line").getStackForm(1L); - CrackRecipeAdder.registerPipe(MetaTileEntityIDs.PipeIncoloy903.ID, MyMaterial.incoloy903, 15000, 8000, true); - CrackRecipeAdder.registerWire(MetaTileEntityIDs.WireSignalium.ID, MyMaterial.signalium, 12, 131072, 16, true); - CrackRecipeAdder.registerWire(MetaTileEntityIDs.WireLumiium.ID, MyMaterial.lumiium, 8, 524288, 64, true); + CrackRecipeAdder.registerPipe(MetaTileEntityIDs.PipeIncoloy903.ID, GGMaterial.incoloy903, 15000, 8000, true); + CrackRecipeAdder.registerWire(MetaTileEntityIDs.WireSignalium.ID, GGMaterial.signalium, 12, 131072, 16, true); + CrackRecipeAdder.registerWire(MetaTileEntityIDs.WireLumiium.ID, GGMaterial.lumiium, 8, 524288, 64, true); } public static void Register() { GameRegistry.registerItem(_null_, "_null_", GoodGenerator.MOD_ID); - NEI_Config.hide(_null_); + NEIConfig.hide(_null_); - GameRegistry.registerBlock(MAR_Casing, MyItemBlocks.class, "MAR_Casing"); - GameRegistry.registerBlock(radiationProtectionSteelFrame, MyItemBlocks.class, "radiationProtectionSteelFrame"); - GameRegistry.registerBlock(fieldRestrictingGlass, MyItemBlocks.class, "fieldRestrictingGlass"); - GameRegistry.registerBlock(FRF_Casings, MyItemBlocks.class, "FRF_Casings"); - GameRegistry.registerBlock(FRF_Coil_1, MyItemBlocks.class, "FRF_Coil_1"); - GameRegistry.registerBlock(FRF_Coil_2, MyItemBlocks.class, "FRF_Coil_2"); - GameRegistry.registerBlock(FRF_Coil_3, MyItemBlocks.class, "FRF_Coil_3"); - GameRegistry.registerBlock(FRF_Coil_4, MyItemBlocks.class, "FRF_Coil_4"); - GameRegistry.registerBlock(rawCylinder, MyItemBlocks.class, "rawCylinder"); - GameRegistry.registerBlock(titaniumPlatedCylinder, MyItemBlocks.class, "titaniumPlatedCylinder"); - GameRegistry.registerBlock(speedingPipe, MyItemBlocks.class, "speedingPipe"); - GameRegistry.registerBlock(yottaFluidTankCell, MyItemBlocks.class, "yottaFluidTankCells"); - GameRegistry.registerBlock(yottaFluidTankCasing, MyItemBlocks.class, "yottaFluidTankCasing"); + GameRegistry.registerBlock(MAR_Casing, GGItemBlocks.class, "MAR_Casing"); + GameRegistry.registerBlock(radiationProtectionSteelFrame, GGItemBlocks.class, "radiationProtectionSteelFrame"); + GameRegistry.registerBlock(fieldRestrictingGlass, GGItemBlocks.class, "fieldRestrictingGlass"); + GameRegistry.registerBlock(FRF_Casings, GGItemBlocks.class, "FRF_Casings"); + GameRegistry.registerBlock(FRF_Coil_1, GGItemBlocks.class, "FRF_Coil_1"); + GameRegistry.registerBlock(FRF_Coil_2, GGItemBlocks.class, "FRF_Coil_2"); + GameRegistry.registerBlock(FRF_Coil_3, GGItemBlocks.class, "FRF_Coil_3"); + GameRegistry.registerBlock(FRF_Coil_4, GGItemBlocks.class, "FRF_Coil_4"); + GameRegistry.registerBlock(rawCylinder, GGItemBlocks.class, "rawCylinder"); + GameRegistry.registerBlock(titaniumPlatedCylinder, GGItemBlocks.class, "titaniumPlatedCylinder"); + GameRegistry.registerBlock(speedingPipe, GGItemBlocks.class, "speedingPipe"); + GameRegistry.registerBlock(yottaFluidTankCell, GGItemBlocks.class, "yottaFluidTankCells"); + GameRegistry.registerBlock(yottaFluidTankCasing, GGItemBlocks.class, "yottaFluidTankCasing"); GameRegistry - .registerBlock(supercriticalFluidTurbineCasing, MyItemBlocks.class, "supercriticalFluidTurbineCasing"); - GameRegistry.registerBlock(componentAssemblylineCasing, MyItemBlocks.class, "componentAssemblylineCasing"); - GameRegistry.registerBlock(pressureResistantWalls, MyItemBlocks.class, "pressureResistantWalls"); - GameRegistry.registerBlock(impreciseUnitCasing, MyItemBlocks.class, "impreciseUnitCasing"); - GameRegistry.registerBlock(preciseUnitCasing, MyItemBlocks.class, "preciseUnitCasing"); - GameRegistry.registerBlock(compactFusionCoil, MyItemBlocks.class, "compactFusionCoil"); + .registerBlock(supercriticalFluidTurbineCasing, GGItemBlocks.class, "supercriticalFluidTurbineCasing"); + GameRegistry.registerBlock(componentAssemblylineCasing, GGItemBlocks.class, "componentAssemblylineCasing"); + GameRegistry.registerBlock(pressureResistantWalls, GGItemBlocks.class, "pressureResistantWalls"); + GameRegistry.registerBlock(impreciseUnitCasing, GGItemBlocks.class, "impreciseUnitCasing"); + GameRegistry.registerBlock(preciseUnitCasing, GGItemBlocks.class, "preciseUnitCasing"); + GameRegistry.registerBlock(compactFusionCoil, GGItemBlocks.class, "compactFusionCoil"); GameRegistry.registerItem(radiationProtectionPlate, "radiationProtectionPlate", GoodGenerator.MOD_ID); GameRegistry.registerItem(wrappedUraniumIngot, "wrappedUraniumIngot", GoodGenerator.MOD_ID); GameRegistry.registerItem(highDensityUraniumNugget, "highDensityUraniumNugget", GoodGenerator.MOD_ID); @@ -413,32 +413,35 @@ public class Loaders { if (Loader.isModLoaded("Thaumcraft")) { LargeEssentiaEnergyData.processEssentiaData(); GameRegistry.registerItem(upgradeEssentia, "upgradeEssentia", GoodGenerator.MOD_ID); - GameRegistry.registerTileEntity(EssentiaHatch.class, "EssentiaHatch"); - GameRegistry.registerTileEntity(EssentiaOutputHatch.class, "EssentiaOutputHatch"); - GameRegistry.registerTileEntity(EssentiaOutputHatch_ME.class, "EssentiaOutputHatch_ME"); - Loaders.LEG = new LargeEssentiaGenerator( + GameRegistry.registerTileEntity(MTEEssentiaHatch.class, "EssentiaHatch"); + GameRegistry.registerTileEntity(MTEEssentiaOutputHatch.class, "EssentiaOutputHatch"); + GameRegistry.registerTileEntity(MTEEssentiaOutputHatchME.class, "EssentiaOutputHatch_ME"); + Loaders.LEG = new MTELargeEssentiaGenerator( MetaTileEntityIDs.LargeEssentiaGenerator.ID, "LargeEssentiaGenerator", "Large Essentia Generator - Marked for Deprecation").getStackForm(1L); - Loaders.LES = new LargeEssentiaSmeltery( + Loaders.LES = new MTELargeEssentiaSmeltery( MetaTileEntityIDs.LargeEssentiaSmeltery.ID, "LargeEssentiaSmeltery", "Large Essentia Smeltery").getStackForm(1L); - essentiaHatch = new TEBlock("essentiaHatch", new String[] { GoodGenerator.MOD_ID + ":essentiaHatch" }, 1); - essentiaOutputHatch = new TEBlock( + essentiaHatch = new BlockTEContainer( + "essentiaHatch", + new String[] { GoodGenerator.MOD_ID + ":essentiaHatch" }, + 1); + essentiaOutputHatch = new BlockTEContainer( "essentiaOutputHatch", new String[] { GoodGenerator.MOD_ID + ":essentiaOutputHatch" }, 2); - essentiaOutputHatch_ME = new TEBlock( + essentiaOutputHatch_ME = new BlockTEContainer( "essentiaOutputHatch_ME", new String[] { GoodGenerator.MOD_ID + ":essentiaOutputHatch_ME" }, 3); - GameRegistry.registerBlock(magicCasing, MyItemBlocks.class, "magicCasing"); - GameRegistry.registerBlock(essentiaCell, MyItemBlocks.class, "essentiaCell"); - GameRegistry.registerBlock(essentiaHatch, MyItemBlocks.class, "essentiaHatch"); - GameRegistry.registerBlock(essentiaOutputHatch, MyItemBlocks.class, "essentiaOutputHatch"); - GameRegistry.registerBlock(essentiaFilterCasing, MyItemBlocks.class, "essentiaFilterCasing"); - GameRegistry.registerBlock(essentiaOutputHatch_ME, MyItemBlocks.class, "essentiaOutputHatch_ME"); + GameRegistry.registerBlock(magicCasing, GGItemBlocks.class, "magicCasing"); + GameRegistry.registerBlock(essentiaCell, GGItemBlocks.class, "essentiaCell"); + GameRegistry.registerBlock(essentiaHatch, GGItemBlocks.class, "essentiaHatch"); + GameRegistry.registerBlock(essentiaOutputHatch, GGItemBlocks.class, "essentiaOutputHatch"); + GameRegistry.registerBlock(essentiaFilterCasing, GGItemBlocks.class, "essentiaFilterCasing"); + GameRegistry.registerBlock(essentiaOutputHatch_ME, GGItemBlocks.class, "essentiaOutputHatch_ME"); Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][0] = TextureFactory.of(magicCasing); } @@ -456,7 +459,7 @@ public class Loaders { Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][2] = TextureFactory .of(supercriticalFluidTurbineCasing); Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][3] = TextureFactory - .of(GregTech_API.sBlockConcretes, 8); + .of(GregTechAPI.sBlockConcretes, 8); Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][4] = TextureFactory .of(impreciseUnitCasing, 0); Textures.BlockIcons.casingTexturePages[GoodGeneratorTexturePage][5] = TextureFactory @@ -495,14 +498,14 @@ public class Loaders { } public static void completeLoad() { - RecipeLoader_02.FinishLoadRecipe(); + RecipeLoader2.FinishLoadRecipe(); MaterialFix.addRecipeForMultiItems(); ComponentAssemblyLineRecipeLoader.run(); } public static void initLoadRecipes() { RecipeLoader.InitLoadRecipe(); - RecipeLoader_02.InitLoadRecipe(); + RecipeLoader2.InitLoadRecipe(); FuelRecipeLoader.RegisterFuel(); NaquadahReworkRecipeLoader.RecipeLoad(); } @@ -510,7 +513,7 @@ public class Loaders { public static void postInitLoadRecipes() { RecipeLoader.RecipeLoad(); RecipeLoader.Fixer(); - RecipeLoader_02.RecipeLoad(); + RecipeLoader2.RecipeLoad(); NeutronActivatorLoader.NARecipeLoad(); } } diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java index 56e2a10df2..97b885668b 100644 --- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java @@ -1,40 +1,40 @@ package goodgenerator.loader; import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.neutronActivatorRecipes; -import static goodgenerator.items.MyMaterial.P507; -import static goodgenerator.items.MyMaterial.adamantine; -import static goodgenerator.items.MyMaterial.concentratedEnrichedNaquadahSludge; -import static goodgenerator.items.MyMaterial.enrichedNaquadahEarth; -import static goodgenerator.items.MyMaterial.enrichedNaquadahGoo; -import static goodgenerator.items.MyMaterial.enrichedNaquadahRichSolution; -import static goodgenerator.items.MyMaterial.enrichedNaquadahSulphate; -import static goodgenerator.items.MyMaterial.fluorineRichWasteLiquid; -import static goodgenerator.items.MyMaterial.fluoroantimonicAcid; -import static goodgenerator.items.MyMaterial.galliumHydroxide; -import static goodgenerator.items.MyMaterial.indiumPhosphate; -import static goodgenerator.items.MyMaterial.inertEnrichedNaquadah; -import static goodgenerator.items.MyMaterial.inertNaquadah; -import static goodgenerator.items.MyMaterial.inertNaquadria; -import static goodgenerator.items.MyMaterial.lowQualityNaquadahEmulsion; -import static goodgenerator.items.MyMaterial.lowQualityNaquadahSolution; -import static goodgenerator.items.MyMaterial.lowQualityNaquadriaPhosphate; -import static goodgenerator.items.MyMaterial.lowQualityNaquadriaSolution; -import static goodgenerator.items.MyMaterial.lowQualityNaquadriaSulphate; -import static goodgenerator.items.MyMaterial.magnesiumSulphate; -import static goodgenerator.items.MyMaterial.naquadahAdamantiumSolution; -import static goodgenerator.items.MyMaterial.naquadahEarth; -import static goodgenerator.items.MyMaterial.naquadahGoo; -import static goodgenerator.items.MyMaterial.naquadahRichSolution; -import static goodgenerator.items.MyMaterial.naquadahine; -import static goodgenerator.items.MyMaterial.naquadriaEarth; -import static goodgenerator.items.MyMaterial.naquadriaGoo; -import static goodgenerator.items.MyMaterial.naquadriaRichSolution; -import static goodgenerator.items.MyMaterial.naquadriaSulphate; -import static goodgenerator.items.MyMaterial.titaniumTrifluoride; -import static goodgenerator.items.MyMaterial.towEthyl1Hexanol; -import static goodgenerator.items.MyMaterial.triniumSulphate; -import static goodgenerator.items.MyMaterial.wasteLiquid; -import static goodgenerator.main.GG_Config_Loader.EnableNaquadahRework; +import static goodgenerator.items.GGMaterial.P507; +import static goodgenerator.items.GGMaterial.adamantine; +import static goodgenerator.items.GGMaterial.concentratedEnrichedNaquadahSludge; +import static goodgenerator.items.GGMaterial.enrichedNaquadahEarth; +import static goodgenerator.items.GGMaterial.enrichedNaquadahGoo; +import static goodgenerator.items.GGMaterial.enrichedNaquadahRichSolution; +import static goodgenerator.items.GGMaterial.enrichedNaquadahSulphate; +import static goodgenerator.items.GGMaterial.fluorineRichWasteLiquid; +import static goodgenerator.items.GGMaterial.fluoroantimonicAcid; +import static goodgenerator.items.GGMaterial.galliumHydroxide; +import static goodgenerator.items.GGMaterial.indiumPhosphate; +import static goodgenerator.items.GGMaterial.inertEnrichedNaquadah; +import static goodgenerator.items.GGMaterial.inertNaquadah; +import static goodgenerator.items.GGMaterial.inertNaquadria; +import static goodgenerator.items.GGMaterial.lowQualityNaquadahEmulsion; +import static goodgenerator.items.GGMaterial.lowQualityNaquadahSolution; +import static goodgenerator.items.GGMaterial.lowQualityNaquadriaPhosphate; +import static goodgenerator.items.GGMaterial.lowQualityNaquadriaSolution; +import static goodgenerator.items.GGMaterial.lowQualityNaquadriaSulphate; +import static goodgenerator.items.GGMaterial.magnesiumSulphate; +import static goodgenerator.items.GGMaterial.naquadahAdamantiumSolution; +import static goodgenerator.items.GGMaterial.naquadahEarth; +import static goodgenerator.items.GGMaterial.naquadahGoo; +import static goodgenerator.items.GGMaterial.naquadahRichSolution; +import static goodgenerator.items.GGMaterial.naquadahine; +import static goodgenerator.items.GGMaterial.naquadriaEarth; +import static goodgenerator.items.GGMaterial.naquadriaGoo; +import static goodgenerator.items.GGMaterial.naquadriaRichSolution; +import static goodgenerator.items.GGMaterial.naquadriaSulphate; +import static goodgenerator.items.GGMaterial.titaniumTrifluoride; +import static goodgenerator.items.GGMaterial.towEthyl1Hexanol; +import static goodgenerator.items.GGMaterial.triniumSulphate; +import static goodgenerator.items.GGMaterial.wasteLiquid; +import static goodgenerator.main.GGConfigLoader.EnableNaquadahRework; import static goodgenerator.util.MyRecipeAdder.computeRangeNKE; import static gregtech.api.recipe.RecipeMaps.autoclaveRecipes; import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; @@ -45,14 +45,14 @@ import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; -import static gregtech.api.util.GT_RecipeConstants.NKE_RANGE; -import static gregtech.api.util.GT_RecipeConstants.QFT_FOCUS_TIER; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; -import static gregtech.common.items.GT_MetaGenerated_Item_01.registerCauldronCleaningFor; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeConstants.NKE_RANGE; +import static gregtech.api.util.GTRecipeConstants.QFT_FOCUS_TIER; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; +import static gregtech.common.items.MetaGeneratedItem01.registerCauldronCleaningFor; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.quantumForceTransformerRecipes; import java.util.HashSet; @@ -64,13 +64,12 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.PlatinumSludgeOverHaul; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; - +import bartworks.system.material.WerkstoffLoader; +import bartworks.system.material.gtenhancement.PlatinumSludgeOverHaul; import goodgenerator.main.GoodGenerator; import goodgenerator.util.CrackRecipeAdder; import goodgenerator.util.ItemRefer; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.Mods; @@ -78,12 +77,12 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.interfaces.IRecipeMutableAccess; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gregtech.common.items.CombType; -import gregtech.loaders.misc.GT_Bees; +import gregtech.loaders.misc.GTBees; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.item.chemistry.GenericChem; @@ -94,12 +93,12 @@ public class NaquadahReworkRecipeLoader { if (!EnableNaquadahRework) return; // Naquadah (UEV) - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( naquadahEarth.get(OrePrefixes.dust, 32), Materials.Sodium.getDust(64), Materials.Carbon.getDust(1), - GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)) + GTUtility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)) .itemOutputs( inertNaquadah.get(OrePrefixes.dust, 1), Materials.Titanium.getDust(64), @@ -110,29 +109,29 @@ public class NaquadahReworkRecipeLoader { Materials.Fluorine.getGas(64000L), Materials.Oxygen.getGas(100L)) .duration(10 * SECONDS) - .eut(GT_Values.VP[10]) + .eut(GTValues.VP[10]) .metadata(QFT_FOCUS_TIER, 2) .addTo(quantumForceTransformerRecipes); // Enriched Naquadah (UIV) - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( enrichedNaquadahEarth.get(OrePrefixes.dust, 32), Materials.Zinc.getDust(64), Materials.Carbon.getDust(1), - GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)) + GTUtility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)) .itemOutputs(inertEnrichedNaquadah.get(OrePrefixes.dust, 1), Materials.Trinium.getDust(64)) .fluidInputs(Materials.SulfuricAcid.getFluid(16000), Materials.Oxygen.getGas(100L)) .fluidOutputs(wasteLiquid.getFluidOrGas(32000)) .duration(10 * SECONDS) - .eut(GT_Values.VP[11]) + .eut(GTValues.VP[11]) .metadata(QFT_FOCUS_TIER, 2) .addTo(quantumForceTransformerRecipes); // Naquadria (UMV) - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( naquadriaEarth.get(OrePrefixes.dust, 32), Materials.Magnesium.getDust(64), - GT_Utility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst)) + GTUtility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst)) .itemOutputs( inertNaquadria.get(OrePrefixes.dust, 1), Materials.Barium.getDust(64), @@ -143,13 +142,13 @@ public class NaquadahReworkRecipeLoader { Materials.SulfuricAcid.getFluid(16000), Materials.Oxygen.getGas(100L)) .duration(5 * SECONDS) - .eut(GT_Values.VP[12]) + .eut(GTValues.VP[12]) .metadata(QFT_FOCUS_TIER, 3) .addTo(quantumForceTransformerRecipes); // Activate Them - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(inertNaquadah.get(OrePrefixes.dust, 64), inertNaquadah.get(OrePrefixes.dust, 32)) .itemOutputs(Materials.Nickel.getDust(16)) .fluidInputs(Materials.Nickel.getPlasma(144 * 16)) @@ -159,7 +158,7 @@ public class NaquadahReworkRecipeLoader { .metadata(NKE_RANGE, computeRangeNKE(600, 500)) .noOptimize() .addTo(neutronActivatorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( inertEnrichedNaquadah.get(OrePrefixes.dust, 64), inertEnrichedNaquadah.get(OrePrefixes.dust, 32)) @@ -171,7 +170,7 @@ public class NaquadahReworkRecipeLoader { .metadata(NKE_RANGE, computeRangeNKE(900, 850)) .noOptimize() .addTo(neutronActivatorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(inertNaquadria.get(OrePrefixes.dust, 64), inertNaquadria.get(OrePrefixes.dust, 32)) .itemOutputs(Materials.Americium.getDust(16)) .fluidInputs(Materials.Americium.getPlasma(144 * 16)) @@ -183,7 +182,7 @@ public class NaquadahReworkRecipeLoader { .addTo(neutronActivatorRecipes); // Fix shit - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(lowQualityNaquadriaSolution.get(OrePrefixes.cell, 1)) .itemOutputs(Materials.Tin.getDust(2)) .duration(16 * SECONDS + 14 * TICKS) @@ -191,8 +190,8 @@ public class NaquadahReworkRecipeLoader { .addTo(maceratorRecipes); // Naquadah Rework Line - GT_Values.RA.stdBuilder() - .itemInputs(naquadahEarth.get(OrePrefixes.dust, 2), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(naquadahEarth.get(OrePrefixes.dust, 2), GTUtility.getIntegratedCircuit(1)) .fluidInputs(fluoroantimonicAcid.getFluidOrGas(3000)) .fluidOutputs(lowQualityNaquadahEmulsion.getFluidOrGas(2000)) .itemOutputs(titaniumTrifluoride.get(OrePrefixes.dust, 4)) @@ -202,19 +201,19 @@ public class NaquadahReworkRecipeLoader { .addTo(blastFurnaceRecipes); // TiF3 + 3H = Ti + 3HF - GT_Values.RA.stdBuilder() - .itemInputs(titaniumTrifluoride.get(OrePrefixes.dust, 4), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(titaniumTrifluoride.get(OrePrefixes.dust, 4), GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Hydrogen.getGas(3000)) .fluidOutputs(Materials.HydrofluoricAcid.getFluid(3000)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Titanium, 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.Titanium, 1)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_EV) .metadata(COIL_HEAT, 2000) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 1)), + GTUtility.copyAmount(0, GTOreDictUnificator.get(OrePrefixes.plate, Materials.Copper, 1)), Materials.Hydrogen.getCells(8)) .fluidInputs(FluidRegistry.getFluidStack("seedoil", 3000)) .itemOutputs(ItemList.Cell_Empty.get(8)) @@ -224,8 +223,8 @@ public class NaquadahReworkRecipeLoader { .addTo(UniversalChemical); // 2C8H18O + H3PO4 =Na,C2H6O= C16H35O3P + 2H2O - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 2)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 2)) .fluidInputs( towEthyl1Hexanol.getFluidOrGas(2000), Materials.PhosphoricAcid.getFluid(1000), @@ -235,7 +234,7 @@ public class NaquadahReworkRecipeLoader { .eut(TierEU.RECIPE_EV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(lowQualityNaquadahSolution.get(OrePrefixes.cell, 36), P507.get(OrePrefixes.cell, 4)) .itemOutputs(naquadahAdamantiumSolution.get(OrePrefixes.cell, 30), ItemList.Cell_Empty.get(10)) .fluidOutputs(fluorineRichWasteLiquid.getFluidOrGas(10000)) @@ -243,15 +242,15 @@ public class NaquadahReworkRecipeLoader { .eut(TierEU.RECIPE_EV) .addTo(chemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(P507.getFluidOrGas(4000), lowQualityNaquadahSolution.getFluidOrGas(36000)) .fluidOutputs(fluorineRichWasteLiquid.getFluidOrGas(10000), naquadahAdamantiumSolution.getFluidOrGas(30000)) .duration(3 * MINUTES + 20 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 40)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 40)) .fluidInputs(fluorineRichWasteLiquid.getFluidOrGas(1500)) .fluidOutputs(wasteLiquid.getFluidOrGas(1000)) .itemOutputs(WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 60)) @@ -263,11 +262,11 @@ public class NaquadahReworkRecipeLoader { wasteLiquid.getFluidOrGas(10000), new FluidStack[] { Materials.SaltWater.getFluid(3000), FluidRegistry.getFluidStack("phenol", 2000), Materials.HydrochloricAcid.getFluid(5000) }, - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3), 15 * SECONDS, TierEU.RECIPE_HV); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemOutputs( adamantine.get(OrePrefixes.dust, 4), naquadahEarth.get(OrePrefixes.dust, 2), @@ -280,8 +279,8 @@ public class NaquadahReworkRecipeLoader { .noOptimize() .addTo(neutronActivatorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27)) .fluidInputs(naquadahRichSolution.getFluidOrGas(5000)) .itemOutputs(naquadahine.get(OrePrefixes.dust, 30)) .fluidOutputs(P507.getFluidOrGas(1000)) @@ -290,33 +289,33 @@ public class NaquadahReworkRecipeLoader { .addTo(autoclaveRecipes); // NqO2 + C = CO2 + Nq - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( naquadahine.get(OrePrefixes.dust, 3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Carbon, 1)) .fluidOutputs(Materials.CarbonDioxide.getGas(1000)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Naquadah, 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.Naquadah, 1)) .duration(2 * SECONDS) .eut(TierEU.RECIPE_IV) .metadata(COIL_HEAT, 5000) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 27), + GTUtility.getIntegratedCircuit(1)) .fluidInputs(lowQualityNaquadahEmulsion.getFluidOrGas(10000)) .itemOutputs( galliumHydroxide.get(OrePrefixes.dust, 64), galliumHydroxide.get(OrePrefixes.dust, 48), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Antimony, 15)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Antimony, 15)) .outputChances(6250, 6250, 10000) .fluidOutputs(lowQualityNaquadahSolution.getFluidOrGas(9000)) .duration(50 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(enrichedNaquadahEarth.get(OrePrefixes.dust, 4)) .fluidInputs(P507.getFluidOrGas(1000), Materials.SulfuricAcid.getFluid(18000)) .fluidOutputs(enrichedNaquadahRichSolution.getFluidOrGas(4000), wasteLiquid.getFluidOrGas(1000)) @@ -326,7 +325,7 @@ public class NaquadahReworkRecipeLoader { .addTo(multiblockChemicalReactorRecipes); // ZnSO4 + 2H = H2SO4 + Zn - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(WerkstoffLoader.ZincSulfate.get(OrePrefixes.dust, 6)) .fluidInputs(Materials.Hydrogen.getGas(2000)) .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) @@ -335,8 +334,8 @@ public class NaquadahReworkRecipeLoader { .eut(TierEU.RECIPE_ULV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 60)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 60)) .fluidInputs(enrichedNaquadahRichSolution.getFluidOrGas(10000)) .itemOutputs(concentratedEnrichedNaquadahSludge.get(OrePrefixes.dust, 8)) .fluidOutputs(P507.getFluidOrGas(2500)) @@ -344,7 +343,7 @@ public class NaquadahReworkRecipeLoader { .eut(TierEU.RECIPE_HV) .addTo(autoclaveRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(concentratedEnrichedNaquadahSludge.get(OrePrefixes.dust, 16)) .itemOutputs( enrichedNaquadahSulphate.get(OrePrefixes.dust, 64), @@ -361,12 +360,12 @@ public class NaquadahReworkRecipeLoader { .addTo(neutronActivatorRecipes); // Nq+(SO4)2 + 2Zn = Nq+ + 2ZnSO4 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( enrichedNaquadahSulphate.get(OrePrefixes.dust, 11), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 2)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 2)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.NaquadahEnriched, 1), + GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.NaquadahEnriched, 1), WerkstoffLoader.ZincSulfate.get(OrePrefixes.dust, 12)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_IV) @@ -374,16 +373,16 @@ public class NaquadahReworkRecipeLoader { .addTo(blastFurnaceRecipes); // KeSO4 + 2H = Ke + H2SO4 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(triniumSulphate.get(OrePrefixes.dust, 6)) .fluidInputs(Materials.Hydrogen.getGas(2000)) .fluidOutputs(Materials.SulfuricAcid.getFluid(1000)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Trinium, 1)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(naquadriaEarth.get(OrePrefixes.dust, 4)) .fluidInputs(Materials.PhosphoricAcid.getFluid(4000)) .itemOutputs( @@ -395,38 +394,38 @@ public class NaquadahReworkRecipeLoader { .addTo(centrifugeRecipes); // Ga(OH)3 + 3Na = Ga + 3NaOH - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( galliumHydroxide.get(OrePrefixes.dust, 7), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 3)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 3)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gallium, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.SodiumHydroxide, 9)) .duration(2 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); // 2InPO4 + 3Ca = 2In + Ca3(PO4)2 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( indiumPhosphate.get(OrePrefixes.dust, 12), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 3)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 3)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 5)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 2), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.TricalciumPhosphate, 5)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(lowQualityNaquadriaPhosphate.get(OrePrefixes.dust, 10), Materials.SulfuricAcid.getCells(30)) .fluidOutputs(naquadriaRichSolution.getFluidOrGas(9000)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Barite, 1), ItemList.Cell_Empty.get(30)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Barite, 1), ItemList.Cell_Empty.get(30)) .duration(50 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemOutputs( naquadriaSulphate.get(OrePrefixes.dust, 44), lowQualityNaquadriaSulphate.get(OrePrefixes.dust, 6)) @@ -437,7 +436,7 @@ public class NaquadahReworkRecipeLoader { .noOptimize() .addTo(neutronActivatorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(lowQualityNaquadriaSulphate.get(OrePrefixes.dust, 3), Materials.Water.getCells(3)) .fluidInputs(P507.getFluidOrGas(500)) .fluidOutputs(lowQualityNaquadriaSolution.getFluidOrGas(3500)) @@ -455,12 +454,12 @@ public class NaquadahReworkRecipeLoader { TierEU.RECIPE_IV); // Nq*(SO4)2 + 2Mg = Nq* + 2MgSO4 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( naquadriaSulphate.get(OrePrefixes.dust, 11), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Naquadria, 1), + GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.Naquadria, 1), magnesiumSulphate.get(OrePrefixes.dust, 12)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_ZPM) @@ -468,17 +467,17 @@ public class NaquadahReworkRecipeLoader { .addTo(blastFurnaceRecipes); // InPO4 + Ga(OH)3 = InGaP - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( indiumPhosphate.get(OrePrefixes.dust, 6), galliumHydroxide.get(OrePrefixes.dust, 7), - GT_Utility.getIntegratedCircuit(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.IndiumGalliumPhosphide, 3)) + GTUtility.getIntegratedCircuit(2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.IndiumGalliumPhosphide, 3)) .duration(15 * TICKS) .eut(TierEU.RECIPE_ULV) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ball.get(0)) .fluidInputs(naquadahGoo.getFluidOrGas(72)) .itemOutputs(ItemRefer.Naquadah_Mass.get(1)) @@ -486,7 +485,7 @@ public class NaquadahReworkRecipeLoader { .eut(TierEU.RECIPE_LV) .addTo(fluidSolidifierRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ball.get(0)) .fluidInputs(enrichedNaquadahGoo.getFluidOrGas(72)) .itemOutputs(ItemRefer.Enriched_Naquadah_Mass.get(1)) @@ -494,7 +493,7 @@ public class NaquadahReworkRecipeLoader { .eut(TierEU.RECIPE_LV) .addTo(fluidSolidifierRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ball.get(0)) .fluidInputs(naquadriaGoo.getFluidOrGas(72)) .itemOutputs(ItemRefer.Naquadria_Mass.get(1)) @@ -502,7 +501,7 @@ public class NaquadahReworkRecipeLoader { .eut(TierEU.RECIPE_LV) .addTo(fluidSolidifierRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Naquadah_Mass.get(1)) .itemOutputs(naquadahEarth.get(OrePrefixes.dust, 1), enrichedNaquadahEarth.get(OrePrefixes.dust, 1)) .outputChances(10000, 100) @@ -510,7 +509,7 @@ public class NaquadahReworkRecipeLoader { .eut(2) .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Enriched_Naquadah_Mass.get(1)) .itemOutputs(enrichedNaquadahEarth.get(OrePrefixes.dust, 1), naquadriaEarth.get(OrePrefixes.dust, 1)) .outputChances(10000, 100) @@ -518,7 +517,7 @@ public class NaquadahReworkRecipeLoader { .eut(2) .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Naquadria_Mass.get(1)) .itemOutputs(naquadriaEarth.get(OrePrefixes.dust, 1), naquadriaEarth.get(OrePrefixes.dust, 1)) .outputChances(10000, 100) @@ -526,9 +525,9 @@ public class NaquadahReworkRecipeLoader { .eut(2) .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 16), + GTOreDictUnificator.get(OrePrefixes.block, Materials.SiliconSG, 16), naquadahine.get(OrePrefixes.dust, 3), ItemList.GalliumArsenideCrystal.get(1L)) .fluidInputs(Materials.Argon.getGas(8000)) @@ -539,15 +538,15 @@ public class NaquadahReworkRecipeLoader { .addTo(blastFurnaceRecipes); // NqO2 + 4Na = 2Na2O + Nq - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(naquadahine.get(OrePrefixes.dust, 3), Materials.Sodium.getDust(4)) .itemOutputs(Materials.Naquadah.getDust(1), Materials.SodiumOxide.getDust(6)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() - .itemInputs(naquadahEarth.get(OrePrefixes.dust, 2), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(naquadahEarth.get(OrePrefixes.dust, 2), GTUtility.getIntegratedCircuit(2)) .fluidInputs(Materials.Nitrogen.getGas(1000)) .itemOutputs(Materials.Naquadah.getNuggets(1)) .duration(2 * MINUTES) @@ -556,25 +555,25 @@ public class NaquadahReworkRecipeLoader { .addTo(blastFurnaceRecipes); // C2H4 + H2O(g) = C2H6O - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(24)) .fluidInputs(Materials.Ethylene.getGas(1000), FluidRegistry.getFluidStack("steam", 2000)) .fluidOutputs(Materials.Ethanol.getFluid(1000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(Materials.Ethylene.getCells(1), GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(Materials.Ethylene.getCells(1), GTUtility.getIntegratedCircuit(24)) .fluidInputs(FluidRegistry.getFluidStack("steam", 2000)) .itemOutputs(Materials.Ethanol.getCells(1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(chemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Naquadah, 1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, Materials.Naquadah, 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Naquadah, 1)) .duration(16 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(vacuumFreezerRecipes); @@ -582,20 +581,20 @@ public class NaquadahReworkRecipeLoader { public static void SmallRecipeChange() { - GT_Recipe tRecipe; + GTRecipe tRecipe; tRecipe = RecipeMaps.chemicalReactorRecipes.findRecipe( null, false, 1 << 30, new FluidStack[] { Materials.SulfuricAcid.getFluid(500) }, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 16), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 16), ItemList.Empty_Board_Elite.get(2)); if (tRecipe != null) { RecipeMaps.chemicalReactorRecipes.getBackend() .removeRecipe(tRecipe); - GT_Recipe tRecipe2 = tRecipe.copy(); - tRecipe2.mInputs = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 8), + GTRecipe tRecipe2 = tRecipe.copy(); + tRecipe2.mInputs = new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 8), ItemList.Empty_Board_Elite.get(2) }; RecipeMaps.chemicalReactorRecipes.add(tRecipe2); RecipeMaps.chemicalReactorRecipes.getBackend() @@ -607,13 +606,13 @@ public class NaquadahReworkRecipeLoader { false, 1 << 30, new FluidStack[] { Materials.SulfuricAcid.getFluid(500) }, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 16), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Platinum, 16), ItemList.Empty_Board_Elite.get(2)); if (tRecipe != null) { RecipeMaps.multiblockChemicalReactorRecipes.getBackend() .removeRecipe(tRecipe); - GT_Recipe tRecipe2 = tRecipe.copy(); - tRecipe2.mInputs = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 8), + GTRecipe tRecipe2 = tRecipe.copy(); + tRecipe2.mInputs = new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 8), ItemList.Empty_Board_Elite.get(2) }; RecipeMaps.multiblockChemicalReactorRecipes.add(tRecipe2); RecipeMaps.multiblockChemicalReactorRecipes.getBackend() @@ -625,16 +624,16 @@ public class NaquadahReworkRecipeLoader { false, 1 << 30, new FluidStack[] { Materials.Polybenzimidazole.getMolten(36) }, - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.HSSS, 1), - GT_Utility.getIntegratedCircuit(1)); + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 2), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.HSSS, 1), + GTUtility.getIntegratedCircuit(1)); if (tRecipe != null) { RecipeMaps.assemblerRecipes.getBackend() .removeRecipe(tRecipe); - GT_Recipe tRecipe2 = tRecipe.copy(); + GTRecipe tRecipe2 = tRecipe.copy(); tRecipe2.mInputs = new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 2), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NaquadahEnriched, 1) }; + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Polybenzimidazole, 2), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.NaquadahEnriched, 1) }; RecipeMaps.assemblerRecipes.add(tRecipe2); RecipeMaps.assemblerRecipes.getBackend() .reInit(); @@ -645,15 +644,15 @@ public class NaquadahReworkRecipeLoader { if (!EnableNaquadahRework) return; - GT_Log.out.print(GoodGenerator.MOD_ID + ": Begin to remove pure Naquadah, Enriched Naquadah and Naquadria.\n"); + GTLog.out.print(GoodGenerator.MOD_ID + ": Begin to remove pure Naquadah, Enriched Naquadah and Naquadria.\n"); - HashSet<GT_Recipe> remove = new HashSet<>(5000); - HashSet<GT_Recipe> reAdd = new HashSet<>(5000); + HashSet<GTRecipe> remove = new HashSet<>(5000); + HashSet<GTRecipe> reAdd = new HashSet<>(5000); // For Crusher - for (GT_Recipe recipe : RecipeMaps.maceratorRecipes.getAllRecipes()) { + for (GTRecipe recipe : RecipeMaps.maceratorRecipes.getAllRecipes()) { ItemStack input = recipe.mInputs[0]; - if (GT_Utility.isStackValid(input)) { + if (GTUtility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { if ((OreDictionary.getOreName(oreDictID) @@ -664,22 +663,22 @@ public class NaquadahReworkRecipeLoader { .startsWith("crushed")) && OreDictionary.getOreName(oreDictID) .contains("Naq")) { - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; @@ -700,39 +699,39 @@ public class NaquadahReworkRecipeLoader { RecipeMaps.maceratorRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Crusher done!\n"); + GTLog.out.print("Crusher done!\n"); // For Washer - for (GT_Recipe recipe : RecipeMaps.oreWasherRecipes.getAllRecipes()) { + for (GTRecipe recipe : RecipeMaps.oreWasherRecipes.getAllRecipes()) { ItemStack input = recipe.mInputs[0]; - if (GT_Utility.isStackValid(input)) { + if (GTUtility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { if (OreDictionary.getOreName(oreDictID) .startsWith("crushed") && OreDictionary.getOreName(oreDictID) .contains("Naq")) { - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; @@ -753,39 +752,39 @@ public class NaquadahReworkRecipeLoader { RecipeMaps.oreWasherRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Washer done!\n"); + GTLog.out.print("Washer done!\n"); // For Thermal Centrifuge - for (GT_Recipe recipe : RecipeMaps.thermalCentrifugeRecipes.getAllRecipes()) { + for (GTRecipe recipe : RecipeMaps.thermalCentrifugeRecipes.getAllRecipes()) { ItemStack input = recipe.mInputs[0]; - if (GT_Utility.isStackValid(input)) { + if (GTUtility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { if (OreDictionary.getOreName(oreDictID) .startsWith("crushed") && OreDictionary.getOreName(oreDictID) .contains("Naq")) { - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; @@ -806,26 +805,26 @@ public class NaquadahReworkRecipeLoader { RecipeMaps.thermalCentrifugeRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Thermal Centrifuge done!\n"); + GTLog.out.print("Thermal Centrifuge done!\n"); final boolean checkCombs = Mods.Forestry.isModLoaded(); // For Centrifuge - for (GT_Recipe recipe : RecipeMaps.centrifugeRecipes.getAllRecipes()) { + for (GTRecipe recipe : RecipeMaps.centrifugeRecipes.getAllRecipes()) { ItemStack input = null; if (recipe.mInputs.length > 0) input = recipe.mInputs[0]; - if (GT_Utility.isStackValid(input)) { + if (GTUtility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); - if (checkCombs && input.isItemEqual(GT_Bees.combs.getStackForType(CombType.DOB))) { - GT_Recipe tRecipe = recipe.copy(); + if (checkCombs && input.isItemEqual(GTBees.combs.getStackForType(CombType.DOB))) { + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2L, naquadahEarth.get(OrePrefixes.dustTiny, 1)); modified = true; @@ -844,52 +843,52 @@ public class NaquadahReworkRecipeLoader { .startsWith("dustSpace") || OreDictionary.getOreName(oreDictID) .startsWith("dustNaq")) { - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dustTiny, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dustTiny, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dustTiny, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustSmall(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dustSmall, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustSmall(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dustSmall, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustSmall(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dustSmall, 1)); modified = true; @@ -910,26 +909,26 @@ public class NaquadahReworkRecipeLoader { RecipeMaps.centrifugeRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Centrifuge done!\n"); + GTLog.out.print("Centrifuge done!\n"); // For Centrifuge (PA) - for (GT_Recipe recipe : RecipeMaps.centrifugeNonCellRecipes.getAllRecipes()) { + for (GTRecipe recipe : RecipeMaps.centrifugeNonCellRecipes.getAllRecipes()) { ItemStack input = null; if (recipe.mInputs.length > 0) input = recipe.mInputs[0]; - if (GT_Utility.isStackValid(input)) { + if (GTUtility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); - if (checkCombs && input.isItemEqual(GT_Bees.combs.getStackForType(CombType.DOB))) { - GT_Recipe tRecipe = recipe.copy(); + if (checkCombs && input.isItemEqual(GTBees.combs.getStackForType(CombType.DOB))) { + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2L, naquadahEarth.get(OrePrefixes.dustTiny, 1)); modified = true; @@ -948,52 +947,52 @@ public class NaquadahReworkRecipeLoader { .startsWith("dustSpace") || OreDictionary.getOreName(oreDictID) .startsWith("dustNaq")) { - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dustTiny, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dustTiny, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustTiny(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dustTiny, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDustSmall(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dustSmall, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDustSmall(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dustSmall, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDustSmall(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dustSmall, 1)); modified = true; @@ -1014,39 +1013,39 @@ public class NaquadahReworkRecipeLoader { RecipeMaps.centrifugeNonCellRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Centrifuge (PA) done!\n"); + GTLog.out.print("Centrifuge (PA) done!\n"); // For Hammer - for (GT_Recipe recipe : RecipeMaps.hammerRecipes.getAllRecipes()) { + for (GTRecipe recipe : RecipeMaps.hammerRecipes.getAllRecipes()) { ItemStack input = recipe.mInputs[0]; - if (GT_Utility.isStackValid(input)) { + if (GTUtility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { if (OreDictionary.getOreName(oreDictID) .startsWith("crushed") && OreDictionary.getOreName(oreDictID) .contains("Naq")) { - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize * 2, naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; @@ -1067,15 +1066,15 @@ public class NaquadahReworkRecipeLoader { RecipeMaps.hammerRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Hammer done!\n"); + GTLog.out.print("Hammer done!\n"); // For Chemical Reactor - for (GT_Recipe recipe : RecipeMaps.chemicalReactorRecipes.getAllRecipes()) { + for (GTRecipe recipe : RecipeMaps.chemicalReactorRecipes.getAllRecipes()) { if (recipe.mFluidOutputs == null) continue; boolean isAny = false; for (int i = 0; i < recipe.mFluidOutputs.length; i++) { @@ -1088,7 +1087,7 @@ public class NaquadahReworkRecipeLoader { } } if (!isAny) continue; - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < recipe.mFluidOutputs.length; i++) { if (recipe.mFluidOutputs[i] == null) continue; @@ -1114,15 +1113,15 @@ public class NaquadahReworkRecipeLoader { RecipeMaps.chemicalReactorRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Chemical Reactor done!\n"); + GTLog.out.print("Chemical Reactor done!\n"); // For Multi Chemical Reactor - for (GT_Recipe recipe : RecipeMaps.multiblockChemicalReactorRecipes.getAllRecipes()) { + for (GTRecipe recipe : RecipeMaps.multiblockChemicalReactorRecipes.getAllRecipes()) { if (recipe.mFluidOutputs == null) continue; boolean isAny = false; for (int i = 0; i < recipe.mFluidOutputs.length; i++) { @@ -1135,7 +1134,7 @@ public class NaquadahReworkRecipeLoader { } } if (!isAny) continue; - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < recipe.mFluidOutputs.length; i++) { if (recipe.mFluidOutputs[i] == null) continue; @@ -1161,12 +1160,12 @@ public class NaquadahReworkRecipeLoader { RecipeMaps.multiblockChemicalReactorRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Multi Chemical Reactor done!\n"); + GTLog.out.print("Multi Chemical Reactor done!\n"); // For Gt++ Multi Centrifuge // Apparently NEI will break down if one modifies the hash list directly. @@ -1177,30 +1176,30 @@ public class NaquadahReworkRecipeLoader { // GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.reInit(); // For Simple Washer - for (GT_Recipe recipe : GTPPRecipeMaps.simpleWasherRecipes.getAllRecipes()) { + for (GTRecipe recipe : GTPPRecipeMaps.simpleWasherRecipes.getAllRecipes()) { ItemStack input = recipe.mInputs[0]; - if (GT_Utility.isStackValid(input)) { + if (GTUtility.isStackValid(input)) { int[] oreDict = OreDictionary.getOreIDs(input); for (int oreDictID : oreDict) { if (OreDictionary.getOreName(oreDictID) .startsWith("dustImpureNaq") || OreDictionary.getOreName(oreDictID) .startsWith("dustPureNaq")) { - GT_Recipe tRecipe = recipe.copy(); + GTRecipe tRecipe = recipe.copy(); boolean modified = false; for (int i = 0; i < tRecipe.mOutputs.length; i++) { - if (!GT_Utility.isStackValid(tRecipe.mOutputs[i])) continue; + if (!GTUtility.isStackValid(tRecipe.mOutputs[i])) continue; if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadah.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility + tRecipe.mOutputs[i] = GTUtility .copyAmount(tRecipe.mOutputs[i].stackSize, naquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.NaquadahEnriched.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility.copyAmount( + tRecipe.mOutputs[i] = GTUtility.copyAmount( tRecipe.mOutputs[i].stackSize, enrichedNaquadahEarth.get(OrePrefixes.dust, 1)); modified = true; } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Naquadria.getDust(1))) { - tRecipe.mOutputs[i] = GT_Utility + tRecipe.mOutputs[i] = GTUtility .copyAmount(tRecipe.mOutputs[i].stackSize, naquadriaEarth.get(OrePrefixes.dust, 1)); modified = true; } @@ -1220,27 +1219,27 @@ public class NaquadahReworkRecipeLoader { GTPPRecipeMaps.simpleWasherRecipes.getBackend() .reInit(); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace " + remove.size() + "! "); remove.clear(); reAdd.clear(); - GT_Log.out.print("Simple Washer done!\n"); + GTLog.out.print("Simple Washer done!\n"); // For Cauldron Wash registerCauldronCleaningFor(Materials.Naquadah, naquadahEarth.getBridgeMaterial()); registerCauldronCleaningFor(Materials.NaquadahEnriched, enrichedNaquadahEarth.getBridgeMaterial()); registerCauldronCleaningFor(Materials.Naquadria, naquadriaEarth.getBridgeMaterial()); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace 3! "); - GT_Log.out.print("Cauldron Wash done!\n"); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace 3! "); + GTLog.out.print("Cauldron Wash done!\n"); // For Crafting Table CraftingManager.getInstance() .getRecipeList() .forEach(NaquadahReworkRecipeLoader::replaceInCraftTable); - GT_Log.out.print(GoodGenerator.MOD_ID + ": Replace Unknown! "); - GT_Log.out.print("Crafting Table done!\n"); + GTLog.out.print(GoodGenerator.MOD_ID + ": Replace Unknown! "); + GTLog.out.print("Crafting Table done!\n"); } public static void replaceInCraftTable(Object obj) { @@ -1252,17 +1251,17 @@ public class NaquadahReworkRecipeLoader { Object input = mutableRecipe.gt5u$getRecipeInputs(); - if (GT_Utility.areStacksEqual(result, Materials.Naquadah.getDust(1), true)) { + if (GTUtility.areStacksEqual(result, Materials.Naquadah.getDust(1), true)) { if (PlatinumSludgeOverHaul.checkRecipe(input, Materials.Naquadah)) { return; } mutableRecipe.gt5u$setRecipeOutputItem(naquadahEarth.get(OrePrefixes.dust, 2)); - } else if (GT_Utility.areStacksEqual(result, Materials.NaquadahEnriched.getDust(1), true)) { + } else if (GTUtility.areStacksEqual(result, Materials.NaquadahEnriched.getDust(1), true)) { if (PlatinumSludgeOverHaul.checkRecipe(input, Materials.NaquadahEnriched)) { return; } mutableRecipe.gt5u$setRecipeOutputItem(enrichedNaquadahEarth.get(OrePrefixes.dust, 2)); - } else if (GT_Utility.areStacksEqual(result, Materials.Naquadria.getDust(1), true)) { + } else if (GTUtility.areStacksEqual(result, Materials.Naquadria.getDust(1), true)) { if (PlatinumSludgeOverHaul.checkRecipe(input, Materials.Naquadria)) { return; } diff --git a/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java b/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java index 6e07c53235..aaba3ac759 100644 --- a/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java +++ b/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java @@ -1,27 +1,27 @@ package goodgenerator.loader; import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.neutronActivatorRecipes; -import static goodgenerator.items.MyMaterial.plutoniumBasedLiquidFuel; -import static goodgenerator.items.MyMaterial.plutoniumBasedLiquidFuelExcited; -import static goodgenerator.items.MyMaterial.thoriumBasedLiquidFuelDepleted; -import static goodgenerator.items.MyMaterial.thoriumBasedLiquidFuelExcited; -import static goodgenerator.items.MyMaterial.uraniumBasedLiquidFuel; -import static goodgenerator.items.MyMaterial.uraniumBasedLiquidFuelExcited; +import static goodgenerator.items.GGMaterial.plutoniumBasedLiquidFuel; +import static goodgenerator.items.GGMaterial.plutoniumBasedLiquidFuelExcited; +import static goodgenerator.items.GGMaterial.thoriumBasedLiquidFuelDepleted; +import static goodgenerator.items.GGMaterial.thoriumBasedLiquidFuelExcited; +import static goodgenerator.items.GGMaterial.uraniumBasedLiquidFuel; +import static goodgenerator.items.GGMaterial.uraniumBasedLiquidFuelExcited; import static goodgenerator.util.MyRecipeAdder.computeRangeNKE; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.NKE_RANGE; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.NKE_RANGE; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; public class NeutronActivatorLoader { public static void NARecipeLoad() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(thoriumBasedLiquidFuelExcited.getFluidOrGas(200)) .fluidOutputs(thoriumBasedLiquidFuelDepleted.getFluidOrGas(200)) .duration(8 * MINUTES + 20 * SECONDS) @@ -29,8 +29,8 @@ public class NeutronActivatorLoader { .metadata(NKE_RANGE, computeRangeNKE(700, 500)) .noOptimize() .addTo(neutronActivatorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tungsten, 1))) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(0, GTOreDictUnificator.get(OrePrefixes.plate, Materials.Tungsten, 1))) .fluidInputs(uraniumBasedLiquidFuel.getFluidOrGas(100)) .fluidOutputs(uraniumBasedLiquidFuelExcited.getFluidOrGas(100)) .duration(4 * SECONDS) @@ -38,8 +38,8 @@ public class NeutronActivatorLoader { .metadata(NKE_RANGE, computeRangeNKE(550, 450)) .noOptimize() .addTo(neutronActivatorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(0, GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tritanium, 1))) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(0, GTOreDictUnificator.get(OrePrefixes.plate, Materials.Tritanium, 1))) .fluidInputs(plutoniumBasedLiquidFuel.getFluidOrGas(100)) .fluidOutputs(plutoniumBasedLiquidFuelExcited.getFluidOrGas(100)) .duration(4 * SECONDS) diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index 261ecc69cc..58afffeee4 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -14,67 +14,66 @@ import static gregtech.api.recipe.RecipeMaps.implosionRecipes; import static gregtech.api.recipe.RecipeMaps.mixerRecipes; import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.HOURS; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.ADDITIVE_AMOUNT; -import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; -import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE; -import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE; -import static gregtech.api.util.GT_RecipeConstants.FUSION_THRESHOLD; -import static gregtech.api.util.GT_RecipeConstants.PRECISE_ASSEMBLER_CASING_TIER; -import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM; -import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; -import static gregtech.loaders.postload.GT_MachineRecipeLoader.solderingMats; +import static gregtech.api.util.GTRecipeBuilder.HOURS; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.ADDITIVE_AMOUNT; +import static gregtech.api.util.GTRecipeConstants.AssemblyLine; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE; +import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE; +import static gregtech.api.util.GTRecipeConstants.FUSION_THRESHOLD; +import static gregtech.api.util.GTRecipeConstants.PRECISE_ASSEMBLER_CASING_TIER; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; +import static gregtech.loaders.postload.MachineRecipeLoader.solderingMats; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; - +import bartworks.system.material.WerkstoffLoader; import goodgenerator.api.recipe.GoodGeneratorRecipeMaps; -import goodgenerator.items.MyMaterial; +import goodgenerator.items.GGMaterial; import goodgenerator.util.CrackRecipeAdder; import goodgenerator.util.ItemRefer; import goodgenerator.util.MaterialFix; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeConstants; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeConstants; +import gregtech.api.util.GTUtility; public class RecipeLoader { public static void RecipeLoad() { // Radiation Protection Plate - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 8L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8L), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Iridium, 8L), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8L), + GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Lead.getMolten(1152)) .itemOutputs(ItemRefer.Radiation_Protection_Plate.get(1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lanthanum, 4L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8L), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Lanthanum, 4L), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8L), + GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Lead.getMolten(1152)) .itemOutputs(ItemRefer.Radiation_Protection_Plate.get(1)) .duration(20 * SECONDS) @@ -86,22 +85,22 @@ public class RecipeLoader { : FluidRegistry.getFluid("molten.solderingalloy"); // LNR Controller - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata( RESEARCH_ITEM, ItemList.Generator_Naquadah_Mark_III.get(1) .copy()) .metadata(RESEARCH_TIME, 1 * HOURS + 24 * MINUTES) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Adamantium, 8), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Adamantium, 8), ItemRefer.Radiation_Protection_Plate.get(16), ItemList.Field_Generator_ZPM.get(2), ItemList.Electric_Pump_ZPM.get(8), new Object[] { OrePrefixes.circuit.get(Materials.UV), 4 }, - GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorLuV, 8), - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Naquadah, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 16)) + GTOreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorLuV, 8), + GTOreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Naquadah, 4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 8), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.Osmium, 16)) .fluidInputs( Materials.Trinium.getMolten(576), new FluidStack(solderIndalloy, 4608), @@ -112,187 +111,187 @@ public class RecipeLoader { .addTo(AssemblyLine); // LNR Casing - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Radiation_Protection_Plate.get(6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Europium, 1), ItemList.Field_Generator_MV.get(1), - GT_Utility.getIntegratedCircuit(1)) + GTUtility.getIntegratedCircuit(1)) .itemOutputs(ItemRefer.Field_Restriction_Casing.get(1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); // LNR Frame - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 8), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSE, 4), - GT_Utility.getIntegratedCircuit(24)) + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.NaquadahAlloy, 8), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSE, 4), + GTUtility.getIntegratedCircuit(24)) .itemOutputs(ItemRefer.Radiation_Proof_Steel_Frame_Box.get(1)) .duration(16 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); // Uranium Liquid Fuel Process Line - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.graphiteUraniumMixture.get(OrePrefixes.dust, 4), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.TungstenCarbide, 2), - GT_Utility.getIntegratedCircuit(1)) + GGMaterial.graphiteUraniumMixture.get(OrePrefixes.dust, 4), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.TungstenCarbide, 2), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(ItemRefer.Wrapped_Uranium_Ingot.get(1)) .duration(1 * MINUTES + 10 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Wrapped_Uranium_Ingot.get(4)) .itemOutputs( ItemRefer.High_Density_Uranium_Nugget.get(1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.TungstenCarbide, 8)) + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.TungstenCarbide, 8)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .metadata(ADDITIVE_AMOUNT, 8) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.High_Density_Uranium_Nugget.get(9)) .itemOutputs(ItemRefer.High_Density_Uranium.get(1)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(compressorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.High_Density_Uranium.get(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quantium, 4), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 8), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quantium, 4), + GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Radon.getGas(1000L)) - .fluidOutputs(MyMaterial.uraniumBasedLiquidFuel.getFluidOrGas(1000)) + .fluidOutputs(GGMaterial.uraniumBasedLiquidFuel.getFluidOrGas(1000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LuV / 2) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() - .fluidInputs(MyMaterial.uraniumBasedLiquidFuel.getFluidOrGas(10), Materials.Hydrogen.getGas(100L)) - .fluidOutputs(MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(10)) + GTValues.RA.stdBuilder() + .fluidInputs(GGMaterial.uraniumBasedLiquidFuel.getFluidOrGas(10), Materials.Hydrogen.getGas(100L)) + .fluidOutputs(GGMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(10)) .duration(2 * SECONDS) .eut(TierEU.RECIPE_IV) .metadata(FUSION_THRESHOLD, 200000000) .addTo(fusionRecipes); // Thorium Liquid Process Line - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.uraniumCarbideThoriumMixture.get(OrePrefixes.dust, 64), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.TungstenSteel, 4), - GT_Utility.getIntegratedCircuit(1)) + GGMaterial.uraniumCarbideThoriumMixture.get(OrePrefixes.dust, 64), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.TungstenSteel, 4), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(ItemRefer.Wrapped_Thorium_Ingot.get(1)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Wrapped_Thorium_Ingot.get(1)) .itemOutputs( ItemRefer.High_Density_Thorium_Nugget.get(1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.TungstenSteel, 8)) + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.TungstenSteel, 8)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .metadata(ADDITIVE_AMOUNT, 4) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.High_Density_Thorium_Nugget.get(9)) .itemOutputs(ItemRefer.High_Density_Thorium.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(compressorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.High_Density_Thorium.get(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Draconium, 2), - GT_Utility.getIntegratedCircuit(2)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 4), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Draconium, 2), + GTUtility.getIntegratedCircuit(2)) .fluidInputs(Materials.Mercury.getFluid(1000L)) - .fluidOutputs(MyMaterial.thoriumBasedLiquidFuel.getFluidOrGas(4000)) + .fluidOutputs(GGMaterial.thoriumBasedLiquidFuel.getFluidOrGas(4000)) .duration(2 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_HV / 2) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.thoriumBasedLiquidFuel.get(OrePrefixes.cell, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.thoriumBasedLiquidFuel.get(OrePrefixes.cell, 1), GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Helium.getPlasma(250L)) - .itemOutputs(MyMaterial.thoriumBasedLiquidFuelExcited.get(OrePrefixes.cell, 1)) + .itemOutputs(GGMaterial.thoriumBasedLiquidFuelExcited.get(OrePrefixes.cell, 1)) .duration(6 * SECONDS) .eut(TierEU.RECIPE_IV / 2) .addTo(mixerRecipes); // Liquid Plutonium Process Line - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.plutoniumOxideUraniumMixture.get(OrePrefixes.dust, 8), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.HSSS, 4), - GT_Utility.getIntegratedCircuit(1)) + GGMaterial.plutoniumOxideUraniumMixture.get(OrePrefixes.dust, 8), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.HSSS, 4), + GTUtility.getIntegratedCircuit(1)) .itemOutputs(ItemRefer.Wrapped_Plutonium_Ingot.get(1)) .duration(1 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Wrapped_Plutonium_Ingot.get(2)) .itemOutputs( ItemRefer.High_Density_Plutonium_Nugget.get(1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.HSSS, 8)) + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.HSSS, 8)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LV) .metadata(ADDITIVE_AMOUNT, 16) .addTo(implosionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.High_Density_Plutonium_Nugget.get(9)) .itemOutputs(ItemRefer.High_Density_Plutonium.get(1)) .duration(1 * MINUTES) .eut(TierEU.RECIPE_MV) .addTo(compressorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.High_Density_Plutonium.get(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Caesium, 16), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2), - GT_Utility.getIntegratedCircuit(1)) - .fluidOutputs(MyMaterial.plutoniumBasedLiquidFuel.getFluidOrGas(1000)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Neutronium, 8), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Caesium, 16), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2), + GTUtility.getIntegratedCircuit(1)) + .fluidOutputs(GGMaterial.plutoniumBasedLiquidFuel.getFluidOrGas(1000)) .duration(18 * SECONDS) .eut(TierEU.RECIPE_LuV) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() - .fluidInputs(Materials.Lutetium.getMolten(16), MyMaterial.plutoniumBasedLiquidFuel.getFluidOrGas(20)) - .fluidOutputs(MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(20)) + GTValues.RA.stdBuilder() + .fluidInputs(Materials.Lutetium.getMolten(16), GGMaterial.plutoniumBasedLiquidFuel.getFluidOrGas(20)) + .fluidOutputs(GGMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(20)) .duration(1 * SECONDS) .eut(TierEU.RECIPE_LuV / 2) .metadata(FUSION_THRESHOLD, 220000000) .addTo(fusionRecipes); // Th-232 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 24), - MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 0), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 24), + GGMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 0), + GTUtility.getIntegratedCircuit(1)) .fluidInputs(FluidRegistry.getFluidStack("nitricacid", 6000)) - .fluidOutputs(MyMaterial.oxalate.getFluidOrGas(3000), Materials.NitricOxide.getGas(6000)) + .fluidOutputs(GGMaterial.oxalate.getFluidOrGas(3000), Materials.NitricOxide.getGas(6000)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(multiblockChemicalReactorRecipes); // Th + 2O = ThO2 - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 1)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 1)) .fluidInputs(Materials.Oxygen.getGas(2000)) .itemOutputs(WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 3)) .duration(5 * SECONDS) @@ -301,28 +300,28 @@ public class RecipeLoader { .addTo(blastFurnaceRecipes); // Th + 8HNO3 =HF= Th(NO3)4 + 4NO2 + 4H2O - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(Materials.Thorium.getDust(1)) .fluidInputs(Materials.HydrofluoricAcid.getFluid(100), FluidRegistry.getFluidStack("nitricacid", 8000)) - .fluidOutputs(MyMaterial.thoriumNitrate.getFluidOrGas(1000), Materials.NitrogenDioxide.getGas(4000)) + .fluidOutputs(GGMaterial.thoriumNitrate.getFluidOrGas(1000), Materials.NitrogenDioxide.getGas(4000)) .duration(2 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(multiblockChemicalReactorRecipes); // 4NaOH + Th(NO3)4 = Th(OH)4 + 4NaNO3 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1), Materials.SodiumHydroxide.getDust(12)) - .fluidInputs(MyMaterial.thoriumNitrate.getFluidOrGas(1000)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1), Materials.SodiumHydroxide.getDust(12)) + .fluidInputs(GGMaterial.thoriumNitrate.getFluidOrGas(1000)) .itemOutputs( - MyMaterial.thoriumHydroxide.get(OrePrefixes.dust, 9), + GGMaterial.thoriumHydroxide.get(OrePrefixes.dust, 9), WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 20)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(UniversalChemical); // 2 NaNO3 + H2SO4 = Na2SO4 + 2HNO3 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1), WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 10)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1), WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 10)) .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) .fluidOutputs(Materials.NitricAcid.getFluid(2000)) .itemOutputs(WerkstoffLoader.Sodiumsulfate.get(OrePrefixes.dust, 7)) @@ -331,40 +330,38 @@ public class RecipeLoader { .addTo(UniversalChemical); // Th(OH)4 + 4HF = ThF4 + 4H2O - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.thoriumHydroxide.get(OrePrefixes.dust, 9), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.thoriumHydroxide.get(OrePrefixes.dust, 9), GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.HydrofluoricAcid.getFluid(4000)) - .fluidOutputs(MyMaterial.thoriumTetrafluoride.getFluidOrGas(1000)) + .fluidOutputs(GGMaterial.thoriumTetrafluoride.getFluidOrGas(1000)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); // Zn + 2Cl = ZnCl2 - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1), - GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Zinc, 1), GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Chlorine.getGas(2000)) - .itemOutputs(MyMaterial.zincChloride.get(OrePrefixes.dust, 3)) + .itemOutputs(GGMaterial.zincChloride.get(OrePrefixes.dust, 3)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); // ZnCl2 + 3Ca + ThF4 = ZnTh + CaCl2 + 2CaF2 - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.zincChloride.get(OrePrefixes.dust, 3), Materials.Calcium.getDust(3)) - .fluidInputs(MyMaterial.thorium232Tetrafluoride.getFluidOrGas(1000)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.zincChloride.get(OrePrefixes.dust, 3), Materials.Calcium.getDust(3)) + .fluidInputs(GGMaterial.thorium232Tetrafluoride.getFluidOrGas(1000)) .fluidOutputs(WerkstoffLoader.CalciumChloride.getFluidOrGas(3000)) .itemOutputs( - MyMaterial.zincThoriumAlloy.get(OrePrefixes.ingot, 1), + GGMaterial.zincThoriumAlloy.get(OrePrefixes.ingot, 1), WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 6)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 3000) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.zincThoriumAlloy.get(OrePrefixes.ingot, 1), GT_Utility.getIntegratedCircuit(11)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.zincThoriumAlloy.get(OrePrefixes.ingot, 1), GTUtility.getIntegratedCircuit(11)) .fluidInputs(Materials.Argon.getGas(250)) .fluidOutputs(Materials.Zinc.getMolten(144)) .itemOutputs(WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 1)) @@ -374,30 +371,30 @@ public class RecipeLoader { .addTo(blastFurnaceRecipes); // 2V + 5O = V2O5 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 2), - GT_Utility.getIntegratedCircuit(24)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 2), + GTUtility.getIntegratedCircuit(24)) .fluidInputs(Materials.Oxygen.getGas(5000)) - .itemOutputs(MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 7)) + .itemOutputs(GGMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 7)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) .metadata(COIL_HEAT, 2500) .addTo(blastFurnaceRecipes); // Atomic Separation Catalyst - ItemStack[] mat1 = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 32), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Firestone, 4) }; - ItemStack[] mat2 = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Draconium, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quantium, 4), }; - ItemStack[] mat3 = new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ardite, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Manyullyn, 4) }; + ItemStack[] mat1 = new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 32), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Firestone, 4) }; + ItemStack[] mat2 = new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Draconium, 4), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quantium, 4), }; + ItemStack[] mat3 = new ItemStack[] { GTOreDictUnificator.get(OrePrefixes.dust, Materials.Ardite, 4), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Manyullyn, 4) }; for (ItemStack m1 : mat1) { for (ItemStack m2 : mat2) { for (ItemStack m3 : mat3) { - GT_Values.RA.stdBuilder() - .itemInputs(m1, m2, m3, GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(m1, m2, m3, GTUtility.getIntegratedCircuit(4)) .fluidInputs(Materials.Naquadah.getMolten(288)) .itemOutputs(ItemRefer.Raw_Atomic_Separation_Catalyst.get(63)) .duration(15 * SECONDS) @@ -407,284 +404,284 @@ public class RecipeLoader { } } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( WerkstoffLoader.Tiberium.get(OrePrefixes.plate, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 8)) - .itemOutputs(MyMaterial.orundum.get(OrePrefixes.plate, 1)) + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 8)) + .itemOutputs(GGMaterial.orundum.get(OrePrefixes.plate, 1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_IV / 2) .addTo(formingPressRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.orundum.get(OrePrefixes.plate, 2), ItemRefer.Raw_Atomic_Separation_Catalyst.get(4)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.orundum.get(OrePrefixes.plate, 2), ItemRefer.Raw_Atomic_Separation_Catalyst.get(4)) .fluidInputs(Materials.Plutonium.getMolten(144)) - .itemOutputs(MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingotHot, 1)) + .itemOutputs(GGMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingotHot, 1)) .duration(3 * MINUTES) .eut(TierEU.RECIPE_HV) .metadata(COIL_HEAT, 5000) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingotHot, 1)) - .itemOutputs(MyMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingot, 1)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingotHot, 1)) + .itemOutputs(GGMaterial.atomicSeparationCatalyst.get(OrePrefixes.ingot, 1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_LuV) .addTo(vacuumFreezerRecipes); CrackRecipeAdder.crackerAdder( - MyMaterial.naquadahGas.getFluidOrGas(1000), - MyMaterial.atomicSeparationCatalyst.getMolten(4), + GGMaterial.naquadahGas.getFluidOrGas(1000), + GGMaterial.atomicSeparationCatalyst.getMolten(4), new FluidStack[] { Materials.Helium.getGas(300), WerkstoffLoader.Neon.getFluidOrGas(50), Materials.Argon.getGas(80), WerkstoffLoader.Krypton.getFluidOrGas(20), WerkstoffLoader.Xenon.getFluidOrGas(40), Materials.Radon.getGas(14000) }, - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadah, 1), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadah, 1), 6, 4020, 300); CrackRecipeAdder.crackerAdder( - MyMaterial.lightNaquadahFuel.getFluidOrGas(1000), - MyMaterial.atomicSeparationCatalyst.getMolten(4), - new FluidStack[] { Materials.Radon.getGas(1400), MyMaterial.naquadahGas.getFluidOrGas(400), - Materials.Uranium.getMolten(648), MyMaterial.heavyNaquadahFuel.getFluidOrGas(280), - Materials.Plutonium.getMolten(576), MyMaterial.naquadahAsphalt.getFluidOrGas(140) }, - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium235, 1), + GGMaterial.lightNaquadahFuel.getFluidOrGas(1000), + GGMaterial.atomicSeparationCatalyst.getMolten(4), + new FluidStack[] { Materials.Radon.getGas(1400), GGMaterial.naquadahGas.getFluidOrGas(400), + Materials.Uranium.getMolten(648), GGMaterial.heavyNaquadahFuel.getFluidOrGas(280), + Materials.Plutonium.getMolten(576), GGMaterial.naquadahAsphalt.getFluidOrGas(140) }, + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Uranium235, 1), 6, 4020, 450); CrackRecipeAdder.crackerAdder( - MyMaterial.heavyNaquadahFuel.getFluidOrGas(1000), - MyMaterial.atomicSeparationCatalyst.getMolten(6), - new FluidStack[] { Materials.Radon.getGas(1000), MyMaterial.naquadahGas.getFluidOrGas(450), - MyMaterial.lightNaquadahFuel.getFluidOrGas(560), Materials.Uranium.getMolten(720), - Materials.Lutetium.getMolten(648), MyMaterial.naquadahAsphalt.getFluidOrGas(240) }, - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1), + GGMaterial.heavyNaquadahFuel.getFluidOrGas(1000), + GGMaterial.atomicSeparationCatalyst.getMolten(6), + new FluidStack[] { Materials.Radon.getGas(1000), GGMaterial.naquadahGas.getFluidOrGas(450), + GGMaterial.lightNaquadahFuel.getFluidOrGas(560), Materials.Uranium.getMolten(720), + Materials.Lutetium.getMolten(648), GGMaterial.naquadahAsphalt.getFluidOrGas(240) }, + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Plutonium, 1), 6, 4020, 500); CrackRecipeAdder.crackerAdder( - MyMaterial.naquadahAsphalt.getFluidOrGas(1000), - MyMaterial.atomicSeparationCatalyst.getMolten(12), - new FluidStack[] { MyMaterial.lightNaquadahFuel.getFluidOrGas(600), Materials.Uranium.getMolten(1152), + GGMaterial.naquadahAsphalt.getFluidOrGas(1000), + GGMaterial.atomicSeparationCatalyst.getMolten(12), + new FluidStack[] { GGMaterial.lightNaquadahFuel.getFluidOrGas(600), Materials.Uranium.getMolten(1152), Materials.Thorium.getMolten(864), Materials.Plutonium.getMolten(792), Materials.Thulium.getMolten(216), - MyMaterial.heavyNaquadahFuel.getFluidOrGas(350) }, - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 1), + GGMaterial.heavyNaquadahFuel.getFluidOrGas(350) }, + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 1), 6, 4020, 800); // 2C2H6O =H2SO4= C4H10O + H2O - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(2)) .fluidInputs(Materials.Ethanol.getFluid(1000), Materials.SulfuricAcid.getFluid(1000)) - .fluidOutputs(MyMaterial.ether.getFluidOrGas(500), Materials.DilutedSulfuricAcid.getFluid(1500)) + .fluidOutputs(GGMaterial.ether.getFluidOrGas(500), Materials.DilutedSulfuricAcid.getFluid(1500)) .duration(25 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_MV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(Materials.GasolineRaw.getCells(9), Materials.Ethanol.getCells(1)) - .itemOutputs(MyMaterial.ethanolGasoline.get(OrePrefixes.cell, 10)) + .itemOutputs(GGMaterial.ethanolGasoline.get(OrePrefixes.cell, 10)) .duration(15 * TICKS) .eut(TierEU.RECIPE_MV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.ether.get(OrePrefixes.cell)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.ether.get(OrePrefixes.cell)) .metadata(FUEL_VALUE, 537) .metadata(FUEL_TYPE, 0) - .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.ether.get(OrePrefixes.cell)) + .addTo(GTRecipeConstants.Fuel); + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.ether.get(OrePrefixes.cell)) .metadata(FUEL_VALUE, 537) .metadata(FUEL_TYPE, 1) - .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.ethanolGasoline.get(OrePrefixes.cell)) + .addTo(GTRecipeConstants.Fuel); + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.ethanolGasoline.get(OrePrefixes.cell)) .metadata(FUEL_VALUE, 1100) .metadata(FUEL_TYPE, 0) - .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.cyclopentadiene.get(OrePrefixes.cell)) + .addTo(GTRecipeConstants.Fuel); + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.cyclopentadiene.get(OrePrefixes.cell)) .metadata(FUEL_VALUE, 70) .metadata(FUEL_TYPE, 1) - .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.ironedFuel.get(OrePrefixes.cell)) + .addTo(GTRecipeConstants.Fuel); + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.ironedFuel.get(OrePrefixes.cell)) .metadata(FUEL_VALUE, 2248) .metadata(FUEL_TYPE, 0) - .addTo(GT_RecipeConstants.Fuel); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.ironedKerosene.get(OrePrefixes.cell)) + .addTo(GTRecipeConstants.Fuel); + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.ironedKerosene.get(OrePrefixes.cell)) .metadata(FUEL_VALUE, 1824) .metadata(FUEL_TYPE, 0) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); // Sb + 3Cl = SbCl3 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Antimony, 1)) - .fluidInputs(MyMaterial.ether.getFluidOrGas(1000), Materials.Chlorine.getGas(3000)) - .fluidOutputs(MyMaterial.antimonyTrichloride.getFluidOrGas(1000)) + GTUtility.getIntegratedCircuit(1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Antimony, 1)) + .fluidInputs(GGMaterial.ether.getFluidOrGas(1000), Materials.Chlorine.getGas(3000)) + .fluidOutputs(GGMaterial.antimonyTrichloride.getFluidOrGas(1000)) .duration(3 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(multiblockChemicalReactorRecipes); // SbCl3 + 2Cl = SbCl5 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(MyMaterial.antimonyTrichloride.getFluidOrGas(1000), Materials.Chlorine.getGas(2000)) - .fluidOutputs(MyMaterial.antimonyPentachlorideSolution.getFluidOrGas(1000)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) + .fluidInputs(GGMaterial.antimonyTrichloride.getFluidOrGas(1000), Materials.Chlorine.getGas(2000)) + .fluidOutputs(GGMaterial.antimonyPentachlorideSolution.getFluidOrGas(1000)) .duration(9 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(multiblockChemicalReactorRecipes); CrackRecipeAdder.addUniversalDistillationRecipe( - MyMaterial.antimonyPentachlorideSolution.getFluidOrGas(1000), - new FluidStack[] { MyMaterial.ether.getFluidOrGas(1000), - MyMaterial.antimonyPentachloride.getFluidOrGas(1000) }, - GT_Values.NI, + GGMaterial.antimonyPentachlorideSolution.getFluidOrGas(1000), + new FluidStack[] { GGMaterial.ether.getFluidOrGas(1000), + GGMaterial.antimonyPentachloride.getFluidOrGas(1000) }, + GTValues.NI, 30 * SECONDS, TierEU.RECIPE_MV); // SbCl5 + 5HF = SbF5 + 5HCl - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) .fluidInputs( - MyMaterial.antimonyPentachloride.getFluidOrGas(1000), + GGMaterial.antimonyPentachloride.getFluidOrGas(1000), Materials.HydrofluoricAcid.getFluid(5000)) .fluidOutputs( - MyMaterial.antimonyPentafluoride.getFluidOrGas(1000), + GGMaterial.antimonyPentafluoride.getFluidOrGas(1000), Materials.HydrochloricAcid.getFluid(5000)) .duration(21 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(multiblockChemicalReactorRecipes); // SbH5 + HF = HSbF6 - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) .fluidInputs( - MyMaterial.antimonyPentafluoride.getFluidOrGas(1000), + GGMaterial.antimonyPentafluoride.getFluidOrGas(1000), Materials.HydrofluoricAcid.getFluid(1000)) - .fluidOutputs(MyMaterial.fluoroantimonicAcid.getFluidOrGas(1000)) + .fluidOutputs(GGMaterial.fluoroantimonicAcid.getFluidOrGas(1000)) .duration(42 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 16), - GT_Utility.getIntegratedCircuit(16)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 16), + GTUtility.getIntegratedCircuit(16)) .fluidInputs(Materials.HydrofluoricAcid.getFluid(3000)) - .fluidOutputs(MyMaterial.acidNaquadahEmulsion.getFluidOrGas(2000)) - .itemOutputs(MyMaterial.radioactiveSludge.get(OrePrefixes.dust, 3)) + .fluidOutputs(GGMaterial.acidNaquadahEmulsion.getFluidOrGas(2000)) + .itemOutputs(GGMaterial.radioactiveSludge.get(OrePrefixes.dust, 3)) .duration(3 * MINUTES) .eut(TierEU.RECIPE_EV) .metadata(COIL_HEAT, 3400) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 8)) - .fluidInputs(MyMaterial.acidNaquadahEmulsion.getFluidOrGas(1000)) - .fluidOutputs(MyMaterial.naquadahEmulsion.getFluidOrGas(1000)) + GTUtility.getIntegratedCircuit(3), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 8)) + .fluidInputs(GGMaterial.acidNaquadahEmulsion.getFluidOrGas(1000)) + .fluidOutputs(GGMaterial.naquadahEmulsion.getFluidOrGas(1000)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.AntimonyTrioxide, 1), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.AntimonyTrioxide, 1), WerkstoffLoader.Fluorspar.get(OrePrefixes.dust, 4)) .duration(12 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(multiblockChemicalReactorRecipes); CrackRecipeAdder.addUniversalDistillationRecipe( - MyMaterial.naquadahSolution.getFluidOrGas(20), - new FluidStack[] { MyMaterial.naquadahAsphalt.getFluidOrGas(2), - MyMaterial.heavyNaquadahFuel.getFluidOrGas(5), MyMaterial.lightNaquadahFuel.getFluidOrGas(10), - FluidRegistry.getFluidStack("water", 10), MyMaterial.naquadahGas.getFluidOrGas(60) }, - GT_Values.NI, + GGMaterial.naquadahSolution.getFluidOrGas(20), + new FluidStack[] { GGMaterial.naquadahAsphalt.getFluidOrGas(2), + GGMaterial.heavyNaquadahFuel.getFluidOrGas(5), GGMaterial.lightNaquadahFuel.getFluidOrGas(10), + FluidRegistry.getFluidStack("water", 10), GGMaterial.naquadahGas.getFluidOrGas(60) }, + GTValues.NI, 1 * SECONDS, TierEU.RECIPE_EV); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.naquadahGas.get(OrePrefixes.cell)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.naquadahGas.get(OrePrefixes.cell)) .metadata(FUEL_VALUE, 1024) .metadata(FUEL_TYPE, 1) - .addTo(GT_RecipeConstants.Fuel); + .addTo(GTRecipeConstants.Fuel); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs( - MyMaterial.lightNaquadahFuel.getFluidOrGas(780), - MyMaterial.heavyNaquadahFuel.getFluidOrGas(360)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(100)) + GGMaterial.lightNaquadahFuel.getFluidOrGas(780), + GGMaterial.heavyNaquadahFuel.getFluidOrGas(360)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkI.getFluidOrGas(100)) .duration(25 * SECONDS) .eut(TierEU.RECIPE_LuV) .metadata(FUSION_THRESHOLD, 320000000) .addTo(fusionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 32)) - .fluidInputs(MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(100), MyMaterial.naquadahGas.getFluidOrGas(1500)) - .fluidOutputs(MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(100)) + GTUtility.getIntegratedCircuit(1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.NetherStar, 4), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.ElectrumFlux, 32)) + .fluidInputs(GGMaterial.naquadahBasedFuelMkI.getFluidOrGas(100), GGMaterial.naquadahGas.getFluidOrGas(1500)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkII.getFluidOrGas(100)) .duration(25 * SECONDS) .eut(TierEU.RECIPE_UHV / 2) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 32), - GT_Utility.getIntegratedCircuit(16)) - .fluidInputs(MyMaterial.fluoroantimonicAcid.getFluidOrGas(4000)) - .fluidOutputs(MyMaterial.acidNaquadahEmulsion.getFluidOrGas(8000)) - .itemOutputs(MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 17)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 32), + GTUtility.getIntegratedCircuit(16)) + .fluidInputs(GGMaterial.fluoroantimonicAcid.getFluidOrGas(4000)) + .fluidOutputs(GGMaterial.acidNaquadahEmulsion.getFluidOrGas(8000)) + .itemOutputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 17)) .duration(3 * MINUTES) .eut(TierEU.RECIPE_IV / 2) .metadata(COIL_HEAT, 3400) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata( RESEARCH_ITEM, ItemList.Generator_Naquadah_Mark_V.get(1) .copy()) .metadata(RESEARCH_TIME, 7 * HOURS) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 8), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmiridium, 8), ItemRefer.Advanced_Radiation_Protection_Plate.get(64), ItemList.Field_Generator_UV.get(8), ItemList.Electric_Pump_UHV.get(2), new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 }, - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.MysteriousCrystal, 8), + GTOreDictUnificator.get(OrePrefixes.pipeHuge, Materials.MysteriousCrystal, 8), ItemList.Circuit_Wafer_NPIC.get(16), ItemList.UHV_Coil.get(64), new Object[] { "craftingLensYellow", 16 }, - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Thulium, 64)) + GTOreDictUnificator.get(OrePrefixes.screw, Materials.Thulium, 64)) .fluidInputs( Materials.Quantium.getMolten(9216L), Materials.DraconiumAwakened.getMolten(4608L), - MyMaterial.extremelyUnstableNaquadah.getMolten(1440), + GGMaterial.extremelyUnstableNaquadah.getMolten(1440), new FluidStack(solderIndalloy, 14400)) .itemOutputs(ItemRefer.Naquadah_Fuel_Refinery.get(1)) .eut(TierEU.RECIPE_UHV) .duration(30 * MINUTES) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.Radiation_Protection_Plate.get(1)) .metadata(RESEARCH_TIME, 1 * HOURS + 7 * MINUTES) .itemInputs( ItemRefer.Radiation_Protection_Plate.get(1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectrumFlux, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Trinium, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.ElectrumFlux, 4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Trinium, 4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 4), ItemRefer.Radiation_Protection_Plate.get(1)) .fluidInputs(new FluidStack(solderIndalloy, 1152)) .itemOutputs(ItemRefer.Advanced_Radiation_Protection_Plate.get(1)) @@ -692,19 +689,19 @@ public class RecipeLoader { .duration(50 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.Field_Restriction_Casing.get(1)) .metadata(RESEARCH_TIME, 3 * HOURS + 30 * MINUTES) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Thulium, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Thulium, 1), ItemRefer.Advanced_Radiation_Protection_Plate.get(6), ItemList.Field_Generator_IV.get(2), - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 16), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NaquadahAlloy, 32), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.NaquadahAlloy, 32), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Manyullyn, 32), - GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Manyullyn, 32), - MyMaterial.orundum.get(OrePrefixes.plate, 4)) + GTOreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Naquadah, 16), + GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.NaquadahAlloy, 32), + GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.NaquadahAlloy, 32), + GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Manyullyn, 32), + GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.Manyullyn, 32), + GGMaterial.orundum.get(OrePrefixes.plate, 4)) .fluidInputs(Materials.TungstenSteel.getMolten(1152), new FluidStack(solderIndalloy, 2304)) .itemOutputs(ItemRefer.Naquadah_Fuel_Refinery_Casing.get(1)) .eut(TierEU.RECIPE_ZPM / 2) @@ -712,17 +709,17 @@ public class RecipeLoader { .addTo(AssemblyLine); if (NewHorizonsCoreMod.isModLoaded()) { - GT_Values.RA.stdBuilder() - .metadata(RESEARCH_ITEM, MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot)) + GTValues.RA.stdBuilder() + .metadata(RESEARCH_ITEM, GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot)) .metadata(RESEARCH_TIME, 4 * HOURS + 10 * MINUTES) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1), ItemList.Field_Generator_UV.get(2), ItemList.Electric_Pump_UV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 64), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.BlackPlutonium, 16), + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 64), + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorZPM, 64), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Americium, 8), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.BlackPlutonium, 16), ItemList.Circuit_Wafer_PPIC.get(32), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 1L }) .fluidInputs( @@ -734,17 +731,17 @@ public class RecipeLoader { .duration(15 * MINUTES) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.Field_Restriction_Coil_T1.get(1)) .metadata(RESEARCH_TIME, 4 * HOURS + 50 * MINUTES) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), ItemList.Field_Generator_UHV.get(2), ItemList.Electric_Pump_UHV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 64), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Neutronium, 16), + GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 64), + GTOreDictUnificator.get(OrePrefixes.wireGt02, Materials.SuperconductorUV, 64), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 8), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Neutronium, 16), ItemList.Circuit_Wafer_PPIC.get(48), new Object[] { OrePrefixes.circuit.get(Materials.UEV), 1L }) .fluidInputs( @@ -756,17 +753,17 @@ public class RecipeLoader { .duration(30 * MINUTES) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.Field_Restriction_Coil_T2.get(1)) .metadata(RESEARCH_TIME, 5 * HOURS + 30 * MINUTES) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), ItemList.Field_Generator_UEV.get(2), ItemList.Electric_Pump_UEV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 64), - GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 16), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 64), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUHV, 64), + GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 8), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 16), ItemList.Circuit_Wafer_PPIC.get(64), new Object[] { OrePrefixes.circuit.get(Materials.UIV), 1L }) .fluidInputs( @@ -778,21 +775,21 @@ public class RecipeLoader { .duration(1 * HOURS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.Field_Restriction_Coil_T3.get(1)) .metadata(RESEARCH_TIME, 7 * HOURS) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1), ItemList.Field_Generator_UIV.get(2), ItemList.Electric_Pump_UIV.get(8), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 64), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 64), - GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, MaterialsUEVplus.SpaceTime, 16), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 64), + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorUEV, 64), + GTOreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.SpaceTime, 8), + GTOreDictUnificator.get(OrePrefixes.pipeMedium, MaterialsUEVplus.SpaceTime, 16), ItemList.Circuit_Wafer_PPIC.get(64), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 1)) + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UXV, 1)) .fluidInputs( - MyMaterial.metastableOganesson.getMolten(1000), + GGMaterial.metastableOganesson.getMolten(1000), MaterialsUEVplus.TranscendentMetal.getMolten(9216), Materials.Lubricant.getFluid(128000)) .itemOutputs(ItemRefer.Field_Restriction_Coil_T4.get(1)) @@ -801,13 +798,13 @@ public class RecipeLoader { .addTo(AssemblyLine); } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BorosilicateGlass, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ReinforceGlass, 6), - GT_OreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 32), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BorosilicateGlass, 1), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.ReinforceGlass, 6), + GTOreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 32), ItemList.Field_Generator_HV.get(4), - GT_Utility.getIntegratedCircuit(6)) + GTUtility.getIntegratedCircuit(6)) .fluidInputs(Materials.Naquadria.getMolten(288)) .itemOutputs(ItemRefer.Field_Restriction_Glass.get(1)) .duration(15 * SECONDS) @@ -815,94 +812,94 @@ public class RecipeLoader { .addTo(assemblerRecipes); // Ca + O = CaO - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1)) + GTUtility.getIntegratedCircuit(1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1)) .fluidInputs(Materials.Oxygen.getGas(1000)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Quicklime, 2)) .duration(10 * TICKS) .eut(TierEU.RECIPE_LV) .addTo(UniversalChemical); // AlN = Al + N - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Aluminum_Nitride_Dust.get(2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 1)) .fluidOutputs(Materials.Nitrogen.getGas(1000L)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(electrolyzerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Aluminum_Nitride_Dust.get(4), WerkstoffLoader.YttriumOxide.get(OrePrefixes.dust, 5), - GT_Utility.getIntegratedCircuit(9)) + GTUtility.getIntegratedCircuit(9)) .fluidInputs(FluidRegistry.getFluidStack("advancedglue", 1000)) .itemOutputs(ItemRefer.Special_Ceramics_Dust.get(9)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Aluminum_Nitride_Dust.get(4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uraninite, 5), - GT_Utility.getIntegratedCircuit(9)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Uraninite, 5), + GTUtility.getIntegratedCircuit(9)) .fluidInputs(FluidRegistry.getFluidStack("advancedglue", 1000)) .itemOutputs(ItemRefer.Special_Ceramics_Dust.get(9)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Special_Ceramics_Dust.get(2), ItemList.Shape_Extruder_Plate.get(0L)) .itemOutputs(ItemRefer.Special_Ceramics_Plate.get(1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(extruderRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( ItemRefer.Raw_Cylinder.get(1), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.REVERSIBLE, new Object[] { "PPP", "PFP", "PPP", 'P', ItemRefer.Special_Ceramics_Plate.get(1), 'F', - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1) }); + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1) }); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Raw_Cylinder.get(1), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 1), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6), - GT_Utility.getIntegratedCircuit(4)) + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 1), + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Titanium, 4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Titanium, 6), + GTUtility.getIntegratedCircuit(4)) .itemOutputs(ItemRefer.Titanium_Plated_Cylinder.get(1)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(16), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2)) + GTUtility.getIntegratedCircuit(16), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2)) .fluidInputs(FluidRegistry.getFluidStack("liquidoxygen", 1000), Materials.NitrogenDioxide.getGas(1000)) .fluidOutputs(FluidRegistry.getFluidStack("combustionpromotor", 500)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(16), WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(16), WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2)) .fluidInputs(FluidRegistry.getFluidStack("liquidoxygen", 1000), Materials.NitrogenDioxide.getGas(1000)) .fluidOutputs(FluidRegistry.getFluidStack("combustionpromotor", 500)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(16), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2)) + GTUtility.getIntegratedCircuit(16), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Saltpeter, 2)) .fluidInputs( FluidRegistry.getFluidStack("fluid.hydrogenperoxide", 1000), Materials.NitrogenDioxide.getGas(1000)) @@ -910,8 +907,8 @@ public class RecipeLoader { .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(16), WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(16), WerkstoffLoader.SodiumNitrate.get(OrePrefixes.dust, 2)) .fluidInputs( FluidRegistry.getFluidStack("fluid.hydrogenperoxide", 1000), Materials.NitrogenDioxide.getGas(1000)) @@ -920,45 +917,45 @@ public class RecipeLoader { .eut(TierEU.RECIPE_MV) .addTo(multiblockChemicalReactorRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( ItemRefer.Universal_Chemical_Fuel_Engine.get(1), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.REVERSIBLE, new Object[] { "TZT", "ALB", "WGW", 'T', - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 1), 'Z', "circuitUltimate", 'A', + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 1), 'Z', "circuitUltimate", 'A', ItemList.Machine_Multi_DieselEngine.get(1), 'B', ItemList.Machine_Multi_ExtremeDieselEngine.get(1), 'L', - ItemList.Hull_LuV, 'W', GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 1), 'G', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmium, 1), }); + ItemList.Hull_LuV, 'W', GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 1), 'G', + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Osmium, 1), }); // neutron activator - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.PolyvinylChloride, 4), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Plastic, 4), - GT_Utility.getIntegratedCircuit(8)) + GTOreDictUnificator.get(OrePrefixes.stick, Materials.PolyvinylChloride, 4), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Plastic, 4), + GTUtility.getIntegratedCircuit(8)) .fluidInputs(FluidRegistry.getFluidStack("dye.chemical.dyecyan", 144)) .itemOutputs(ItemRefer.Plastic_Case.get(1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.PolyvinylChloride, 4), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Plastic, 4), - GT_Utility.getIntegratedCircuit(8)) + GTOreDictUnificator.get(OrePrefixes.stick, Materials.PolyvinylChloride, 4), + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Plastic, 4), + GTUtility.getIntegratedCircuit(8)) .fluidInputs(FluidRegistry.getFluidStack("dye.watermixed.dyecyan", 144)) .itemOutputs(ItemRefer.Plastic_Case.get(1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_LV) .addTo(assemblerRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( ItemRefer.Plastic_Case.get(1), new Object[] { "PCP", "CDC", "PCP", 'P', - GT_OreDictUnificator.get(OrePrefixes.stick, Materials.PolyvinylChloride, 1), 'C', - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Plastic, 1), 'D', "dyeCyan" }); + GTOreDictUnificator.get(OrePrefixes.stick, Materials.PolyvinylChloride, 1), 'C', + GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.Plastic, 1), 'D', "dyeCyan" }); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Coated_Basic.get(1), ItemList.Circuit_Chip_ULPIC.get(1), @@ -972,10 +969,10 @@ public class RecipeLoader { .noOptimize() .addTo(GoodGeneratorRecipeMaps.preciseAssemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Quartzite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 4)) + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Quartzite, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 4)) .fluidInputs(Materials.Water.getFluid(1000)) .itemOutputs(ItemRefer.Quartz_Wafer.get(1)) .outputChances(3333) @@ -984,10 +981,10 @@ public class RecipeLoader { .eut(TierEU.RECIPE_LV) .addTo(autoclaveRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Quartzite, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 4)) + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Quartzite, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 4)) .fluidInputs(FluidRegistry.getFluidStack("ic2distilledwater", 1000)) .itemOutputs(ItemRefer.Quartz_Wafer.get(1)) .requiresCleanRoom() @@ -995,7 +992,7 @@ public class RecipeLoader { .eut(TierEU.RECIPE_LV) .addTo(autoclaveRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Quartz_Wafer.get(1), ItemRefer.Special_Ceramics_Plate.get(2), @@ -1013,58 +1010,58 @@ public class RecipeLoader { int tMultiplier = tMat.contains(SubTag.SOLDERING_MATERIAL_GOOD) ? 1 : tMat.contains(SubTag.SOLDERING_MATERIAL_BAD) ? 4 : 2; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Quartz_Crystal_Resonator.get(2), ItemRefer.Plastic_Case.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1), ItemList.Cover_Screen.get(1), - GT_OreDictUnificator.get(OrePrefixes.componentCircuit, Materials.Diode, 16L), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8)) + GTOreDictUnificator.get(OrePrefixes.componentCircuit, Materials.Diode, 16L), + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8)) .fluidInputs(tMat.getMolten(144 * tMultiplier)) .itemOutputs(ItemRefer.Inverter.get(1)) .duration(12 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Quartz_Crystal_Resonator.get(2), ItemRefer.Plastic_Case.get(1), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 1), ItemList.Cover_Screen.get(1), ItemList.Circuit_Parts_DiodeASMD.get(4), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8)) + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8)) .fluidInputs(tMat.getMolten(144 * tMultiplier)) .itemOutputs(ItemRefer.Inverter.get(1)) .duration(12 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); if (NewHorizonsCoreMod.isModLoaded()) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Multifiberglass_Elite.get(1), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedGoldChip", 16), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedGoldChip", 16), ItemList.Circuit_Chip_SoC2.get(8), ItemList.Circuit_Chip_NOR.get(32), - MyMaterial.signalium.get(OrePrefixes.bolt, 32), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8), - GT_ModHandler.getIC2Item("reactorVent", 1L, 1)) + GGMaterial.signalium.get(OrePrefixes.bolt, 32), + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8), + GTModHandler.getIC2Item("reactorVent", 1L, 1)) .fluidInputs(tMat.getMolten(288 * tMultiplier)) .itemOutputs(ItemRefer.HiC_T1.get(1)) .duration(1 * MINUTES) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Multifiberglass_Elite.get(1), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedGoldChip", 16), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedGoldChip", 16), ItemList.Circuit_Chip_SoC2.get(8), ItemList.Circuit_Chip_NOR.get(32), - MyMaterial.signalium.get(OrePrefixes.bolt, 32), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TinAlloy, 1)) + GGMaterial.signalium.get(OrePrefixes.bolt, 32), + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Aluminium, 8), + GTOreDictUnificator.get(OrePrefixes.rotor, Materials.TinAlloy, 1)) .fluidInputs(tMat.getMolten(288 * tMultiplier)) .itemOutputs(ItemRefer.HiC_T1.get(1)) .duration(1 * MINUTES) @@ -1073,130 +1070,130 @@ public class RecipeLoader { } } - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( Loaders.NeutronAccelerators[0].copy(), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "WPM", "CHI", "WPM", 'W', GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Lead, 1), - 'P', GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lead, 1), 'M', - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Lead, 1), 'C', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1), 'H', ItemList.Hull_ULV, 'I', + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.REVERSIBLE, + new Object[] { "WPM", "CHI", "WPM", 'W', GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Lead, 1), + 'P', GTOreDictUnificator.get(OrePrefixes.plate, Materials.Lead, 1), 'M', + GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Lead, 1), 'C', + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1), 'H', ItemList.Hull_ULV, 'I', ItemRefer.Inverter.get(1), }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( Loaders.NeutronAccelerators[1].copy(), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "WPM", "CHI", "WPM", 'W', GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 1), - 'P', GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Lead, 1), 'M', + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.REVERSIBLE, + new Object[] { "WPM", "CHI", "WPM", 'W', GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tin, 1), + 'P', GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Lead, 1), 'M', ItemList.Electric_Motor_LV, 'C', "plateAnyRubber", 'H', ItemList.Hull_LV, 'I', ItemRefer.Inverter.get(1), }); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Inverter.get(1), ItemList.Hull_MV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnyCopper, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Plastic, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Beryllium, 2), + GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.AnyCopper, 2), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Plastic, 1), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Beryllium, 2), ItemList.Electric_Motor_MV.get(2)) .itemOutputs(Loaders.NeutronAccelerators[2].copy()) .duration(15 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Inverter.get(1), ItemList.Hull_HV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.PolyvinylChloride, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Beryllium, 2), + GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Gold, 2), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.PolyvinylChloride, 1), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Beryllium, 2), ItemList.Electric_Motor_HV.get(2)) .itemOutputs(Loaders.NeutronAccelerators[3].copy()) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, Loaders.NeutronAccelerators[5].copy()) .metadata(RESEARCH_TIME, 16 * MINUTES) .itemInputs( ItemRefer.Inverter.get(2), ItemList.Hull_LuV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherStar, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polybenzimidazole, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NeodymiumMagnetic, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NeodymiumMagnetic, 4), + GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.YttriumBariumCuprate, 2), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherStar, 1), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polybenzimidazole, 4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NeodymiumMagnetic, 4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NeodymiumMagnetic, 4), ItemList.Electric_Motor_LuV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorMV, 4)) + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorMV, 4)) .fluidInputs(Materials.Argon.getGas(3000)) .itemOutputs(Loaders.NeutronAccelerators[6].copy()) .eut(TierEU.RECIPE_LuV) .duration(15 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, Loaders.NeutronAccelerators[6].copy()) .metadata(RESEARCH_TIME, 16 * MINUTES) .itemInputs( ItemRefer.Inverter.get(2), ItemList.Hull_ZPM.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.VanadiumGallium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherStar, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Polybenzimidazole, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SamariumMagnetic, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SamariumMagnetic, 4), + GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.VanadiumGallium, 2), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherStar, 1), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Polybenzimidazole, 4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.SamariumMagnetic, 4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.SamariumMagnetic, 4), ItemList.Electric_Motor_ZPM.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorEV, 4)) + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorEV, 4)) .fluidInputs(WerkstoffLoader.Xenon.getFluidOrGas(3000)) .itemOutputs(Loaders.NeutronAccelerators[7].copy()) .eut(TierEU.RECIPE_ZPM) .duration(15 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, Loaders.NeutronAccelerators[7].copy()) .metadata(RESEARCH_TIME, 16 * MINUTES) .itemInputs( ItemRefer.Inverter.get(4), ItemList.Hull_UV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NetherStar, 2), - GT_OreDictUnificator.get(OrePrefixes.plateTriple, Materials.Polybenzimidazole, 4), + GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.NaquadahAlloy, 4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.NetherStar, 2), + GTOreDictUnificator.get(OrePrefixes.plateTriple, Materials.Polybenzimidazole, 4), ItemList.ZPM_Coil.get(4), - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.NickelZincFerrite, 16), + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.NickelZincFerrite, 16), ItemList.ZPM_Coil.get(4), ItemList.Electric_Motor_UV.get(2), - GT_OreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorLuV, 4)) + GTOreDictUnificator.get(OrePrefixes.wireGt04, Materials.SuperconductorLuV, 4)) .fluidInputs(WerkstoffLoader.Oganesson.getFluidOrGas(3000)) .itemOutputs(Loaders.NeutronAccelerators[8].copy()) .eut(TierEU.RECIPE_UV) .duration(15 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Casing_IV.get(1L), ItemList.Cover_ActivityDetector.get(1L), ItemList.Cover_Screen.get(1L), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 4), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.VibrantAlloy, 4), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1), ItemList.Sensor_HV.get(2), - GT_Utility.getIntegratedCircuit(1)) + GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Helium.getGas(1000)) .itemOutputs(Loaders.NS.copy()) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( ItemRefer.Neutron_Source.get(1), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.REVERSIBLE, new Object[] { " P ", "PUP", " P ", 'P', - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Steel, 1), 'U', + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Steel, 1), 'U', ItemRefer.High_Density_Uranium.get(1) }); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.HiC_T2.get(2), ItemList.Emitter_EV.get(2), ItemRefer.Neutron_Source.get(1)) .itemOutputs(Loaders.NA.copy()) .fluidInputs(Materials.StainlessSteel.getMolten(576), Materials.TungstenCarbide.getMolten(144)) @@ -1209,28 +1206,28 @@ public class RecipeLoader { public static void InitLoadRecipe() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Inverter.get(1), ItemList.Hull_EV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.StyreneButadieneRubber, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.IronMagnetic, 4), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TungstenCarbide, 2), + GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 2), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.StyreneButadieneRubber, 1), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.IronMagnetic, 4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.TungstenCarbide, 2), ItemList.Electric_Motor_EV.get(2)) .itemOutputs(Loaders.NeutronAccelerators[4].copy()) .duration(15 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Inverter.get(1), ItemList.Hull_IV.get(1L), - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 2), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicone, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.SteelMagnetic, 4), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.TungstenCarbide, 2), + GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 2), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Silicone, 1), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.SteelMagnetic, 4), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.TungstenCarbide, 2), ItemList.Electric_Motor_IV.get(2)) .itemOutputs(Loaders.NeutronAccelerators[5].copy()) .duration(15 * SECONDS) @@ -1238,10 +1235,10 @@ public class RecipeLoader { .addTo(assemblerRecipes); // Al2O3 + 2N + 3C = 2AlN + 3CO - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sapphire, 5), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 3)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sapphire, 5), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 3)) .fluidInputs(FluidRegistry.getFluidStack("liquidnitrogen", 2000)) .fluidOutputs(Materials.CarbonMonoxide.getGas(3000)) .itemOutputs(ItemRefer.Aluminum_Nitride_Dust.get(2)) @@ -1250,10 +1247,10 @@ public class RecipeLoader { .metadata(COIL_HEAT, 4600) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.GreenSapphire, 5), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 3)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.GreenSapphire, 5), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 3)) .fluidInputs(FluidRegistry.getFluidStack("liquidnitrogen", 2000)) .fluidOutputs(Materials.CarbonMonoxide.getGas(3000)) .itemOutputs(ItemRefer.Aluminum_Nitride_Dust.get(2)) @@ -1262,10 +1259,10 @@ public class RecipeLoader { .metadata(COIL_HEAT, 4600) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 5), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 3)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 5), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 3)) .fluidInputs(FluidRegistry.getFluidStack("liquidnitrogen", 2000)) .fluidOutputs(Materials.CarbonMonoxide.getGas(3000)) .itemOutputs(ItemRefer.Aluminum_Nitride_Dust.get(2)) @@ -1274,95 +1271,95 @@ public class RecipeLoader { .metadata(COIL_HEAT, 4600) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 1), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot)) + GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.dust, 1), + GTUtility.getIntegratedCircuit(1)) + .itemOutputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot)) .duration(6 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_ZPM) .metadata(COIL_HEAT, 7000) .addTo(blastFurnaceRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot, 1)) - .itemOutputs(MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot, 1)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingotHot, 1)) + .itemOutputs(GGMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot, 1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_LuV) .addTo(vacuumFreezerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(MyMaterial.naquadahBasedFuelMkVIDepleted.getFluidOrGas(1000)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) + .fluidInputs(GGMaterial.naquadahBasedFuelMkVIDepleted.getFluidOrGas(1000)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1)) .outputChances(1000, 500, 400, 50, 20, 5) - .fluidOutputs(MyMaterial.metastableOganesson.getMolten(122)) + .fluidOutputs(GGMaterial.metastableOganesson.getMolten(122)) .duration(12 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_LuV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(MyMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1000)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) + .fluidInputs(GGMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1000)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1)) .outputChances(1000, 500, 400, 50, 20, 5) .fluidOutputs(WerkstoffLoader.Oganesson.getFluidOrGas(182)) .duration(12 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_LuV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(MyMaterial.naquadahBasedFuelMkIVDepleted.getFluidOrGas(1000)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) + .fluidInputs(GGMaterial.naquadahBasedFuelMkIVDepleted.getFluidOrGas(1000)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 32), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 32)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 32), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Sunnarium, 32)) .outputChances(9900, 9500, 9000, 8000, 5000, 3000) .fluidOutputs(WerkstoffLoader.Oganesson.getFluidOrGas(864)) .duration(2 * MINUTES + 5 * SECONDS) .eut(TierEU.RECIPE_LuV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(MyMaterial.naquadahBasedFuelMkIIIDepleted.getFluidOrGas(1000)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) + .fluidInputs(GGMaterial.naquadahBasedFuelMkIIIDepleted.getFluidOrGas(1000)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 32), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 32), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 32)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 32), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 32), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bedrockium, 32)) .outputChances(9500, 9000, 8000, 7000, 5000, 4000) .fluidOutputs(WerkstoffLoader.Oganesson.getFluidOrGas(720)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_LuV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(MyMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1000)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) + .fluidInputs(GGMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1000)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 32), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Americium, 32), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 32), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Americium, 32), WerkstoffLoader.Californium.get(OrePrefixes.dust, 32)) .outputChances(9000, 8500, 5000, 4000, 2000) .fluidOutputs(WerkstoffLoader.Oganesson.getFluidOrGas(144)) @@ -1370,95 +1367,95 @@ public class RecipeLoader { .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1000)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) + .fluidInputs(GGMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1000)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lead, 16L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Barium, 6L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lead, 16L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Bismuth, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Barium, 6L)) .outputChances(6000, 1000, 5000) .fluidOutputs(WerkstoffLoader.Xenon.getFluidOrGas(10)) .duration(50 * SECONDS) .eut(TierEU.RECIPE_EV / 2) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1000)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) + .fluidInputs(GGMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1000)) .itemOutputs( WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 64), WerkstoffLoader.Thorium232.get(OrePrefixes.dust, 16), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Praseodymium, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Praseodymium, 32), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 4)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Praseodymium, 64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Praseodymium, 32), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 2), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Indium, 4)) .outputChances(10000, 8000, 10000, 8000, 3000, 5000) .duration(1 * MINUTES + 15 * SECONDS) .eut(TierEU.RECIPE_EV / 2) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1000)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) + .fluidInputs(GGMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1000)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 9), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cerium, 4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 2)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 9), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Cerium, 4), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 2)) .outputChances(5000, 8000, 7500) .fluidOutputs(WerkstoffLoader.Krypton.getFluidOrGas(144)) .duration(2 * MINUTES + 5 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(MyMaterial.thoriumTetrafluoride.getFluidOrGas(1000)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Thorium, 1)) - .fluidOutputs(MyMaterial.thorium232Tetrafluoride.getFluidOrGas(750)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) + .fluidInputs(GGMaterial.thoriumTetrafluoride.getFluidOrGas(1000)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Thorium, 1)) + .fluidOutputs(GGMaterial.thorium232Tetrafluoride.getFluidOrGas(750)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(MyMaterial.naquadahEmulsion.getFluidOrGas(1000)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) + .fluidInputs(GGMaterial.naquadahEmulsion.getFluidOrGas(1000)) .itemOutputs( - MyMaterial.radioactiveSludge.get(OrePrefixes.dust, 4), - MyMaterial.radioactiveSludge.get(OrePrefixes.dust, 2), - MyMaterial.radioactiveSludge.get(OrePrefixes.dust, 1), - MyMaterial.radioactiveSludge.get(OrePrefixes.dust, 1), - MyMaterial.radioactiveSludge.get(OrePrefixes.dust, 1), - MyMaterial.radioactiveSludge.get(OrePrefixes.dust, 1)) + GGMaterial.radioactiveSludge.get(OrePrefixes.dust, 4), + GGMaterial.radioactiveSludge.get(OrePrefixes.dust, 2), + GGMaterial.radioactiveSludge.get(OrePrefixes.dust, 1), + GGMaterial.radioactiveSludge.get(OrePrefixes.dust, 1), + GGMaterial.radioactiveSludge.get(OrePrefixes.dust, 1), + GGMaterial.radioactiveSludge.get(OrePrefixes.dust, 1)) .outputChances(8000, 7500, 5000, 2000, 500, 100) - .fluidOutputs(MyMaterial.naquadahSolution.getFluidOrGas(500)) + .fluidOutputs(GGMaterial.naquadahSolution.getFluidOrGas(500)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(MyMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1000)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) + .fluidInputs(GGMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1000)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 48), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 32), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Neodymium, 32), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Europium, 32)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 64), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 48), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 32), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Neodymium, 32), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Europium, 32)) .outputChances(9000, 8500, 5000, 4000, 2000) .fluidOutputs(WerkstoffLoader.Xenon.getFluidOrGas(144)) .duration(5 * MINUTES) .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.radioactiveSludge.get(OrePrefixes.dust, 4)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.radioactiveSludge.get(OrePrefixes.dust, 4)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 2), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Uranium, 1), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Plutonium, 1), WerkstoffLoader.Tiberium.get(OrePrefixes.dust, 1)) .outputChances(10000, 9500, 8000, 2500, 2000, 2000) .fluidOutputs(Materials.Radon.getGas(20)) @@ -1468,9 +1465,9 @@ public class RecipeLoader { } public static void Fixer() { - MaterialFix.MaterialFluidExtractionFix(MyMaterial.atomicSeparationCatalyst); - MaterialFix.MaterialFluidExtractionFix(MyMaterial.extremelyUnstableNaquadah); - MaterialFix.MaterialFluidExtractionFix(MyMaterial.metastableOganesson); - MaterialFix.MaterialFluidExtractionFix(MyMaterial.shirabon); + MaterialFix.MaterialFluidExtractionFix(GGMaterial.atomicSeparationCatalyst); + MaterialFix.MaterialFluidExtractionFix(GGMaterial.extremelyUnstableNaquadah); + MaterialFix.MaterialFluidExtractionFix(GGMaterial.metastableOganesson); + MaterialFix.MaterialFluidExtractionFix(GGMaterial.shirabon); } } diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader2.java index 59b139ff41..238d21d8aa 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader2.java @@ -1,6 +1,5 @@ package goodgenerator.loader; -import static com.github.technus.tectech.loader.recipe.BaseRecipeLoader.getItemContainer; import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.neutronActivatorRecipes; import static goodgenerator.api.recipe.GoodGeneratorRecipeMaps.preciseAssemblerRecipes; import static goodgenerator.util.MyRecipeAdder.computeRangeNKE; @@ -25,65 +24,65 @@ import static gregtech.api.recipe.RecipeMaps.multiblockChemicalReactorRecipes; import static gregtech.api.recipe.RecipeMaps.plasmaForgeRecipes; import static gregtech.api.recipe.RecipeMaps.unpackagerRecipes; import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.HOURS; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; -import static gregtech.api.util.GT_RecipeConstants.FUSION_THRESHOLD; -import static gregtech.api.util.GT_RecipeConstants.NKE_RANGE; -import static gregtech.api.util.GT_RecipeConstants.PRECISE_ASSEMBLER_CASING_TIER; -import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM; -import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; -import static gregtech.api.util.GT_RecipeConstants.UniversalChemical; +import static gregtech.api.util.GTRecipeBuilder.HOURS; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeConstants.AssemblyLine; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeConstants.FUSION_THRESHOLD; +import static gregtech.api.util.GTRecipeConstants.NKE_RANGE; +import static gregtech.api.util.GTRecipeConstants.PRECISE_ASSEMBLER_CASING_TIER; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_ITEM; +import static gregtech.api.util.GTRecipeConstants.RESEARCH_TIME; +import static gregtech.api.util.GTRecipeConstants.UniversalChemical; +import static tectech.loader.recipe.BaseRecipeLoader.getItemContainer; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.technus.tectech.recipe.TT_recipeAdder; - -import goodgenerator.items.MyMaterial; +import bartworks.system.material.WerkstoffLoader; +import goodgenerator.items.GGMaterial; import goodgenerator.util.CrackRecipeAdder; import goodgenerator.util.ItemRefer; import goodgenerator.util.MyRecipeAdder; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.item.chemistry.GenericChem; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import ic2.core.Ic2Items; +import tectech.recipe.TTRecipeAdder; -public class RecipeLoader_02 { +public class RecipeLoader2 { public static void RecipeLoad() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueAlloy, 1), - GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 32), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Beryllium, 32), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1)) + GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueAlloy, 1), + GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV, 32), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Beryllium, 32), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1)) .itemOutputs(ItemRefer.Speeding_Pipe.get(1)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); // Compact MK1 Fusion Disassembly Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Compact_Fusion_Coil_T0.get(1)) .itemOutputs(ItemList.Casing_Coil_Superconductor.get(3)) .duration(30 * SECONDS) @@ -91,7 +90,7 @@ public class RecipeLoader_02 { .addTo(assemblerRecipes); // Compact MK2 Fusion Disassembly Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Compact_Fusion_Coil_T1.get(1)) .itemOutputs(ItemList.Casing_Fusion_Coil.get(3)) .duration(30 * SECONDS) @@ -99,235 +98,235 @@ public class RecipeLoader_02 { .addTo(assemblerRecipes); // Compact MK3 Fusion Disassembly Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Compact_Fusion_Coil_T2.get(1)) .itemOutputs(ItemList.Casing_Fusion_Coil.get(3)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_UHV) .addTo(assemblerRecipes); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy2, 500, 480, 2800, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy2, 513, 480, 2800, false); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy4, 500, 480, 2800, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy4, 513, 480, 2800, false); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.incoloy903, 2400, 1920, 3700, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.adamantiumAlloy, 2500, 1920, 5500, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.marM200, 200, 7680, 5000, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.marM200, 220, 7680, 5000, false); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.signalium, 1600, 30720, 4000, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.lumiium, 1600, 30720, 4000, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.artheriumSn, 500, 122880, 6500, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.titaniumBetaC, 400, 7680, 5300, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.dalisenite, 800, 491520, 8700, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.hikarium, 1200, 30720, 5400, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.tairitsu, 1200, 1966080, 7400, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.preciousMetalAlloy, 2400, 7864320, 10000, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.enrichedNaquadahAlloy, 2400, 7864320, 11000, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.metastableOganesson, 600, 7864320, 12000, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.shirabon, 600, 31457280, 13000, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.atomicSeparationCatalyst, 35000, 120, 5000, false); - - GT_ModHandler.removeFurnaceSmelting(MyMaterial.dalisenite.get(OrePrefixes.dust)); // :doom: - - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.dalisenite.get(OrePrefixes.ingotHot, 1)) - .itemOutputs(MyMaterial.dalisenite.get(OrePrefixes.ingot, 1)) + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy2, 500, 480, 2800, true); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy2, 513, 480, 2800, false); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy4, 500, 480, 2800, true); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.zircaloy4, 513, 480, 2800, false); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.incoloy903, 2400, 1920, 3700, true); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.adamantiumAlloy, 2500, 1920, 5500, true); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.marM200, 200, 7680, 5000, true); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.marM200, 220, 7680, 5000, false); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.signalium, 1600, 30720, 4000, true); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.lumiium, 1600, 30720, 4000, true); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.artheriumSn, 500, 122880, 6500, true); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.titaniumBetaC, 400, 7680, 5300, true); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.dalisenite, 800, 491520, 8700, true); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.hikarium, 1200, 30720, 5400, true); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.tairitsu, 1200, 1966080, 7400, true); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.preciousMetalAlloy, 2400, 7864320, 10000, true); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.enrichedNaquadahAlloy, 2400, 7864320, 11000, true); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.metastableOganesson, 600, 7864320, 12000, true); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.shirabon, 600, 31457280, 13000, true); + CrackRecipeAdder.reAddBlastRecipe(GGMaterial.atomicSeparationCatalyst, 35000, 120, 5000, false); + + GTModHandler.removeFurnaceSmelting(GGMaterial.dalisenite.get(OrePrefixes.dust)); // :doom: + + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.dalisenite.get(OrePrefixes.ingotHot, 1)) + .itemOutputs(GGMaterial.dalisenite.get(OrePrefixes.ingot, 1)) .duration(16 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(vacuumFreezerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.shirabon.get(OrePrefixes.ingotHot, 1)) - .itemOutputs(MyMaterial.shirabon.get(OrePrefixes.ingot, 1)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.shirabon.get(OrePrefixes.ingotHot, 1)) + .itemOutputs(GGMaterial.shirabon.get(OrePrefixes.ingot, 1)) .duration(2 * MINUTES) .eut(TierEU.RECIPE_UHV) .addTo(vacuumFreezerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.zircaloy4.get(OrePrefixes.plate, 4), - MyMaterial.zircaloy2.get(OrePrefixes.ring, 2), - GT_Utility.getIntegratedCircuit(2)) + GGMaterial.zircaloy4.get(OrePrefixes.plate, 4), + GGMaterial.zircaloy2.get(OrePrefixes.ring, 2), + GTUtility.getIntegratedCircuit(2)) .itemOutputs(ItemRefer.Advanced_Fuel_Rod.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Advanced_Fuel_Rod.get(1), ItemRefer.High_Density_Uranium.get(1)) .itemOutputs(ItemRefer.Fuel_Rod_U_1.get(1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(cannerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fuel_Rod_U_1.get(2), - MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(2)) + GGMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GTUtility.getIntegratedCircuit(2)) .itemOutputs(ItemRefer.Fuel_Rod_U_2.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fuel_Rod_U_2.get(2), - MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(5)) + GGMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GTUtility.getIntegratedCircuit(5)) .itemOutputs(ItemRefer.Fuel_Rod_U_4.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fuel_Rod_U_1.get(4), - MyMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), - GT_Utility.getIntegratedCircuit(4)) + GGMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), + GTUtility.getIntegratedCircuit(4)) .itemOutputs(ItemRefer.Fuel_Rod_U_4.get(1)) .duration(11 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Advanced_Fuel_Rod.get(1), ItemRefer.High_Density_Plutonium.get(1)) .itemOutputs(ItemRefer.Fuel_Rod_Pu_1.get(1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(cannerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fuel_Rod_Pu_1.get(2), - MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(2)) + GGMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GTUtility.getIntegratedCircuit(2)) .itemOutputs(ItemRefer.Fuel_Rod_Pu_2.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fuel_Rod_Pu_2.get(2), - MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(5)) + GGMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GTUtility.getIntegratedCircuit(5)) .itemOutputs(ItemRefer.Fuel_Rod_Pu_4.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fuel_Rod_Pu_1.get(4), - MyMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), - GT_Utility.getIntegratedCircuit(4)) + GGMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), + GTUtility.getIntegratedCircuit(4)) .itemOutputs(ItemRefer.Fuel_Rod_Pu_4.get(1)) .duration(11 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( ItemRefer.YOTTank_Casing.get(1), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.REVERSIBLE, new Object[] { "BPB", "FOF", "BPB", 'B', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.BlackSteel, 1), 'P', - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1), 'F', - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1), 'O', - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), }); + GTOreDictUnificator.get(OrePrefixes.plate, Materials.BlackSteel, 1), 'P', + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1), 'F', + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1), 'O', + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( ItemRefer.YOTTank.get(1), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "SPS", "ECE", "SLS", 'S', - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.BlueSteel, 1), 'P', ItemList.Cover_Screen.get(1), - 'E', "circuitData", 'L', GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 1), 'C', + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.REVERSIBLE, + new Object[] { "SPS", "ECE", "SLS", 'S', GTOreDictUnificator.get(OrePrefixes.screw, Materials.BlueSteel, 1), + 'P', ItemList.Cover_Screen.get(1), 'E', "circuitData", 'L', + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 1), 'C', ItemRefer.YOTTank_Casing.get(1) }); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Hatch_Output_IV.get(1), - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 440), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.CertusQuartz, 8), - GT_Utility.getIntegratedCircuit(1)) + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 440), + GTOreDictUnificator.get(OrePrefixes.screw, Materials.CertusQuartz, 8), + GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Plastic.getMolten(144)) .itemOutputs(Loaders.YFH) .duration(10 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Large_Fluid_Cell_Steel.get(12L), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Tin, 4), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Tin, 4), + GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Plastic.getMolten(144)) .itemOutputs(ItemRefer.Fluid_Storage_Core_T1.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Large_Fluid_Cell_Aluminium.get(3L), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Tin, 4), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Tin, 4), + GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Plastic.getMolten(144)) .itemOutputs(ItemRefer.Fluid_Storage_Core_T1.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Large_Fluid_Cell_StainlessSteel.get(2L), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Tin, 4), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.Tin, 4), + GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Plastic.getMolten(144)) .itemOutputs(ItemRefer.Fluid_Storage_Core_T1.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Large_Fluid_Cell_Titanium.get(64L), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 8), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.BlackSteel, 4), - GT_Utility.getIntegratedCircuit(2)) + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Titanium, 8), + GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.BlackSteel, 4), + GTUtility.getIntegratedCircuit(2)) .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(2304)) .itemOutputs(ItemRefer.Fluid_Storage_Core_T2.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Large_Fluid_Cell_TungstenSteel.get(18L), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.BlackSteel, 4), - GT_Utility.getIntegratedCircuit(2)) + GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.BlackSteel, 4), + GTUtility.getIntegratedCircuit(2)) .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(2304)) .itemOutputs(ItemRefer.Fluid_Storage_Core_T2.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Large_Fluid_Cell_Chrome.get(4L), - GT_OreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.BlackSteel, 4), - GT_Utility.getIntegratedCircuit(2)) + GTOreDictUnificator.get(OrePrefixes.plateQuadruple, Materials.BlackSteel, 4), + GTUtility.getIntegratedCircuit(2)) .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(2304)) .itemOutputs(ItemRefer.Fluid_Storage_Core_T2.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fluid_Storage_Core_T1.get(32), ItemRefer.Fluid_Storage_Core_T1.get(32), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.BlackSteel, 16), - GT_Utility.getIntegratedCircuit(10)) + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.BlackSteel, 16), + GTUtility.getIntegratedCircuit(10)) .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(2304)) .itemOutputs(ItemRefer.Fluid_Storage_Core_T2.get(1)) .duration(10 * SECONDS) @@ -338,50 +337,50 @@ public class RecipeLoader_02 { ? FluidRegistry.getFluid("molten.indalloy140") : FluidRegistry.getFluid("molten.solderingalloy"); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.Fluid_Storage_Core_T2.get(1)) .metadata(RESEARCH_TIME, 17 * MINUTES) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.StainlessSteel, 4), + GTOreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.StainlessSteel, 4), ItemList.Electric_Pump_HV.get(8), ItemList.Quantum_Tank_LV.get(1), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 8), - GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 1L, 6), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Polycaprolactam, 32)) + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Osmium, 8), + GTModHandler.getModItem(GalacticraftMars.ID, "item.null", 1L, 6), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.Polycaprolactam, 32)) .fluidInputs(new FluidStack(solderIndalloy, 2304), Materials.Lubricant.getFluid(4000)) .itemOutputs(ItemRefer.Fluid_Storage_Core_T3.get(1)) .eut(TierEU.RECIPE_LuV) .duration(20 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.Fluid_Storage_Core_T3.get(1)) .metadata(RESEARCH_TIME, 34 * MINUTES) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Titanium, 4), + GTOreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Titanium, 4), ItemList.Electric_Pump_EV.get(8), ItemList.Quantum_Tank_LV.get(4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 8), - GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 4L, 6), - GT_OreDictUnificator.get(OrePrefixes.foil, Materials.StyreneButadieneRubber, 64), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 64)) + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Europium, 8), + GTModHandler.getModItem(GalacticraftMars.ID, "item.null", 4L, 6), + GTOreDictUnificator.get(OrePrefixes.foil, Materials.StyreneButadieneRubber, 64), + GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.TungstenSteel, 64)) .fluidInputs(new FluidStack(solderIndalloy, 18432), Materials.Lubricant.getFluid(16000)) .itemOutputs(ItemRefer.Fluid_Storage_Core_T4.get(1)) .eut(TierEU.RECIPE_ZPM) .duration(20 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.Fluid_Storage_Core_T4.get(1)) .metadata(RESEARCH_TIME, 1 * HOURS + 8 * MINUTES) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.MysteriousCrystal, 4), + GTOreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.MysteriousCrystal, 4), ItemList.Electric_Pump_IV.get(8), ItemList.Quantum_Tank_HV.get(8), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 8), - GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 16L, 6), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Polycaprolactam, 24), - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Titanium, 64)) + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Neutronium, 8), + GTModHandler.getModItem(GalacticraftMars.ID, "item.null", 16L, 6), + GTOreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Polycaprolactam, 24), + GTOreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Titanium, 64)) .fluidInputs( Materials.Draconium.getMolten(2304), Materials.Titanium.getMolten(288), @@ -391,16 +390,16 @@ public class RecipeLoader_02 { .duration(20 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.Fluid_Storage_Core_T5.get(1)) .metadata(RESEARCH_TIME, 2 * HOURS + 15 * MINUTES) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 4), + GTOreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 4), ItemList.Electric_Pump_LuV.get(8), ItemList.Quantum_Tank_EV.get(16), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 16), - GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Infinity, 16), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 16), + GTModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), ItemList.Machine_IV_Compressor.get(64)) .fluidInputs( Materials.Draconium.getMolten(2304), @@ -411,17 +410,17 @@ public class RecipeLoader_02 { .duration(20 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.Fluid_Storage_Core_T6.get(1)) .metadata(RESEARCH_TIME, 4 * HOURS + 30 * MINUTES) .itemInputs( - GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), + GTModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), ItemList.Electric_Pump_ZPM.get(8), - GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 1L, 0), + GTModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 1L, 0), ItemList.Quantum_Tank_EV.get(32), - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 8), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.InfinityCatalyst, 8), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 16)) + GTOreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 8), + GTOreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.InfinityCatalyst, 8), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 16)) .fluidInputs( Materials.Draconium.getMolten(23040), new FluidStack(solderIndalloy, 2304), @@ -431,17 +430,17 @@ public class RecipeLoader_02 { .duration(20 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.Fluid_Storage_Core_T7.get(1)) .metadata(RESEARCH_TIME, 9 * HOURS) .itemInputs( - GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), + GTModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), ItemList.Electric_Pump_UV.get(8), - GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 2L, 0), + GTModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 2L, 0), ItemList.Quantum_Tank_EV.get(64), - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 16), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 24), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 16)) + GTOreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 16), + GTOreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 24), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 16)) .fluidInputs( Materials.Draconium.getMolten(36864), new FluidStack(solderIndalloy, 30240), @@ -451,17 +450,17 @@ public class RecipeLoader_02 { .duration(20 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.Fluid_Storage_Core_T8.get(1)) .metadata(RESEARCH_TIME, 180 * HOURS) .itemInputs( - GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), + GTModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), ItemList.Electric_Pump_UHV.get(8), - GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 2L, 0), + GTModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 2L, 0), ItemList.Quantum_Tank_IV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 32), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 36), - GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8)) + GTOreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 32), + GTOreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.Infinity, 36), + GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.DraconiumAwakened, 8)) .fluidInputs( Materials.Draconium.getMolten(36864), new FluidStack(solderIndalloy, 30240), @@ -472,17 +471,17 @@ public class RecipeLoader_02 { .duration(20 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.Fluid_Storage_Core_T9.get(1)) .metadata(RESEARCH_TIME, 360 * HOURS) .itemInputs( - GT_ModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), + GTModHandler.getModItem(GalacticraftMars.ID, "item.null", 64L, 6), ItemList.Electric_Pump_UEV.get(8), - GT_ModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 4L, 0), + GTModHandler.getModItem(Avaritia.ID, "Neutronium_Compressor", 4L, 0), ItemList.Quantum_Tank_IV.get(16), - GT_OreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 32), - GT_OreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.CosmicNeutronium, 24), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.SpaceTime, 4)) + GTOreDictUnificator.get(OrePrefixes.pipeNonuple, Materials.Infinity, 32), + GTOreDictUnificator.get(OrePrefixes.plateQuintuple, Materials.CosmicNeutronium, 24), + GTOreDictUnificator.get(OrePrefixes.plateDouble, MaterialsUEVplus.SpaceTime, 4)) .fluidInputs( Materials.Draconium.getMolten(36864), new FluidStack(solderIndalloy, 46080), @@ -493,44 +492,44 @@ public class RecipeLoader_02 { .duration(20 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), ItemRefer.Fluid_Storage_Core_T1.get(10), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 4), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 4), ItemList.Electric_Pump_HV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 4), - GT_Utility.getIntegratedCircuit(5)) + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 4), + GTUtility.getIntegratedCircuit(5)) .fluidInputs(Materials.Plastic.getMolten(144)) .itemOutputs(ItemRefer.YOTTank_Cell_T1.get(1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1), ItemRefer.Fluid_Storage_Core_T2.get(10), WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 4), ItemList.Electric_Pump_EV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 4), - GT_Utility.getIntegratedCircuit(5)) + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Enderium, 4), + GTUtility.getIntegratedCircuit(5)) .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(144)) .itemOutputs(ItemRefer.YOTTank_Cell_T2.get(1)) .duration(50 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.YOTTank_Cell_T2.get(1)) .metadata(RESEARCH_TIME, 17 * MINUTES) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah, 1), ItemRefer.Fluid_Storage_Core_T3.get(10), new Object[] { OrePrefixes.circuit.get(Materials.LuV), 8 }, ItemList.Electric_Pump_IV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NiobiumTitanium, 8), - MyMaterial.adamantiumAlloy.get(OrePrefixes.plate, 32)) + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NiobiumTitanium, 8), + GGMaterial.adamantiumAlloy.get(OrePrefixes.plate, 32)) .fluidInputs( Materials.Quantium.getMolten(1440), FluidRegistry.getFluidStack("ic2coolant", 8000), @@ -540,16 +539,16 @@ public class RecipeLoader_02 { .duration(50 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.YOTTank_Cell_T3.get(1)) .metadata(RESEARCH_TIME, 34 * MINUTES) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1), ItemRefer.Fluid_Storage_Core_T4.get(10), new Object[] { OrePrefixes.circuit.get(Materials.ZPM), 8 }, ItemList.Electric_Pump_LuV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.MysteriousCrystal, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectrumFlux, 32)) + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.MysteriousCrystal, 8), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.ElectrumFlux, 32)) .fluidInputs( Materials.Draconium.getMolten(1440), FluidRegistry.getFluidStack("ic2coolant", 16000), @@ -559,16 +558,16 @@ public class RecipeLoader_02 { .duration(50 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.YOTTank_Cell_T4.get(1)) .metadata(RESEARCH_TIME, 1 * HOURS + 8 * MINUTES) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1), ItemRefer.Fluid_Storage_Core_T5.get(10), new Object[] { OrePrefixes.circuit.get(Materials.UV), 8 }, ItemList.Electric_Pump_ZPM.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.DraconiumAwakened, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 64)) + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.DraconiumAwakened, 8), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 64)) .fluidInputs( Materials.Draconium.getMolten(1440), FluidRegistry.getFluidStack("ic2coolant", 16000), @@ -578,16 +577,16 @@ public class RecipeLoader_02 { .duration(50 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.YOTTank_Cell_T5.get(1)) .metadata(RESEARCH_TIME, 2 * HOURS + 15 * MINUTES) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), ItemRefer.Fluid_Storage_Core_T6.get(2), new Object[] { OrePrefixes.circuit.get(Materials.UHV), 8L }, ItemList.Electric_Pump_UV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 8), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 64)) + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 8), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 64)) .fluidInputs( Materials.DraconiumAwakened.getMolten(1440), FluidRegistry.getFluidStack("ic2coolant", 46080), @@ -597,17 +596,17 @@ public class RecipeLoader_02 { .duration(50 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.YOTTank_Cell_T6.get(1)) .metadata(RESEARCH_TIME, 4 * HOURS + 30 * MINUTES) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), ItemRefer.Fluid_Storage_Core_T7.get(2), new Object[] { OrePrefixes.circuit.get(Materials.UEV), 8L }, ItemList.Electric_Pump_UHV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 16), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 32), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 32)) + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.NetherStar, 16), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.CosmicNeutronium, 32), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 32)) .fluidInputs( Materials.DraconiumAwakened.getMolten(14400), FluidRegistry.getFluidStack("supercoolant", 46080), @@ -617,18 +616,18 @@ public class RecipeLoader_02 { .duration(50 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.YOTTank_Cell_T7.get(1)) .metadata(RESEARCH_TIME, 9 * HOURS) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1), ItemRefer.Fluid_Storage_Core_T8.get(2), new Object[] { OrePrefixes.circuit.get(Materials.UIV), 8L }, ItemList.Electric_Pump_UEV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 12), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 64)) + GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 12), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 64)) .fluidInputs( Materials.DraconiumAwakened.getMolten(14400), FluidRegistry.getFluidStack("supercoolant", 46080), @@ -639,18 +638,18 @@ public class RecipeLoader_02 { .addTo(AssemblyLine); if (NewHorizonsCoreMod.isModLoaded()) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.YOTTank_Cell_T8.get(1)) .metadata(RESEARCH_TIME, 18 * HOURS) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 2), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 2), ItemRefer.Fluid_Storage_Core_T9.get(2), new Object[] { OrePrefixes.circuit.get(Materials.UMV), 8L }, ItemList.Electric_Pump_UIV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 12), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 64)) + GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 12), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12), + GTOreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 64)) .fluidInputs( Materials.DraconiumAwakened.getMolten(14400), FluidRegistry.getFluidStack("supercoolant", 46080), @@ -660,18 +659,18 @@ public class RecipeLoader_02 { .duration(50 * SECONDS) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.YOTTank_Cell_T9.get(1)) .metadata(RESEARCH_TIME, 36 * HOURS) .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 2), + GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 2), ItemRefer.Fluid_Storage_Core_T10.get(2), new Object[] { OrePrefixes.circuit.get(Materials.UXV), 12L }, ItemList.Electric_Pump_UMV.get(8), - GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 64), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12), - GT_OreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 10)) + GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.NetherStar, 64), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.CosmicNeutronium, 12), + GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.DraconiumAwakened, 12), + GTOreDictUnificator.get(OrePrefixes.plate, MaterialsUEVplus.SpaceTime, 10)) .fluidInputs( Materials.DraconiumAwakened.getMolten(14400), MaterialsUEVplus.TranscendentMetal.getMolten(1440), @@ -684,161 +683,161 @@ public class RecipeLoader_02 { } // Craft 2x64X Tier to 1X+1 Tier - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fluid_Storage_Core_T6.get(64), ItemRefer.Fluid_Storage_Core_T6.get(64), - GT_Utility.getIntegratedCircuit(2)) + GTUtility.getIntegratedCircuit(2)) .itemOutputs(ItemRefer.Fluid_Storage_Core_T7.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fluid_Storage_Core_T7.get(64), ItemRefer.Fluid_Storage_Core_T7.get(64), - GT_Utility.getIntegratedCircuit(2)) + GTUtility.getIntegratedCircuit(2)) .itemOutputs(ItemRefer.Fluid_Storage_Core_T8.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fluid_Storage_Core_T8.get(64), ItemRefer.Fluid_Storage_Core_T8.get(64), - GT_Utility.getIntegratedCircuit(2)) + GTUtility.getIntegratedCircuit(2)) .itemOutputs(ItemRefer.Fluid_Storage_Core_T9.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fluid_Storage_Core_T9.get(64), ItemRefer.Fluid_Storage_Core_T9.get(64), - GT_Utility.getIntegratedCircuit(2)) + GTUtility.getIntegratedCircuit(2)) .itemOutputs(ItemRefer.Fluid_Storage_Core_T10.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.YOTTank_Cell_T1.get(1)) .itemOutputs( ItemRefer.Fluid_Storage_Core_T1.get(10), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1)) + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(unpackagerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.YOTTank_Cell_T2.get(1)) .itemOutputs( ItemRefer.Fluid_Storage_Core_T2.get(10), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1)) + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(unpackagerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.YOTTank_Cell_T3.get(1)) .itemOutputs( ItemRefer.Fluid_Storage_Core_T3.get(10), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah, 1)) + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Naquadah, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(unpackagerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.YOTTank_Cell_T4.get(1)) .itemOutputs( ItemRefer.Fluid_Storage_Core_T4.get(10), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1)) + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(unpackagerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.YOTTank_Cell_T5.get(1)) .itemOutputs( ItemRefer.Fluid_Storage_Core_T5.get(10), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1)) + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.CosmicNeutronium, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(unpackagerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.YOTTank_Cell_T6.get(1)) .itemOutputs( ItemRefer.Fluid_Storage_Core_T6.get(2), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1)) + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(unpackagerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.YOTTank_Cell_T7.get(1)) .itemOutputs( ItemRefer.Fluid_Storage_Core_T7.get(2), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1)) + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(unpackagerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.YOTTank_Cell_T8.get(1)) .itemOutputs( ItemRefer.Fluid_Storage_Core_T8.get(2), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1)) + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(unpackagerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.YOTTank_Cell_T9.get(1)) .itemOutputs( ItemRefer.Fluid_Storage_Core_T9.get(2), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1)) + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Infinity, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(unpackagerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.YOTTank_Cell_T10.get(1)) .itemOutputs( ItemRefer.Fluid_Storage_Core_T10.get(2), - GT_OreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1)) + GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(unpackagerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(WerkstoffLoader.Tiberium.get(OrePrefixes.dust, 1)) .itemOutputs( WerkstoffLoader.Tiberium.get(OrePrefixes.gem, 1), WerkstoffLoader.Tiberium.get(OrePrefixes.gem, 1)) .outputChances(10000, 2000) - .fluidInputs(MyMaterial.naquadahGas.getFluidOrGas(250)) + .fluidInputs(GGMaterial.naquadahGas.getFluidOrGas(250)) .duration(400) .eut(TierEU.RECIPE_HV) .addTo(autoclaveRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(Materials.Firestone.getGems(1)) - .fluidInputs(MyMaterial.lightNaquadahFuel.getFluidOrGas(144)) + .fluidInputs(GGMaterial.lightNaquadahFuel.getFluidOrGas(144)) .itemOutputs(WerkstoffLoader.Tiberium.get(OrePrefixes.gem, 1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(chemicalBathRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(Materials.Diamond.getGems(1)) - .fluidInputs(MyMaterial.heavyNaquadahFuel.getFluidOrGas(144)) + .fluidInputs(GGMaterial.heavyNaquadahFuel.getFluidOrGas(144)) .itemOutputs(WerkstoffLoader.Tiberium.get(OrePrefixes.gem, 1)) .duration(20 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(chemicalBathRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .fluidInputs(Materials.HeavyFuel.getFluid(1000)) .fluidOutputs( Materials.Toluene.getFluid(400), @@ -848,7 +847,7 @@ public class RecipeLoader_02 { .eut(TierEU.RECIPE_HV) .addTo(distillationTowerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(Materials.Coal.getGems(1)) .itemOutputs(Materials.Ash.getDust(1)) .outputChances(10) @@ -859,7 +858,7 @@ public class RecipeLoader_02 { if (OreDictionary.getOres("fuelCoke") .size() > 0) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( OreDictionary.getOres("fuelCoke") .get(0)) @@ -871,25 +870,25 @@ public class RecipeLoader_02 { .addTo(fluidExtractionRecipes); } - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(24)) .fluidInputs(FluidRegistry.getFluidStack("fluid.coaltaroil", 100)) - .fluidOutputs(MyMaterial.cyclopentadiene.getFluidOrGas(30)) + .fluidOutputs(GGMaterial.cyclopentadiene.getFluidOrGas(30)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(distilleryRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(24)) .fluidInputs(Materials.WoodTar.getFluid(500)) - .fluidOutputs(MyMaterial.cyclopentadiene.getFluidOrGas(20)) + .fluidOutputs(GGMaterial.cyclopentadiene.getFluidOrGas(20)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(distilleryRecipes); // FeCl2 + Cl = FeCl3 - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.ferrousChloride.get(OrePrefixes.cell, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.ferrousChloride.get(OrePrefixes.cell, 1), GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Chlorine.getGas(1000)) .itemOutputs(Materials.IronIIIChloride.getCells(1)) .duration(2 * SECONDS) @@ -897,172 +896,171 @@ public class RecipeLoader_02 { .addTo(UniversalChemical); // FeCl3 + H = FeCl2 + HCl - GT_Values.RA.stdBuilder() - .itemInputs(Materials.IronIIIChloride.getCells(1), GT_Utility.getIntegratedCircuit(7)) + GTValues.RA.stdBuilder() + .itemInputs(Materials.IronIIIChloride.getCells(1), GTUtility.getIntegratedCircuit(7)) .fluidInputs(Materials.Hydrogen.getGas(1000)) .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) - .itemOutputs(MyMaterial.ferrousChloride.get(OrePrefixes.cell, 1)) + .itemOutputs(GGMaterial.ferrousChloride.get(OrePrefixes.cell, 1)) .duration(4 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(UniversalChemical); // NH3 + 2C2H6O = C4H11N + 2H2O - GT_Values.RA.stdBuilder() - .itemInputs(Materials.Ammonia.getCells(1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(Materials.Ammonia.getCells(1), GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Ethanol.getFluid(2000)) .fluidOutputs(Materials.Water.getFluid(2000)) - .itemOutputs(MyMaterial.diethylamine.get(OrePrefixes.cell, 1)) + .itemOutputs(GGMaterial.diethylamine.get(OrePrefixes.cell, 1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(UniversalChemical); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(2)) .fluidInputs( - MyMaterial.cyclopentadiene.getFluidOrGas(2000), - MyMaterial.ferrousChloride.getFluidOrGas(1000), - MyMaterial.diethylamine.getFluidOrGas(8000), + GGMaterial.cyclopentadiene.getFluidOrGas(2000), + GGMaterial.ferrousChloride.getFluidOrGas(1000), + GGMaterial.diethylamine.getFluidOrGas(8000), Materials.Ice.getSolid(4000)) - .fluidOutputs(MyMaterial.impureFerroceneMixture.getFluidOrGas(15000)) + .fluidOutputs(GGMaterial.impureFerroceneMixture.getFluidOrGas(15000)) .duration(2 * MINUTES) .eut(TierEU.RECIPE_MV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.ether.get(OrePrefixes.cell, 1), GT_Utility.getIntegratedCircuit(1)) - .fluidInputs(MyMaterial.impureFerroceneMixture.getFluidOrGas(7500)) - .itemOutputs(MyMaterial.ferroceneSolution.get(OrePrefixes.cell, 1)) - .fluidOutputs(MyMaterial.ferroceneWaste.getFluidOrGas(5000)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.ether.get(OrePrefixes.cell, 1), GTUtility.getIntegratedCircuit(1)) + .fluidInputs(GGMaterial.impureFerroceneMixture.getFluidOrGas(7500)) + .itemOutputs(GGMaterial.ferroceneSolution.get(OrePrefixes.cell, 1)) + .fluidOutputs(GGMaterial.ferroceneWaste.getFluidOrGas(5000)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(mixerRecipes); CrackRecipeAdder.addUniversalDistillationRecipe( - MyMaterial.ferroceneWaste.getFluidOrGas(1000), - new FluidStack[] { Materials.Water.getFluid(400), MyMaterial.diethylamine.getFluidOrGas(800), - MyMaterial.ether.getFluidOrGas(500) }, - GT_Values.NI, + GGMaterial.ferroceneWaste.getFluidOrGas(1000), + new FluidStack[] { Materials.Water.getFluid(400), GGMaterial.diethylamine.getFluidOrGas(800), + GGMaterial.ether.getFluidOrGas(500) }, + GTValues.NI, 30 * SECONDS, TierEU.RECIPE_MV); CrackRecipeAdder.addUniversalDistillationRecipe( - MyMaterial.ferroceneSolution.getFluidOrGas(2000), - new FluidStack[] { MyMaterial.ether.getFluidOrGas(1000) }, - MyMaterial.ferrocene.get(OrePrefixes.dust, 1), + GGMaterial.ferroceneSolution.getFluidOrGas(2000), + new FluidStack[] { GGMaterial.ether.getFluidOrGas(1000) }, + GGMaterial.ferrocene.get(OrePrefixes.dust, 1), 30 * SECONDS, TierEU.RECIPE_MV); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.ferrocene.get(OrePrefixes.dust, 4), Materials.SodiumHydroxide.getDust(8)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.ferrocene.get(OrePrefixes.dust, 4), Materials.SodiumHydroxide.getDust(8)) .fluidInputs( FluidRegistry.getFluidStack("fluid.kerosene", 40000), Materials.Naphtha.getFluid(3000), - MyMaterial.diethylamine.getFluidOrGas(1000)) - .fluidOutputs(MyMaterial.ironedKerosene.getFluidOrGas(44000)) + GGMaterial.diethylamine.getFluidOrGas(1000)) + .fluidOutputs(GGMaterial.ironedKerosene.getFluidOrGas(44000)) .duration(2 * MINUTES) .eut(TierEU.RECIPE_EV) .addTo(multiblockChemicalReactorRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.ferrocene.get(OrePrefixes.dust, 4)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.ferrocene.get(OrePrefixes.dust, 4)) .fluidInputs( FluidRegistry.getFluidStack("combustionpromotor", 4000), Materials.Naphtha.getFluid(40000), Materials.LightFuel.getFluid(3000), Materials.LPG.getFluid(1000), Materials.Tetranitromethane.getFluid(2000)) - .fluidOutputs(MyMaterial.ironedFuel.getFluidOrGas(50000)) + .fluidOutputs(GGMaterial.ironedFuel.getFluidOrGas(50000)) .duration(2 * MINUTES) .eut(TierEU.RECIPE_IV) .addTo(multiblockChemicalReactorRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( ItemRefer.Combustion_Generator_EV.get(1), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "PCP", "MHM", "GWG", 'G', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 1), 'C', "circuitData", 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 1), 'P', + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.REVERSIBLE, + new Object[] { "PCP", "MHM", "GWG", 'G', GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium, 1), + 'C', "circuitData", 'W', GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium, 1), 'P', ItemList.Electric_Piston_EV, 'H', ItemList.Hull_EV, 'M', ItemList.Electric_Motor_EV }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( ItemRefer.Combustion_Generator_IV.get(1), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.REVERSIBLE, new Object[] { "PCP", "MHM", "GWG", 'G', - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TungstenSteel, 1), 'C', "circuitElite", 'W', - GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 1), 'P', - ItemList.Electric_Piston_IV, 'H', ItemList.Hull_IV, 'M', ItemList.Electric_Motor_IV }); + GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.TungstenSteel, 1), 'C', "circuitElite", 'W', + GTOreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten, 1), 'P', ItemList.Electric_Piston_IV, + 'H', ItemList.Hull_IV, 'M', ItemList.Electric_Motor_IV }); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Advanced_Fuel_Rod.get(1)) - .fluidInputs(MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(250)) + .fluidInputs(GGMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(250)) .itemOutputs(ItemRefer.Fuel_Rod_LU_1.get(1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(fluidCannerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Advanced_Fuel_Rod.get(1)) - .fluidInputs(MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(250)) + .fluidInputs(GGMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(250)) .itemOutputs(ItemRefer.Fuel_Rod_LPu_1.get(1)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(fluidCannerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fuel_Rod_LPu_1.get(2), - MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(2)) + GGMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GTUtility.getIntegratedCircuit(2)) .itemOutputs(ItemRefer.Fuel_Rod_LPu_2.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fuel_Rod_LPu_2.get(2), - MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(5)) + GGMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GTUtility.getIntegratedCircuit(5)) .itemOutputs(ItemRefer.Fuel_Rod_LPu_4.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fuel_Rod_LPu_1.get(4), - MyMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), - GT_Utility.getIntegratedCircuit(4)) + GGMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), + GTUtility.getIntegratedCircuit(4)) .itemOutputs(ItemRefer.Fuel_Rod_LPu_4.get(1)) .duration(11 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fuel_Rod_LU_1.get(2), - MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(2)) + GGMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GTUtility.getIntegratedCircuit(2)) .itemOutputs(ItemRefer.Fuel_Rod_LU_2.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fuel_Rod_LU_2.get(2), - MyMaterial.zircaloy2.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(5)) + GGMaterial.zircaloy2.get(OrePrefixes.stick, 4), + GTUtility.getIntegratedCircuit(5)) .itemOutputs(ItemRefer.Fuel_Rod_LU_4.get(1)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.Fuel_Rod_LU_1.get(4), - MyMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), - GT_Utility.getIntegratedCircuit(4)) + GGMaterial.zircaloy2.get(OrePrefixes.stickLong, 6), + GTUtility.getIntegratedCircuit(4)) .itemOutputs(ItemRefer.Fuel_Rod_LU_4.get(1)) .duration(11 * SECONDS) .eut(TierEU.RECIPE_IV) @@ -1092,84 +1090,84 @@ public class RecipeLoader_02 { FluidRegistry.getFluidStack("supercriticalsteam", 32000), 1600); - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Lepidolite, 1)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Lepidolite, 1)) .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) .itemOutputs( Materials.RockSalt.getDust(1), - MyMaterial.lithiumChloride.get(OrePrefixes.dust, 3), + GGMaterial.lithiumChloride.get(OrePrefixes.dust, 3), Materials.Cryolite.getDust(4)) .outputChances(8000, 8000, 8000) .duration(7 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(chemicalBathRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.marM200.get(OrePrefixes.ingot, 18), Materials.Cerium.getIngots(1)) - .fluidInputs(MyMaterial.lithiumChloride.getMolten(144)) - .itemOutputs(MyMaterial.marCeM200.get(OrePrefixes.ingotHot, 19)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.marM200.get(OrePrefixes.ingot, 18), Materials.Cerium.getIngots(1)) + .fluidInputs(GGMaterial.lithiumChloride.getMolten(144)) + .itemOutputs(GGMaterial.marCeM200.get(OrePrefixes.ingotHot, 19)) .duration(4 * MINUTES + 45 * SECONDS) .eut(TierEU.RECIPE_ZPM) .metadata(COIL_HEAT, 5400) .addTo(blastFurnaceRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( ItemRefer.SC_Turbine_Casing.get(1), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "PhP", "GCG", "PwP", 'G', MyMaterial.marM200.get(OrePrefixes.gearGt, 1), 'C', - ItemList.Casing_Turbine.get(1), 'P', MyMaterial.marCeM200.get(OrePrefixes.plate, 1), }); + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.REVERSIBLE, + new Object[] { "PhP", "GCG", "PwP", 'G', GGMaterial.marM200.get(OrePrefixes.gearGt, 1), 'C', + ItemList.Casing_Turbine.get(1), 'P', GGMaterial.marCeM200.get(OrePrefixes.plate, 1), }); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.marM200.get(OrePrefixes.gearGt, 2), - MyMaterial.marCeM200.get(OrePrefixes.plate, 4), + GGMaterial.marM200.get(OrePrefixes.gearGt, 2), + GGMaterial.marCeM200.get(OrePrefixes.plate, 4), ItemList.Casing_Turbine.get(1)) .itemOutputs(ItemRefer.SC_Turbine_Casing.get(1)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( ItemRefer.SC_Fluid_Turbine.get(1), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, - new Object[] { "NPN", "GHG", "IPI", 'N', "circuitMaster", 'P', MyMaterial.marM200.get(OrePrefixes.plate, 1), - 'H', ItemList.Hull_IV.get(1), 'G', MyMaterial.marCeM200.get(OrePrefixes.gearGt, 1), 'I', - MyMaterial.incoloy903.get(OrePrefixes.pipeLarge, 1) }); + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.REVERSIBLE, + new Object[] { "NPN", "GHG", "IPI", 'N', "circuitMaster", 'P', GGMaterial.marM200.get(OrePrefixes.plate, 1), + 'H', ItemList.Hull_IV.get(1), 'G', GGMaterial.marCeM200.get(OrePrefixes.gearGt, 1), 'I', + GGMaterial.incoloy903.get(OrePrefixes.pipeLarge, 1) }); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.marM200.get(OrePrefixes.plate, 2), - MyMaterial.marCeM200.get(OrePrefixes.gearGt, 2), - MyMaterial.incoloy903.get(OrePrefixes.pipeLarge, 2), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 2), + GGMaterial.marM200.get(OrePrefixes.plate, 2), + GGMaterial.marCeM200.get(OrePrefixes.gearGt, 2), + GGMaterial.incoloy903.get(OrePrefixes.pipeLarge, 2), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 2), ItemList.Hull_IV.get(1)) .itemOutputs(ItemRefer.SC_Fluid_Turbine.get(1)) .duration(15 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - MyMaterial.incoloy903.get(OrePrefixes.plate, 4), - MyMaterial.marCeM200.get(OrePrefixes.plate, 4), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.NiobiumTitanium, 1), - GT_Utility.getIntegratedCircuit(8)) + GGMaterial.incoloy903.get(OrePrefixes.plate, 4), + GGMaterial.marCeM200.get(OrePrefixes.plate, 4), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NiobiumTitanium, 1), + GTUtility.getIntegratedCircuit(8)) .itemOutputs(ItemRefer.Pressure_Resistant_Wall.get(1)) .duration(50 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( ItemRefer.Extreme_Heat_Exchanger.get(1), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.REVERSIBLE, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.REVERSIBLE, new Object[] { "EPE", "PHP", "SPS", 'P', - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 1), 'H', - ItemList.Hull_IV.get(1), 'S', MyMaterial.marM200.get(OrePrefixes.plate, 1), 'E', - GT_ModHandler.getIC2Item("reactorHeatSwitchDiamond", 1L, 1) }); + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.TungstenSteel, 1), 'H', + ItemList.Hull_IV.get(1), 'S', GGMaterial.marM200.get(OrePrefixes.plate, 1), 'E', + GTModHandler.getIC2Item("reactorHeatSwitchDiamond", 1L, 1) }); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Salty_Root.get(1)) - .fluidInputs(GT_ModHandler.getWater(100)) + .fluidInputs(GTModHandler.getWater(100)) .itemOutputs(Materials.Salt.getDust(1), Materials.RockSalt.getDust(1), Materials.Saltpeter.getDust(1)) .outputChances(9500, 8000, 5000) .duration(5 * SECONDS) @@ -1177,229 +1175,229 @@ public class RecipeLoader_02 { .addTo(chemicalBathRecipes); if (NewHorizonsCoreMod.isModLoaded()) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Robot_Arm_IV.get(4), ItemRefer.HiC_T1.get(4), ItemList.Tool_DataOrb.get(3), - GT_OreDictUnificator.get(OrePrefixes.cableGt08, Materials.Titanium, 4), - MyMaterial.hikarium.get(OrePrefixes.gearGt, 4), - MyMaterial.marM200.get(OrePrefixes.plateDouble, 2), + GTOreDictUnificator.get(OrePrefixes.cableGt08, Materials.Titanium, 4), + GGMaterial.hikarium.get(OrePrefixes.gearGt, 4), + GGMaterial.marM200.get(OrePrefixes.plateDouble, 2), ItemRefer.IC2_Ir_Plate.get(2), - MyMaterial.lumiium.get(OrePrefixes.bolt, 48)) + GGMaterial.lumiium.get(OrePrefixes.bolt, 48)) .fluidInputs(Materials.Palladium.getMolten(1152)) .itemOutputs(ItemRefer.Precise_Assembler.get(1)) .duration(1 * MINUTES + 30 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T1.get(2), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedDiamondCrystalChip", 8), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedDiamondCrystalChip", 8), ItemList.Circuit_Chip_NAND.get(16), - GT_ModHandler.getIC2Item("reactorVentCore", 1L, 1)) + GTModHandler.getIC2Item("reactorVentCore", 1L, 1)) .itemOutputs(ItemRefer.HiC_T2.get(1)) .fluidInputs( Materials.Plastic.getMolten(288), - MyMaterial.signalium.getMolten(144), - MyMaterial.lumiium.getMolten(72), + GGMaterial.signalium.getMolten(144), + GGMaterial.lumiium.getMolten(72), Materials.Enderium.getMolten(72)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_LuV) .metadata(PRECISE_ASSEMBLER_CASING_TIER, 1) .noOptimize() .addTo(preciseAssemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T1.get(2), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedDiamondCrystalChip", 8), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedDiamondCrystalChip", 8), ItemList.Circuit_Chip_NAND.get(16), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Aluminium, 2)) + GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Aluminium, 2)) .itemOutputs(ItemRefer.HiC_T2.get(1)) .fluidInputs( Materials.Plastic.getMolten(288), - MyMaterial.signalium.getMolten(144), - MyMaterial.lumiium.getMolten(72), + GGMaterial.signalium.getMolten(144), + GGMaterial.lumiium.getMolten(72), Materials.Enderium.getMolten(72)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_LuV) .metadata(PRECISE_ASSEMBLER_CASING_TIER, 1) .noOptimize() .addTo(preciseAssemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T2.get(2), ItemList.Circuit_Parts_Crystal_Chip_Master.get(8), ItemList.Circuit_Chip_CrystalSoC2.get(1), - GT_ModHandler.getIC2Item("reactorVentDiamond", 1L, 1)) + GTModHandler.getIC2Item("reactorVentDiamond", 1L, 1)) .itemOutputs(ItemRefer.HiC_T3.get(1)) .fluidInputs( - MyMaterial.adamantiumAlloy.getMolten(576), - MyMaterial.signalium.getMolten(288), - MyMaterial.lumiium.getMolten(144), + GGMaterial.adamantiumAlloy.getMolten(576), + GGMaterial.signalium.getMolten(288), + GGMaterial.lumiium.getMolten(144), Materials.TungstenCarbide.getMolten(72)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_ZPM) .metadata(PRECISE_ASSEMBLER_CASING_TIER, 2) .noOptimize() .addTo(preciseAssemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T2.get(2), ItemList.Circuit_Parts_Crystal_Chip_Master.get(8), ItemList.Circuit_Chip_CrystalSoC2.get(1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 2)) + GTOreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 2)) .itemOutputs(ItemRefer.HiC_T3.get(1)) .fluidInputs( - MyMaterial.adamantiumAlloy.getMolten(576), - MyMaterial.signalium.getMolten(288), - MyMaterial.lumiium.getMolten(144), + GGMaterial.adamantiumAlloy.getMolten(576), + GGMaterial.signalium.getMolten(288), + GGMaterial.lumiium.getMolten(144), Materials.TungstenCarbide.getMolten(72)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_ZPM) .metadata(PRECISE_ASSEMBLER_CASING_TIER, 2) .noOptimize() .addTo(preciseAssemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T3.get(2), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedEnergyChip", 8), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedEnergyChip", 8), ItemList.Circuit_Chip_QuantumCPU.get(16), - GT_ModHandler.getIC2Item("reactorVentGold", 1L, 1)) + GTModHandler.getIC2Item("reactorVentGold", 1L, 1)) .itemOutputs(ItemRefer.HiC_T4.get(1)) .fluidInputs( - MyMaterial.marM200.getMolten(1152), - MyMaterial.signalium.getMolten(576), - MyMaterial.lumiium.getMolten(288), - MyMaterial.artheriumSn.getMolten(144)) + GGMaterial.marM200.getMolten(1152), + GGMaterial.signalium.getMolten(576), + GGMaterial.lumiium.getMolten(288), + GGMaterial.artheriumSn.getMolten(144)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_UV) .metadata(PRECISE_ASSEMBLER_CASING_TIER, 3) .noOptimize() .addTo(preciseAssemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T3.get(2), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedEnergyChip", 8), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedEnergyChip", 8), ItemList.Circuit_Chip_QuantumCPU.get(16), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.EnergeticAlloy, 2)) + GTOreDictUnificator.get(OrePrefixes.rotor, Materials.EnergeticAlloy, 2)) .itemOutputs(ItemRefer.HiC_T4.get(1)) .fluidInputs( - MyMaterial.marM200.getMolten(1152), - MyMaterial.signalium.getMolten(576), - MyMaterial.lumiium.getMolten(288), - MyMaterial.artheriumSn.getMolten(144)) + GGMaterial.marM200.getMolten(1152), + GGMaterial.signalium.getMolten(576), + GGMaterial.lumiium.getMolten(288), + GGMaterial.artheriumSn.getMolten(144)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_UV) .metadata(PRECISE_ASSEMBLER_CASING_TIER, 3) .noOptimize() .addTo(preciseAssemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T4.get(2), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedManyullynCrystalChip", 8), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedManyullynCrystalChip", 8), ItemList.Circuit_Chip_BioCPU.get(1), Ic2Items.reactorVentSpread) .itemOutputs(ItemRefer.HiC_T5.get(1)) .fluidInputs( - MyMaterial.titaniumBetaC.getMolten(1728), - MyMaterial.signalium.getMolten(1152), - MyMaterial.lumiium.getMolten(576), - MyMaterial.dalisenite.getMolten(288)) + GGMaterial.titaniumBetaC.getMolten(1728), + GGMaterial.signalium.getMolten(1152), + GGMaterial.lumiium.getMolten(576), + GGMaterial.dalisenite.getMolten(288)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_UHV) .metadata(PRECISE_ASSEMBLER_CASING_TIER, 3) .noOptimize() .addTo(preciseAssemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemRefer.HiC_T4.get(2), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedManyullynCrystalChip", 8), + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.EngravedManyullynCrystalChip", 8), ItemList.Circuit_Chip_BioCPU.get(1), - GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenCarbide, 2)) + GTOreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenCarbide, 2)) .itemOutputs(ItemRefer.HiC_T5.get(1)) .fluidInputs( - MyMaterial.titaniumBetaC.getMolten(1728), - MyMaterial.signalium.getMolten(1152), - MyMaterial.lumiium.getMolten(576), - MyMaterial.dalisenite.getMolten(288)) + GGMaterial.titaniumBetaC.getMolten(1728), + GGMaterial.signalium.getMolten(1152), + GGMaterial.lumiium.getMolten(576), + GGMaterial.dalisenite.getMolten(288)) .duration(5 * SECONDS) .eut(TierEU.RECIPE_UHV) .metadata(PRECISE_ASSEMBLER_CASING_TIER, 3) .noOptimize() .addTo(preciseAssemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Casing_LuV.get(3), ItemList.Robot_Arm_EV.get(2), - GT_OreDictUnificator.get(OrePrefixes.cableGt02, Materials.Osmiridium, 2), - MyMaterial.marM200.get(OrePrefixes.plateDouble, 2), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1), - ELEMENT.getInstance().RUTHENIUM.getBolt(32), - GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Platinum, 8)) - .fluidInputs(MyMaterial.zircaloy4.getMolten(576)) + GTOreDictUnificator.get(OrePrefixes.cableGt02, Materials.Osmiridium, 2), + GGMaterial.marM200.get(OrePrefixes.plateDouble, 2), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1), + MaterialsElements.getInstance().RUTHENIUM.getBolt(32), + GTOreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.Platinum, 8)) + .fluidInputs(GGMaterial.zircaloy4.getMolten(576)) .itemOutputs(ItemRefer.Imprecise_Electronic_Unit.get(2)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Casing_ZPM.get(3), ItemList.Robot_Arm_IV.get(2), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, MyMaterial.lumiium.getBridgeMaterial(), 2), - MyMaterial.marCeM200.get(OrePrefixes.plateDouble, 2), + GTOreDictUnificator.get(OrePrefixes.cableGt04, GGMaterial.lumiium.getBridgeMaterial(), 2), + GGMaterial.marCeM200.get(OrePrefixes.plateDouble, 2), ItemRefer.HiC_T1.get(1), - MyMaterial.signalium.get(OrePrefixes.bolt, 32), - MyMaterial.titaniumBetaC.get(OrePrefixes.gearGtSmall, 8)) + GGMaterial.signalium.get(OrePrefixes.bolt, 32), + GGMaterial.titaniumBetaC.get(OrePrefixes.gearGtSmall, 8)) .fluidInputs(Materials.BlackSteel.getMolten(576)) .itemOutputs(ItemRefer.Precise_Electronic_Unit_T1.get(2)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Casing_UV.get(3), ItemList.Robot_Arm_LuV.get(2), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 4), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.ElectrumFlux, 4), ItemRefer.HiC_T2.get(1), ItemRefer.Precise_Electronic_Unit_T1.get(1), - MyMaterial.marCeM200.get(OrePrefixes.bolt, 32), - MyMaterial.artheriumSn.get(OrePrefixes.gearGtSmall, 8)) - .fluidInputs(MyMaterial.adamantiumAlloy.getMolten(1152)) + GGMaterial.marCeM200.get(OrePrefixes.bolt, 32), + GGMaterial.artheriumSn.get(OrePrefixes.gearGtSmall, 8)) + .fluidInputs(GGMaterial.adamantiumAlloy.getMolten(1152)) .itemOutputs(ItemRefer.Precise_Electronic_Unit_T2.get(4)) .duration(4 * MINUTES) .eut(TierEU.RECIPE_ZPM) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Casing_MAX.get(3), ItemList.Field_Generator_ZPM.get(2), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 4), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.Bedrockium, 4), ItemRefer.HiC_T3.get(1), ItemRefer.Precise_Electronic_Unit_T2.get(1), - MyMaterial.titaniumBetaC.get(OrePrefixes.bolt, 32), - MyMaterial.dalisenite.get(OrePrefixes.gearGtSmall, 8)) - .fluidInputs(MyMaterial.artheriumSn.getMolten(1152)) + GGMaterial.titaniumBetaC.get(OrePrefixes.bolt, 32), + GGMaterial.dalisenite.get(OrePrefixes.gearGtSmall, 8)) + .fluidInputs(GGMaterial.artheriumSn.getMolten(1152)) .itemOutputs(ItemRefer.Precise_Electronic_Unit_T3.get(4)) .duration(4 * MINUTES) .eut(TierEU.RECIPE_UV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( getItemContainer("Casing_UEV").get(3), ItemList.Field_Generator_UV.get(2), - GT_OreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 8), + GTOreDictUnificator.get(OrePrefixes.cableGt04, Materials.NetherStar, 8), ItemRefer.HiC_T4.get(1), ItemRefer.Precise_Electronic_Unit_T3.get(1), - MyMaterial.enrichedNaquadahAlloy.get(OrePrefixes.bolt, 32), - MyMaterial.tairitsu.get(OrePrefixes.gearGtSmall, 8)) - .fluidInputs(MyMaterial.preciousMetalAlloy.getMolten(1152)) + GGMaterial.enrichedNaquadahAlloy.get(OrePrefixes.bolt, 32), + GGMaterial.tairitsu.get(OrePrefixes.gearGtSmall, 8)) + .fluidInputs(GGMaterial.preciousMetalAlloy.getMolten(1152)) .itemOutputs(ItemRefer.Precise_Electronic_Unit_T4.get(4)) .duration(4 * MINUTES) .eut(TierEU.RECIPE_UHV) @@ -1407,62 +1405,62 @@ public class RecipeLoader_02 { } // Compact MK1 Fusion Coil - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Casing_Coil_Superconductor.get(3), ItemRefer.HiC_T2.get(1), ItemRefer.Special_Ceramics_Plate.get(2)) .itemOutputs(ItemRefer.Compact_Fusion_Coil_T0.get(1)) - .fluidInputs(MyMaterial.marM200.getMolten(1152), MyMaterial.zircaloy4.getMolten(288)) + .fluidInputs(GGMaterial.marM200.getMolten(1152), GGMaterial.zircaloy4.getMolten(288)) .duration(60 * SECONDS) .eut(9001) .metadata(PRECISE_ASSEMBLER_CASING_TIER, 1) .noOptimize() .addTo(preciseAssemblerRecipes); // Compact MK2 Fusion Coil - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Casing_Fusion_Coil.get(3), ItemRefer.Quartz_Crystal_Resonator.get(2), ItemRefer.HiC_T3.get(1)) .itemOutputs(ItemRefer.Compact_Fusion_Coil_T1.get(1)) - .fluidInputs(MyMaterial.artheriumSn.getMolten(576), MyMaterial.titaniumBetaC.getMolten(144)) + .fluidInputs(GGMaterial.artheriumSn.getMolten(576), GGMaterial.titaniumBetaC.getMolten(144)) .duration(40 * SECONDS) .eut(14000) .metadata(PRECISE_ASSEMBLER_CASING_TIER, 2) .noOptimize() .addTo(preciseAssemblerRecipes); // Compact MK3 Fusion Coil - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.Casing_Fusion_Coil.get(3), ItemRefer.Radiation_Protection_Plate.get(2), ItemList.QuantumStar.get(4), ItemRefer.HiC_T4.get(1)) .itemOutputs(ItemRefer.Compact_Fusion_Coil_T2.get(1)) - .fluidInputs(MyMaterial.dalisenite.getMolten(576), MyMaterial.hikarium.getMolten(144)) + .fluidInputs(GGMaterial.dalisenite.getMolten(576), GGMaterial.hikarium.getMolten(144)) .duration(40 * SECONDS) .eut(114514) .metadata(PRECISE_ASSEMBLER_CASING_TIER, 3) .noOptimize() .addTo(preciseAssemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemList.FusionComputer_LuV.get(48), ItemRefer.HiC_T1.get(8), - MyMaterial.marCeM200.get(OrePrefixes.plate, 32), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 8), + GGMaterial.marCeM200.get(OrePrefixes.plate, 32), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 8), ItemList.Circuit_Wafer_HPIC.get(16), ItemList.Field_Generator_LuV.get(4), - MyMaterial.marM200.get(OrePrefixes.stickLong, 8)) - .fluidInputs(MyMaterial.adamantiumAlloy.getMolten(9216)) + GGMaterial.marM200.get(OrePrefixes.stickLong, 8)) + .fluidInputs(GGMaterial.adamantiumAlloy.getMolten(9216)) .itemOutputs(ItemRefer.Compact_Fusion_MK1.get(1)) .duration(1 * MINUTES) .eut(TierEU.RECIPE_LuV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.Compact_Fusion_MK1.get(1)) .metadata(RESEARCH_TIME, 20 * MINUTES) .itemInputs( @@ -1476,17 +1474,17 @@ public class RecipeLoader_02 { ItemList.Neutron_Reflector.get(4), ItemRefer.HiC_T2.get(8), ItemList.Field_Generator_ZPM.get(8), - MyMaterial.artheriumSn.get(OrePrefixes.gearGtSmall, 32)) + GGMaterial.artheriumSn.get(OrePrefixes.gearGtSmall, 32)) .fluidInputs( - MyMaterial.marCeM200.getMolten(2304), + GGMaterial.marCeM200.getMolten(2304), WerkstoffLoader.HDCS.getMolten(1152), - MyMaterial.artheriumSn.getMolten(288)) + GGMaterial.artheriumSn.getMolten(288)) .itemOutputs(ItemRefer.Compact_Fusion_MK2.get(1)) .eut(TierEU.RECIPE_ZPM / 2) .duration(5 * MINUTES) .addTo(AssemblyLine); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .metadata(RESEARCH_ITEM, ItemRefer.Compact_Fusion_MK2.get(1)) .metadata(RESEARCH_TIME, 20 * MINUTES) .itemInputs( @@ -1502,8 +1500,8 @@ public class RecipeLoader_02 { ItemList.Field_Generator_UV.get(8), WerkstoffLoader.HDCS.get(OrePrefixes.gearGtSmall, 64)) .fluidInputs( - MyMaterial.titaniumBetaC.getMolten(2304), - MyMaterial.dalisenite.getMolten(1152), + GGMaterial.titaniumBetaC.getMolten(2304), + GGMaterial.dalisenite.getMolten(1152), Materials.Americium.getMolten(288)) .itemOutputs(ItemRefer.Compact_Fusion_MK3.get(1)) .eut(TierEU.RECIPE_ZPM) @@ -1511,7 +1509,7 @@ public class RecipeLoader_02 { .addTo(AssemblyLine); // Compact MK4 Fusion Coil - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(GregtechItemList.Casing_Fusion_Internal.get(3), ItemRefer.HiC_T5.get(1), CI.getEnergyCore(4, 1)) .itemOutputs(ItemRefer.Compact_Fusion_Coil_T3.get(1)) .fluidInputs( @@ -1524,14 +1522,14 @@ public class RecipeLoader_02 { .addTo(preciseAssemblerRecipes); // Compact MK4 Fusion Disassembly Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Compact_Fusion_Coil_T3.get(1)) .itemOutputs(GregtechItemList.Casing_Fusion_Internal.get(3)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_UEV) .addTo(assemblerRecipes); - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( ItemRefer.Compact_Fusion_MK3.get(1), 2_560_000, 4_096, @@ -1540,23 +1538,26 @@ public class RecipeLoader_02 { new Object[] { GregtechItemList.FusionComputer_UV2.get(48), new Object[] { "circuitInfinite", 1 }, new Object[] { "circuitInfinite", 1 }, new Object[] { "circuitInfinite", 1 }, new Object[] { "circuitInfinite", 1 }, ItemList.Circuit_Wafer_PPIC.get(64), ItemList.UHV_Coil.get(16), - ALLOY.TITANSTEEL.getPlateDense(8), ItemRefer.HiC_T4.get(8), ItemList.Field_Generator_UHV.get(8), - MyMaterial.enrichedNaquadahAlloy.get(OrePrefixes.gearGtSmall, 64) }, - new FluidStack[] { GenericChem.TEFLON.getFluidStack(2304), MyMaterial.dalisenite.getMolten(1152), - ALLOY.BOTMIUM.getFluidStack(288) }, + MaterialsAlloy.TITANSTEEL.getPlateDense(8), ItemRefer.HiC_T4.get(8), + ItemList.Field_Generator_UHV.get(8), + GGMaterial.enrichedNaquadahAlloy.get(OrePrefixes.gearGtSmall, 64) }, + new FluidStack[] { GenericChem.TEFLON.getFluidStack(2304), GGMaterial.dalisenite.getMolten(1152), + MaterialsAlloy.BOTMIUM.getFluidStack(288) }, ItemRefer.Compact_Fusion_MK4.get(1), 6000, (int) TierEU.RECIPE_UV); // Compact MK5 Fusion Coil - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( GregtechItemList.Casing_Fusion_Internal2.get(3), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 1), + GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 1), ItemRefer.HiC_T5.get(4), CI.getEnergyCore(5, 1)) .itemOutputs(ItemRefer.Compact_Fusion_Coil_T4.get(1)) - .fluidInputs(ALLOY.BLACK_TITANIUM.getFluidStack(1152), MyMaterial.metastableOganesson.getMolten(576)) + .fluidInputs( + MaterialsAlloy.BLACK_TITANIUM.getFluidStack(1152), + GGMaterial.metastableOganesson.getMolten(576)) .duration(1 * MINUTES + 40 * SECONDS) .eut(TierEU.RECIPE_UHV) .metadata(PRECISE_ASSEMBLER_CASING_TIER, 3) @@ -1564,7 +1565,7 @@ public class RecipeLoader_02 { .addTo(preciseAssemblerRecipes); // Compact MK5 Computer - TT_recipeAdder.addResearchableAssemblylineRecipe( + TTRecipeAdder.addResearchableAssemblylineRecipe( ItemRefer.Compact_Fusion_MK4.get(1), 10_240_000, 16_384, @@ -1573,46 +1574,46 @@ public class RecipeLoader_02 { new Object[] { GregtechItemList.FusionComputer_UV3.get(48), new Object[] { "circuitBio", 1 }, new Object[] { "circuitBio", 1 }, new Object[] { "circuitBio", 1 }, new Object[] { "circuitBio", 1 }, ItemList.Circuit_Wafer_QPIC.get(64), ItemList.UHV_Coil.get(64), - ELEMENT.STANDALONE.HYPOGEN.getPlateDense(8), ItemRefer.HiC_T5.get(8), - ItemList.Field_Generator_UEV.get(8), MyMaterial.metastableOganesson.get(OrePrefixes.gearGtSmall, 64) }, - new FluidStack[] { MyMaterial.tairitsu.getMolten(2304), ALLOY.OCTIRON.getFluidStack(1152), - ELEMENT.STANDALONE.RHUGNOR.getFluidStack(288) }, + MaterialsElements.STANDALONE.HYPOGEN.getPlateDense(8), ItemRefer.HiC_T5.get(8), + ItemList.Field_Generator_UEV.get(8), GGMaterial.metastableOganesson.get(OrePrefixes.gearGtSmall, 64) }, + new FluidStack[] { GGMaterial.tairitsu.getMolten(2304), MaterialsAlloy.OCTIRON.getFluidStack(1152), + MaterialsElements.STANDALONE.RHUGNOR.getFluidStack(288) }, ItemRefer.Compact_Fusion_MK5.get(1), 6000, (int) TierEU.RECIPE_UHV); // Compact MK5 Fusion Disassembly Recipe - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Compact_Fusion_Coil_T4.get(1)) .itemOutputs(GregtechItemList.Casing_Fusion_Internal2.get(3)) .duration(1 * MINUTES) .eut(TierEU.RECIPE_UIV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(Materials.Antimony.getDust(8), GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(Materials.Antimony.getDust(8), GTUtility.getIntegratedCircuit(24)) .fluidInputs( - MyMaterial.ether.getFluidOrGas(1000), + GGMaterial.ether.getFluidOrGas(1000), Materials.Fluorine.getGas(40000), Materials.Ice.getSolid(8000)) - .fluidOutputs(MyMaterial.antimonyPentafluorideSolution.getFluidOrGas(8000)) + .fluidOutputs(GGMaterial.antimonyPentafluorideSolution.getFluidOrGas(8000)) .duration(40 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(multiblockChemicalReactorRecipes); CrackRecipeAdder.addUniversalDistillationRecipe( - MyMaterial.antimonyPentafluorideSolution.getFluidOrGas(4000), - new FluidStack[] { MyMaterial.antimonyPentafluoride.getFluidOrGas(4000), - MyMaterial.ether.getFluidOrGas(500) }, - GT_Values.NI, + GGMaterial.antimonyPentafluorideSolution.getFluidOrGas(4000), + new FluidStack[] { GGMaterial.antimonyPentafluoride.getFluidOrGas(4000), + GGMaterial.ether.getFluidOrGas(500) }, + GTValues.NI, 5 * SECONDS, TierEU.RECIPE_MV); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Plastic, 2), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1), - GT_Utility.getIntegratedCircuit(1)) + GTOreDictUnificator.get(OrePrefixes.pipeHuge, Materials.Plastic, 2), + GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Steel, 1), + GTUtility.getIntegratedCircuit(1)) .fluidInputs(Materials.Concrete.getMolten(2304)) .itemOutputs(ItemRefer.Coolant_Tower.get(1)) .duration(10 * SECONDS) @@ -1622,7 +1623,7 @@ public class RecipeLoader_02 { public static void InitLoadRecipe() { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Fuel_Rod_U_Depleted_1.get(1)) .itemOutputs( ItemRefer.Advanced_Fuel_Rod.get(1), @@ -1637,7 +1638,7 @@ public class RecipeLoader_02 { .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Fuel_Rod_U_Depleted_2.get(1)) .itemOutputs( ItemRefer.Advanced_Fuel_Rod.get(2), @@ -1652,7 +1653,7 @@ public class RecipeLoader_02 { .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Fuel_Rod_U_Depleted_4.get(1)) .itemOutputs( ItemRefer.Advanced_Fuel_Rod.get(4), @@ -1667,7 +1668,7 @@ public class RecipeLoader_02 { .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Fuel_Rod_Pu_Depleted_1.get(1)) .itemOutputs( ItemRefer.Advanced_Fuel_Rod.get(1), @@ -1682,7 +1683,7 @@ public class RecipeLoader_02 { .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Fuel_Rod_Pu_Depleted_2.get(1)) .itemOutputs( ItemRefer.Advanced_Fuel_Rod.get(2), @@ -1697,7 +1698,7 @@ public class RecipeLoader_02 { .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Fuel_Rod_Pu_Depleted_4.get(1)) .itemOutputs( ItemRefer.Advanced_Fuel_Rod.get(4), @@ -1712,107 +1713,107 @@ public class RecipeLoader_02 { .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Fuel_Rod_LPu_Depleted_1.get(1)) .itemOutputs(ItemRefer.Advanced_Fuel_Rod.get(1)) - .fluidOutputs(MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(250)) + .fluidOutputs(GGMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(250)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Fuel_Rod_LPu_Depleted_2.get(1)) .itemOutputs(ItemRefer.Advanced_Fuel_Rod.get(2)) - .fluidOutputs(MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(500)) + .fluidOutputs(GGMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(500)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Fuel_Rod_LPu_Depleted_4.get(1)) .itemOutputs(ItemRefer.Advanced_Fuel_Rod.get(4)) - .fluidOutputs(MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1000)) + .fluidOutputs(GGMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Fuel_Rod_LU_Depleted_1.get(1)) .itemOutputs(ItemRefer.Advanced_Fuel_Rod.get(1)) - .fluidOutputs(MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(250)) + .fluidOutputs(GGMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(250)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Fuel_Rod_LU_Depleted_2.get(1)) .itemOutputs(ItemRefer.Advanced_Fuel_Rod.get(2)) - .fluidOutputs(MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(500)) + .fluidOutputs(GGMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(500)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.Fuel_Rod_LU_Depleted_4.get(1)) .itemOutputs(ItemRefer.Advanced_Fuel_Rod.get(4)) - .fluidOutputs(MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1000)) + .fluidOutputs(GGMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1000)) .duration(10 * SECONDS) .eut(TierEU.RECIPE_IV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( Materials.Glowstone.getDust(4), Materials.Redstone.getDust(2), Materials.Aluminium.getDust(1), - GT_Utility.getIntegratedCircuit(3)) + GTUtility.getIntegratedCircuit(3)) .itemOutputs(ItemRefer.High_Energy_Mixture.get(4)) .duration(12 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.High_Energy_Mixture.get(2)) .fluidInputs(Materials.PhosphoricAcid.getFluid(4000)) - .itemOutputs(MyMaterial.lumiinessence.get(OrePrefixes.dust, 1)) + .itemOutputs(GGMaterial.lumiinessence.get(OrePrefixes.dust, 1)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_HV / 2) .addTo(fluidSolidifierRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( Materials.AnnealedCopper.getDust(4), Materials.Ardite.getDust(2), Materials.RedAlloy.getDust(2), - GT_Utility.getIntegratedCircuit(4)) + GTUtility.getIntegratedCircuit(4)) .fluidInputs(Materials.Redstone.getMolten(288)) - .itemOutputs(MyMaterial.signalium.get(OrePrefixes.dust, 1)) + .itemOutputs(GGMaterial.signalium.get(OrePrefixes.dust, 1)) .duration(12 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( Materials.TinAlloy.getDust(4), Materials.SterlingSilver.getDust(2), - MyMaterial.lumiinessence.get(OrePrefixes.dust, 2), - GT_Utility.getIntegratedCircuit(4)) + GGMaterial.lumiinessence.get(OrePrefixes.dust, 2), + GTUtility.getIntegratedCircuit(4)) .fluidInputs(Materials.Glowstone.getMolten(288)) - .itemOutputs(MyMaterial.lumiium.get(OrePrefixes.dust, 1)) + .itemOutputs(GGMaterial.lumiium.get(OrePrefixes.dust, 1)) .duration(12 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() - .fluidInputs(MyMaterial.enrichedNaquadahAlloy.getMolten(144), WerkstoffLoader.Oganesson.getFluidOrGas(250)) - .fluidOutputs(MyMaterial.metastableOganesson.getMolten(36)) + GTValues.RA.stdBuilder() + .fluidInputs(GGMaterial.enrichedNaquadahAlloy.getMolten(144), WerkstoffLoader.Oganesson.getFluidOrGas(250)) + .fluidOutputs(GGMaterial.metastableOganesson.getMolten(36)) .duration(30 * SECONDS) .eut(TierEU.RECIPE_UV) .metadata(FUSION_THRESHOLD, 1_000_000_000) .addTo(fusionRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(MyMaterial.metastableOganesson.get(OrePrefixes.dust)) + GTValues.RA.stdBuilder() + .itemInputs(GGMaterial.metastableOganesson.get(OrePrefixes.dust)) .fluidOutputs(WerkstoffLoader.Oganesson.getFluidOrGas(250)) .duration(1 * MINUTES + 40 * SECONDS) .eut(0) @@ -1820,14 +1821,14 @@ public class RecipeLoader_02 { .noOptimize() .addTo(neutronActivatorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemRefer.HiC_T5.get(0)) .fluidInputs( - MyMaterial.metastableOganesson.getMolten(1152), - MyMaterial.preciousMetalAlloy.getMolten(2304), + GGMaterial.metastableOganesson.getMolten(1152), + GGMaterial.preciousMetalAlloy.getMolten(2304), MaterialsUEVplus.SpaceTime.getMolten(288), MaterialsUEVplus.DimensionallyTranscendentResidue.getFluid(5000)) - .fluidOutputs(MyMaterial.shirabon.getMolten(144)) + .fluidOutputs(GGMaterial.shirabon.getMolten(144)) .duration(10 * SECONDS) .eut(1_500_000_000) .metadata(COIL_HEAT, 13500) @@ -1837,8 +1838,8 @@ public class RecipeLoader_02 { public static float EHEEfficiencyMultiplier = 1.2f; public static void FinishLoadRecipe() { - for (GT_Recipe plasmaFuel : RecipeMaps.plasmaFuels.getAllRecipes()) { - FluidStack tPlasma = GT_Utility.getFluidForFilledItem(plasmaFuel.mInputs[0], true); + for (GTRecipe plasmaFuel : RecipeMaps.plasmaFuels.getAllRecipes()) { + FluidStack tPlasma = GTUtility.getFluidForFilledItem(plasmaFuel.mInputs[0], true); if (tPlasma == null) { continue; } diff --git a/src/main/java/goodgenerator/main/GG_Config_Loader.java b/src/main/java/goodgenerator/main/GGConfigLoader.java index bfa4526167..497c55b9f8 100644 --- a/src/main/java/goodgenerator/main/GG_Config_Loader.java +++ b/src/main/java/goodgenerator/main/GGConfigLoader.java @@ -6,7 +6,7 @@ import net.minecraftforge.common.config.Configuration; import cpw.mods.fml.relauncher.FMLInjectionData; -public class GG_Config_Loader { +public class GGConfigLoader { public static final Configuration GG_Config = new Configuration( new File(new File((File) FMLInjectionData.data()[6], "config"), "GoodGenerator.cfg")); diff --git a/src/main/java/goodgenerator/main/GoodGenerator.java b/src/main/java/goodgenerator/main/GoodGenerator.java index 426cd9d352..efbc5b63a4 100644 --- a/src/main/java/goodgenerator/main/GoodGenerator.java +++ b/src/main/java/goodgenerator/main/GoodGenerator.java @@ -2,8 +2,7 @@ package goodgenerator.main; import net.minecraft.creativetab.CreativeTabs; -import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry; - +import bartworks.API.WerkstoffAdderRegistry; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; @@ -15,7 +14,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import goodgenerator.common.CommonProxy; import goodgenerator.crossmod.thaumcraft.Research; -import goodgenerator.items.MyMaterial; +import goodgenerator.items.GGMaterial; import goodgenerator.loader.Loaders; import goodgenerator.loader.NaquadahReworkRecipeLoader; import goodgenerator.tabs.MyTabs; @@ -51,8 +50,8 @@ public final class GoodGenerator { @Mod.EventHandler public static void preInit(FMLPreInitializationEvent event) { - GG_Config_Loader.run(); - WerkstoffAdderRegistry.addWerkstoffAdder(new MyMaterial()); + GGConfigLoader.run(); + WerkstoffAdderRegistry.addWerkstoffAdder(new GGMaterial()); // WerkstoffAdderRegistry.addWerkstoffAdder(new IsotopeMaterialLoader()); Loaders.preInitLoad(); proxy.preInit(event); diff --git a/src/main/java/goodgenerator/network/MessageMTEBase.java b/src/main/java/goodgenerator/network/MessageMTEBase.java index 4a9982d8d8..89dc7b5be6 100644 --- a/src/main/java/goodgenerator/network/MessageMTEBase.java +++ b/src/main/java/goodgenerator/network/MessageMTEBase.java @@ -16,8 +16,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; -import com.github.technus.tectech.TecTech; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -25,6 +23,7 @@ import cpw.mods.fml.relauncher.Side; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import io.netty.buffer.ByteBuf; +import tectech.TecTech; public abstract class MessageMTEBase implements IMessage { diff --git a/src/main/java/goodgenerator/util/CrackRecipeAdder.java b/src/main/java/goodgenerator/util/CrackRecipeAdder.java index dddb7fe69d..489732e068 100644 --- a/src/main/java/goodgenerator/util/CrackRecipeAdder.java +++ b/src/main/java/goodgenerator/util/CrackRecipeAdder.java @@ -7,27 +7,26 @@ import static gregtech.api.recipe.RecipeMaps.distilleryRecipes; import static gregtech.api.recipe.RecipeMaps.extruderRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.recipe.RecipeMaps.wiremillRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeConstants.COIL_HEAT; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; - -import gregtech.api.enums.GT_Values; +import bartworks.system.material.Werkstoff; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeBuilder; -import gregtech.api.util.GT_Utility; +import gregtech.api.metatileentity.implementations.MTECable; +import gregtech.api.metatileentity.implementations.MTEFluid; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTRecipeBuilder; +import gregtech.api.util.GTUtility; public class CrackRecipeAdder { @@ -44,24 +43,24 @@ public class CrackRecipeAdder { .getName() .replaceAll(" ", ""); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) .fluidInputs(inputFluid, cracker) .fluidOutputs(FluidRegistry.getFluidStack("lightlycracked" + name, 1000)) .duration(Math.max((long) (Duration * 0.8), 1L) * TICKS) .eut(EUt) .addTo(crackingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(2)) .fluidInputs(inputFluid, cracker) .fluidOutputs(FluidRegistry.getFluidStack("moderatelycracked" + name, 1000)) .duration(Math.max((long) (Duration), 1L) * TICKS) .eut(EUt) .addTo(crackingRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(3)) .fluidInputs(inputFluid, cracker) .fluidOutputs(FluidRegistry.getFluidStack("heavilycracked" + name, 1000)) .duration(Math.max((long) (Duration * 1.2), 1L) * TICKS) @@ -112,8 +111,8 @@ public class CrackRecipeAdder { ItemStack input = material.get(OrePrefixes.dust, 1); ItemStack output = level > 1750 ? material.get(OrePrefixes.ingotHot, 1) : material.get(OrePrefixes.ingot, 1); if (gas) { - GT_Values.RA.stdBuilder() - .itemInputs(input, GT_Utility.getIntegratedCircuit(11)) + GTValues.RA.stdBuilder() + .itemInputs(input, GTUtility.getIntegratedCircuit(11)) .fluidInputs(Materials.Helium.getGas(1000)) .itemOutputs(output) .duration(duration * TICKS) @@ -121,8 +120,8 @@ public class CrackRecipeAdder { .metadata(COIL_HEAT, level) .addTo(blastFurnaceRecipes); } else { - GT_Values.RA.stdBuilder() - .itemInputs(input, GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(input, GTUtility.getIntegratedCircuit(1)) .itemOutputs(output) .duration(duration * TICKS) .eut(EUt) @@ -134,9 +133,9 @@ public class CrackRecipeAdder { public static void addUniversalDistillationRecipewithCircuit(FluidStack aInput, ItemStack[] aCircuit, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, long aEUt) { for (int i = 0; i < Math.min(aOutputs.length, 11); i++) { - GT_RecipeBuilder buildDistillation = GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(i + 1)); - if (aOutput2 != GT_Values.NI) { + GTRecipeBuilder buildDistillation = GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(i + 1)); + if (aOutput2 != GTValues.NI) { buildDistillation.itemOutputs(aOutput2); } buildDistillation.fluidInputs(aInput) @@ -145,9 +144,9 @@ public class CrackRecipeAdder { .eut(aEUt / 4) .addTo(distilleryRecipes); } - GT_RecipeBuilder buildDT = GT_Values.RA.stdBuilder() + GTRecipeBuilder buildDT = GTValues.RA.stdBuilder() .itemInputs(aCircuit); - if (aOutput2 != GT_Values.NI) { + if (aOutput2 != GTValues.NI) { buildDT.itemOutputs(aOutput2); } buildDT.fluidInputs(aInput) @@ -160,9 +159,9 @@ public class CrackRecipeAdder { public static void addUniversalDistillationRecipe(FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, long aEUt) { for (int i = 0; i < Math.min(aOutputs.length, 11); i++) { - GT_RecipeBuilder buildDistillation = GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(i + 1)); - if (aOutput2 != GT_Values.NI) { + GTRecipeBuilder buildDistillation = GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(i + 1)); + if (aOutput2 != GTValues.NI) { buildDistillation.itemOutputs(aOutput2); } buildDistillation.fluidInputs(aInput) @@ -171,8 +170,8 @@ public class CrackRecipeAdder { .eut(aEUt / 4) .addTo(distilleryRecipes); } - GT_RecipeBuilder buildDT = GT_Values.RA.stdBuilder(); - if (aOutput2 != GT_Values.NI) { + GTRecipeBuilder buildDT = GTValues.RA.stdBuilder(); + if (aOutput2 != GTValues.NI) { buildDT.itemOutputs(aOutput2); } buildDT.fluidInputs(aInput) @@ -191,9 +190,9 @@ public class CrackRecipeAdder { String unName = material.getDefaultName() .replace(" ", "_"); String Name = material.getDefaultName(); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(material.getBridgeMaterial()), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( ID, "GT_Pipe_" + unName + "_Tiny", "Tiny " + Name + " Fluid Pipe", @@ -202,9 +201,9 @@ public class CrackRecipeAdder { flow / 6, temp, gas).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(material.getBridgeMaterial()), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( ID + 1, "GT_Pipe_" + unName + "_Small", "Small " + Name + " Fluid Pipe", @@ -213,9 +212,9 @@ public class CrackRecipeAdder { flow / 3, temp, gas).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(material.getBridgeMaterial()), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( ID + 2, "GT_Pipe_" + unName, Name + " Fluid Pipe", @@ -224,9 +223,9 @@ public class CrackRecipeAdder { flow, temp, gas).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(material.getBridgeMaterial()), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( ID + 3, "GT_Pipe_" + unName + "_Large", "Large " + Name + " Fluid Pipe", @@ -235,9 +234,9 @@ public class CrackRecipeAdder { flow * 2, temp, gas).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeHuge.get(material.getBridgeMaterial()), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( ID + 4, "GT_Pipe_" + unName + "_Huge", "Huge " + Name + " Fluid Pipe", @@ -246,7 +245,7 @@ public class CrackRecipeAdder { flow * 4, temp, gas).getStackForm(1L)); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Pipe_Tiny.get(0)) .itemOutputs(material.get(OrePrefixes.pipeTiny, 2)) .duration( @@ -254,7 +253,7 @@ public class CrackRecipeAdder { .getMass() * TICKS) .eut(TierEU.RECIPE_MV) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Pipe_Small.get(0)) .itemOutputs(material.get(OrePrefixes.pipeSmall, 1)) .duration( @@ -263,7 +262,7 @@ public class CrackRecipeAdder { * TICKS) .eut(TierEU.RECIPE_MV) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot, 3), ItemList.Shape_Extruder_Pipe_Medium.get(0)) .itemOutputs(material.get(OrePrefixes.pipeMedium, 1)) .duration( @@ -272,7 +271,7 @@ public class CrackRecipeAdder { * TICKS) .eut(TierEU.RECIPE_MV) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot, 6), ItemList.Shape_Extruder_Pipe_Large.get(0)) .itemOutputs(material.get(OrePrefixes.pipeLarge, 1)) .duration( @@ -281,7 +280,7 @@ public class CrackRecipeAdder { * TICKS) .eut(TierEU.RECIPE_MV) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot, 12), ItemList.Shape_Extruder_Pipe_Huge.get(0)) .itemOutputs(material.get(OrePrefixes.pipeHuge, 1)) .duration( @@ -290,7 +289,7 @@ public class CrackRecipeAdder { * TICKS) .eut(TierEU.RECIPE_MV) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Pipe_Tiny.get(0)) .fluidInputs(material.getMolten(72)) .itemOutputs(material.get(OrePrefixes.pipeTiny, 1)) @@ -299,7 +298,7 @@ public class CrackRecipeAdder { .getMass() * TICKS) .eut(TierEU.RECIPE_LV) .addTo(fluidSolidifierRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Pipe_Small.get(0)) .fluidInputs(material.getMolten(144)) .itemOutputs(material.get(OrePrefixes.pipeSmall, 1)) @@ -309,7 +308,7 @@ public class CrackRecipeAdder { * TICKS) .eut(TierEU.RECIPE_LV) .addTo(fluidSolidifierRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Pipe_Medium.get(0)) .fluidInputs(material.getMolten(432)) .itemOutputs(material.get(OrePrefixes.pipeMedium, 1)) @@ -319,7 +318,7 @@ public class CrackRecipeAdder { * TICKS) .eut(TierEU.RECIPE_LV) .addTo(fluidSolidifierRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Pipe_Large.get(0)) .fluidInputs(material.getMolten(864)) .itemOutputs(material.get(OrePrefixes.pipeLarge, 1)) @@ -329,7 +328,7 @@ public class CrackRecipeAdder { * TICKS) .eut(TierEU.RECIPE_LV) .addTo(fluidSolidifierRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Pipe_Huge.get(0)) .fluidInputs(material.getMolten(1728)) .itemOutputs(material.get(OrePrefixes.pipeHuge, 1)) @@ -351,10 +350,10 @@ public class CrackRecipeAdder { String aTextWire2 = " Wire"; String aTextCable2 = " Cable"; int aLossInsulated = aLoss / 4; - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt01, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 0, aTextWire1 + unName + ".01", "1x " + Name + aTextWire2, @@ -365,10 +364,10 @@ public class CrackRecipeAdder { aVoltage, false, true).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt02, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 1, aTextWire1 + unName + ".02", "2x " + Name + aTextWire2, @@ -379,10 +378,10 @@ public class CrackRecipeAdder { aVoltage, false, true).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt04, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 2, aTextWire1 + unName + ".04", "4x " + Name + aTextWire2, @@ -393,10 +392,10 @@ public class CrackRecipeAdder { aVoltage, false, true).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt08, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 3, aTextWire1 + unName + ".08", "8x " + Name + aTextWire2, @@ -407,10 +406,10 @@ public class CrackRecipeAdder { aVoltage, false, true).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt12, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 4, aTextWire1 + unName + ".12", "12x " + Name + aTextWire2, @@ -421,10 +420,10 @@ public class CrackRecipeAdder { aVoltage, false, true).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt16, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 5, aTextWire1 + unName + ".16", "16x " + Name + aTextWire2, @@ -436,10 +435,10 @@ public class CrackRecipeAdder { false, true).getStackForm(1L)); if (cover) { - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt01, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 6, aTextCable1 + unName + ".01", "1x " + Name + aTextCable2, @@ -450,10 +449,10 @@ public class CrackRecipeAdder { aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt02, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 7, aTextCable1 + unName + ".02", "2x " + Name + aTextCable2, @@ -464,10 +463,10 @@ public class CrackRecipeAdder { aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt04, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 8, aTextCable1 + unName + ".04", "4x " + Name + aTextCable2, @@ -478,10 +477,10 @@ public class CrackRecipeAdder { aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt08, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 9, aTextCable1 + unName + ".08", "8x " + Name + aTextCable2, @@ -492,10 +491,10 @@ public class CrackRecipeAdder { aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt12, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 10, aTextCable1 + unName + ".12", "12x " + Name + aTextCable2, @@ -506,10 +505,10 @@ public class CrackRecipeAdder { aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt16, material.getBridgeMaterial(), - new GT_MetaPipeEntity_Cable( + new MTECable( ID + 11, aTextCable1 + unName + ".16", "16x " + Name + aTextCable2, @@ -521,97 +520,97 @@ public class CrackRecipeAdder { true, false).getStackForm(1L)); } - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(material.get(OrePrefixes.wireGt01, 2)) .duration(5 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 1), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 1), GTUtility.getIntegratedCircuit(2)) .itemOutputs(material.get(OrePrefixes.wireGt02, 1)) .duration(7 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 2), GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 2), GTUtility.getIntegratedCircuit(4)) .itemOutputs(material.get(OrePrefixes.wireGt04, 1)) .duration(10 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 4), GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 4), GTUtility.getIntegratedCircuit(8)) .itemOutputs(material.get(OrePrefixes.wireGt08, 1)) .duration(12 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 6), GT_Utility.getIntegratedCircuit(12)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 6), GTUtility.getIntegratedCircuit(12)) .itemOutputs(material.get(OrePrefixes.wireGt12, 1)) .duration(15 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 8), GT_Utility.getIntegratedCircuit(16)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 8), GTUtility.getIntegratedCircuit(16)) .itemOutputs(material.get(OrePrefixes.wireGt16, 1)) .duration(17 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.stick, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(material.get(OrePrefixes.wireGt01, 1)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 2), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.stick, 2), GTUtility.getIntegratedCircuit(2)) .itemOutputs(material.get(OrePrefixes.wireGt02, 1)) .duration(5 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 4), GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.stick, 4), GTUtility.getIntegratedCircuit(4)) .itemOutputs(material.get(OrePrefixes.wireGt04, 1)) .duration(7 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 8), GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.stick, 8), GTUtility.getIntegratedCircuit(8)) .itemOutputs(material.get(OrePrefixes.wireGt08, 1)) .duration(10 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 12), GT_Utility.getIntegratedCircuit(12)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.stick, 12), GTUtility.getIntegratedCircuit(12)) .itemOutputs(material.get(OrePrefixes.wireGt12, 1)) .duration(12 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 16), GT_Utility.getIntegratedCircuit(16)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.stick, 16), GTUtility.getIntegratedCircuit(16)) .itemOutputs(material.get(OrePrefixes.wireGt16, 1)) .duration(15 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.ingot, 1), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 1), GTUtility.getIntegratedCircuit(3)) .itemOutputs(material.get(OrePrefixes.wireFine, 8)) .duration(5 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.stick, 1), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.stick, 1), GTUtility.getIntegratedCircuit(3)) .itemOutputs(material.get(OrePrefixes.wireFine, 4)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(material.get(OrePrefixes.wireGt01, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.wireGt01, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(material.get(OrePrefixes.wireFine, 4)) .duration(10 * SECONDS) .eut(8) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Wire.get(0)) .itemOutputs(material.get(OrePrefixes.wireGt01, 2)) .duration( diff --git a/src/main/java/goodgenerator/util/ItemRefer.java b/src/main/java/goodgenerator/util/ItemRefer.java index 3662bb5bd1..f9af30e7df 100644 --- a/src/main/java/goodgenerator/util/ItemRefer.java +++ b/src/main/java/goodgenerator/util/ItemRefer.java @@ -7,7 +7,7 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import ic2.core.Ic2Items; public final class ItemRefer { @@ -217,7 +217,7 @@ public final class ItemRefer { public ItemStack get(int amount) { if (mItem != null) return new ItemStack(mItem, amount, mMeta); if (mBlock != null) return new ItemStack(mBlock, amount, mMeta); - if (mItemStack != null) return GT_Utility.copyAmount(amount, mItemStack); + if (mItemStack != null) return GTUtility.copyAmount(amount, mItemStack); return new ItemStack(_null_, amount, 0); } } diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java index 32827b18b2..8df7b3f4e6 100644 --- a/src/main/java/goodgenerator/util/MaterialFix.java +++ b/src/main/java/goodgenerator/util/MaterialFix.java @@ -4,31 +4,30 @@ import static gregtech.api.recipe.RecipeMaps.benderRecipes; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; import static gregtech.api.recipe.RecipeMaps.hammerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; - -import gregtech.api.enums.GT_Values; +import bartworks.system.material.Werkstoff; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; 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; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; public class MaterialFix { public static void MaterialFluidExtractionFix(Werkstoff material) { if (material.hasItemType(OrePrefixes.ingot)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ingot)) .fluidOutputs(material.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) .addTo(fluidExtractionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Ingot.get(0)) .fluidInputs(material.getMolten(144)) .itemOutputs(material.get(OrePrefixes.ingot)) @@ -37,13 +36,13 @@ public class MaterialFix { .addTo(fluidSolidifierRecipes); } if (material.hasItemType(OrePrefixes.plate)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.plate)) .fluidOutputs(material.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) .eut(8) .addTo(fluidExtractionRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Plate.get(0)) .fluidInputs(material.getMolten(144)) .itemOutputs(material.get(OrePrefixes.plate)) @@ -52,7 +51,7 @@ public class MaterialFix { .addTo(fluidSolidifierRecipes); } if (material.hasItemType(OrePrefixes.gearGtSmall)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.gearGtSmall)) .fluidOutputs(material.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) @@ -60,7 +59,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.stickLong)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.stickLong)) .fluidOutputs(material.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) @@ -68,7 +67,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.spring)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.spring)) .fluidOutputs(material.getMolten(144)) .duration(1 * SECONDS + 12 * TICKS) @@ -76,7 +75,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.stick)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.stick)) .fluidOutputs(material.getMolten(72)) .duration(16 * TICKS) @@ -84,7 +83,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.itemCasing)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.itemCasing)) .fluidOutputs(material.getMolten(72)) .duration(16 * TICKS) @@ -92,7 +91,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.wireGt01)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.wireGt01)) .fluidOutputs(material.getMolten(72)) .duration(16 * TICKS) @@ -100,16 +99,16 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.cableGt01)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.cableGt01)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2)) .fluidOutputs(material.getMolten(72)) .duration(16 * TICKS) .eut(8) .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.foil)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.foil)) .fluidOutputs(material.getMolten(36)) .duration(8 * TICKS) @@ -117,7 +116,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.springSmall)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.springSmall)) .fluidOutputs(material.getMolten(36)) .duration(8 * TICKS) @@ -125,7 +124,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.ring)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.ring)) .fluidOutputs(material.getMolten(36)) .duration(8 * TICKS) @@ -133,7 +132,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.bolt)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.bolt)) .fluidOutputs(material.getMolten(18)) .duration(4 * TICKS) @@ -141,7 +140,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.wireFine)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.wireFine)) .fluidOutputs(material.getMolten(18)) .duration(4 * TICKS) @@ -149,7 +148,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.round)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.round)) .fluidOutputs(material.getMolten(16)) .duration(4 * TICKS) @@ -157,7 +156,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.screw)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.screw)) .fluidOutputs(material.getMolten(16)) .duration(4 * TICKS) @@ -165,7 +164,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.nugget)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.nugget)) .fluidOutputs(material.getMolten(16)) .duration(4 * TICKS) @@ -173,7 +172,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.rotor)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.rotor)) .fluidOutputs(material.getMolten(612)) .duration(136 * TICKS) @@ -181,7 +180,7 @@ public class MaterialFix { .addTo(fluidExtractionRecipes); } if (material.hasItemType(OrePrefixes.gearGt)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(material.get(OrePrefixes.gearGt)) .fluidOutputs(material.getMolten(576)) .duration(128 * TICKS) @@ -194,8 +193,8 @@ public class MaterialFix { for (Werkstoff tMaterial : Werkstoff.werkstoffHashSet) { if (tMaterial == null) continue; if (tMaterial.hasItemType(OrePrefixes.plateDouble) && tMaterial.hasItemType(OrePrefixes.ingotDouble)) { - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.plate, 2), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.plate, 2), GTUtility.getIntegratedCircuit(2)) .itemOutputs(tMaterial.get(OrePrefixes.plateDouble, 1)) .duration( Math.max( @@ -204,8 +203,8 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingotDouble, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingotDouble, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(tMaterial.get(OrePrefixes.plateDouble, 1)) .duration( Math.max( @@ -214,16 +213,16 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.plateDouble, 1), new Object[] { "P", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.ingotDouble, 1), new Object[] { "P", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1) }); } if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) { - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.plate, 3), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.plate, 3), GTUtility.getIntegratedCircuit(3)) .itemOutputs(tMaterial.get(OrePrefixes.plateTriple, 1)) .duration( Math.max( @@ -232,8 +231,8 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingot, 3), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingot, 3), GTUtility.getIntegratedCircuit(3)) .itemOutputs(tMaterial.get(OrePrefixes.plateTriple, 1)) .duration( Math.max( @@ -242,8 +241,8 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(tMaterial.get(OrePrefixes.plateTriple, 1)) .duration( Math.max( @@ -252,18 +251,18 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.plateTriple, 1), new Object[] { "B", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1), 'B', tMaterial.get(OrePrefixes.plateDouble, 1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.ingotTriple, 1), new Object[] { "B", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1), 'B', tMaterial.get(OrePrefixes.ingotDouble, 1) }); } if (tMaterial.hasItemType(OrePrefixes.plateDense)) { - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.plate, 9), GT_Utility.getIntegratedCircuit(9)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.plate, 9), GTUtility.getIntegratedCircuit(9)) .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) .duration( Math.max( @@ -272,8 +271,8 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingot, 9), GT_Utility.getIntegratedCircuit(9)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingot, 9), GTUtility.getIntegratedCircuit(9)) .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) .duration( Math.max( @@ -284,8 +283,8 @@ public class MaterialFix { .addTo(benderRecipes); if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) { - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.plateTriple, 3), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.plateTriple, 3), GTUtility.getIntegratedCircuit(3)) .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) .duration( Math.max( @@ -294,8 +293,8 @@ public class MaterialFix { 1L) * TICKS) .eut(TierEU.RECIPE_MV / 2) .addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 3), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 3), GTUtility.getIntegratedCircuit(3)) .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) .duration( Math.max( @@ -308,7 +307,7 @@ public class MaterialFix { } if (tMaterial.hasItemType(OrePrefixes.stick)) { if (tMaterial.hasItemType(OrePrefixes.cellMolten)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Rod.get(0)) .fluidInputs(tMaterial.getMolten(72)) .itemOutputs(tMaterial.get(OrePrefixes.stick, 1)) @@ -323,7 +322,7 @@ public class MaterialFix { } if (tMaterial.hasItemType(OrePrefixes.stickLong)) { if (tMaterial.hasItemType(OrePrefixes.cellMolten)) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Shape_Mold_Rod_Long.get(0)) .fluidInputs(tMaterial.getMolten(144)) .itemOutputs(tMaterial.get(OrePrefixes.stickLong, 1)) @@ -336,10 +335,10 @@ public class MaterialFix { .addTo(fluidSolidifierRecipes); } if (tMaterial.hasItemType(OrePrefixes.stick)) { - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.stickLong, 1), new Object[] { "PhP", 'P', tMaterial.get(OrePrefixes.stick, 1) }); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(tMaterial.get(OrePrefixes.stick, 2)) .itemOutputs(tMaterial.get(OrePrefixes.stickLong, 1)) .duration( @@ -352,11 +351,11 @@ public class MaterialFix { } } if (tMaterial.hasItemType(OrePrefixes.spring)) { - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.spring, 1), new Object[] { " s ", "fPx", " P ", 'P', tMaterial.get(OrePrefixes.stickLong, 1) }); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.stickLong, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.stickLong, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(tMaterial.get(OrePrefixes.spring, 1)) .duration( Math.max( @@ -367,11 +366,11 @@ public class MaterialFix { .addTo(benderRecipes); } if (tMaterial.hasItemType(OrePrefixes.springSmall)) { - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.springSmall, 1), new Object[] { " s ", "fPx", 'P', tMaterial.get(OrePrefixes.stick, 1) }); - GT_Values.RA.stdBuilder() - .itemInputs(tMaterial.get(OrePrefixes.stick, 1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.stick, 1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(tMaterial.get(OrePrefixes.springSmall, 1)) .duration( Math.max( @@ -383,9 +382,9 @@ public class MaterialFix { } } Materials tUHV = Materials.Longasssuperconductornameforuhvwire; - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.stick, tUHV, 2)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, tUHV, 1)) + GTValues.RA.stdBuilder() + .itemInputs(GTOreDictUnificator.get(OrePrefixes.stick, tUHV, 2)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.stickLong, tUHV, 1)) .duration(Math.max(tUHV.getMass(), 1L) * TICKS) .eut(TierEU.RECIPE_LV / 2) .addTo(hammerRecipes); diff --git a/src/main/java/goodgenerator/util/StackUtils.java b/src/main/java/goodgenerator/util/StackUtils.java index 2784828117..957ff6a4d3 100644 --- a/src/main/java/goodgenerator/util/StackUtils.java +++ b/src/main/java/goodgenerator/util/StackUtils.java @@ -13,10 +13,10 @@ import net.minecraftforge.fluids.FluidStack; import appeng.api.AEApi; import appeng.api.storage.data.IAEFluidStack; -import goodgenerator.items.MyMaterial; +import goodgenerator.items.GGMaterial; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; public class StackUtils { @@ -32,11 +32,11 @@ public class StackUtils { ArrayList<ItemStack> stacks = new ArrayList<>(); if (totalItems >= 64) { for (int i = 0; i < totalItems / 64; i++) { - stacks.add(GT_Utility.copyAmount(64, stack)); + stacks.add(GTUtility.copyAmount(64, stack)); } } if (totalItems % 64 > 0) { - stacks.add(GT_Utility.copyAmount(totalItems % 64, stack)); + stacks.add(GTUtility.copyAmount(totalItems % 64, stack)); } return stacks; } @@ -51,13 +51,13 @@ public class StackUtils { int newSize = i.stackSize; for (int j = index + 1; j < stacks.size(); j++) { ItemStack is2 = stacks.get(j); - if (GT_Utility.areStacksEqual(i, is2)) { + if (GTUtility.areStacksEqual(i, is2)) { newSize += is2.stackSize; stacks.remove(j); j--; } } - output.add(GT_Utility.copyAmountUnsafe(newSize, i)); + output.add(GTUtility.copyAmountUnsafe(newSize, i)); } return output; } @@ -70,11 +70,11 @@ public class StackUtils { HashMap<ItemStack, Integer> totals = new HashMap<>(); itemLoop: for (ItemStack item : items) { int t = items.stream() - .filter(i2 -> GT_Utility.areStacksEqual(item, i2)) + .filter(i2 -> GTUtility.areStacksEqual(item, i2)) .mapToInt(i -> i.stackSize) .sum(); - for (ItemStack i2 : totals.keySet()) if (GT_Utility.areStacksEqual(item, i2)) continue itemLoop; - totals.put(GT_Utility.copyAmount(1, item), t); + for (ItemStack i2 : totals.keySet()) if (GTUtility.areStacksEqual(item, i2)) continue itemLoop; + totals.put(GTUtility.copyAmount(1, item), t); } return totals; } @@ -96,27 +96,27 @@ public class StackUtils { case 2: // MV return Materials.RoseGold.getMolten(aAmount); case 3: // HV - return MyMaterial.zircaloy4.getMolten(aAmount); + return GGMaterial.zircaloy4.getMolten(aAmount); case 4: // EV - return MyMaterial.incoloy903.getMolten(aAmount); + return GGMaterial.incoloy903.getMolten(aAmount); case 5: // IV - return MyMaterial.titaniumBetaC.getMolten(aAmount); + return GGMaterial.titaniumBetaC.getMolten(aAmount); case 6: // LuV - return MyMaterial.artheriumSn.getMolten(aAmount); + return GGMaterial.artheriumSn.getMolten(aAmount); case 7: // ZPM - return MyMaterial.dalisenite.getMolten(aAmount); + return GGMaterial.dalisenite.getMolten(aAmount); case 8: // UV - return MyMaterial.tairitsu.getMolten(aAmount); + return GGMaterial.tairitsu.getMolten(aAmount); case 9: // UHV - return MyMaterial.preciousMetalAlloy.getMolten(aAmount); + return GGMaterial.preciousMetalAlloy.getMolten(aAmount); case 10: // UEV - return MyMaterial.enrichedNaquadahAlloy.getMolten(aAmount); + return GGMaterial.enrichedNaquadahAlloy.getMolten(aAmount); case 11: // UIV - return MyMaterial.metastableOganesson.getMolten(aAmount); + return GGMaterial.metastableOganesson.getMolten(aAmount); case 12: // UMV return MaterialsUEVplus.SpaceTime.getMolten(aAmount); default: - return MyMaterial.shirabon.getMolten(aAmount); + return GGMaterial.shirabon.getMolten(aAmount); } } diff --git a/src/main/java/goodgenerator/util/StructureHelper.java b/src/main/java/goodgenerator/util/StructureHelper.java index e66ac9f9ee..0d2c101ee9 100644 --- a/src/main/java/goodgenerator/util/StructureHelper.java +++ b/src/main/java/goodgenerator/util/StructureHelper.java @@ -19,8 +19,8 @@ import com.gtnewhorizon.structurelib.structure.IStructureElement; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.metatileentity.BaseMetaPipeEntity; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.metatileentity.implementations.MTEFrame; +import gregtech.api.util.GTOreDictUnificator; public class StructureHelper { @@ -35,8 +35,8 @@ public class StructureHelper { if (tBlock instanceof BaseMetaPipeEntity) { BaseMetaPipeEntity tFrame = (BaseMetaPipeEntity) tBlock; if (tFrame.isInvalidTileEntity()) return false; - if (tFrame.getMetaTileEntity() instanceof GT_MetaPipeEntity_Frame) { - return ((GT_MetaPipeEntity_Frame) tFrame.getMetaTileEntity()).mMaterial == aMaterials; + if (tFrame.getMetaTileEntity() instanceof MTEFrame) { + return ((MTEFrame) tFrame.getMetaTileEntity()).mMaterial == aMaterials; } } return false; @@ -54,7 +54,7 @@ public class StructureHelper { @Override public boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) { - ItemStack tFrame = GT_OreDictUnificator.get(OrePrefixes.frameGt, aMaterials, 1); + ItemStack tFrame = GTOreDictUnificator.get(OrePrefixes.frameGt, aMaterials, 1); if (tFrame.getItem() instanceof ItemBlock) { ItemBlock tFrameStackItem = (ItemBlock) tFrame.getItem(); return tFrameStackItem |