mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-21 04:32:24 +00:00
Improve .gitignore and Adding ModelManager like that from Forestry
This commit is contained in:
1 parent
ce2629a9f4
commit
2adc2e3562
33 files changed
+361
-92
No files matched your search
@@ -10,7 +10,6 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
|
||||
|
||||
public class BinnieModProxy implements IBinnieModProxy {
|
||||
private AbstractMod mod;
|
||||
|
||||
@@ -2,7 +2,6 @@ package binnie.core.proxy;
|
||||
|
||||
import binnie.core.AbstractMod;
|
||||
import binnie.core.BinnieCore;
|
||||
import binnie.core.item.IColoredItem;
|
||||
import binnie.core.network.BinnieCorePacketID;
|
||||
import binnie.core.network.INetworkedEntity;
|
||||
import binnie.core.network.packet.MessageUpdate;
|
||||
@@ -29,10 +28,16 @@ public class BinnieProxy extends BinnieModProxy implements IBinnieProxy {
|
||||
super(BinnieCore.instance);
|
||||
this.uniqueTextureUID = 1200;
|
||||
}
|
||||
|
||||
public void registerItemColors(IColoredItem itemColor) {
|
||||
|
||||
|
||||
public Item registerItem(Item item){
|
||||
return GameRegistry.register(item);
|
||||
}
|
||||
|
||||
public void registerModels() {
|
||||
}
|
||||
|
||||
public void registerItemAndBlockColors() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void preInit() {
|
||||
|
||||
@@ -1,15 +1,12 @@
|
||||
package binnie.core.proxy;
|
||||
|
||||
import binnie.core.item.IColoredItem;
|
||||
import binnie.core.machines.RendererMachine;
|
||||
import binnie.core.machines.TileEntityMachine;
|
||||
import binnie.core.models.ModelManager;
|
||||
import binnie.core.resource.BinnieResource;
|
||||
import binnie.craftgui.resource.minecraft.CraftGUIResourceManager;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.client.renderer.color.ItemColors;
|
||||
import net.minecraft.client.renderer.texture.ITextureObject;
|
||||
import net.minecraft.client.renderer.texture.SimpleTexture;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
@@ -17,7 +14,6 @@ import net.minecraft.client.resources.IReloadableResourceManager;
|
||||
import net.minecraft.client.resources.IResourceManager;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.World;
|
||||
@@ -25,8 +21,6 @@ import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.fml.client.FMLClientHandler;
|
||||
import net.minecraftforge.fml.client.registry.ClientRegistry;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
@@ -34,37 +28,28 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
public final class BinnieProxyClient extends BinnieProxy implements IBinnieProxy {
|
||||
public void registerItemColors(IColoredItem itemColor) {
|
||||
ItemColors itemColors = Minecraft.getMinecraft().getItemColors();
|
||||
if (itemColor instanceof Item) {
|
||||
itemColors.registerItemColorHandler(ColoredItemItemColor.INSTANCE, (Item) itemColor);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item registerItem(Item item) {
|
||||
ModelManager.getInstance().registerItemClient(item);
|
||||
return super.registerItem(item);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerModels() {
|
||||
ModelManager.getInstance().registerModels();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerItemAndBlockColors() {
|
||||
ModelManager.getInstance().registerItemAndBlockColors();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerIcon(ResourceLocation location) {
|
||||
Minecraft.getMinecraft().getTextureMapBlocks().registerSprite(location);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private static class ColoredItemItemColor implements IItemColor {
|
||||
public static final ColoredItemItemColor INSTANCE = new ColoredItemItemColor();
|
||||
|
||||
private ColoredItemItemColor() {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColorFromItemstack(ItemStack stack, int tintIndex) {
|
||||
Item item = stack.getItem();
|
||||
if (item instanceof IColoredItem) {
|
||||
return ((IColoredItem) item).getColorFromItemstack(stack, tintIndex);
|
||||
}
|
||||
return 0xffffff;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void registermodel(Item item, int meta) {
|
||||
registermodel(item, meta, new ModelResourceLocation(item.getRegistryName(), "inventory"));
|
||||
|
||||
Reference in new issue
Block a user