diff options
author | Jordan Byrne <draknyte1@hotmail.com> | 2018-04-01 07:30:12 +1000 |
---|---|---|
committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-04-01 07:30:12 +1000 |
commit | 01a27512f6abce74ae21ad769a4235b50cc21b3e (patch) | |
tree | 773947d8937acfe9bcce63600dbd36530ff3ac33 /src/Java | |
parent | 1716ff95d34268567852174b9b01539bbda86210 (diff) | |
download | GT5-Unofficial-01a27512f6abce74ae21ad769a4235b50cc21b3e.tar.gz GT5-Unofficial-01a27512f6abce74ae21ad769a4235b50cc21b3e.tar.bz2 GT5-Unofficial-01a27512f6abce74ae21ad769a4235b50cc21b3e.zip |
$ Fixed module not using correct ID.
Diffstat (limited to 'src/Java')
3 files changed, 2 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java b/src/Java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java index 9791e0b5ac..d575c4925f 100644 --- a/src/Java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java +++ b/src/Java/gtPlusPlus/xmod/sc2/HANDLER_SC2.java @@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.sc2.items.ItemCartModuleEx; import vswe.stevescarts.Items.ItemCartModule; import vswe.stevescarts.ModuleData.ModuleData; import vswe.stevescarts.ModuleData.ModuleDataLoader; @@ -19,7 +18,7 @@ import vswe.stevescarts.ModuleData.ModuleDataLoader; public class HANDLER_SC2 { private static final String MODITEMS = "vswe.stevescarts.Items.ModItems"; - private static Class MODITEMSCLASS; + private static Class<?> MODITEMSCLASS; public static ItemCartModule modules; @SuppressWarnings("unchecked") diff --git a/src/Java/gtPlusPlus/xmod/sc2/modules/workers/tools/ModuleExoticFarmer.java b/src/Java/gtPlusPlus/xmod/sc2/modules/workers/tools/ModuleExoticFarmer.java index 4122f0bc16..065c2efdd9 100644 --- a/src/Java/gtPlusPlus/xmod/sc2/modules/workers/tools/ModuleExoticFarmer.java +++ b/src/Java/gtPlusPlus/xmod/sc2/modules/workers/tools/ModuleExoticFarmer.java @@ -10,7 +10,6 @@ import net.minecraft.world.IBlockAccess; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.gregtech.common.helpers.TreeFarmHelper; -import gtPlusPlus.xmod.sc2.modules.IExoticCropModule; import gtPlusPlus.xmod.sc2.slots.SlotExoticSeed; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.IPlantable; diff --git a/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java b/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java index bc57f8a500..85e91e9122 100644 --- a/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java +++ b/src/Java/vswe/stevescarts/ModuleData/ModuleDataLoader.java @@ -27,10 +27,9 @@ public class ModuleDataLoader { public static void load() { HashMap<Byte, ModuleData> u = getList(); if (u.size() < Byte.MAX_VALUE) { - int mNextFreeID = u.size()+1; ID_ExoticFarmer= 105; final ModuleDataGroup farmerGroup = new ModuleDataGroup(vswe.stevescarts.Helpers.Localization.MODULE_INFO.FARMER_GROUP); - final ModuleData farmerExotic = new ModuleDataTool(mNextFreeID, "Exotic Farmer", + final ModuleData farmerExotic = new ModuleDataTool(ID_ExoticFarmer, "Exotic Farmer", (Class<? extends ModuleBase>) ModuleExoticFarmerUpgraded.class, 75, true) .addSide(SIDE.FRONT).addRecipe(new Object[][]{ {ComponentTypes.GALGADORIAN_METAL.getItemStack(), |