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 --- src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/java/gtPlusPlus/plugin/villagers') diff --git a/src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java b/src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java index 5d1b36b134..6a39fb0166 100644 --- a/src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java +++ b/src/main/java/gtPlusPlus/plugin/villagers/VillagerObject.java @@ -1,10 +1,11 @@ package gtPlusPlus.plugin.villagers; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.util.ResourceLocation; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.lib.CORE; public class VillagerObject { @@ -29,7 +30,7 @@ public class VillagerObject { if (aSkin instanceof String) { String s = (String) aSkin; - aSkin = new ResourceLocation(CORE.MODID + ":" + "textures/entity/villager/" + s + ".png"); + aSkin = new ResourceLocation(GTPlusPlus.ID + ":" + "textures/entity/villager/" + s + ".png"); } if (aSkin instanceof ResourceLocation) { Core_VillagerAdditions.mVillagerSkins.put(aID, (ResourceLocation) aSkin); -- cgit