Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-12-23 11:49:23 +01:00
Code Issues Projects Releases Wiki Activity

Fixed a stupid bug with me being stupid. Whoops.

Browse source
This commit is contained in:
Ellpeck 2015-08-26 19:33:35 +02:00
parent 9484d4c1aa
commit e934a812bd
8 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ellpeck/actuallyadditions/blocks/BlockCoffeeMachine.java
View file

@ -5,8 +5,8 @@ import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.actuallyadditions.ActuallyAdditions; import ellpeck.actuallyadditions.ActuallyAdditions;
import ellpeck.actuallyadditions.config.values.ConfigIntValues; import ellpeck.actuallyadditions.config.values.ConfigIntValues;
import ellpeck.actuallyadditions.inventory.GuiHandler; import ellpeck.actuallyadditions.inventory.GuiHandler;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine; import ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine;
import ellpeck.actuallyadditions.util.AssetUtil;
import ellpeck.actuallyadditions.util.BlockUtil; import ellpeck.actuallyadditions.util.BlockUtil;
import ellpeck.actuallyadditions.util.INameableItem; import ellpeck.actuallyadditions.util.INameableItem;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@ -81,7 +81,7 @@ public class BlockCoffeeMachine extends BlockContainerBase implements INameableI
@Override @Override
public int getRenderType(){ public int getRenderType(){
return ClientProxy.COFFEE_MACHINE_RENDER_ID; return AssetUtil.COFFEE_MACHINE_RENDER_ID;
} }
@Override @Override

4
src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java
View file

