diff options
author | boubou19 <miisterunknown@gmail.com> | 2023-04-09 01:08:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-09 01:08:26 +0200 |
commit | 26caa265b7eae49767947e1ff4e6cfc8166b07f5 (patch) | |
tree | 0fc0332da7a843cf153bf75fcc2e20601bbf18ee /src/main/java/gtPlusPlus/plugin | |
parent | c33b3ba66194c7441fbd437530d21a51aa4395d5 (diff) | |
download | GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.tar.gz GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.tar.bz2 GT5-Unofficial-26caa265b7eae49767947e1ff4e6cfc8166b07f5.zip |
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 <miozune@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/plugin')
5 files changed, 18 insertions, 12 deletions
diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index c2d1bb58b6..b9f48562ab 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -1,5 +1,8 @@ package gtPlusPlus.plugin.agrichem; +import static gregtech.api.enums.Mods.Forestry; +import static gregtech.api.enums.Mods.Railcraft; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; @@ -26,7 +29,6 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.recipe.common.CI; @@ -378,7 +380,7 @@ public class BioRecipes { 30); // Add Charcoal Recipe - if (LoadedMods.Railcraft) { + if (Railcraft.isModLoaded()) { RailcraftUtils.addCokeOvenRecipe( ItemUtils.getSimpleStack(AgriculturalChem.mWoodPellet, 2), true, @@ -957,7 +959,7 @@ public class BioRecipes { private static void recipeCompost() { ItemStack aFert; - if (LoadedMods.Forestry) { + if (Forestry.isModLoaded()) { aFert = ItemUtils.getSimpleStack(AgriculturalChem.aFertForestry, 32); CORE.RA.addChemicalPlantRecipe( new ItemStack[] { getBioChip(11), 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) { 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); diff --git a/src/main/java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java b/src/main/java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java index af63ab1307..2e050f411d 100644 --- a/src/main/java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java +++ b/src/main/java/gtPlusPlus/plugin/waila/Core_WailaPlugin.java @@ -1,7 +1,8 @@ package gtPlusPlus.plugin.waila; +import static gregtech.api.enums.Mods.Waila; + import gtPlusPlus.api.interfaces.IPlugin; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.plugin.manager.Core_Manager; public class Core_WailaPlugin implements IPlugin { @@ -20,7 +21,7 @@ public class Core_WailaPlugin implements IPlugin { @Override public boolean preInit() { - if (LoadedMods.Waila) { + if (Waila.isModLoaded()) { mActive = true; } return mActive; |