From d7dd256c7b23cb21613fa6de690d79c309f1b072 Mon Sep 17 00:00:00 2001 From: glowredman <35727266+glowredman@users.noreply.github.com> Date: Sat, 14 Oct 2023 15:23:37 +0200 Subject: Small cleanup (#100) * Use llamalad's `@ModifyReturnValue` * Prefix mixin methods with "kubatech$" * Address some warnings * Remove dead code --- src/main/java/kubatech/loaders/RecipeLoader.java | 20 -------------------- src/main/java/kubatech/loaders/TCLoader.java | 1 + src/main/java/kubatech/loaders/item/ItemProxy.java | 5 +---- 3 files changed, 2 insertions(+), 24 deletions(-) (limited to 'src/main/java/kubatech/loaders') diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java index a2b5c472eb..8b52707e32 100644 --- a/src/main/java/kubatech/loaders/RecipeLoader.java +++ b/src/main/java/kubatech/loaders/RecipeLoader.java @@ -67,9 +67,6 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import com.dreammaster.gthandler.CustomItemList; import cpw.mods.fml.common.registry.GameRegistry; @@ -80,7 +77,6 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.lib.CORE; -import kubatech.Tags; import kubatech.api.LoaderReference; import kubatech.api.enums.ItemList; import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber; @@ -89,7 +85,6 @@ import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_MegaIndustrialA 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; @@ -157,21 +152,6 @@ 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) { - 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"); diff --git a/src/main/java/kubatech/loaders/TCLoader.java b/src/main/java/kubatech/loaders/TCLoader.java index ae30b87988..2422ff0533 100644 --- a/src/main/java/kubatech/loaders/TCLoader.java +++ b/src/main/java/kubatech/loaders/TCLoader.java @@ -62,6 +62,7 @@ public class TCLoader { private static InfusionRecipe ultimateTeaRecipe = null; + @SuppressWarnings("unchecked") private static void registerRecipe() { if (ultimateTeaRecipe != null) return; final ItemStack[] components = new ItemStack[] { diff --git a/src/main/java/kubatech/loaders/item/ItemProxy.java b/src/main/java/kubatech/loaders/item/ItemProxy.java index a8d7124a65..4e37175cd7 100644 --- a/src/main/java/kubatech/loaders/item/ItemProxy.java +++ b/src/main/java/kubatech/loaders/item/ItemProxy.java @@ -66,16 +66,13 @@ public class ItemProxy { private final String unlocalizedName; private final String texturepath; private IIcon icon; - private int itemID; public ItemProxy(String unlocalizedName, String texture) { this.unlocalizedName = "kubaitem." + unlocalizedName; texturepath = Tags.MODID + ":" + texture; } - public void ItemInit(int index) { - itemID = index; - } + public void ItemInit(int index) {} public String getUnlocalizedName() { return unlocalizedName; -- cgit