diff options
| author | miozune <miozune@gmail.com> | 2022-07-15 14:34:19 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-15 06:34:19 +0100 |
| commit | c0eb617fa5c146b7a222c5461faf14394508cf4b (patch) | |
| tree | e25d23490122b5c663fd4e2791a81704c0183b00 /src/main/java/goodgenerator/crossmod | |
| parent | 36301feacf5a33ded24d338ae39985da6080d2bb (diff) | |
| download | GT5-Unofficial-c0eb617fa5c146b7a222c5461faf14394508cf4b.tar.gz GT5-Unofficial-c0eb617fa5c146b7a222c5461faf14394508cf4b.tar.bz2 GT5-Unofficial-c0eb617fa5c146b7a222c5461faf14394508cf4b.zip | |
Expand item limit for Neutron Activator & Add back Low Quality Naquadria Sulphate to the outputs from Concentrated Enriched-Naquadah Sludge (#53)
* Expand item limit for Neutron Activator & Add back Low Quality Naquadria Sulphate to the outputs from Concentrated Enriched-Naquadah Sludge
* updateBuildScript & spotlessApply
Diffstat (limited to 'src/main/java/goodgenerator/crossmod')
10 files changed, 693 insertions, 621 deletions
diff --git a/src/main/java/goodgenerator/crossmod/LoadedList.java b/src/main/java/goodgenerator/crossmod/LoadedList.java index f5a30509f8..0079e60dcd 100644 --- a/src/main/java/goodgenerator/crossmod/LoadedList.java +++ b/src/main/java/goodgenerator/crossmod/LoadedList.java @@ -23,5 +23,4 @@ public class LoadedList { AUTOMAGY = Loader.isModLoaded("Automagy"); WITCHING_GADGETS = Loader.isModLoaded("WitchingGadgets"); } - } diff --git a/src/main/java/goodgenerator/crossmod/ic2/CropsLoader.java b/src/main/java/goodgenerator/crossmod/ic2/CropsLoader.java index ce9e9f74a1..0c94742ddb 100644 --- a/src/main/java/goodgenerator/crossmod/ic2/CropsLoader.java +++ b/src/main/java/goodgenerator/crossmod/ic2/CropsLoader.java @@ -7,5 +7,4 @@ public class CropsLoader { public static void registerCrops() { Crops.instance.registerCrop(new GGCropsSaltyRoot("saltroot")); } - } diff --git a/src/main/java/goodgenerator/crossmod/ic2/GGCropsSaltyRoot.java b/src/main/java/goodgenerator/crossmod/ic2/GGCropsSaltyRoot.java index 77d4f2edee..030b30b270 100644 --- a/src/main/java/goodgenerator/crossmod/ic2/GGCropsSaltyRoot.java +++ b/src/main/java/goodgenerator/crossmod/ic2/GGCropsSaltyRoot.java @@ -6,15 +6,14 @@ import goodgenerator.main.GoodGenerator; import goodgenerator.util.ItemRefer; import ic2.api.crops.CropCard; import ic2.api.crops.ICropTile; +import java.util.Arrays; +import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import speiger.src.crops.api.ICropCardInfo; -import java.util.Arrays; -import java.util.List; - public class GGCropsSaltyRoot extends CropCard implements ICropCardInfo { private final String cropName; @@ -88,7 +87,7 @@ public class GGCropsSaltyRoot extends CropCard implements ICropCardInfo { public void registerSprites(IIconRegister iconRegister) { textures = new IIcon[maxSize()]; for (int i = 1; i <= textures.length; i++) { - textures[i - 1] = iconRegister.registerIcon(GoodGenerator.MOD_ID + ":crops/"+name()+"."+i); + textures[i - 1] = iconRegister.registerIcon(GoodGenerator.MOD_ID + ":crops/" + name() + "." + i); } } @@ -111,15 +110,12 @@ public class GGCropsSaltyRoot extends CropCard implements ICropCardInfo { @Override public int weightInfluences(ICropTile crop, float humidity, float nutrients, float air) { - return (int) ( - humidity + nutrients * 2 + air); + return (int) (-humidity + nutrients * 2 + air); } @Override public List<String> getCropInformation() { - return Arrays.asList( - "It prefers dry environment.", - "Inedible." - ); + return Arrays.asList("It prefers dry environment.", "Inedible."); } @Override diff --git a/src/main/java/goodgenerator/crossmod/nei/ExtremeHeatExchangerHandler.java b/src/main/java/goodgenerator/crossmod/nei/ExtremeHeatExchangerHandler.java index 4397c3ab5e..d2bc69d90b 100644 --- a/src/main/java/goodgenerator/crossmod/nei/ExtremeHeatExchangerHandler.java +++ b/src/main/java/goodgenerator/crossmod/nei/ExtremeHeatExchangerHandler.java @@ -8,18 +8,22 @@ import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.nei.GT_NEI_DefaultHandler; +import java.awt.*; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; -import java.awt.*; - public class ExtremeHeatExchangerHandler extends GT_NEI_DefaultHandler { public ExtremeHeatExchangerHandler(GT_Recipe.GT_Recipe_Map aRecipeMap) { super(aRecipeMap); - this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier())); + this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect( + new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier())); if (!NEI_Config.isAdded) { - FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); + FMLInterModComms.sendRuntimeMessage( + GT_Values.GT, + "NEIPlugins", + "register-crafting-handler", + "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); GuiCraftingRecipe.craftinghandlers.add(this); GuiUsageRecipe.usagehandlers.add(this); } @@ -35,12 +39,20 @@ public class ExtremeHeatExchangerHandler extends GT_NEI_DefaultHandler { FluidStack[] Inputs = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mFluidInputs; FluidStack[] Outputs = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mFluidOutputs; int Threshold = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue; - drawText(10, 73, StatCollector.translateToLocal("value.extreme_heat_exchanger.0") + " " + GT_Utility.formatNumbers(Inputs[0].amount) + " L/s", -16777216); + drawText( + 10, + 73, + StatCollector.translateToLocal("value.extreme_heat_exchanger.0") + " " + + GT_Utility.formatNumbers(Inputs[0].amount) + " L/s", + -16777216); drawText(10, 83, StatCollector.translateToLocal("value.extreme_heat_exchanger.1"), -16777216); drawText(10, 93, GT_Utility.formatNumbers(Outputs[0].amount / 160) + " L/s", -16777216); drawText(10, 103, StatCollector.translateToLocal("value.extreme_heat_exchanger.2"), -16777216); drawText(10, 113, GT_Utility.formatNumbers(Outputs[1].amount / 160) + " L/s", -16777216); - drawText(10, 123, StatCollector.translateToLocal("value.extreme_heat_exchanger.4") + " " + Threshold + " L/s", -16777216); + drawText( + 10, + 123, + StatCollector.translateToLocal("value.extreme_heat_exchanger.4") + " " + Threshold + " L/s", + -16777216); } - } diff --git a/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java b/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java index c1fae90a88..bcae911545 100644 --- a/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java +++ b/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java @@ -22,7 +22,8 @@ public class IMCForNEI { if (LoadedList.GTPP) { sendCatalyst("gt.recipe.fusionreactor", "gregtech:gt.blockmachines:32022", -10); } -// sendCatalyst("gt.recipe.fusionreactor", "gregtech:gt.blockmachines:32023", -10); // Compact Fusion MK-V + // sendCatalyst("gt.recipe.fusionreactor", "gregtech:gt.blockmachines:32023", -10); // Compact Fusion + // MK-V sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32019", -10); sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32020", -10); @@ -30,7 +31,8 @@ public class IMCForNEI { if (LoadedList.GTPP) { sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32022", -10); } -// sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32023", -10); // Compact Fusion MK-V + // sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32023", -10); // Compact + // Fusion MK-V } private static void sendHandler(String aName, String aBlock) { diff --git a/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java b/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java index 2d3b51f90d..b9a8d5cb52 100644 --- a/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java +++ b/src/main/java/goodgenerator/crossmod/nei/NEI_Config.java @@ -1,9 +1,9 @@ package goodgenerator.crossmod.nei; -import goodgenerator.main.GoodGenerator; -import goodgenerator.util.MyRecipeAdder; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; +import goodgenerator.main.GoodGenerator; +import goodgenerator.util.MyRecipeAdder; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/goodgenerator/crossmod/nei/NeutronActivatorHandler.java b/src/main/java/goodgenerator/crossmod/nei/NeutronActivatorHandler.java index ea7cf56cf9..ab2aedf2fc 100644 --- a/src/main/java/goodgenerator/crossmod/nei/NeutronActivatorHandler.java +++ b/src/main/java/goodgenerator/crossmod/nei/NeutronActivatorHandler.java @@ -8,17 +8,21 @@ import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.nei.GT_NEI_DefaultHandler; -import net.minecraft.util.StatCollector; - import java.awt.*; +import net.minecraft.util.StatCollector; public class NeutronActivatorHandler extends GT_NEI_DefaultHandler { public NeutronActivatorHandler(GT_Recipe.GT_Recipe_Map aRecipeMap) { super(aRecipeMap); - this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier())); + this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect( + new Rectangle(65, 13, 36, 18), this.getOverlayIdentifier())); if (!NEI_Config.isAdded) { - FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); + FMLInterModComms.sendRuntimeMessage( + GT_Values.GT, + "NEIPlugins", + "register-crafting-handler", + "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); GuiCraftingRecipe.craftinghandlers.add(this); GuiUsageRecipe.usagehandlers.add(this); } @@ -34,10 +38,24 @@ public class NeutronActivatorHandler extends GT_NEI_DefaultHandler { int tDuration = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mDuration; int minNKE = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue % 10000; int maxNKE = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue / 10000; - drawText(10, 73, this.trans("158", "Time: ") + GT_Utility.formatNumbers((float)tDuration / 20.0) + this.trans("161", " secs"), -16777216); + drawText( + 10, + 73, + this.trans("158", "Time: ") + + GT_Utility.formatNumbers((float) tDuration / 20.0) + + this.trans("161", " secs"), + -16777216); drawText(10, 83, StatCollector.translateToLocal("value.neutron_activator.0"), -16777216); - drawText(10, 93, GT_Utility.formatNumbers(minNKE) + StatCollector.translateToLocal("value.neutron_activator.2"), -16777216); + drawText( + 10, + 93, + GT_Utility.formatNumbers(minNKE) + StatCollector.translateToLocal("value.neutron_activator.2"), + -16777216); drawText(10, 103, StatCollector.translateToLocal("value.neutron_activator.1"), -16777216); - drawText(10, 113, GT_Utility.formatNumbers(maxNKE) + StatCollector.translateToLocal("value.neutron_activator.2"), -16777216); + drawText( + 10, + 113, + GT_Utility.formatNumbers(maxNKE) + StatCollector.translateToLocal("value.neutron_activator.2"), + -16777216); } } diff --git a/src/main/java/goodgenerator/crossmod/nei/PreciseAssemblerHandler.java b/src/main/java/goodgenerator/crossmod/nei/PreciseAssemblerHandler.java index 06918fe3ce..5d1797a834 100644 --- a/src/main/java/goodgenerator/crossmod/nei/PreciseAssemblerHandler.java +++ b/src/main/java/goodgenerator/crossmod/nei/PreciseAssemblerHandler.java @@ -7,7 +7,6 @@ import cpw.mods.fml.common.event.FMLInterModComms; import gregtech.api.enums.GT_Values; import gregtech.api.util.GT_Recipe; import gregtech.nei.GT_NEI_DefaultHandler; - import java.awt.*; public class PreciseAssemblerHandler extends GT_NEI_DefaultHandler { @@ -17,7 +16,11 @@ public class PreciseAssemblerHandler extends GT_NEI_DefaultHandler { this.transferRects.remove(new RecipeTransferRect(new Rectangle(65, 13, 36, 18), getOverlayIdentifier())); this.transferRects.add(new RecipeTransferRect(new Rectangle(75, 19, 26, 18), getOverlayIdentifier())); if (!NEI_Config.isAdded) { - FMLInterModComms.sendRuntimeMessage(GT_Values.GT, "NEIPlugins", "register-crafting-handler", "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); + FMLInterModComms.sendRuntimeMessage( + GT_Values.GT, + "NEIPlugins", + "register-crafting-handler", + "gregtech@" + this.getRecipeName() + "@" + this.getOverlayIdentifier()); GuiCraftingRecipe.craftinghandlers.add(this); GuiUsageRecipe.usagehandlers.add(this); } @@ -27,5 +30,4 @@ public class PreciseAssemblerHandler extends GT_NEI_DefaultHandler { public TemplateRecipeHandler newInstance() { return new PreciseAssemblerHandler(this.mRecipeMap); } - } diff --git a/src/main/java/goodgenerator/crossmod/thaumcraft/LargeEssentiaEnergyData.java b/src/main/java/goodgenerator/crossmod/thaumcraft/LargeEssentiaEnergyData.java index 0328b5906d..a55ddd9dd0 100644 --- a/src/main/java/goodgenerator/crossmod/thaumcraft/LargeEssentiaEnergyData.java +++ b/src/main/java/goodgenerator/crossmod/thaumcraft/LargeEssentiaEnergyData.java @@ -4,12 +4,11 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import thaumcraft.api.aspects.Aspect; - import java.io.*; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.HashMap; +import thaumcraft.api.aspects.Aspect; public class LargeEssentiaEnergyData { @@ -17,7 +16,9 @@ public class LargeEssentiaEnergyData { public static String readJsonFile() { try { - URL url = Thread.currentThread().getContextClassLoader().getResource("assets/goodgenerator/data/essentia.json"); + URL url = Thread.currentThread() + .getContextClassLoader() + .getResource("assets/goodgenerator/data/essentia.json"); assert url != null; BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream(), StandardCharsets.UTF_8)); String s; @@ -39,7 +40,7 @@ public class LargeEssentiaEnergyData { return; } JsonParser jsonParser = new JsonParser(); - JsonObject jsonObject = (JsonObject)jsonParser.parse(data); + JsonObject jsonObject = (JsonObject) jsonParser.parse(data); JsonArray jsonArray = jsonObject.get("Essentia").getAsJsonArray(); for (JsonElement elm : jsonArray) { JsonObject essData = elm.getAsJsonObject(); @@ -57,29 +58,25 @@ public class LargeEssentiaEnergyData { public static int getAspectTypeIndex(Aspect aspect) { if (ASPECT_FUEL_DATA.containsKey(aspect)) { return ASPECT_FUEL_DATA.get(aspect).getCategoryIndex(); - } - else return -1; + } else return -1; } public static String getAspectType(Aspect aspect) { if (ASPECT_FUEL_DATA.containsKey(aspect)) { return ASPECT_FUEL_DATA.get(aspect).getCategory(); - } - else return null; + } else return null; } public static int getAspectFuelValue(Aspect aspect) { if (ASPECT_FUEL_DATA.containsKey(aspect)) { return ASPECT_FUEL_DATA.get(aspect).getFuelValue(); - } - else return 0; + } else return 0; } public static float getAspectCeo(Aspect aspect) { if (ASPECT_FUEL_DATA.containsKey(aspect)) { return ASPECT_FUEL_DATA.get(aspect).getConsumeSpeed(); - } - else return 0; + } else return 0; } } @@ -108,17 +105,28 @@ class FuelData { public int getCategoryIndex() { switch (category) { - case "NORMAL": return 0; - case "AIR": return 1; - case "THERMAL": return 2; - case "UNSTABLE": return 3; - case "VICTUS": return 4; - case "TAINTED": return 5; - case "MECHANICS": return 6; - case "SPRITE": return 7; - case "RADIATION": return 8; - case "ELECTRIC": return 9; - default: return -1; + case "NORMAL": + return 0; + case "AIR": + return 1; + case "THERMAL": + return 2; + case "UNSTABLE": + return 3; + case "VICTUS": + return 4; + case "TAINTED": + return 5; + case "MECHANICS": + return 6; + case "SPRITE": + return 7; + case "RADIATION": + return 8; + case "ELECTRIC": + return 9; + default: + return -1; } } -}
\ No newline at end of file +} diff --git a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java index 274ea5643a..3055db0e74 100644 --- a/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java +++ b/src/main/java/goodgenerator/crossmod/thaumcraft/Research.java @@ -1,11 +1,12 @@ package goodgenerator.crossmod.thaumcraft; +import static thaumcraft.api.ThaumcraftApi.addArcaneCraftingRecipe; + +import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; +import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import goodgenerator.crossmod.LoadedList; -import goodgenerator.items.MyMaterial; import goodgenerator.util.DescTextLocalization; import goodgenerator.util.ItemRefer; -import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; -import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import gregtech.api.GregTech_API; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -14,6 +15,8 @@ import gregtech.api.enums.TC_Aspects; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import ic2.core.Ic2Items; +import java.util.Arrays; +import java.util.Collections; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -22,719 +25,752 @@ import thaumcraft.api.aspects.AspectList; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; -import java.util.Arrays; -import java.util.Collections; - -import static thaumcraft.api.ThaumcraftApi.addArcaneCraftingRecipe; - -public class Research{ +public class Research { public static void addResearch() { - DescTextLocalization.addText("research.ESSENTIA_GENERATOR.page",4); - DescTextLocalization.addText("research.ESSENTIA_CELL.page",1); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_BLANK.page",1); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_AIR.page",2); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_THERMAL.page",3); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_UNSTABLE.page",3); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_VICTUS.page",3); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_TAINTED.page",4); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_MECHANICS.page",3); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_SPRITE.page",3); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_RADIATION.page",3); - DescTextLocalization.addText("research.ESSENTIA_UPGRADE_ELECTRIC.page",2); + DescTextLocalization.addText("research.ESSENTIA_GENERATOR.page", 4); + DescTextLocalization.addText("research.ESSENTIA_CELL.page", 1); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_BLANK.page", 1); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_AIR.page", 2); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_THERMAL.page", 3); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_UNSTABLE.page", 3); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_VICTUS.page", 3); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_TAINTED.page", 4); + DescTextLocalization.addText("research.ESSENTIA_UPGRADE_MECHANICS.page", 3); + 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( "ESSENTIA_GENERATOR", "Combustion Engine in Magic World", "Will it cause Flux pollution?", - new String[]{"INFUSION"}, + new String[] {"INFUSION"}, "ARTIFICE", ItemRefer.Large_Essentia_Generator.get(1), - 3, 0, -9, 3, + 3, + 0, + -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 TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L)), null, - new Object[]{ - "research.ESSENTIA_GENERATOR.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_GENERATOR", - ItemList.Hull_HV.get(1), - new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), - new ItemStack(ConfigBlocks.blockJar, 1), - GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Thaumium, 1L), - GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), - new ItemStack(ConfigBlocks.blockWoodenDevice, 1), - GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Manyullyn, 1L), - Ic2Items.teslaCoil, - ItemList.Sensor_MV.get(1) - }, - ItemRefer.Large_Essentia_Generator.get(1), - 6, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 32), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 32) - ) - ), - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_GENERATOR", - ItemList.Hatch_Input_HV.get(1), - new ItemStack[]{ - new ItemStack(ConfigBlocks.blockJar, 1), - ItemRefer.Magic_Casing.get(1), - new ItemStack(ConfigBlocks.blockTube, 1), - ItemList.Electric_Pump_MV.get(1L) - }, - 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( - "ESSENTIA_GENERATOR", - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Thaumium, 1), - new ItemStack[]{ - GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectricalSteel, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectricalSteel, 1), - ItemList.Electric_Pump_HV.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) - ) - ), - addArcaneCraftingRecipe( - "ESSENTIA_GENERATOR", + new Object[] { + "research.ESSENTIA_GENERATOR.page.0", + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_GENERATOR", + ItemList.Hull_HV.get(1), + new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 1L), + new ItemStack(ConfigBlocks.blockJar, 1), + GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Thaumium, 1L), + GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Emerald, 1L), + new ItemStack(ConfigBlocks.blockWoodenDevice, 1), + GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Manyullyn, 1L), + Ic2Items.teslaCoil, + ItemList.Sensor_MV.get(1) + }, + ItemRefer.Large_Essentia_Generator.get(1), + 6, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.POTENTIA, 64L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 64L), + new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 32), + new TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 32))), + GregTech_API.sThaumcraftCompat.addInfusionRecipe( + "ESSENTIA_GENERATOR", + ItemList.Hatch_Input_HV.get(1), + new ItemStack[] { + new ItemStack(ConfigBlocks.blockJar, 1), ItemRefer.Magic_Casing.get(1), - new AspectList().add(Aspect.AIR, 50).add(Aspect.FIRE, 50).add(Aspect.ORDER, 50), - "SCS","GAG","SCS", - 'S', new ItemStack(ConfigItems.itemResource,1,14), - 'C', GT_OreDictUnificator.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" - } - ); + new ItemStack(ConfigBlocks.blockTube, 1), + ItemList.Electric_Pump_MV.get(1L) + }, + 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( + "ESSENTIA_GENERATOR", + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Thaumium, 1), + new ItemStack[] { + GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.StainlessSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectricalSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.ElectricalSteel, 1), + ItemList.Electric_Pump_HV.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))), + addArcaneCraftingRecipe( + "ESSENTIA_GENERATOR", + ItemRefer.Magic_Casing.get(1), + new AspectList() + .add(Aspect.AIR, 50) + .add(Aspect.FIRE, 50) + .add(Aspect.ORDER, 50), + "SCS", + "GAG", + "SCS", + 'S', + new ItemStack(ConfigItems.itemResource, 1, 14), + 'C', + GT_OreDictUnificator.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( "ESSENTIA_CELL", "Better Cells", "And higher efficiency.", - new String[]{"ESSENTIA_GENERATOR"}, + new String[] {"ESSENTIA_GENERATOR"}, "ARTIFICE", ItemRefer.Essentia_Cell_T4.get(1), - 2, 0, -10, 3, + 2, + 0, + -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 TC_Aspects.TC_AspectStack(TC_Aspects.PERMUTATIO, 10L)), null, - new Object[]{ - "research.ESSENTIA_CELL.page.0", - GregTech_API.sThaumcraftCompat.addInfusionRecipe( - "ESSENTIA_CELL", - ItemRefer.Essentia_Cell_T1.get(1), - new ItemStack[]{ - GT_OreDictUnificator.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), - }, - 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( - "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) - |
