De-enum GeneticsItems, create ETItems

This commit is contained in:
ah-OOG-ah committed 2024-09-29 19:14:10 -04:00
1 parent 27c13f7758
commit 033f536462
31 files changed
+348 -363

No files matched your search

+20 -15
View File
@@ -3,12 +3,6 @@ package binnie.extratrees;
import static binnie.extratrees.ExtraTrees.EB_MOD_NAME;
import static binnie.extratrees.ExtraTrees.ET_MODID;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import com.gtnewhorizon.gtnhlib.config.ConfigException;
import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
import binnie.core.AbstractMod;
import binnie.core.BinnieCore;
import binnie.core.Tags;
@@ -30,11 +24,16 @@ import binnie.extratrees.item.ModuleItems;
import binnie.extratrees.machines.ModuleMachine;
import binnie.extratrees.nei.IMCForNEI;
import binnie.extratrees.proxy.Proxy;
import com.gtnewhorizon.gtnhlib.config.ConfigException;
import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
@Mod(
modid = ET_MODID,
@@ -45,7 +44,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
guiFactory = "binnie.extratrees.config.ETConfigGUIFactory")
public class ExtraTrees extends AbstractMod {
public static final String ET_MODID = "ExtraTrees";
public static final String ET_MODID = "extratrees";
public static final String EB_MOD_NAME = "Extra Trees";
@Mod.Instance("ExtraTrees")
@@ -62,10 +61,6 @@ public class ExtraTrees extends AbstractMod {
}
}
public static Item itemDictionary;
public static Item itemDictionaryLepi;
public static Item itemMisc;
public static Item itemFood;
public static Block blockStairs;
public static Block blockLog;
public static BlockCarpentry blockCarpentry;
@@ -76,8 +71,6 @@ public class ExtraTrees extends AbstractMod {
public static BlockCarpentry blockPanel;
public static Block blockSlab;
public static Block blockDoubleSlab;
public static Item itemHammer;
public static Item itemDurableHammer;
public static Block blockGate;
public static Block blockDoor;
public static BlockMultiFence blockMultiFence;
@@ -114,6 +107,19 @@ public class ExtraTrees extends AbstractMod {
postInit();
}
@Mod.EventHandler
public void missingMappings(FMLMissingMappingsEvent event) {
for (FMLMissingMappingsEvent.MissingMapping m : event.getAll()) {
final String[] name = m.name.split(":");
if (name.length < 2) continue;
if (name[0].equals("ExtraTrees")) {
if (m.type == GameRegistry.Type.BLOCK) m.remap(GameRegistry.findBlock(ET_MODID, name[1]));
else m.remap(GameRegistry.findItem(ET_MODID, name[1]));
}
}
}
@Override
public IBinnieGUID[] getGUIDs() {
return ExtraTreesGUID.values();
@@ -129,10 +135,9 @@ public class ExtraTrees extends AbstractMod {
return ExtraTrees.proxy;
}
// Concerningly, this isn't the same as the MODID
@Override
public String getModID() {
return "extratrees";
return ET_MODID;
}
@Override