CleanUp, improven Crate Model, and add IModelState parameter to the model baker

This commit is contained in:
Nedelosk committed 2016-05-06 19:00:58 +02:00
1 parent 03c1c26258
commit 898860975a
58 files changed
+282 -271

No files matched your search

@@ -18,7 +18,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
import forestry.api.storage.ICrateRegistry;
import forestry.core.items.ItemCrated;
import forestry.core.models.ModelManager;
import forestry.core.proxy.Proxies;
import forestry.core.utils.ItemStackUtil;
import forestry.core.utils.Log;
@@ -37,7 +36,6 @@ public class CrateRegistry implements ICrateRegistry {
crate.setUnlocalizedName(crateName);
GameRegistry.registerItem(crate, crateName);
Proxies.common.registerItem(crate);
Proxies.render.registerModelCrate(crate);
PluginStorage.registerCrate(crate);
}
@@ -32,6 +32,7 @@ import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
@@ -66,10 +67,14 @@ import forestry.plugins.BlankForestryPlugin;
import forestry.plugins.ForestryPlugin;
import forestry.plugins.ForestryPluginUids;
import forestry.storage.items.ItemRegistryStorage;
import forestry.storage.proxy.ProxyStorage;
@ForestryPlugin(pluginID = ForestryPluginUids.STORAGE, name = "Storage", author = "SirSengir", url = Constants.URL, unlocalizedDescription = "for.plugin.storage.description")
public class PluginStorage extends BlankForestryPlugin {
@SidedProxy(clientSide = "forestry.storage.proxy.ProxyStorageClient", serverSide = "forestry.storage.proxy.ProxyStorage")
public static ProxyStorage proxy;
private static final List<ItemCrated> crates = new ArrayList<>();
private static final String CONFIG_CATEGORY = "backpacks";
@@ -115,6 +120,8 @@ public class PluginStorage extends BlankForestryPlugin {
definition = new BackpackDefinition(new Color(0xdd3a3a));
BackpackManager.backpackInterface.registerBackpack(BackpackManager.BUILDER_UID, definition);
proxy.registerCrateModel();
}
@Override
@@ -0,0 +1,8 @@
package forestry.storage.proxy;
public class ProxyStorage {
public void registerCrateModel(){
}
}
@@ -0,0 +1,16 @@
package forestry.storage.proxy;
import forestry.core.models.ModelCrate;
import forestry.core.models.ModelIndex;
import forestry.core.proxy.Proxies;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
public class ProxyStorageClient extends ProxyStorage {
@Override
public void registerCrateModel() {
ModelResourceLocation modelLocation = new ModelResourceLocation("forestry:crate-filled", "crate-filled");
Proxies.render.registerModel(new ModelIndex(modelLocation, new ModelCrate()));
}
}