From 6d436a2c6a5d9b51070b8399c4fdb196603a8e82 Mon Sep 17 00:00:00 2001 From: Jakub <53441451+kuba6000@users.noreply.github.com> Date: Sun, 14 Aug 2022 15:19:13 +0200 Subject: Add "Mob Drops" NEI page + Extreme Extermination Chamber (#1) * First commit * Mixins * Merge the same items with diffrent damage * Faster random in NEI * More accuracy ? * Update ClientProxy.java * Renaming * Update buildscript * Use reserved MTE ID's * EEC work * Rework NEI page * Fix inaccurate chances * Basic equipment spawn * Add config options * Translations * Add infernal drops * Witchery fix * Forestry fixes * More fixes * Default blacklist * NEI sorting * Comment out testing deps * Clientsided check * Blood Magic support * LoaderReference * Check if peacefull is allowed * Add some XP output * Add recipe * Send Server config to Client * Add command to reload config * Translations * Process MT additions --- src/main/java/kubatech/loaders/RecipeLoader.java | 77 ++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 src/main/java/kubatech/loaders/RecipeLoader.java (limited to 'src/main/java/kubatech/loaders/RecipeLoader.java') diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java new file mode 100644 index 0000000000..99908a857f --- /dev/null +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -0,0 +1,77 @@ +/* + * KubaTech - Gregtech Addon + * Copyright (C) 2022 kuba6000 + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package kubatech.loaders; + +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GT_ModHandler; +import kubatech.Tags; +import kubatech.api.LoaderReference; +import kubatech.api.enums.ItemList; +import kubatech.common.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class RecipeLoader { + + private static final Logger LOG = LogManager.getLogger(Tags.MODID + "[Recipe Loader]"); + protected static final long bitsd = GT_ModHandler.RecipeBits.NOT_REMOVABLE + | GT_ModHandler.RecipeBits.REVERSIBLE + | GT_ModHandler.RecipeBits.BUFFERED + | GT_ModHandler.RecipeBits.DISMANTLEABLE; + + private static int MTEID = 14201; + private static final int MTEIDMax = 14300; + + public static void addRecipes() { + if (LoaderReference.EnderIO) { + ItemList.ExtremeExterminationChamber.set(new GT_MetaTileEntity_ExtremeExterminationChamber( + MTEID++, "multimachine.exterminationchamber", "Extreme Extermination Chamber") + .getStackForm(1L)); + GT_ModHandler.addCraftingRecipe(ItemList.ExtremeExterminationChamber.get(1), bitsd, new Object[] { + "RCR", + "CHC", + "VVV", + 'R', + gregtech.api.enums.ItemList.Robot_Arm_EV, + 'C', + OrePrefixes.circuit.get(Materials.Data), + 'H', + gregtech.api.enums.ItemList.Hull_EV, + 'V', + GT_ModHandler.getModItem("OpenBlocks", "vacuumhopper", 1, new ItemStack(Blocks.hopper)) + }); + } + if (MTEID > MTEIDMax + 1) throw new RuntimeException("MTE ID's"); + } + + private static boolean lateRecipesInitialized = false; + + public static void addRecipesLate() { + // Runs on server start + if (lateRecipesInitialized) return; + lateRecipesInitialized = true; + + MobRecipeLoader.generateMobRecipeMap(); + MobRecipeLoader.processMobRecipeMap(); + } +} -- cgit From 4ad580a05e475a912ff9964cdd09d5ff666b98e8 Mon Sep 17 00:00:00 2001 From: kuba6000 Date: Sun, 14 Aug 2022 21:46:59 +0200 Subject: LGPL 3.0 --- src/main/java/kubatech/loaders/RecipeLoader.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/main/java/kubatech/loaders/RecipeLoader.java') diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index 99908a857f..ba6cbb7a1f 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -2,18 +2,18 @@ * KubaTech - Gregtech Addon * Copyright (C) 2022 kuba6000 * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. * - * This program is distributed in the hope that it will be useful, + * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . * */ -- cgit From 76a2834cedfa4f3916d07e2893fc54121268489e Mon Sep 17 00:00:00 2001 From: kuba6000 Date: Wed, 17 Aug 2022 05:01:16 +0200 Subject: Structure --- src/main/java/kubatech/loaders/RecipeLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/kubatech/loaders/RecipeLoader.java') diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index ba6cbb7a1f..84c3603225 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -25,7 +25,7 @@ import gregtech.api.util.GT_ModHandler; import kubatech.Tags; import kubatech.api.LoaderReference; import kubatech.api.enums.ItemList; -import kubatech.common.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber; +import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import org.apache.logging.log4j.LogManager; -- cgit From 24e5b1391b6a057d6508d1902f5f02bc27d508c8 Mon Sep 17 00:00:00 2001 From: Jakub <53441451+kuba6000@users.noreply.github.com> Date: Mon, 29 Aug 2022 11:01:23 +0200 Subject: Tea line (#11) * Add normal Tea * Add Tea Line Also removed red tea and butterfly tea * Don't use item if in creative * Move recipes * Better MTE registration * Always throw * Add textures --- src/main/java/kubatech/loaders/RecipeLoader.java | 178 ++++++++++++++++++++++- 1 file changed, 174 insertions(+), 4 deletions(-) (limited to 'src/main/java/kubatech/loaders/RecipeLoader.java') diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index 84c3603225..62d1594a30 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -19,15 +19,26 @@ package kubatech.loaders; +import static kubatech.api.enums.ItemList.*; +import static kubatech.api.enums.ItemList.YellowTea; + +import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.core.lib.CORE; +import java.lang.reflect.InvocationTargetException; import kubatech.Tags; import kubatech.api.LoaderReference; import kubatech.api.enums.ItemList; import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -43,10 +54,12 @@ public class RecipeLoader { private static final int MTEIDMax = 14300; public static void addRecipes() { - if (LoaderReference.EnderIO) { - ItemList.ExtremeExterminationChamber.set(new GT_MetaTileEntity_ExtremeExterminationChamber( - MTEID++, "multimachine.exterminationchamber", "Extreme Extermination Chamber") - .getStackForm(1L)); + if (registerMTE( + ExtremeExterminationChamber, + GT_MetaTileEntity_ExtremeExterminationChamber.class, + "multimachine.exterminationchamber", + "Extreme Extermination Chamber", + LoaderReference.EnderIO)) { GT_ModHandler.addCraftingRecipe(ItemList.ExtremeExterminationChamber.get(1), bitsd, new Object[] { "RCR", "CHC", @@ -61,9 +74,48 @@ public class RecipeLoader { GT_ModHandler.getModItem("OpenBlocks", "vacuumhopper", 1, new ItemStack(Blocks.hopper)) }); } + RegisterTeaLine(); if (MTEID > MTEIDMax + 1) throw new RuntimeException("MTE ID's"); } + private static boolean registerMTE( + ItemList item, Class mte, String aName, String aNameRegional) { + return registerMTE(item, mte, aName, aNameRegional, true); + } + + private static boolean registerMTE( + ItemList item, Class mte, String aName, String aNameRegional, boolean... deps) { + boolean dep = true; + for (boolean i : deps) + if (!i) { + dep = false; + break; + } + return registerMTE(item, mte, aName, aNameRegional, dep); + } + + private static boolean registerMTE( + ItemList item, Class mte, String aName, String aNameRegional, boolean dep) { + if (MTEID > MTEIDMax) throw new RuntimeException("MTE ID's"); + if (dep) { + try { + item.set(mte.getConstructor(int.class, String.class, String.class) + .newInstance(MTEID, aName, aNameRegional) + .getStackForm(1)); + } catch (InvocationTargetException ex) { + Throwable original_ex = ex.getCause(); + if (original_ex instanceof RuntimeException) throw (RuntimeException) original_ex; + throw new RuntimeException(original_ex.getMessage()); + } catch (RuntimeException ex) { + throw ex; + } catch (Exception ex) { + throw new RuntimeException(ex.getMessage()); + } + } + MTEID++; + return dep; + } + private static boolean lateRecipesInitialized = false; public static void addRecipesLate() { @@ -74,4 +126,122 @@ public class RecipeLoader { MobRecipeLoader.generateMobRecipeMap(); MobRecipeLoader.processMobRecipeMap(); } + + private static void RegisterTeaLine() { + // TEA LINE // + if (LoaderReference.GTPlusPlus && LoaderReference.HarvestCraft) { + CORE.RA.addDehydratorRecipe( + new ItemStack[] {GameRegistry.findItemStack("harvestcraft", "tealeafItem", 1)}, + null, + null, + new ItemStack[] {TeaLeafDehydrated.get(1)}, + null, + 100, + 32); + CORE.RA.addDehydratorRecipe( + new ItemStack[] {TeaLeafDehydrated.get(1)}, + null, + null, + new ItemStack[] {WhiteTeaLeaf.get(1)}, + null, + 100, + 32); + GT_Values.RA.addMixerRecipe( + new ItemStack[] {TeaLeafDehydrated.get(1)}, + new FluidStack[] {FluidRegistry.getFluidStack("water", 50)}, + new ItemStack[] {SteamedTeaLeaf.get(1)}, + null, + 100, + 32); + CORE.RA.addDehydratorRecipe( + new ItemStack[] {SteamedTeaLeaf.get(1)}, + null, + null, + new ItemStack[] {YellowTeaLeaf.get(1)}, + null, + 100, + 32); + GT_Values.RA.addBenderRecipe(TeaLeafDehydrated.get(1), RolledTeaLeaf.get(1), 100, 32); + CORE.RA.addDehydratorRecipe( + new ItemStack[] {RolledTeaLeaf.get(1)}, + null, + null, + new ItemStack[] {GreenTeaLeaf.get(1)}, + null, + 100, + 32); + GT_Values.RA.addChemicalRecipe( + RolledTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(1), OxidizedTeaLeaf.get(1), 100, 32); + CORE.RA.addDehydratorRecipe( + new ItemStack[] {OxidizedTeaLeaf.get(1)}, + null, + null, + new ItemStack[] {BlackTeaLeaf.get(1)}, + null, + 100, + 32); + GT_Values.RA.addChemicalRecipe( + RolledTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(2), FermentedTeaLeaf.get(1), 200, 32); + CORE.RA.addDehydratorRecipe( + new ItemStack[] {FermentedTeaLeaf.get(1)}, + null, + null, + new ItemStack[] {PuerhTeaLeaf.get(1)}, + null, + 100, + 32); + GT_Values.RA.addCutterRecipe( + new ItemStack[] {TeaLeafDehydrated.get(1)}, + new ItemStack[] {BruisedTeaLeaf.get(1)}, + 100, + 32, + false); + GT_Values.RA.addChemicalRecipe( + BruisedTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(1), PartiallyOxidizedTeaLeaf.get(1), 50, 32); + CORE.RA.addDehydratorRecipe( + new ItemStack[] {PartiallyOxidizedTeaLeaf.get(1)}, + null, + null, + new ItemStack[] {OolongTeaLeaf.get(1)}, + null, + 100, + 32); + + // Tea Assembly + GameRegistry.addSmelting(BlackTeaLeaf.get(1), BlackTea.get(1), 10); + GT_Values.RA.addMixerRecipe( + new ItemStack[] {BlackTea.get(1), GameRegistry.findItemStack("harvestcraft", "limejuiceItem", 1)}, + null, + new ItemStack[] {EarlGrayTea.get(1)}, + null, + 100, + 32); + GameRegistry.addSmelting(GreenTeaLeaf.get(1), GreenTea.get(1), 10); + GT_Values.RA.addMixerRecipe( + new ItemStack[] {BlackTea.get(1)}, + new FluidStack[] {FluidRegistry.getFluidStack("potion.lemonjuice", 1000)}, + new ItemStack[] {LemonTea.get(1)}, + null, + 100, + 32); + GT_Values.RA.addMixerRecipe( + new ItemStack[] {BlackTea.get(1)}, + new FluidStack[] {FluidRegistry.getFluidStack("milk", 1000)}, + new ItemStack[] {MilkTea.get(1)}, + null, + 100, + 32); + GameRegistry.addSmelting(OolongTeaLeaf.get(1), OolongTea.get(1), 10); + GT_Values.RA.addMixerRecipe( + new ItemStack[] {GameRegistry.findItemStack("harvestcraft", "peppermintItem", 1)}, + new FluidStack[] {FluidRegistry.getFluidStack("water", 1000)}, + new ItemStack[] {PeppermintTea.get(1)}, + null, + 100, + 32); + GameRegistry.addSmelting(PuerhTeaLeaf.get(1), PuerhTea.get(1), 10); + GameRegistry.addSmelting(WhiteTeaLeaf.get(1), WhiteTea.get(1), 10); + GameRegistry.addSmelting(YellowTeaLeaf.get(1), YellowTea.get(1), 10); + } + } } -- cgit From 6788a967869a668b716e0fb0f6da1a0114a03686 Mon Sep 17 00:00:00 2001 From: Jakub <53441451+kuba6000@users.noreply.github.com> Date: Sun, 11 Sep 2022 10:34:27 +0200 Subject: Less logs (#15) * Less logs * Update MobRecipeLoader.java * clean --- src/main/java/kubatech/loaders/RecipeLoader.java | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main/java/kubatech/loaders/RecipeLoader.java') diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index 62d1594a30..66a889b010 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -20,7 +20,6 @@ package kubatech.loaders; import static kubatech.api.enums.ItemList.*; -import static kubatech.api.enums.ItemList.YellowTea; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; -- cgit From 668262073cd655571ae33a4b40b95e1e38e6c883 Mon Sep 17 00:00:00 2001 From: Jakub <53441451+kuba6000@users.noreply.github.com> Date: Sun, 16 Oct 2022 15:16:09 +0200 Subject: Add Industrial Apicultural Acclimatiser and Drone Domestication Station (#26) * Somewhat working * Some data generation * Chance * spotless * Update CommandBees.java * Buff Mega Apiary * Update GT5 * Add recipe * Update dependencies.gradle * yes * I kinda feel like a rainbow today * Block Mega Apiary rotation * Disable spotless on the strucuture * Update GT_MetaTileEntity_ExtremeIndustrialApiary.java * Doesn't matter * Disable bees command * Update StringUtils.java * Change class name --- src/main/java/kubatech/loaders/RecipeLoader.java | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'src/main/java/kubatech/loaders/RecipeLoader.java') diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index 66a889b010..60e2884704 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -34,6 +34,7 @@ import kubatech.Tags; import kubatech.api.LoaderReference; import kubatech.api.enums.ItemList; import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber; +import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_MegaIndustrialApiary; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; @@ -73,6 +74,33 @@ public class RecipeLoader { GT_ModHandler.getModItem("OpenBlocks", "vacuumhopper", 1, new ItemStack(Blocks.hopper)) }); } + if (registerMTE( + ExtremeIndustrialApiary, + GT_MetaTileEntity_MegaIndustrialApiary.class, + "multimachine.extremeapiary", + "Industrial Apicultural Acclimatiser and Drone Domestication Station", + LoaderReference.Forestry)) { + GT_Values.RA.addAssemblylineRecipe( + gregtech.api.enums.ItemList.Machine_IndustrialApiary.get(1), + 10000, + new Object[] { + gregtech.api.enums.ItemList.Machine_IndustrialApiary.get(64L), + gregtech.api.enums.ItemList.IndustrialApiary_Upgrade_Acceleration_8_Upgraded.get(64L), + gregtech.api.enums.ItemList.IndustrialApiary_Upgrade_STABILIZER.get(64L), + gregtech.api.enums.ItemList.Robot_Arm_UV.get(16L), + new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L}, + new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L}, + new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L}, + new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L}, + }, + new FluidStack[] { + FluidRegistry.getFluidStack("molten.indalloy140", 28800), + FluidRegistry.getFluidStack("honey", 20000) + }, + ExtremeIndustrialApiary.get(1), + 6000, + 2_048_000); + } RegisterTeaLine(); if (MTEID > MTEIDMax + 1) throw new RuntimeException("MTE ID's"); } -- cgit From 9e1d901d8bf9cbea03b02705eebbcbebe31cebe8 Mon Sep 17 00:00:00 2001 From: kuba6000 Date: Sat, 22 Oct 2022 00:15:26 +0200 Subject: Lower ciruits tier to UV --- src/main/java/kubatech/loaders/RecipeLoader.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/main/java/kubatech/loaders/RecipeLoader.java') diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index 60e2884704..2b7fe77719 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -88,10 +88,10 @@ public class RecipeLoader { gregtech.api.enums.ItemList.IndustrialApiary_Upgrade_Acceleration_8_Upgraded.get(64L), gregtech.api.enums.ItemList.IndustrialApiary_Upgrade_STABILIZER.get(64L), gregtech.api.enums.ItemList.Robot_Arm_UV.get(16L), - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.Infinite), 4L}, + new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, + new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, + new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, + new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, }, new FluidStack[] { FluidRegistry.getFluidStack("molten.indalloy140", 28800), -- cgit From 8a581938862a4d612f510a8afed88727a34c3916 Mon Sep 17 00:00:00 2001 From: Jakub <53441451+kuba6000@users.noreply.github.com> Date: Thu, 15 Dec 2022 16:53:12 +0100 Subject: MODULAR UI (#34) * MODULAR UUUUUUUUIIIIIIIIIII * Tea * Add recipe to ULTIMATE TEA * Stupid MT Scripts. I hate it * Yeet * More TEA * Add blocks * More Modular UIs * Textures * Fix custom UI containers * Texture, tooltip * UI with tabs * ButtonWidget * fix * Fix * Texture * Color is fixed * More UI work * Modular UI is hard dependency now * Spotless * Simplify * Format numbers * A * Update TeaAcceptorTile.java * Shadow is fixed, lets gooooo * hardness * Mixins mixins mixins * Tab icons * Fix crash * Shop concept * Bump ModularUI * Bump Modular UI * Nooooooooooo * GREY -> GRAY * Bump ModularUI * Bump GT5 * EEC with MUI test * Include incomplete structure * REFLECTIONS !! * Just use slot filter * Update pos when needed * Update GT_MetaTileEntity_ExtremeExterminationChamber.java * Spawner status * Nice toggle button * Send messages * Next toggle button * Start work on IAADDS * Scrollable inventory test * Draw queen slots * Fix * Update dependencies.gradle * Use sync widget * Add button to enable/disable working * Configuration in Mega Apiary * Refactor a bit * Update ModularUI * Bump ModularUI * Bump GT5 * Fix build * Update dependencies.gradle * Update build.gradle * Update dependencies.gradle * spotless * Begin working on configuration window * Update dependencies.gradle * Deprecated * Update dependencies.gradle * Optimize bee storage rendering (2 fps -> 100 fps) * Make Mega Apiary storage GUI usable * Configuration window looks ok * Color is fixed * TC research * Disable for now * Finish tea command * ok * Fix * Update en_US.lang * ZzZ * Stuff changed --- src/main/java/kubatech/loaders/RecipeLoader.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'src/main/java/kubatech/loaders/RecipeLoader.java') diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index 2b7fe77719..7bbaaf17e7 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -21,6 +21,7 @@ package kubatech.loaders; import static kubatech.api.enums.ItemList.*; +import com.dreammaster.gthandler.CustomItemList; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; @@ -270,5 +271,24 @@ public class RecipeLoader { GameRegistry.addSmelting(WhiteTeaLeaf.get(1), WhiteTea.get(1), 10); GameRegistry.addSmelting(YellowTeaLeaf.get(1), YellowTea.get(1), 10); } + if (LoaderReference.Avaritia && LoaderReference.GTNHCoreMod) { + GT_Values.RA.addAssemblylineRecipe( + TeaAcceptorResearchNote.get(1), + 10000, + new Object[] { + LegendaryUltimateTea.get(0), + GameRegistry.findItemStack("Avaritia", "Neutronium_Compressor", 1), + gregtech.api.enums.ItemList.Quantum_Tank_EV.get(1), + CustomItemList.FluidExtractorUHV.get(10), + new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, + new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, + new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, + new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, + }, + new FluidStack[] {FluidRegistry.getFluidStack("molten.indalloy140", 28800)}, + TeaAcceptor.get(1), + 6000, + 2_048_000); + } } } -- cgit From 48bc11c294c4a25aa8778f0603bff89bc08c19ae Mon Sep 17 00:00:00 2001 From: miozune Date: Mon, 19 Dec 2022 00:35:08 +0900 Subject: Fix non-forestry honey used to craft Mega apiary (#37) --- src/main/java/kubatech/loaders/RecipeLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/kubatech/loaders/RecipeLoader.java') diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index 7bbaaf17e7..48d3ce5411 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -96,7 +96,7 @@ public class RecipeLoader { }, new FluidStack[] { FluidRegistry.getFluidStack("molten.indalloy140", 28800), - FluidRegistry.getFluidStack("honey", 20000) + FluidRegistry.getFluidStack("for.honey", 20000) }, ExtremeIndustrialApiary.get(1), 6000, -- cgit From 570f3ab14be37436205ea865ecfc2df4e966d491 Mon Sep 17 00:00:00 2001 From: kuba6000 Date: Tue, 17 Jan 2023 17:36:37 +0100 Subject: New year --- src/main/java/kubatech/loaders/RecipeLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/kubatech/loaders/RecipeLoader.java') diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index 48d3ce5411..6fbc62c7cc 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -1,6 +1,6 @@ /* * KubaTech - Gregtech Addon - * Copyright (C) 2022 kuba6000 + * Copyright (C) 2022 - 2023 kuba6000 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public -- cgit From f51616bda220887fdd45c4bc951ff59e3398213a Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 19:03:53 -0800 Subject: [ci skip] spotlessApply with the new settings --- src/main/java/kubatech/loaders/RecipeLoader.java | 219 +++++++++++------------ 1 file changed, 106 insertions(+), 113 deletions(-) (limited to 'src/main/java/kubatech/loaders/RecipeLoader.java') diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index 6fbc62c7cc..dc70c183e8 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -1,53 +1,48 @@ /* - * KubaTech - Gregtech Addon - * Copyright (C) 2022 - 2023 kuba6000 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - * + * KubaTech - Gregtech Addon Copyright (C) 2022 - 2023 kuba6000 This library is free software; you can redistribute it + * and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software + * Foundation; either version 3 of the License, or (at your option) any later version. This library is distributed in + * the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have + * received a copy of the GNU Lesser General Public License along with this library. If not, see + * . */ package kubatech.loaders; import static kubatech.api.enums.ItemList.*; -import com.dreammaster.gthandler.CustomItemList; -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; import java.lang.reflect.InvocationTargetException; + import kubatech.Tags; import kubatech.api.LoaderReference; import kubatech.api.enums.ItemList; import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber; import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_MegaIndustrialApiary; + import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import com.dreammaster.gthandler.CustomItemList; + +import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.metatileentity.MetaTileEntity; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.core.lib.CORE; + public class RecipeLoader { private static final Logger LOG = LogManager.getLogger(Tags.MODID + "[Recipe Loader]"); - protected static final long bitsd = GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE + protected static final long bitsd = GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.DISMANTLEABLE; @@ -61,19 +56,12 @@ public class RecipeLoader { "multimachine.exterminationchamber", "Extreme Extermination Chamber", LoaderReference.EnderIO)) { - GT_ModHandler.addCraftingRecipe(ItemList.ExtremeExterminationChamber.get(1), bitsd, new Object[] { - "RCR", - "CHC", - "VVV", - 'R', - gregtech.api.enums.ItemList.Robot_Arm_EV, - 'C', - OrePrefixes.circuit.get(Materials.Data), - 'H', - gregtech.api.enums.ItemList.Hull_EV, - 'V', - GT_ModHandler.getModItem("OpenBlocks", "vacuumhopper", 1, new ItemStack(Blocks.hopper)) - }); + GT_ModHandler.addCraftingRecipe( + ItemList.ExtremeExterminationChamber.get(1), + bitsd, + new Object[] { "RCR", "CHC", "VVV", 'R', gregtech.api.enums.ItemList.Robot_Arm_EV, 'C', + OrePrefixes.circuit.get(Materials.Data), 'H', gregtech.api.enums.ItemList.Hull_EV, 'V', + GT_ModHandler.getModItem("OpenBlocks", "vacuumhopper", 1, new ItemStack(Blocks.hopper)) }); } if (registerMTE( ExtremeIndustrialApiary, @@ -84,20 +72,16 @@ public class RecipeLoader { GT_Values.RA.addAssemblylineRecipe( gregtech.api.enums.ItemList.Machine_IndustrialApiary.get(1), 10000, - new Object[] { - gregtech.api.enums.ItemList.Machine_IndustrialApiary.get(64L), - gregtech.api.enums.ItemList.IndustrialApiary_Upgrade_Acceleration_8_Upgraded.get(64L), - gregtech.api.enums.ItemList.IndustrialApiary_Upgrade_STABILIZER.get(64L), - gregtech.api.enums.ItemList.Robot_Arm_UV.get(16L), - new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, - }, - new FluidStack[] { - FluidRegistry.getFluidStack("molten.indalloy140", 28800), - FluidRegistry.getFluidStack("for.honey", 20000) - }, + new Object[] { gregtech.api.enums.ItemList.Machine_IndustrialApiary.get(64L), + gregtech.api.enums.ItemList.IndustrialApiary_Upgrade_Acceleration_8_Upgraded.get(64L), + gregtech.api.enums.ItemList.IndustrialApiary_Upgrade_STABILIZER.get(64L), + gregtech.api.enums.ItemList.Robot_Arm_UV.get(16L), + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }, }, + new FluidStack[] { FluidRegistry.getFluidStack("molten.indalloy140", 28800), + FluidRegistry.getFluidStack("for.honey", 20000) }, ExtremeIndustrialApiary.get(1), 6000, 2_048_000); @@ -106,30 +90,29 @@ public class RecipeLoader { if (MTEID > MTEIDMax + 1) throw new RuntimeException("MTE ID's"); } - private static boolean registerMTE( - ItemList item, Class mte, String aName, String aNameRegional) { + private static boolean registerMTE(ItemList item, Class mte, String aName, + String aNameRegional) { return registerMTE(item, mte, aName, aNameRegional, true); } - private static boolean registerMTE( - ItemList item, Class mte, String aName, String aNameRegional, boolean... deps) { + private static boolean registerMTE(ItemList item, Class mte, String aName, + String aNameRegional, boolean... deps) { boolean dep = true; - for (boolean i : deps) - if (!i) { - dep = false; - break; - } + for (boolean i : deps) if (!i) { + dep = false; + break; + } return registerMTE(item, mte, aName, aNameRegional, dep); } - private static boolean registerMTE( - ItemList item, Class mte, String aName, String aNameRegional, boolean dep) { + private static boolean registerMTE(ItemList item, Class mte, String aName, + String aNameRegional, boolean dep) { if (MTEID > MTEIDMax) throw new RuntimeException("MTE ID's"); if (dep) { try { - item.set(mte.getConstructor(int.class, String.class, String.class) - .newInstance(MTEID, aName, aNameRegional) - .getStackForm(1)); + item.set( + mte.getConstructor(int.class, String.class, String.class) + .newInstance(MTEID, aName, aNameRegional).getStackForm(1)); } catch (InvocationTargetException ex) { Throwable original_ex = ex.getCause(); if (original_ex instanceof RuntimeException) throw (RuntimeException) original_ex; @@ -156,81 +139,93 @@ public class RecipeLoader { } private static void RegisterTeaLine() { - // TEA LINE // + // TEA LINE // if (LoaderReference.GTPlusPlus && LoaderReference.HarvestCraft) { CORE.RA.addDehydratorRecipe( - new ItemStack[] {GameRegistry.findItemStack("harvestcraft", "tealeafItem", 1)}, + new ItemStack[] { GameRegistry.findItemStack("harvestcraft", "tealeafItem", 1) }, null, null, - new ItemStack[] {TeaLeafDehydrated.get(1)}, + new ItemStack[] { TeaLeafDehydrated.get(1) }, null, 100, 32); CORE.RA.addDehydratorRecipe( - new ItemStack[] {TeaLeafDehydrated.get(1)}, + new ItemStack[] { TeaLeafDehydrated.get(1) }, null, null, - new ItemStack[] {WhiteTeaLeaf.get(1)}, + new ItemStack[] { WhiteTeaLeaf.get(1) }, null, 100, 32); GT_Values.RA.addMixerRecipe( - new ItemStack[] {TeaLeafDehydrated.get(1)}, - new FluidStack[] {FluidRegistry.getFluidStack("water", 50)}, - new ItemStack[] {SteamedTeaLeaf.get(1)}, + new ItemStack[] { TeaLeafDehydrated.get(1) }, + new FluidStack[] { FluidRegistry.getFluidStack("water", 50) }, + new ItemStack[] { SteamedTeaLeaf.get(1) }, null, 100, 32); CORE.RA.addDehydratorRecipe( - new ItemStack[] {SteamedTeaLeaf.get(1)}, + new ItemStack[] { SteamedTeaLeaf.get(1) }, null, null, - new ItemStack[] {YellowTeaLeaf.get(1)}, + new ItemStack[] { YellowTeaLeaf.get(1) }, null, 100, 32); GT_Values.RA.addBenderRecipe(TeaLeafDehydrated.get(1), RolledTeaLeaf.get(1), 100, 32); CORE.RA.addDehydratorRecipe( - new ItemStack[] {RolledTeaLeaf.get(1)}, + new ItemStack[] { RolledTeaLeaf.get(1) }, null, null, - new ItemStack[] {GreenTeaLeaf.get(1)}, + new ItemStack[] { GreenTeaLeaf.get(1) }, null, 100, 32); GT_Values.RA.addChemicalRecipe( - RolledTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(1), OxidizedTeaLeaf.get(1), 100, 32); + RolledTeaLeaf.get(1), + GT_Utility.getIntegratedCircuit(1), + OxidizedTeaLeaf.get(1), + 100, + 32); CORE.RA.addDehydratorRecipe( - new ItemStack[] {OxidizedTeaLeaf.get(1)}, + new ItemStack[] { OxidizedTeaLeaf.get(1) }, null, null, - new ItemStack[] {BlackTeaLeaf.get(1)}, + new ItemStack[] { BlackTeaLeaf.get(1) }, null, 100, 32); GT_Values.RA.addChemicalRecipe( - RolledTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(2), FermentedTeaLeaf.get(1), 200, 32); + RolledTeaLeaf.get(1), + GT_Utility.getIntegratedCircuit(2), + FermentedTeaLeaf.get(1), + 200, + 32); CORE.RA.addDehydratorRecipe( - new ItemStack[] {FermentedTeaLeaf.get(1)}, + new ItemStack[] { FermentedTeaLeaf.get(1) }, null, null, - new ItemStack[] {PuerhTeaLeaf.get(1)}, + new ItemStack[] { PuerhTeaLeaf.get(1) }, null, 100, 32); GT_Values.RA.addCutterRecipe( - new ItemStack[] {TeaLeafDehydrated.get(1)}, - new ItemStack[] {BruisedTeaLeaf.get(1)}, + new ItemStack[] { TeaLeafDehydrated.get(1) }, + new ItemStack[] { BruisedTeaLeaf.get(1) }, 100, 32, false); GT_Values.RA.addChemicalRecipe( - BruisedTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(1), PartiallyOxidizedTeaLeaf.get(1), 50, 32); + BruisedTeaLeaf.get(1), + GT_Utility.getIntegratedCircuit(1), + PartiallyOxidizedTeaLeaf.get(1), + 50, + 32); CORE.RA.addDehydratorRecipe( - new ItemStack[] {PartiallyOxidizedTeaLeaf.get(1)}, + new ItemStack[] { PartiallyOxidizedTeaLeaf.get(1) }, null, null, - new ItemStack[] {OolongTeaLeaf.get(1)}, + new ItemStack[] { OolongTeaLeaf.get(1) }, null, 100, 32); @@ -238,32 +233,32 @@ public class RecipeLoader { // Tea Assembly GameRegistry.addSmelting(BlackTeaLeaf.get(1), BlackTea.get(1), 10); GT_Values.RA.addMixerRecipe( - new ItemStack[] {BlackTea.get(1), GameRegistry.findItemStack("harvestcraft", "limejuiceItem", 1)}, + new ItemStack[] { BlackTea.get(1), GameRegistry.findItemStack("harvestcraft", "limejuiceItem", 1) }, null, - new ItemStack[] {EarlGrayTea.get(1)}, + new ItemStack[] { EarlGrayTea.get(1) }, null, 100, 32); GameRegistry.addSmelting(GreenTeaLeaf.get(1), GreenTea.get(1), 10); GT_Values.RA.addMixerRecipe( - new ItemStack[] {BlackTea.get(1)}, - new FluidStack[] {FluidRegistry.getFluidStack("potion.lemonjuice", 1000)}, - new ItemStack[] {LemonTea.get(1)}, + new ItemStack[] { BlackTea.get(1) }, + new FluidStack[] { FluidRegistry.getFluidStack("potion.lemonjuice", 1000) }, + new ItemStack[] { LemonTea.get(1) }, null, 100, 32); GT_Values.RA.addMixerRecipe( - new ItemStack[] {BlackTea.get(1)}, - new FluidStack[] {FluidRegistry.getFluidStack("milk", 1000)}, - new ItemStack[] {MilkTea.get(1)}, + new ItemStack[] { BlackTea.get(1) }, + new FluidStack[] { FluidRegistry.getFluidStack("milk", 1000) }, + new ItemStack[] { MilkTea.get(1) }, null, 100, 32); GameRegistry.addSmelting(OolongTeaLeaf.get(1), OolongTea.get(1), 10); GT_Values.RA.addMixerRecipe( - new ItemStack[] {GameRegistry.findItemStack("harvestcraft", "peppermintItem", 1)}, - new FluidStack[] {FluidRegistry.getFluidStack("water", 1000)}, - new ItemStack[] {PeppermintTea.get(1)}, + new ItemStack[] { GameRegistry.findItemStack("harvestcraft", "peppermintItem", 1) }, + new FluidStack[] { FluidRegistry.getFluidStack("water", 1000) }, + new ItemStack[] { PeppermintTea.get(1) }, null, 100, 32); @@ -275,17 +270,15 @@ public class RecipeLoader { GT_Values.RA.addAssemblylineRecipe( TeaAcceptorResearchNote.get(1), 10000, - new Object[] { - LegendaryUltimateTea.get(0), - GameRegistry.findItemStack("Avaritia", "Neutronium_Compressor", 1), - gregtech.api.enums.ItemList.Quantum_Tank_EV.get(1), - CustomItemList.FluidExtractorUHV.get(10), - new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, - new Object[] {OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L}, - }, - new FluidStack[] {FluidRegistry.getFluidStack("molten.indalloy140", 28800)}, + new Object[] { LegendaryUltimateTea.get(0), + GameRegistry.findItemStack("Avaritia", "Neutronium_Compressor", 1), + gregtech.api.enums.ItemList.Quantum_Tank_EV.get(1), + CustomItemList.FluidExtractorUHV.get(10), + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }, + new Object[] { OrePrefixes.circuit.get(Materials.SuperconductorUHV), 4L }, }, + new FluidStack[] { FluidRegistry.getFluidStack("molten.indalloy140", 28800) }, TeaAcceptor.get(1), 6000, 2_048_000); -- cgit From a12768cd189fcbca175295a948291a81f8c4d350 Mon Sep 17 00:00:00 2001 From: Jakub <53441451+kuba6000@users.noreply.github.com> Date: Fri, 17 Mar 2023 18:53:13 +0100 Subject: Show progress bar when generating mob recipe map (#59) * Show progress bar when generating mob recipe map * test * Check for BLS * Process on server start * Buildscript --- src/main/java/kubatech/loaders/RecipeLoader.java | 1 - 1 file changed, 1 deletion(-) (limited to 'src/main/java/kubatech/loaders/RecipeLoader.java') diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index dc70c183e8..c8241e7f0c 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -134,7 +134,6 @@ public class RecipeLoader { if (lateRecipesInitialized) return; lateRecipesInitialized = true; - MobRecipeLoader.generateMobRecipeMap(); MobRecipeLoader.processMobRecipeMap(); } -- cgit