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/nei | |
| 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/nei')
4 files changed, 18 insertions, 13 deletions
diff --git a/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java b/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java index dc566d9896..b31a0639db 100644 --- a/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java +++ b/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java @@ -1,6 +1,8 @@ package gtPlusPlus.nei; -import java.awt.Rectangle; +import static gregtech.api.enums.Mods.GTPlusPlus; + +import java.awt.*; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -18,7 +20,6 @@ import gtPlusPlus.core.gui.machine.GUI_DecayablesChest; import gtPlusPlus.core.handler.Recipes.DecayableRecipe; import gtPlusPlus.core.item.base.dusts.BaseItemDustUnique; import gtPlusPlus.core.item.materials.DustDecayable; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.VanillaColours; import gtPlusPlus.nei.handlers.NeiTextureHandler; @@ -31,7 +32,7 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler { } public String getGuiTexture() { - return CORE.MODID + ":textures/gui/nei/decayables.png"; + return GTPlusPlus.ID + ":textures/gui/nei/decayables.png"; } public Class<? extends GuiContainer> getGuiClass() { diff --git a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java index 75f4fa3ba0..1019c43948 100644 --- a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java +++ b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java @@ -1,6 +1,6 @@ package gtPlusPlus.nei; -import java.awt.Rectangle; +import java.awt.*; import java.lang.ref.SoftReference; import java.util.ArrayList; import java.util.Iterator; diff --git a/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java b/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java index 244fa687db..24792570a7 100644 --- a/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java +++ b/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java @@ -1,9 +1,12 @@ package gtPlusPlus.nei; +import static gregtech.api.enums.Mods.AdvancedSolarPanel; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.NotEnoughItems; + import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.event.FMLInterModComms; -import gtPlusPlus.core.lib.LoadedMods; public class NEI_IMC_Sender { @@ -59,7 +62,7 @@ public class NEI_IMC_Sender { sendHandler("gtpp.recipe.quantumforcesmelter", "gregtech:gt.blockmachines:31151"); sendCatalyst("gtpp.recipe.quantumforcesmelter", "gregtech:gt.blockmachines:31151"); - if (LoadedMods.AdvancedSolarPanel) { + if (AdvancedSolarPanel.isModLoaded()) { sendHandler("gtpp.recipe.moleculartransformer", "AdvancedSolarPanel:BlockMolecularTransformer"); sendCatalyst("gtpp.recipe.moleculartransformer", "gregtech:gt.blockmachines:31072"); } @@ -97,14 +100,14 @@ public class NEI_IMC_Sender { NBTTagCompound aNBT = new NBTTagCompound(); aNBT.setString("handler", aRecipeName); aNBT.setString("modName", "GT++"); - aNBT.setString("modId", "miscutils"); + aNBT.setString("modId", GTPlusPlus.ID); aNBT.setBoolean("modRequired", true); aNBT.setString("itemName", aBlock); aNBT.setInteger("yShift", 6); aNBT.setInteger("handlerHeight", 135); aNBT.setInteger("handlerWidth", 166); aNBT.setInteger("maxRecipesPerPage", aRecipesPerPage); - FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT); + FMLInterModComms.sendMessage(NotEnoughItems.ID, "registerHandlerInfo", aNBT); } private static void sendCatalyst(String aName, String aStack, int aPriority) { @@ -112,7 +115,7 @@ public class NEI_IMC_Sender { aNBT.setString("handlerID", aName); aNBT.setString("itemName", aStack); aNBT.setInteger("priority", aPriority); - FMLInterModComms.sendMessage("NotEnoughItems", "registerCatalystInfo", aNBT); + FMLInterModComms.sendMessage(NotEnoughItems.ID, "registerCatalystInfo", aNBT); } private static void sendCatalyst(String aName, String aStack) { @@ -123,6 +126,6 @@ public class NEI_IMC_Sender { NBTTagCompound aNBT = new NBTTagCompound(); aNBT.setString("handlerID", aName); aNBT.setString("itemName", aStack); - FMLInterModComms.sendMessage("NotEnoughItems", "removeCatalystInfo", aNBT); + FMLInterModComms.sendMessage(NotEnoughItems.ID, "removeCatalystInfo", aNBT); } } diff --git a/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java b/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java index bbc3c5b9a2..fc02e86011 100644 --- a/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java +++ b/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java @@ -1,5 +1,7 @@ package gtPlusPlus.nei.handlers; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.Tessellator; @@ -10,8 +12,6 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import gtPlusPlus.core.lib.CORE; - /** * Based on crazypants.enderio.gui.IconEIO * @@ -50,7 +50,8 @@ public final class NeiTextureHandler { public final double width; public final double height; - public static final ResourceLocation TEXTURE = new ResourceLocation(CORE.MODID + ":textures/gui/nei/widgets.png"); + public static final ResourceLocation TEXTURE = new ResourceLocation( + GTPlusPlus.ID + ":textures/gui/nei/widgets.png"); public NeiTextureHandler(int x, int y) { this(x, y, 16, 16); |
