Revert "Register render models and states directly instead of scanning GameData"

This reverts commit 72c0093856.
This commit is contained in:
mezz committed 2016-03-10 21:02:36 -08:00
1 parent 72c0093856
commit d5a45a39eb
6 files changed
+32 -36

No files matched your search

+2
View File
@@ -97,6 +97,8 @@ public class Forestry {
ForestryAPI.activeMode = new GameMode(Config.gameMode);
PluginManager.runPreInit();
Proxies.render.registerModels();
}
@EventHandler
@@ -14,18 +14,12 @@ import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.oredict.OreDictionary;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IStateMapperRegister;
import forestry.core.models.ModelManager;
import forestry.core.utils.StringUtil;
import forestry.plugins.PluginManager;
@@ -40,9 +34,6 @@ public abstract class BlockRegistry {
GameRegistry.registerBlock(block, null, name);
GameRegistry.registerItem(itemBlock, name);
allBlocks.add(block);
registerRendering(block);
return block;
}
@@ -53,23 +44,9 @@ public abstract class BlockRegistry {
block.setUnlocalizedName("for." + name);
GameRegistry.registerBlock(block, itemClass, StringUtil.cleanBlockName(block), itemCtorArgs);
allBlocks.add(block);
registerRendering(block);
return block;
}
private static void registerRendering(Block block) {
if (FMLCommonHandler.instance().getSide() == Side.CLIENT) {
if (block instanceof IItemModelRegister) {
((IItemModelRegister) block).registerModel(Item.getItemFromBlock(block), ModelManager.getInstance());
}
if (block instanceof IStateMapperRegister) {
((IStateMapperRegister) block).registerStateMapper();
}
}
}
protected static void registerOreDictWildcard(String oreDictName, Block block) {
OreDictionary.registerOre(oreDictName, new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE));
}
@@ -13,13 +13,9 @@ package forestry.core.items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.oredict.OreDictionary;
import forestry.api.core.IItemModelRegister;
import forestry.core.models.ModelManager;
import forestry.core.utils.StringUtil;
import forestry.plugins.PluginManager;
@@ -30,13 +26,6 @@ public abstract class ItemRegistry {
}
item.setUnlocalizedName("for." + name);
GameRegistry.registerItem(item, StringUtil.cleanItemName(item));
if (FMLCommonHandler.instance().getSide() == Side.CLIENT) {
if (item instanceof IItemModelRegister) {
((IItemModelRegister) item).registerModel(item, ModelManager.getInstance());
}
}
return item;
}
@@ -13,6 +13,7 @@ package forestry.core.models;
import javax.annotation.Nonnull;
import java.util.ArrayList;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelResourceLocation;
@@ -23,11 +24,14 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.fml.common.registry.GameData;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import forestry.api.core.ForestryAPI;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.api.core.IStateMapperRegister;
import forestry.core.config.Constants;
import forestry.core.utils.StringUtil;
@@ -36,8 +40,8 @@ public class ModelManager implements IModelManager {
private static final ModelManager instance = new ModelManager();
private static final ArrayList<BlockModelIndex> customBlockModels = new ArrayList<>();
private static final ArrayList<ModelIndex> customModels = new ArrayList<>();
private static final ArrayList<BlockModelIndex> customBlockModels = new ArrayList<BlockModelIndex>();
private static final ArrayList<ModelIndex> customModels = new ArrayList<ModelIndex>();
static {
ForestryAPI.modelManager = instance;
@@ -100,6 +104,22 @@ public class ModelManager implements IModelManager {
public ModelResourceLocation getModelLocation(String modID, String identifier) {
return new ModelResourceLocation(modID + ":" + identifier, "inventory");
}
public static void registerModels() {
for (Block block : GameData.getBlockRegistry()) {
if (block instanceof IItemModelRegister) {
((IItemModelRegister) block).registerModel(Item.getItemFromBlock(block), getInstance());
}
if (block instanceof IStateMapperRegister) {
((IStateMapperRegister) block).registerStateMapper();
}
}
for (Item item : GameData.getItemRegistry()) {
if (item instanceof IItemModelRegister) {
((IItemModelRegister) item).registerModel(item, getInstance());
}
}
}
public static void registerCustomModels(ModelBakeEvent event) {
IRegistry registry = event.modelRegistry;
@@ -90,6 +90,9 @@ public class ProxyRender {
public void bindTexture(ResourceLocation location) {
}
public void registerModels() {
}
/* FX */
@@ -146,6 +146,11 @@ public class ProxyRenderClient extends ProxyRender {
ModelLoader.setCustomStateMapper(block, mapper);
}
@Override
public void registerModels() {
ModelManager.registerModels();
}
private static boolean shouldSpawnParticle(World world) {
if (!Config.enableParticleFX) {
return false;