From 26caa265b7eae49767947e1ff4e6cfc8166b07f5 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sun, 9 Apr 2023 01:08:26 +0200 Subject: clean up GT++ code (#589) * yeet big reactor support * yeet IC2 classic support * yeet pneumaticraft support * yeet More Planets support * yeet Immersive Engineering support * yeet Psychedilicraft support * yeet Beyond Reality Core support * sort mods to see what must be purged * yeet simply jetpacks * yeet RFTools * yeet xReliquary * yeet RedTech * yeet Mekanism * yeet GrowthCraft * yeet ihl * leftover cleaning * yeet thermal fondation support * yeet compact windmills support * spotless * remove constants from LoadedMods (part 1 / 2) * spotless * remove constants from LoadedMods (part 2 / 2) * use mod id enum instead of strings + optimize imports * Loaded.isModLoaded -> enum * restore RA init * missing ! * start organizing recipes stuff * fix crash on world load in dev * remove unused class * remove HazmatUtils.java * move all the removals * remove enableHarderRecipesForHighTierCasings and usages(disabled in the pack) * move some pyrolyse oven recipes to its own file * sa * bump GT version * bump GT5U version * spotless apply * use Everglades entry from the mod enum --------- Co-authored-by: miozune Co-authored-by: Martin Robertz --- .../gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java | 5 +++-- .../java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/main/java/gtPlusPlus/plugin/agrichem/item/algae') diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java index d7c2b36598..17e0ccf4e9 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAgrichemBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.plugin.agrichem.item.algae; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.List; @@ -19,7 +21,6 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.OreDictUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; @@ -149,7 +150,7 @@ public class ItemAgrichemBase extends Item { @Override public void registerIcons(final IIconRegister u) { for (int i = 0; i < this.base.length; i++) { - String aPath = CORE.MODID + ":" + "bioscience/MetaItem1/" + i; + String aPath = GTPlusPlus.ID + ":" + "bioscience/MetaItem1/" + i; this.base[i] = u.registerIcon(aPath); } } diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java index 6940e0a466..6aae34fdf1 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.plugin.agrichem.item.algae; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,7 +18,6 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.plugin.agrichem.AlgaeDefinition; import gtPlusPlus.plugin.agrichem.IAlgalItem; @@ -161,8 +162,8 @@ public class ItemAlgaeBase extends Item implements IAlgalItem { @Override public void registerIcons(final IIconRegister i) { - this.base = i.registerIcon(CORE.MODID + ":" + "bioscience/BasicAlgae"); - this.overlay = i.registerIcon(CORE.MODID + ":" + "bioscience/BasicAlgae" + "_Overlay"); + this.base = i.registerIcon(GTPlusPlus.ID + ":" + "bioscience/BasicAlgae"); + this.overlay = i.registerIcon(GTPlusPlus.ID + ":" + "bioscience/BasicAlgae" + "_Overlay"); } public static ItemStack initNBT(ItemStack aFreshAlgae) { -- cgit