Dis game is ass - More textures

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java

@@ -11,6 +11,7 @@
 package de.ellpeck.actuallyadditions.mod.blocks;
 
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
 import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
 import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors;
@@ -28,6 +29,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
@@ -133,6 +135,18 @@ public class BlockColoredLamp extends BlockBase{
         return EnumRarity.RARE;
     }
 
+    @Override
+    protected void registerRendering(){
+        ResourceLocation[] resLocs = new ResourceLocation[allLampTypes.length];
+        for(int i = 0; i < allLampTypes.length; i++){
+            String name = this.getBaseName()+allLampTypes[i].name;
+            resLocs[i] = new ResourceLocation(ModUtil.MOD_ID_LOWER, name);
+            ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ResourceLocation(ModUtil.MOD_ID_LOWER, name));
+        }
+        ActuallyAdditions.proxy.addRenderVariant(Item.getItemFromBlock(this), resLocs);
+    }
+
+
     public static class TheItemBlock extends ItemBlockBase{
 
         public TheItemBlock(Block block){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java

@@ -10,9 +10,9 @@
 
 package de.ellpeck.actuallyadditions.mod.blocks.base;
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyInteger;
@@ -20,6 +20,7 @@ import net.minecraft.block.state.BlockState;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 public class BlockBase extends Block{
@@ -43,7 +44,11 @@ public class BlockBase extends Block{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java

@@ -10,15 +10,16 @@
 
 package de.ellpeck.actuallyadditions.mod.blocks.base;
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.BlockBush;
 import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.BlockState;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 public class BlockBushBase extends BlockBush{
@@ -41,7 +42,11 @@ public class BlockBushBase extends BlockBush{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java

@@ -10,6 +10,7 @@
 
 package de.ellpeck.actuallyadditions.mod.blocks.base;
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.tile.*;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
@@ -31,6 +32,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
@@ -60,7 +62,11 @@ public abstract class BlockContainerBase extends BlockContainer{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java

@@ -11,14 +11,15 @@
 package de.ellpeck.actuallyadditions.mod.blocks.base;
 
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.PosUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.BlockFluidClassic;
@@ -47,7 +48,11 @@ public class BlockFluidFlowing extends BlockFluidClassic{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java

@@ -10,15 +10,16 @@
 
 package de.ellpeck.actuallyadditions.mod.blocks.base;
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.BlockCrops;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.EnumPlantType;
@@ -53,7 +54,11 @@ public class BlockPlant extends BlockCrops{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java

@@ -11,13 +11,14 @@
 package de.ellpeck.actuallyadditions.mod.blocks.base;
 
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockStairs;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 public class BlockStair extends BlockStairs{
@@ -46,7 +47,11 @@ public class BlockStair extends BlockStairs{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java

@@ -10,9 +10,9 @@
 
 package de.ellpeck.actuallyadditions.mod.blocks.base;
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockWall;
 import net.minecraft.block.state.IBlockState;
@@ -20,6 +20,7 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -53,7 +54,11 @@ public class BlockWallAA extends BlockWall{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java

@@ -361,10 +361,10 @@ public class GuiBooklet extends GuiScreen implements IBookletGui{
     public void handleMouseInput() throws IOException{
         int wheel = Mouse.getEventDWheel();
         if(wheel != 0){
-            if(wheel > 0){
+            if(wheel < 0){
                 BookletUtils.handleNextPage(this);
             }
-            else if(wheel < 0){
+            else if(wheel > 0){
                 BookletUtils.handlePreviousPage(this);
             }
         }

src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAllToolAA.java

@@ -11,11 +11,11 @@
 package de.ellpeck.actuallyadditions.mod.items.base;
 
 import com.google.common.collect.Sets;
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.config.ConfigValues;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockDirt;
 import net.minecraft.block.material.Material;
@@ -27,6 +27,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemTool;
 import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.event.ForgeEventFactory;
 import net.minecraftforge.fml.common.registry.GameRegistry;
@@ -76,7 +77,11 @@ public class ItemAllToolAA extends ItemTool{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java

@@ -10,13 +10,14 @@
 
 package de.ellpeck.actuallyadditions.mod.items.base;
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 public class ItemArmorAA extends ItemArmor{
@@ -48,7 +49,11 @@ public class ItemArmorAA extends ItemArmor{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAxeAA.java

@@ -10,13 +10,14 @@
 
 package de.ellpeck.actuallyadditions.mod.items.base;
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemAxe;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 public class ItemAxeAA extends ItemAxe{
@@ -45,7 +46,11 @@ public class ItemAxeAA extends ItemAxe{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java

@@ -10,10 +10,12 @@
 
 package de.ellpeck.actuallyadditions.mod.items.base;
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 
@@ -37,7 +39,11 @@ public class ItemBase extends Item{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBucketAA.java

@@ -10,14 +10,15 @@
 
 package de.ellpeck.actuallyadditions.mod.items.base;
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;
 import net.minecraft.init.Items;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemBucket;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 public class ItemBucketAA extends ItemBucket{
@@ -42,7 +43,11 @@ public class ItemBucketAA extends ItemBucket{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java

@@ -11,14 +11,15 @@
 package de.ellpeck.actuallyadditions.mod.items.base;
 
 import cofh.api.energy.ItemEnergyContainer;
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.relauncher.Side;
@@ -49,7 +50,11 @@ public abstract class ItemEnergy extends ItemEnergyContainer{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java

@@ -10,10 +10,12 @@
 
 package de.ellpeck.actuallyadditions.mod.items.base;
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 
@@ -38,7 +40,11 @@ public class ItemFoodBase extends ItemFood{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java

@@ -10,14 +10,15 @@
 
 package de.ellpeck.actuallyadditions.mod.items.base;
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemHoe;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 public class ItemHoeAA extends ItemHoe{
@@ -46,7 +47,11 @@ public class ItemHoeAA extends ItemHoe{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemPickaxeAA.java

@@ -10,13 +10,14 @@
 
 package de.ellpeck.actuallyadditions.mod.items.base;
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemPickaxe;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 public class ItemPickaxeAA extends ItemPickaxe{
@@ -45,7 +46,11 @@ public class ItemPickaxeAA extends ItemPickaxe{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemShovelAA.java

@@ -10,14 +10,15 @@
 
 package de.ellpeck.actuallyadditions.mod.items.base;
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemSpade;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 public class ItemShovelAA extends ItemSpade{
@@ -46,7 +47,11 @@ public class ItemShovelAA extends ItemSpade{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java

@@ -10,14 +10,15 @@
 
 package de.ellpeck.actuallyadditions.mod.items.base;
 
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
 import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemSword;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
 public class ItemSwordAA extends ItemSword{
@@ -46,7 +47,11 @@ public class ItemSwordAA extends ItemSword{
             this.setCreativeTab(null);
         }
 
-        Util.ITEMS_AND_BLOCKS.add(this);
+        this.registerRendering();
+    }
+
+    protected void registerRendering(){
+        ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName()));
     }
 
     protected String getBaseName(){

src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java

@@ -22,28 +22,30 @@ import de.ellpeck.actuallyadditions.mod.misc.special.SpecialRenderInit;
 import de.ellpeck.actuallyadditions.mod.tile.*;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import de.ellpeck.actuallyadditions.mod.util.playerdata.PersistentClientData;
-import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.ItemModelMesher;
+import net.minecraft.client.resources.model.ModelBakery;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 @SuppressWarnings("unused")
 public class ClientProxy implements IProxy{
 
+    private static Map<ItemStack, ResourceLocation> modelLocationsForRegistering = new HashMap<ItemStack, ResourceLocation>();
+    private static Map<Item, ResourceLocation[]> modelVariantsForRegistering = new HashMap<Item, ResourceLocation[]>();
+
     public static boolean pumpkinBlurPumpkinBlur;
     public static boolean jingleAllTheWay;
     public static boolean bulletForMyValentine;
@@ -63,6 +65,10 @@ public class ClientProxy implements IProxy{
         }
 
         PersistentClientData.setTheFile(new File(Minecraft.getMinecraft().mcDataDir, ModUtil.MOD_ID+"Data.dat"));
+
+        for(Map.Entry<Item, ResourceLocation[]> entry : modelVariantsForRegistering.entrySet()){
+            ModelBakery.registerItemVariants(entry.getKey(), entry.getValue());
+        }
     }
 
     @Override
@@ -84,27 +90,8 @@ public class ClientProxy implements IProxy{
         //TODO Fix villager
         //VillagerRegistry.instance().registerVillagerSkin(ConfigIntValues.JAM_VILLAGER_ID.getValue(), new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/entity/villager/jamVillager.png"));
 
-        for(Object o : Util.ITEMS_AND_BLOCKS){
+        for(Map.Entry<ItemStack, ResourceLocation> entry : modelLocationsForRegistering.entrySet()){
-
+            Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(entry.getKey().getItem(), entry.getKey().getItemDamage(), new ModelResourceLocation(entry.getValue(), "inventory"));
-            ItemStack stack = null;
-            if(o instanceof Item){
-                stack = new ItemStack((Item)o);
-            }
-            else if(o instanceof Block){
-                stack = new ItemStack((Block)o);
-            }
-
-            if(stack != null){
-                ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher();
-                String name = stack.getItem().getRegistryName();
-
-                List<ItemStack> subItems = new ArrayList<ItemStack>();
-                stack.getItem().getSubItems(stack.getItem(), null, subItems);
-
-                for(ItemStack aStack : subItems){
-                    mesher.register(aStack.getItem(), aStack.getItemDamage(), new ModelResourceLocation(name, "inventory"));
-                }
-            }
         }
     }
 
@@ -115,6 +102,16 @@ public class ClientProxy implements IProxy{
         SpecialRenderInit.init();
     }
 
+    @Override
+    public void addRenderRegister(ItemStack stack, ResourceLocation location){
+        modelLocationsForRegistering.put(stack, location);
+    }
+
+    @Override
+    public void addRenderVariant(Item item, ResourceLocation[] location){
+        modelVariantsForRegistering.put(item, location);
+    }
+
     private static void registerRenderer(Class<? extends TileEntity> tileClass, RenderTileEntity tileRender, int renderID){
         ClientRegistry.bindTileEntitySpecialRenderer(tileClass, tileRender);
         //TODO Fix inventory rendering

src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java

@@ -10,6 +10,9 @@
 
 package de.ellpeck.actuallyadditions.mod.proxy;
 
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -21,4 +24,8 @@ public interface IProxy{
     void init(FMLInitializationEvent event);
 
     void postInit(FMLPostInitializationEvent event);
+
+    void addRenderRegister(ItemStack stack, ResourceLocation location);
+
+    void addRenderVariant(Item item, ResourceLocation[] location);
 }

src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java

@@ -11,6 +11,9 @@
 package de.ellpeck.actuallyadditions.mod.proxy;
 
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -32,4 +35,14 @@ public class ServerProxy implements IProxy{
     public void postInit(FMLPostInitializationEvent event){
         ModUtil.LOGGER.info("PostInitializing ServerProxy...");
     }
+
+    @Override
+    public void addRenderRegister(ItemStack stack, ResourceLocation location){
+
+    }
+
+    @Override
+    public void addRenderVariant(Item item, ResourceLocation[] location){
+
+    }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java

@@ -24,15 +24,12 @@ import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.EnumHelper;
 import net.minecraftforge.oredict.OreDictionary;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
 @SuppressWarnings("unused")
 public class Util{
 
-    public static final List ITEMS_AND_BLOCKS = new ArrayList();
-
     public static final Random RANDOM = new Random();
     public static final int WILDCARD = OreDictionary.WILDCARD_VALUE;
 

src/main/resources/assets/actuallyadditions/blockstates/blockAtomicReconstructor.json

@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "meta=0": { "model": "actuallyadditions:blockAtomicReconstructor", "x": 90 },
+    "meta=1": { "model": "actuallyadditions:blockAtomicReconstructor", "x": -90 },
+    "meta=2": { "model": "actuallyadditions:blockAtomicReconstructor", "y": 0 },
+    "meta=3": { "model": "actuallyadditions:blockAtomicReconstructor", "y": 180 },
+    "meta=4": { "model": "actuallyadditions:blockAtomicReconstructor", "y": 270 },
+    "meta=5": { "model": "actuallyadditions:blockAtomicReconstructor", "y": 90 }
+  }
+}

src/main/resources/assets/actuallyadditions/blockstates/blockColoredLamp.json

@@ -0,0 +1,20 @@
+{
+  "variants": {
+    "meta=0": { "model": "actuallyadditions:blockColoredLampWhite" },
+    "meta=1": { "model": "actuallyadditions:blockColoredLampOrange" },
+    "meta=2": { "model": "actuallyadditions:blockColoredLampMagenta" },
+    "meta=3": { "model": "actuallyadditions:blockColoredLampLightBlue" },
+    "meta=4": { "model": "actuallyadditions:blockColoredLampYellow" },
+    "meta=5": { "model": "actuallyadditions:blockColoredLampLime" },
+    "meta=6": { "model": "actuallyadditions:blockColoredLampPink" },
+    "meta=7": { "model": "actuallyadditions:blockColoredLampGray" },
+    "meta=8": { "model": "actuallyadditions:blockColoredLampLightGray" },
+    "meta=9": { "model": "actuallyadditions:blockColoredLampCyan" },
+    "meta=10": { "model": "actuallyadditions:blockColoredLampPurple" },
+    "meta=11": { "model": "actuallyadditions:blockColoredLampBlue" },
+    "meta=12": { "model": "actuallyadditions:blockColoredLampBrown" },
+    "meta=13": { "model": "actuallyadditions:blockColoredLampGreen" },
+    "meta=14": { "model": "actuallyadditions:blockColoredLampRed" },
+    "meta=15": { "model": "actuallyadditions:blockColoredLampBlack" }
+  }
+}

src/main/resources/assets/actuallyadditions/blockstates/blockColoredLampOn.json

@@ -0,0 +1,20 @@
+{
+  "variants": {
+    "meta=0": { "model": "actuallyadditions:blockColoredLampWhiteOn" },
+    "meta=1": { "model": "actuallyadditions:blockColoredLampOrangeOn" },
+    "meta=2": { "model": "actuallyadditions:blockColoredLampMagentaOn" },
+    "meta=3": { "model": "actuallyadditions:blockColoredLampLightBlueOn" },
+    "meta=4": { "model": "actuallyadditions:blockColoredLampYellowOn" },
+    "meta=5": { "model": "actuallyadditions:blockColoredLampLimeOn" },
+    "meta=6": { "model": "actuallyadditions:blockColoredLampPinkOn" },
+    "meta=7": { "model": "actuallyadditions:blockColoredLampGrayOn" },
+    "meta=8": { "model": "actuallyadditions:blockColoredLampLightGrayOn" },
+    "meta=9": { "model": "actuallyadditions:blockColoredLampCyanOn" },
+    "meta=10": { "model": "actuallyadditions:blockColoredLampPurpleOn" },
+    "meta=11": { "model": "actuallyadditions:blockColoredLampBlueOn" },
+    "meta=12": { "model": "actuallyadditions:blockColoredLampBrownOn" },
+    "meta=13": { "model": "actuallyadditions:blockColoredLampGreenOn" },
+    "meta=14": { "model": "actuallyadditions:blockColoredLampRedOn" },
+    "meta=15": { "model": "actuallyadditions:blockColoredLampBlackOn" }
+  }
+}

src/main/resources/assets/actuallyadditions/blockstates/blockFireworkBox.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "normal": { "model": "actuallyadditions:blockFireworkBox" }
+  }
+}

src/main/resources/assets/actuallyadditions/blockstates/blockInputter.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "normal": { "model": "actuallyadditions:blockInputter" }
+  }
+}

src/main/resources/assets/actuallyadditions/blockstates/blockInputterAdvanced.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "normal": { "model": "actuallyadditions:blockInputterAdvanced" }
+  }
+}

src/main/resources/assets/actuallyadditions/blockstates/blockPhantomBreaker.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "normal": { "model": "actuallyadditions:blockPhantomBreaker" }
+  }
+}

src/main/resources/assets/actuallyadditions/blockstates/blockPhantomEnergyface.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "normal": { "model": "actuallyadditions:blockPhantomEnergyface" }
+  }
+}

src/main/resources/assets/actuallyadditions/blockstates/blockPhantomLiquiface.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "normal": { "model": "actuallyadditions:blockPhantomLiquiface" }
+  }
+}

src/main/resources/assets/actuallyadditions/blockstates/blockPhantomPlacer.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "normal": { "model": "actuallyadditions:blockPhantomPlacer" }
+  }
+}

src/main/resources/assets/actuallyadditions/blockstates/blockPhantomface.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "normal": { "model": "actuallyadditions:blockPhantomface" }
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockAtomicReconstructor.json

@@ -0,0 +1,12 @@
+{
+  "parent": "block/cube",
+  "textures": {
+    "particle": "actuallyadditions:blocks/blockAtomicReconstructor",
+    "down": "actuallyadditions:blocks/blockAtomicReconstructorTop",
+    "up": "actuallyadditions:blocks/blockAtomicReconstructorTop",
+    "north": "actuallyadditions:blocks/blockAtomicReconstructorFront",
+    "east": "actuallyadditions:blocks/blockAtomicReconstructor",
+    "south": "actuallyadditions:blocks/blockAtomicReconstructor",
+    "west": "actuallyadditions:blocks/blockAtomicReconstructor"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlack.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampBlack"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlackOn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOnBlack"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlue.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampBlue"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlueOn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOnBlue"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBrown.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampBrown"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBrownOn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOnBrown"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampCyan.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampCyan"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampCyanOn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOnCyan"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGray.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampGray"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGrayOn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOnGray"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGreen.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampGreen"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGreenOn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOnGreen"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightBlue.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampLightBlue"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightBlueOn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOnLightBlue"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightGray.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampLightGray"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightGrayOn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOnLightGray"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLime.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampLime"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLimeOn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOnLime"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampMagenta.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampMagenta"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampMagentaOn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOnMagenta"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampOrange.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOrange"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampOrangeOn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOnOrange"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPink.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampPink"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPinkOn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOnPink"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPurple.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampPurple"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPurpleOn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOnPurple"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampRed.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampRed"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampRedOn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOnRed"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampWhite.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampWhite"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampWhiteOn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOnWhite"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampYellow.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampYellow"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockColoredLampYellowOn.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockColoredLampOnYellow"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockFireworkBox.json

@@ -0,0 +1,12 @@
+{
+  "parent": "block/cube",
+  "textures": {
+    "particle": "actuallyadditions:blocks/blockFireworkBox",
+    "down": "actuallyadditions:blocks/blockFireworkBox",
+    "up": "actuallyadditions:blocks/blockFireworkBoxTop",
+    "north": "actuallyadditions:blocks/blockFireworkBox",
+    "east": "actuallyadditions:blocks/blockFireworkBox",
+    "south": "actuallyadditions:blocks/blockFireworkBox",
+    "west": "actuallyadditions:blocks/blockFireworkBox"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockInputter.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockInputter"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockInputterAdvanced.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockInputterAdvanced"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockPhantomBreaker.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockPhantomBreaker"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockPhantomEnergyface.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockPhantomEnergyface"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockPhantomLiquiface.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockPhantomLiquiface"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockPhantomPlacer.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockPhantomPlacer"
+  }
+}

src/main/resources/assets/actuallyadditions/models/block/blockPhantomface.json

@@ -0,0 +1,6 @@
+{
+  "parent": "block/cube_all",
+  "textures": {
+    "all": "actuallyadditions:blocks/blockPhantomface"
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockAtomicReconstructor.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockAtomicReconstructor",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockColoredLampBlack.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockColoredLampBlack",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockColoredLampBlue.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockColoredLampBlue",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockColoredLampBrown.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockColoredLampBrown",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockColoredLampCyan.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockColoredLampCyan",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockColoredLampGray.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockColoredLampGray",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockColoredLampGreen.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockColoredLampGreen",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockColoredLampLightBlue.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockColoredLampLightBlue",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockColoredLampLightGray.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockColoredLampGray",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockColoredLampLime.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockColoredLampLime",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockColoredLampMagenta.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockColoredLampMagenta",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOrange.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockColoredLampOrange",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockColoredLampPink.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockColoredLampPink",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockColoredLampPurple.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockColoredLampPurple",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockColoredLampWhite.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockColoredLampWhite-",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockColoredLampYellow.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockColoredLampYellow",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockFireworkBox.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockFireworkBox",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockInputter.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockInputter",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockInputterAdvanced.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockInputterAdvanced",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockPhantomBreaker.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockPhantomBreaker",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockPhantomEnergyface.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockPhantomEnergyface",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockPhantomLiquiface.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockPhantomLiquiface",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockPhantomPlacer.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockPhantomPlacer",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}

src/main/resources/assets/actuallyadditions/models/item/blockPhantomface.json

@@ -0,0 +1,10 @@
+{
+  "parent": "actuallyadditions:block/blockPhantomface",
+  "display": {
+    "thirdperson": {
+      "rotation": [ 10, -45, 170 ],
+      "translation": [ 0, 1.5, -2.75 ],
+      "scale": [ 0.375, 0.375, 0.375 ]
+    }
+  }
+}