diff options
| author | Jakub <53441451+kuba6000@users.noreply.github.com> | 2022-08-29 16:04:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-29 16:04:28 +0200 |
| commit | 7d1f51a8937e0a86486267437d444696e81e8aa0 (patch) | |
| tree | a5b145e7271998f7b4b968a2212ed487e54a92b5 /src/main/java/gtPlusPlus/xmod/reliquary/util | |
| parent | 5267969156d30b4bb5f4cb2279ebb49db6bd40e2 (diff) | |
| download | GT5-Unofficial-7d1f51a8937e0a86486267437d444696e81e8aa0.tar.gz GT5-Unofficial-7d1f51a8937e0a86486267437d444696e81e8aa0.tar.bz2 GT5-Unofficial-7d1f51a8937e0a86486267437d444696e81e8aa0.zip | |
Buildscript + Spotless (#318)
* Convert AES.java to readable class
* Buildscript
* Spotless
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/reliquary/util')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java | 77 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java | 90 |
2 files changed, 94 insertions, 73 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java b/src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java index 6086b74ec4..1418a8d086 100644 --- a/src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java +++ b/src/main/java/gtPlusPlus/xmod/reliquary/util/AlkahestRecipeWrapper.java @@ -1,47 +1,52 @@ package gtPlusPlus.xmod.reliquary.util; +import gtPlusPlus.core.util.reflect.ReflectionUtils; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; - -import gtPlusPlus.core.util.reflect.ReflectionUtils; import net.minecraft.item.ItemStack; public class AlkahestRecipeWrapper { - public ItemStack item = null; - public int yield = 0; - public int cost = 0; - public String dictionaryName = null; + public ItemStack item = null; + public int yield = 0; + public int cost = 0; + public String dictionaryName = null; + + public AlkahestRecipeWrapper(ItemStack par1, int par2, int par3) { + this.item = par1; + this.yield = par2; + this.cost = par3; + } - public AlkahestRecipeWrapper(ItemStack par1, int par2, int par3) { - this.item = par1; - this.yield = par2; - this.cost = par3; - } + public AlkahestRecipeWrapper(String par1, int par2, int par3) { + this.dictionaryName = par1; + this.yield = par2; + this.cost = par3; + } - public AlkahestRecipeWrapper(String par1, int par2, int par3) { - this.dictionaryName = par1; - this.yield = par2; - this.cost = par3; - } + public Object getOriginalRecipe() { + try { + Constructor<?> o; + if (dictionaryName == null) { + o = ReflectionUtils.getClass("xreliquary.util.alkahestry.AlkahestRecipe") + .getConstructor(ItemStack.class, int.class, int.class); + } else { + o = ReflectionUtils.getClass("xreliquary.util.alkahestry.AlkahestRecipe") + .getConstructor(String.class, int.class, int.class); + } - public Object getOriginalRecipe() { - try { - Constructor<?> o; - if (dictionaryName == null) { - o = ReflectionUtils.getClass("xreliquary.util.alkahestry.AlkahestRecipe").getConstructor(ItemStack.class, int.class, int.class); - } - else { - o = ReflectionUtils.getClass("xreliquary.util.alkahestry.AlkahestRecipe").getConstructor(String.class, int.class, int.class); - } - - Object r = o.newInstance(dictionaryName == null ? item : dictionaryName, yield, cost); - if (r != null) { - return r; - } + Object r = o.newInstance(dictionaryName == null ? item : dictionaryName, yield, cost); + if (r != null) { + return r; + } - } catch (NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - // oops - } - return null; - } -}
\ No newline at end of file + } catch (NoSuchMethodException + | SecurityException + | InstantiationException + | IllegalAccessException + | IllegalArgumentException + | InvocationTargetException e) { + // oops + } + return null; + } +} diff --git a/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java index 1133e67fe6..c0f19fecbc 100644 --- a/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java +++ b/src/main/java/gtPlusPlus/xmod/reliquary/util/ReliquaryRecipeHandler.java @@ -16,41 +16,57 @@ import net.minecraft.item.ItemStack; public class ReliquaryRecipeHandler { - public static boolean removeAlkahestRecipe(ItemStack aOutput) { - return false; - } - - public static boolean addAlkahestRecipe(ItemStack[] aInputs, ItemStack aOutput) { - if (aInputs == null || aInputs.length <= 0 || aInputs.length > 9) { - return false; - } - return false; - } - - public static void gregifyDefaultRecipes() { - Logger.INFO("Gregifying Reliquary recipes."); - if (GT_ModHandler.removeRecipeByOutput(ReliquaryItems.glowingWater())) { - Logger.INFO("Removing recipe for Glowing Water."); - } - if (GT_ModHandler.removeRecipeByOutput(ReliquaryItems.emptyVoidTear())) { - Logger.INFO("Removing recipe for Empty Void Tears."); - } - if (GT_ModHandler.removeRecipeByOutput(ReliquaryItems.emperorChalice())) { - Logger.INFO("Removing recipe for the Emperor Chalice."); - } - if (GT_ModHandler.removeRecipeByOutput(ReliquaryItems.infernalChalice())) { - Logger.INFO("Removing recipe for the Infernal Chalice."); - } - Logger.INFO("Finished removing original recipes."); - - // Add new recipes - if (CORE.RA.addChemicalRecipe(ALLOY.ENERGYCRYSTAL.getDust(4), ReliquaryItems.emptyVial(), FluidUtils.getHotWater(2000), null, ReliquaryItems.glowingWater(), 20 * 30, 500)) { - Logger.INFO("Added new recipe for Glowing Water."); - } - if (CORE.RA.addSixSlotAssemblingRecipe(new ItemStack[] {ItemUtils.simpleMetaStack(Items.ender_eye, 0, 32), CI.getFieldGenerator(5, GTNH ? 8 : 4), CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 16 : 8), CI.getEmitter(3, 20)}, FluidUtils.getUUM(50), ReliquaryItems.emptyVoidTear(), 20 * 2000, 2000)){ - Logger.INFO("Added new recipe for Empty Void Tears."); - } - Logger.INFO("Finished adding new recipes."); - - } + public static boolean removeAlkahestRecipe(ItemStack aOutput) { + return false; + } + + public static boolean addAlkahestRecipe(ItemStack[] aInputs, ItemStack aOutput) { + if (aInputs == null || aInputs.length <= 0 || aInputs.length > 9) { + return false; + } + return false; + } + + public static void gregifyDefaultRecipes() { + Logger.INFO("Gregifying Reliquary recipes."); + if (GT_ModHandler.removeRecipeByOutput(ReliquaryItems.glowingWater())) { + Logger.INFO("Removing recipe for Glowing Water."); + } + if (GT_ModHandler.removeRecipeByOutput(ReliquaryItems.emptyVoidTear())) { + Logger.INFO("Removing recipe for Empty Void Tears."); + } + if (GT_ModHandler.removeRecipeByOutput(ReliquaryItems.emperorChalice())) { + Logger.INFO("Removing recipe for the Emperor Chalice."); + } + if (GT_ModHandler.removeRecipeByOutput(ReliquaryItems.infernalChalice())) { + Logger.INFO("Removing recipe for the Infernal Chalice."); + } + Logger.INFO("Finished removing original recipes."); + + // Add new recipes + if (CORE.RA.addChemicalRecipe( + ALLOY.ENERGYCRYSTAL.getDust(4), + ReliquaryItems.emptyVial(), + FluidUtils.getHotWater(2000), + null, + ReliquaryItems.glowingWater(), + 20 * 30, + 500)) { + Logger.INFO("Added new recipe for Glowing Water."); + } + if (CORE.RA.addSixSlotAssemblingRecipe( + new ItemStack[] { + ItemUtils.simpleMetaStack(Items.ender_eye, 0, 32), + CI.getFieldGenerator(5, GTNH ? 8 : 4), + CI.getTieredComponent(OrePrefixes.plate, 5, GTNH ? 16 : 8), + CI.getEmitter(3, 20) + }, + FluidUtils.getUUM(50), + ReliquaryItems.emptyVoidTear(), + 20 * 2000, + 2000)) { + Logger.INFO("Added new recipe for Empty Void Tears."); + } + Logger.INFO("Finished adding new recipes."); + } } |