@ -6,8 +6,8 @@ import ellpeck.actuallyadditions.config.values.ConfigIntValues;
import ellpeck.actuallyadditions.items.ItemFertilizer; import ellpeck.actuallyadditions.items.ItemFertilizer;
import ellpeck.actuallyadditions.items.ItemMisc; import ellpeck.actuallyadditions.items.ItemMisc;
import ellpeck.actuallyadditions.items.metalists.TheMiscItems; import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import ellpeck.actuallyadditions.tile.TileEntityCompost; import ellpeck.actuallyadditions.tile.TileEntityCompost;
import ellpeck.actuallyadditions.util.AssetUtil;
import ellpeck.actuallyadditions.util.BlockUtil; import ellpeck.actuallyadditions.util.BlockUtil;
import ellpeck.actuallyadditions.util.INameableItem; import ellpeck.actuallyadditions.util.INameableItem;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@ -105,7 +105,7 @@ public class BlockCompost extends BlockContainerBase implements INameableItem{
@Override @Override
public int getRenderType(){ public int getRenderType(){
return ClientProxy.COMPOST_RENDER_ID; return AssetUtil.COMPOST_RENDER_ID;
} }
@Override @Override

4
src/main/java/ellpeck/actuallyadditions/blocks/BlockFishingNet.java
View file

@ -2,8 +2,8 @@ package ellpeck.actuallyadditions.blocks;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import ellpeck.actuallyadditions.tile.TileEntityFishingNet; import ellpeck.actuallyadditions.tile.TileEntityFishingNet;
import ellpeck.actuallyadditions.util.AssetUtil;
import ellpeck.actuallyadditions.util.BlockUtil; import ellpeck.actuallyadditions.util.BlockUtil;
import ellpeck.actuallyadditions.util.INameableItem; import ellpeck.actuallyadditions.util.INameableItem;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@ -59,7 +59,7 @@ public class BlockFishingNet extends BlockContainerBase implements INameableItem
@Override @Override
public int getRenderType(){ public int getRenderType(){
return ClientProxy.FISHING_NET_RENDER_ID; return AssetUtil.FISHING_NET_RENDER_ID;
} }
@Override @Override

4
src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceSolar.java
View file

@ -3,8 +3,8 @@ package ellpeck.actuallyadditions.blocks;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.actuallyadditions.config.values.ConfigIntValues; import ellpeck.actuallyadditions.config.values.ConfigIntValues;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import ellpeck.actuallyadditions.tile.TileEntityFurnaceSolar; import ellpeck.actuallyadditions.tile.TileEntityFurnaceSolar;
import ellpeck.actuallyadditions.util.AssetUtil;
import ellpeck.actuallyadditions.util.BlockUtil; import ellpeck.actuallyadditions.util.BlockUtil;
import ellpeck.actuallyadditions.util.INameableItem; import ellpeck.actuallyadditions.util.INameableItem;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@ -60,7 +60,7 @@ public class BlockFurnaceSolar extends BlockContainerBase implements INameableIt
@Override @Override
public int getRenderType(){ public int getRenderType(){
return ClientProxy.FURNACE_SOLAR_RENDER_ID; return AssetUtil.FURNACE_SOLAR_RENDER_ID;
} }
@Override @Override

4
src/main/java/ellpeck/actuallyadditions/blocks/BlockPhantomBooster.java
View file

@ -2,8 +2,8 @@ package ellpeck.actuallyadditions.blocks;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import ellpeck.actuallyadditions.tile.TileEntityPhantomBooster; import ellpeck.actuallyadditions.tile.TileEntityPhantomBooster;
import ellpeck.actuallyadditions.util.AssetUtil;
import ellpeck.actuallyadditions.util.BlockUtil; import ellpeck.actuallyadditions.util.BlockUtil;
import ellpeck.actuallyadditions.util.INameableItem; import ellpeck.actuallyadditions.util.INameableItem;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@ -45,7 +45,7 @@ public class BlockPhantomBooster extends BlockContainerBase implements INameable
@Override @Override
public int getRenderType(){ public int getRenderType(){
return ClientProxy.PHANTOM_BOOSTER_RENDER_ID; return AssetUtil.PHANTOM_BOOSTER_RENDER_ID;
} }
@Override @Override

4
src/main/java/ellpeck/actuallyadditions/blocks/BlockSmileyCloud.java
View file

@ -4,8 +4,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import ellpeck.actuallyadditions.ActuallyAdditions; import ellpeck.actuallyadditions.ActuallyAdditions;
import ellpeck.actuallyadditions.inventory.GuiHandler; import ellpeck.actuallyadditions.inventory.GuiHandler;
import ellpeck.actuallyadditions.proxy.ClientProxy;
import ellpeck.actuallyadditions.tile.TileEntitySmileyCloud; import ellpeck.actuallyadditions.tile.TileEntitySmileyCloud;
import ellpeck.actuallyadditions.util.AssetUtil;
import ellpeck.actuallyadditions.util.BlockUtil; import ellpeck.actuallyadditions.util.BlockUtil;
import ellpeck.actuallyadditions.util.INameableItem; import ellpeck.actuallyadditions.util.INameableItem;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@ -97,7 +97,7 @@ public class BlockSmileyCloud extends BlockContainerBase implements INameableIte
@Override @Override
public int getRenderType(){ public int getRenderType(){
return ClientProxy.SMILEY_CLOUD_RENDER_ID; return AssetUtil.SMILEY_CLOUD_RENDER_ID;
} }
@Override @Override

20
src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java
View file

@ -11,6 +11,7 @@ import ellpeck.actuallyadditions.config.values.ConfigIntValues;
import ellpeck.actuallyadditions.event.RenderPlayerEventAA; import ellpeck.actuallyadditions.event.RenderPlayerEventAA;
import ellpeck.actuallyadditions.tile.*; import ellpeck.actuallyadditions.tile.*;
import ellpeck.actuallyadditions.update.UpdateChecker; import ellpeck.actuallyadditions.update.UpdateChecker;
import ellpeck.actuallyadditions.util.AssetUtil;
import ellpeck.actuallyadditions.util.ModUtil; import ellpeck.actuallyadditions.util.ModUtil;
import ellpeck.actuallyadditions.util.Util; import ellpeck.actuallyadditions.util.Util;
import net.minecraft.item.Item; import net.minecraft.item.Item;
@ -20,13 +21,6 @@ import net.minecraftforge.client.MinecraftForgeClient;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class ClientProxy implements IProxy{ public class ClientProxy implements IProxy{
public static int COMPOST_RENDER_ID;
public static int FISHING_NET_RENDER_ID;
public static int FURNACE_SOLAR_RENDER_ID;
public static int COFFEE_MACHINE_RENDER_ID;
public static int PHANTOM_BOOSTER_RENDER_ID;
public static int SMILEY_CLOUD_RENDER_ID;
@Override @Override
public void preInit(){ public void preInit(){
ModUtil.LOGGER.info("PreInitializing ClientProxy..."); ModUtil.LOGGER.info("PreInitializing ClientProxy...");
@ -40,12 +34,12 @@ public class ClientProxy implements IProxy{
public void init(){ public void init(){
ModUtil.LOGGER.info("Initializing ClientProxy..."); ModUtil.LOGGER.info("Initializing ClientProxy...");
COMPOST_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); AssetUtil.COMPOST_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
FISHING_NET_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); AssetUtil.FISHING_NET_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
FURNACE_SOLAR_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); AssetUtil.FURNACE_SOLAR_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
COFFEE_MACHINE_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); AssetUtil.COFFEE_MACHINE_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
PHANTOM_BOOSTER_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); AssetUtil.PHANTOM_BOOSTER_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
SMILEY_CLOUD_RENDER_ID = RenderingRegistry.getNextAvailableRenderId(); AssetUtil.SMILEY_CLOUD_RENDER_ID = RenderingRegistry.getNextAvailableRenderId();
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCompost.class, new RenderTileEntity(new ModelCompost())); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCompost.class, new RenderTileEntity(new ModelCompost()));
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(InitBlocks.blockCompost), new RenderItems(new ModelCompost())); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(InitBlocks.blockCompost), new RenderItems(new ModelCompost()));

7
src/main/java/ellpeck/actuallyadditions/util/AssetUtil.java
View file

@ -15,6 +15,13 @@ import net.minecraft.util.ResourceLocation;
public class AssetUtil{ public class AssetUtil{
public static int COMPOST_RENDER_ID;
public static int FISHING_NET_RENDER_ID;
public static int FURNACE_SOLAR_RENDER_ID;
public static int COFFEE_MACHINE_RENDER_ID;
public static int PHANTOM_BOOSTER_RENDER_ID;
public static int SMILEY_CLOUD_RENDER_ID;
public static final ResourceLocation GUI_INVENTORY_LOCATION = getGuiLocation("guiInventory"); public static final ResourceLocation GUI_INVENTORY_LOCATION = getGuiLocation("guiInventory");
public static ResourceLocation getGuiLocation(String file){ public static ResourceLocation getGuiLocation(String file){