diff options
Diffstat (limited to 'src')
62 files changed, 9033 insertions, 7232 deletions
diff --git a/src/main/java/goodgenerator/api/recipe/ComponentAssemblyLineFrontend.java b/src/main/java/goodgenerator/api/recipe/ComponentAssemblyLineFrontend.java index eae7fdc3e9..b645c8e8f9 100644 --- a/src/main/java/goodgenerator/api/recipe/ComponentAssemblyLineFrontend.java +++ b/src/main/java/goodgenerator/api/recipe/ComponentAssemblyLineFrontend.java @@ -19,7 +19,7 @@ import gregtech.common.gui.modularui.UIHelper; public class ComponentAssemblyLineFrontend extends RecipeMapFrontend { public ComponentAssemblyLineFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder, - NEIRecipePropertiesBuilder neiPropertiesBuilder) { + NEIRecipePropertiesBuilder neiPropertiesBuilder) { super(uiPropertiesBuilder, neiPropertiesBuilder); } diff --git a/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerFrontend.java b/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerFrontend.java index 51078a3a95..b933802fc2 100644 --- a/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerFrontend.java +++ b/src/main/java/goodgenerator/api/recipe/ExtremeHeatExchangerFrontend.java @@ -23,7 +23,7 @@ import gregtech.nei.formatter.INEISpecialInfoFormatter; public class ExtremeHeatExchangerFrontend extends RecipeMapFrontend { public ExtremeHeatExchangerFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder, - NEIRecipePropertiesBuilder neiPropertiesBuilder) { + NEIRecipePropertiesBuilder neiPropertiesBuilder) { super(uiPropertiesBuilder, neiPropertiesBuilder.neiSpecialInfoFormatter(new EHESpecialValueFormatter())); } @@ -45,14 +45,14 @@ public class ExtremeHeatExchangerFrontend extends RecipeMapFrontend { FluidStack[] Outputs = recipeInfo.recipe.mFluidOutputs; int threshold = recipeInfo.recipe.mSpecialValue; return Arrays.asList( - StatCollector.translateToLocal("value.extreme_heat_exchanger.0") + " " - + GT_Utility.formatNumbers(Inputs[0].amount) - + " L/s", - StatCollector.translateToLocal("value.extreme_heat_exchanger.1"), - GT_Utility.formatNumbers(Outputs[0].amount / 160) + " L/s", - StatCollector.translateToLocal("value.extreme_heat_exchanger.2"), - GT_Utility.formatNumbers(Outputs[1].amount / 160) + " L/s", - StatCollector.translateToLocal("value.extreme_heat_exchanger.4") + " " + threshold + " L/s"); + StatCollector.translateToLocal("value.extreme_heat_exchanger.0") + " " + + GT_Utility.formatNumbers(Inputs[0].amount) + + " L/s", + StatCollector.translateToLocal("value.extreme_heat_exchanger.1"), + GT_Utility.formatNumbers(Outputs[0].amount / 160) + " L/s", + StatCollector.translateToLocal("value.extreme_heat_exchanger.2"), + GT_Utility.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/GoodGeneratorRecipeMaps.java b/src/main/java/goodgenerator/api/recipe/GoodGeneratorRecipeMaps.java index d65b8df611..85e4ebca1d 100644 --- a/src/main/java/goodgenerator/api/recipe/GoodGeneratorRecipeMaps.java +++ b/src/main/java/goodgenerator/api/recipe/GoodGeneratorRecipeMaps.java @@ -18,41 +18,61 @@ import gregtech.nei.formatter.SimpleSpecialValueFormatter; public class GoodGeneratorRecipeMaps { public static final RecipeMap<RecipeMapBackend> naquadahReactorFuels = RecipeMapBuilder - .of("gg.recipe.naquadah_reactor").maxIO(0, 0, 1, 1).minInputs(0, 1) - .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.naquadah_reactor")) - .neiRecipeComparator(Comparator.comparing(recipe -> recipe.mSpecialValue)).dontUseProgressBar() - .addSpecialTexture(59, 20, 58, 42, GG_UITextures.PICTURE_NAQUADAH_REACTOR).build(); + .of("gg.recipe.naquadah_reactor") + .maxIO(0, 0, 1, 1) + .minInputs(0, 1) + .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.naquadah_reactor")) + .neiRecipeComparator(Comparator.comparing(recipe -> recipe.mSpecialValue)) + .dontUseProgressBar() + .addSpecialTexture(59, 20, 58, 42, GG_UITextures.PICTURE_NAQUADAH_REACTOR) + .build(); public static final RecipeMap<RecipeMapBackend> naquadahFuelRefineFactoryRecipes = RecipeMapBuilder - .of("gg.recipe.naquadah_fuel_refine_factory").maxIO(6, 0, 2, 1).minInputs(0, 1) - .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.naquadah_fuel_refine_factory")).build(); + .of("gg.recipe.naquadah_fuel_refine_factory") + .maxIO(6, 0, 2, 1) + .minInputs(0, 1) + .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.naquadah_fuel_refine_factory")) + .build(); 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) - .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"), - StatCollector.translateToLocal("value.neutron_activator.1"), - GT_Utility.formatNumbers(maxNKE) + StatCollector.translateToLocal("value.neutron_activator.2")); - }).build(); + .maxIO(9, 9, 1, 1) + .dontUseProgressBar() + .addSpecialTexture(73, 22, 31, 21, GG_UITextures.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"), + StatCollector.translateToLocal("value.neutron_activator.1"), + GT_Utility.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) - .frontend(ExtremeHeatExchangerFrontend::new).build(); + .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) + .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) - .progressBarPos(85, 30).neiTransferRect(80, 30, 35, 18) - .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.precise_assembler")) - .frontend(PreciseAssemblerFrontend::new).build(); + .of("gg.recipe.precise_assembler") + .maxIO(4, 1, 4, 0) + .progressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE) + .progressBarPos(85, 30) + .neiTransferRect(80, 30, 35, 18) + .neiSpecialInfoFormatter(new SimpleSpecialValueFormatter("value.precise_assembler")) + .frontend(PreciseAssemblerFrontend::new) + .build(); public static final RecipeMap<RecipeMapBackend> componentAssemblyLineRecipes = RecipeMapBuilder - .of("gg.recipe.componentassemblyline").maxIO(12, 1, 12, 0).neiTransferRect(70, 15, 18, 54) - .neiSpecialInfoFormatter( - recipeInfo -> Collections.singletonList( - StatCollector.translateToLocalFormatted( - "value.component_assembly_line", - GT_Values.VN[recipeInfo.recipe.mSpecialValue]))) - .dontUseProgressBar().addSpecialTexture(70, 11, 72, 40, GG_UITextures.PICTURE_COMPONENT_ASSLINE) - .frontend(ComponentAssemblyLineFrontend::new).build(); + .of("gg.recipe.componentassemblyline") + .maxIO(12, 1, 12, 0) + .neiTransferRect(70, 15, 18, 54) + .neiSpecialInfoFormatter( + recipeInfo -> Collections.singletonList( + StatCollector.translateToLocalFormatted( + "value.component_assembly_line", + GT_Values.VN[recipeInfo.recipe.mSpecialValue]))) + .dontUseProgressBar() + .addSpecialTexture(70, 11, 72, 40, GG_UITextures.PICTURE_COMPONENT_ASSLINE) + .frontend(ComponentAssemblyLineFrontend::new) + .build(); } diff --git a/src/main/java/goodgenerator/api/recipe/PreciseAssemblerFrontend.java b/src/main/java/goodgenerator/api/recipe/PreciseAssemblerFrontend.java index 83b13abcfe..2f4f0e308b 100644 --- a/src/main/java/goodgenerator/api/recipe/PreciseAssemblerFrontend.java +++ b/src/main/java/goodgenerator/api/recipe/PreciseAssemblerFrontend.java @@ -18,7 +18,7 @@ import gregtech.common.gui.modularui.UIHelper; public class PreciseAssemblerFrontend extends RecipeMapFrontend { public PreciseAssemblerFrontend(BasicUIPropertiesBuilder uiPropertiesBuilder, - NEIRecipePropertiesBuilder neiPropertiesBuilder) { + NEIRecipePropertiesBuilder neiPropertiesBuilder) { super(uiPropertiesBuilder, neiPropertiesBuilder); } diff --git a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java index 720d782538..de8cca2b43 100644 --- a/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java +++ b/src/main/java/goodgenerator/blocks/myFluids/FluidsBuilder.java @@ -30,7 +30,8 @@ public class FluidsBuilder { public static void crackedNaquadahGas_Lightly() { Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedNaquadahGas"); - tmp.setGaseous(true).setTemperature(800); + tmp.setGaseous(true) + .setTemperature(800); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("lightlyCrackedNaquadahGas"); tmp2.setBlockName("lightlyCrackedNaquadahGas"); @@ -40,7 +41,8 @@ public class FluidsBuilder { public static void crackedNaquadahGas_Moderately() { Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedNaquadahGas"); - tmp.setGaseous(true).setTemperature(800); + tmp.setGaseous(true) + .setTemperature(800); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("moderatelyCrackedNaquadahGas"); tmp2.setBlockName("moderatelyCrackedNaquadahGas"); @@ -50,7 +52,8 @@ public class FluidsBuilder { public static void crackedNaquadahGas_Heavily() { Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedNaquadahGas"); - tmp.setGaseous(true).setTemperature(800); + tmp.setGaseous(true) + .setTemperature(800); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("heavilyCrackedNaquadahGas"); tmp2.setBlockName("heavilyCrackedNaquadahGas"); @@ -60,7 +63,8 @@ public class FluidsBuilder { public static void crackedLightNaquadahFuel_Lightly() { Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedLightNaquadahFuel"); - tmp.setGaseous(false).setTemperature(1200); + tmp.setGaseous(false) + .setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("lightlyCrackedLightNaquadahFuel"); tmp2.setBlockName("lightlyCrackedLightNaquadahFuel"); @@ -70,7 +74,8 @@ public class FluidsBuilder { public static void crackedLightNaquadahFuel_Moderately() { Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedLightNaquadahFuel"); - tmp.setGaseous(false).setTemperature(1200); + tmp.setGaseous(false) + .setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("moderatelyCrackedLightNaquadahFuel"); tmp2.setBlockName("moderatelyCrackedLightNaquadahFuel"); @@ -80,7 +85,8 @@ public class FluidsBuilder { public static void crackedLightNaquadahFuel_Heavily() { Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedLightNaquadahFuel"); - tmp.setGaseous(false).setTemperature(1200); + tmp.setGaseous(false) + .setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("heavilyCrackedLightNaquadahFuel"); tmp2.setBlockName("heavilyCrackedLightNaquadahFuel"); @@ -90,7 +96,8 @@ public class FluidsBuilder { public static void crackedHeavyNaquadahFuel_Lightly() { Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedHeavyNaquadahFuel"); - tmp.setGaseous(false).setTemperature(1200); + tmp.setGaseous(false) + .setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("lightlyCrackedHeavyNaquadahFuel"); tmp2.setBlockName("lightlyCrackedHeavyNaquadahFuel"); @@ -100,7 +107,8 @@ public class FluidsBuilder { public static void crackedHeavyNaquadahFuel_Moderately() { Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedHeavyNaquadahFuel"); - tmp.setGaseous(false).setTemperature(1200); + tmp.setGaseous(false) + .setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("moderatelyCrackedHeavyNaquadahFuel"); tmp2.setBlockName("moderatelyCrackedHeavyNaquadahFuel"); @@ -110,7 +118,8 @@ public class FluidsBuilder { public static void crackedHeavyNaquadahFuel_Heavily() { Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedHeavyNaquadahFuel"); - tmp.setGaseous(false).setTemperature(1200); + tmp.setGaseous(false) + .setTemperature(1200); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("heavilyCrackedHeavyNaquadahFuel"); tmp2.setBlockName("heavilyCrackedHeavyNaquadahFuel"); @@ -120,7 +129,10 @@ public class FluidsBuilder { public static void crackedNaquadahAsphalt_Lightly() { Fluid tmp = BaseFluid.BuildFluid("lightlyCrackedNaquadahAsphalt"); - tmp.setGaseous(false).setTemperature(1800).setDensity(20000).setViscosity(20000); + tmp.setGaseous(false) + .setTemperature(1800) + .setDensity(20000) + .setViscosity(20000); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("lightlyCrackedNaquadahAsphalt"); tmp2.setBlockName("lightlyCrackedNaquadahAsphalt"); @@ -130,7 +142,10 @@ public class FluidsBuilder { public static void crackedNaquadahAsphalt_Moderately() { Fluid tmp = BaseFluid.BuildFluid("moderatelyCrackedNaquadahAsphalt"); - tmp.setGaseous(false).setTemperature(1800).setDensity(20000).setViscosity(20000); + tmp.setGaseous(false) + .setTemperature(1800) + .setDensity(20000) + .setViscosity(20000); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("moderatelyCrackedNaquadahAsphalt"); tmp2.setBlockName("moderatelyCrackedNaquadahAsphalt"); @@ -140,7 +155,10 @@ public class FluidsBuilder { public static void crackedNaquadahAsphalt_Heavily() { Fluid tmp = BaseFluid.BuildFluid("heavilyCrackedNaquadahAsphalt"); - tmp.setGaseous(false).setTemperature(1800).setDensity(20000).setViscosity(20000); + tmp.setGaseous(false) + .setTemperature(1800) + .setDensity(20000) + .setViscosity(20000); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("heavilyCrackedNaquadahAsphalt"); tmp2.setBlockName("heavilyCrackedNaquadahAsphalt"); @@ -150,7 +168,8 @@ public class FluidsBuilder { public static void combustionPromotor() { Fluid tmp = BaseFluid.BuildFluid("combustionPromotor"); - tmp.setGaseous(false).setTemperature(300); + tmp.setGaseous(false) + .setTemperature(300); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("combustionPromotor"); tmp2.setBlockName("combustionPromotor"); @@ -160,7 +179,9 @@ public class FluidsBuilder { public static void coalTar() { Fluid tmp = BaseFluid.BuildFluid("fluid.coalTar"); - tmp.setGaseous(false).setTemperature(450).setUnlocalizedName("fluid.coalTar"); + tmp.setGaseous(false) + .setTemperature(450) + .setUnlocalizedName("fluid.coalTar"); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("coalTar"); tmp2.setBlockTextureName("coalTar"); @@ -170,7 +191,9 @@ public class FluidsBuilder { public static void supercriticalSteam() { Fluid tmp = BaseFluid.BuildFluid("supercriticalSteam"); - tmp.setGaseous(true).setTemperature(648).setUnlocalizedName("supercriticalSteam"); + tmp.setGaseous(true) + .setTemperature(648) + .setUnlocalizedName("supercriticalSteam"); BaseFluid tmp2 = new BaseFluid(tmp, Material.water); tmp2.SetTexture("supercriticalSteam"); tmp2.setBlockTextureName("supercriticalSteam"); diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java index 0c7b2caf10..6c13a9c680 100644 --- a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java +++ b/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java @@ -156,7 +156,7 @@ public class TEBlock extends BlockContainer { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, - float par8, float par9) { + float par8, float par9) { if (world.isRemote) { return false; } else { @@ -167,16 +167,17 @@ public class TEBlock extends BlockContainer { if (tItemStack != null) { Item tItem = tItemStack.getItem(); if (tItem instanceof IEssentiaContainerItem - && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) != null - && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()).size() > 0) { + && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) != null + && ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) + .size() > 0) { Aspect tLocked = ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem()) - .getAspects()[0]; + .getAspects()[0]; ((EssentiaHatch) tile).setLockedAspect(tLocked); GT_Utility.sendChatToPlayer( - |