aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/ic2
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-04-09 01:08:26 +0200
committerGitHub <noreply@github.com>2023-04-09 01:08:26 +0200
commit26caa265b7eae49767947e1ff4e6cfc8166b07f5 (patch)
tree0fc0332da7a843cf153bf75fcc2e20601bbf18ee /src/main/java/gtPlusPlus/xmod/ic2
parentc33b3ba66194c7441fbd437530d21a51aa4395d5 (diff)
downloadGT5-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/xmod/ic2')
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java15
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java12
6 files changed, 27 insertions, 19 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java
index 192e7f41d5..475d8d5feb 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/HANDLER_IC2.java
@@ -9,8 +9,6 @@ public class HANDLER_IC2 {
IC2_Items.register();
}
- public static void init() {}
-
public static void postInit() {
RECIPE_IC2.initRecipes();
}
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java
index f86562f1de..50787c0828 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java
@@ -17,7 +17,10 @@ import cpw.mods.fml.relauncher.SideOnly;
import ic2.api.energy.tile.IKineticSource;
import ic2.api.item.IKineticRotor;
import ic2.api.item.IKineticRotor.GearboxType;
-import ic2.core.*;
+import ic2.core.ContainerBase;
+import ic2.core.IC2;
+import ic2.core.IHasGui;
+import ic2.core.WorldData;
import ic2.core.block.invslot.InvSlotConsumableKineticRotor;
import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator;
import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator;
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java b/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java
index 8dafc12de8..ceaa330e4f 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/CustomKineticRotor.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.ic2.item;
+import static gregtech.api.enums.Mods.EnderIO;
+
import java.util.List;
import net.minecraft.client.Minecraft;
@@ -14,7 +16,6 @@ import net.minecraft.util.StatCollector;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.core.lib.LoadedMods;
import ic2.api.item.IKineticRotor;
import ic2.core.IC2;
import ic2.core.block.kineticgenerator.gui.GuiWaterKineticGenerator;
@@ -56,7 +57,7 @@ public class CustomKineticRotor extends Item implements IKineticRotor {
mTier = aTier;
this.setMaxStackSize(1);
// Handle Differences if EIO is not loaded
- if (!LoadedMods.EnderIO && (aTier == 0 || aTier == 2)) {
+ if (!EnderIO.isModLoaded() && (aTier == 0 || aTier == 2)) {
this.renderTexture = mResourceLocations[(aTier == 0 ? 4 : 5)];
this.setUnlocalizedName(mUnlocalNames[(aTier == 0 ? 4 : 5)]);
} else {
@@ -152,7 +153,7 @@ public class CustomKineticRotor extends Item implements IKineticRotor {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int meta) {
- if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) {
+ if (!EnderIO.isModLoaded() && (mTier == 0 || mTier == 2)) {
if (mTier == 0) {
return mTextures[4];
} else {
@@ -166,7 +167,7 @@ public class CustomKineticRotor extends Item implements IKineticRotor {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconIndex(ItemStack aIndex) {
- if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) {
+ if (!EnderIO.isModLoaded() && (mTier == 0 || mTier == 2)) {
if (mTier == 0) {
return mTextures[4];
} else {
@@ -180,7 +181,7 @@ public class CustomKineticRotor extends Item implements IKineticRotor {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamageForRenderPass(int aDmg, int aPass) {
- if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) {
+ if (!EnderIO.isModLoaded() && (mTier == 0 || mTier == 2)) {
if (mTier == 0) {
return mTextures[4];
} else {
@@ -209,7 +210,7 @@ public class CustomKineticRotor extends Item implements IKineticRotor {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) {
- if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) {
+ if (!EnderIO.isModLoaded() && (mTier == 0 || mTier == 2)) {
if (mTier == 0) {
return mTextures[4];
} else {
@@ -223,7 +224,7 @@ public class CustomKineticRotor extends Item implements IKineticRotor {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(ItemStack stack, int pass) {
- if (!LoadedMods.EnderIO && (mTier == 0 || mTier == 2)) {
+ if (!EnderIO.isModLoaded() && (mTier == 0 || mTier == 2)) {
if (mTier == 0) {
return mTextures[4];
} else {
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
index e3401dcbc8..98846e6950 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_ItemIC2.java
@@ -1,5 +1,7 @@
package gtPlusPlus.xmod.ic2.item;
+import static gregtech.api.enums.Mods.GTPlusPlus;
+
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -10,14 +12,13 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.core.creative.AddToCreativeTab;
-import gtPlusPlus.core.lib.CORE;
public class IC2_ItemIC2 extends Item {
public IC2_ItemIC2(final String internalName) {
this.setUnlocalizedName(internalName);
this.setCreativeTab(AddToCreativeTab.tabMachines);
- this.setTextureName(CORE.MODID + ":" + internalName);
+ this.setTextureName(GTPlusPlus.ID + ":" + internalName);
GameRegistry.registerItem(this, internalName);
}
@@ -35,7 +36,7 @@ public class IC2_ItemIC2 extends Item {
* (getTextureName(indexCount) != null) { indexCount++; if (indexCount > 32767) { throw new
* RuntimeException("More Item Icons than actually possible @ " + getUnlocalizedName()); } } this.textures = new
* IIcon[indexCount]; for (int index = 0; index < indexCount; index++) { this.textures[index] =
- * iconRegister.registerIcon(CORE.MODID + ":" + getUnlocalizedName()); } }
+ * iconRegister.registerIcon(GTPlusPlus.ID + ":" + getUnlocalizedName()); } }
* @Override
* @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int meta) { if (meta < this.textures.length) { return
* this.textures[meta]; } return this.textures.length < 1 ? null : this.textures[0]; }
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
index 87dbd83e65..c4ca148920 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java
@@ -1,11 +1,12 @@
package gtPlusPlus.xmod.ic2.item;
+import static gregtech.api.enums.Mods.EnderIO;
+
import net.minecraft.item.ItemStack;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.item.base.CoreItem;
import gtPlusPlus.core.item.wearable.hazmat.ItemArmorHazmatEx;
-import gtPlusPlus.core.lib.LoadedMods;
public class IC2_Items {
@@ -34,7 +35,7 @@ public class IC2_Items {
public static void register() {
- int aIndexEIO = (LoadedMods.EnderIO ? 0 : 1);
+ int aIndexEIO = (EnderIO.isModLoaded() ? 0 : 1);
// Rotor Blades
rotor_Blade_Material_1 = new ItemStack(
diff --git a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
index 730ef865fc..d07f1f6314 100644
--- a/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
+++ b/src/main/java/gtPlusPlus/xmod/ic2/recipe/RECIPE_IC2.java
@@ -1,17 +1,21 @@
package gtPlusPlus.xmod.ic2.recipe;
-import static gtPlusPlus.core.recipe.RECIPES_Tools.*;
+import static gregtech.api.enums.Mods.EnderIO;
+import static gtPlusPlus.core.recipe.RECIPES_Tools.craftingToolHardHammer;
+import static gtPlusPlus.core.recipe.RECIPES_Tools.craftingToolWrench;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
-import gregtech.api.enums.*;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.recipe.common.CI;
@@ -65,7 +69,7 @@ public class RECIPE_IC2 {
private static ItemStack rotor_T4 = ItemUtils.getSimpleStack(IC2_Items.rotor_Material_4.getItem());
private static boolean checkForEnderIO() {
- if (!LoadedMods.EnderIO) {
+ if (!EnderIO.isModLoaded()) {
plate_T1 = "plateMagnalium";
plate_T2 = "plateTungstenSteel";
plate_T3 = "plateUltimet";