From 51872bbc23c0bd81ec6812e97b4f13eac743b7f9 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 8 Jan 2016 20:51:03 +0100 Subject: [PATCH] Dis game is ass - More textures --- .../mod/blocks/BlockColoredLamp.java | 14 ++++++ .../mod/blocks/base/BlockBase.java | 9 +++- .../mod/blocks/base/BlockBushBase.java | 9 +++- .../mod/blocks/base/BlockContainerBase.java | 8 ++- .../mod/blocks/base/BlockFluidFlowing.java | 9 +++- .../mod/blocks/base/BlockPlant.java | 9 +++- .../mod/blocks/base/BlockStair.java | 9 +++- .../mod/blocks/base/BlockWallAA.java | 9 +++- .../mod/booklet/GuiBooklet.java | 4 +- .../mod/items/base/ItemAllToolAA.java | 9 +++- .../mod/items/base/ItemArmorAA.java | 9 +++- .../mod/items/base/ItemAxeAA.java | 9 +++- .../mod/items/base/ItemBase.java | 10 +++- .../mod/items/base/ItemBucketAA.java | 9 +++- .../mod/items/base/ItemEnergy.java | 9 +++- .../mod/items/base/ItemFoodBase.java | 10 +++- .../mod/items/base/ItemHoeAA.java | 9 +++- .../mod/items/base/ItemPickaxeAA.java | 9 +++- .../mod/items/base/ItemShovelAA.java | 9 +++- .../mod/items/base/ItemSwordAA.java | 9 +++- .../mod/proxy/ClientProxy.java | 49 +++++++++---------- .../actuallyadditions/mod/proxy/IProxy.java | 7 +++ .../mod/proxy/ServerProxy.java | 13 +++++ .../actuallyadditions/mod/util/Util.java | 3 -- .../blockstates/blockAtomicReconstructor.json | 10 ++++ .../blockstates/blockColoredLamp.json | 20 ++++++++ .../blockstates/blockColoredLampOn.json | 20 ++++++++ .../blockstates/blockFireworkBox.json | 5 ++ .../blockstates/blockInputter.json | 5 ++ .../blockstates/blockInputterAdvanced.json | 5 ++ .../blockstates/blockPhantomBreaker.json | 5 ++ .../blockstates/blockPhantomEnergyface.json | 5 ++ .../blockstates/blockPhantomLiquiface.json | 5 ++ .../blockstates/blockPhantomPlacer.json | 5 ++ .../blockstates/blockPhantomface.json | 5 ++ .../block/blockAtomicReconstructor.json | 12 +++++ .../models/block/blockColoredLampBlack.json | 6 +++ .../models/block/blockColoredLampBlackOn.json | 6 +++ .../models/block/blockColoredLampBlue.json | 6 +++ .../models/block/blockColoredLampBlueOn.json | 6 +++ .../models/block/blockColoredLampBrown.json | 6 +++ .../models/block/blockColoredLampBrownOn.json | 6 +++ .../models/block/blockColoredLampCyan.json | 6 +++ .../models/block/blockColoredLampCyanOn.json | 6 +++ .../models/block/blockColoredLampGray.json | 6 +++ .../models/block/blockColoredLampGrayOn.json | 6 +++ .../models/block/blockColoredLampGreen.json | 6 +++ .../models/block/blockColoredLampGreenOn.json | 6 +++ .../block/blockColoredLampLightBlue.json | 6 +++ .../block/blockColoredLampLightBlueOn.json | 6 +++ .../block/blockColoredLampLightGray.json | 6 +++ .../block/blockColoredLampLightGrayOn.json | 6 +++ .../models/block/blockColoredLampLime.json | 6 +++ .../models/block/blockColoredLampLimeOn.json | 6 +++ .../models/block/blockColoredLampMagenta.json | 6 +++ .../block/blockColoredLampMagentaOn.json | 6 +++ .../models/block/blockColoredLampOrange.json | 6 +++ .../block/blockColoredLampOrangeOn.json | 6 +++ .../models/block/blockColoredLampPink.json | 6 +++ .../models/block/blockColoredLampPinkOn.json | 6 +++ .../models/block/blockColoredLampPurple.json | 6 +++ .../block/blockColoredLampPurpleOn.json | 6 +++ .../models/block/blockColoredLampRed.json | 6 +++ .../models/block/blockColoredLampRedOn.json | 6 +++ .../models/block/blockColoredLampWhite.json | 6 +++ .../models/block/blockColoredLampWhiteOn.json | 6 +++ .../models/block/blockColoredLampYellow.json | 6 +++ .../block/blockColoredLampYellowOn.json | 6 +++ .../models/block/blockFireworkBox.json | 12 +++++ .../models/block/blockInputter.json | 6 +++ .../models/block/blockInputterAdvanced.json | 6 +++ .../models/block/blockPhantomBreaker.json | 6 +++ .../models/block/blockPhantomEnergyface.json | 6 +++ .../models/block/blockPhantomLiquiface.json | 6 +++ .../models/block/blockPhantomPlacer.json | 6 +++ .../models/block/blockPhantomface.json | 6 +++ .../models/item/blockAtomicReconstructor.json | 10 ++++ .../models/item/blockColoredLampBlack.json | 10 ++++ .../models/item/blockColoredLampBlue.json | 10 ++++ .../models/item/blockColoredLampBrown.json | 10 ++++ .../models/item/blockColoredLampCyan.json | 10 ++++ .../models/item/blockColoredLampGray.json | 10 ++++ .../models/item/blockColoredLampGreen.json | 10 ++++ .../item/blockColoredLampLightBlue.json | 10 ++++ .../item/blockColoredLampLightGray.json | 10 ++++ .../models/item/blockColoredLampLime.json | 10 ++++ .../models/item/blockColoredLampMagenta.json | 10 ++++ .../models/item/blockColoredLampOrange.json | 10 ++++ .../models/item/blockColoredLampPink.json | 10 ++++ .../models/item/blockColoredLampPurple.json | 10 ++++ .../models/item/blockColoredLampWhite.json | 10 ++++ .../models/item/blockColoredLampYellow.json | 10 ++++ .../models/item/blockFireworkBox.json | 10 ++++ .../models/item/blockInputter.json | 10 ++++ .../models/item/blockInputterAdvanced.json | 10 ++++ .../models/item/blockPhantomBreaker.json | 10 ++++ .../models/item/blockPhantomEnergyface.json | 10 ++++ .../models/item/blockPhantomLiquiface.json | 10 ++++ .../models/item/blockPhantomPlacer.json | 10 ++++ .../models/item/blockPhantomface.json | 10 ++++ 100 files changed, 775 insertions(+), 66 deletions(-) create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockAtomicReconstructor.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockColoredLamp.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockColoredLampOn.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockFireworkBox.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockInputter.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockInputterAdvanced.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockPhantomBreaker.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockPhantomEnergyface.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockPhantomLiquiface.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockPhantomPlacer.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockPhantomface.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockAtomicReconstructor.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlack.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlackOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlue.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlueOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBrown.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBrownOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampCyan.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampCyanOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGray.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGrayOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGreen.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGreenOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightBlue.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightBlueOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightGray.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightGrayOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLime.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLimeOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampMagenta.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampMagentaOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampOrange.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampOrangeOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPink.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPinkOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPurple.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPurpleOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampRed.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampRedOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampWhite.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampWhiteOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampYellow.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockColoredLampYellowOn.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockFireworkBox.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockInputter.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockInputterAdvanced.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockPhantomBreaker.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockPhantomEnergyface.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockPhantomLiquiface.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockPhantomPlacer.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockPhantomface.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockAtomicReconstructor.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampBlack.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampBlue.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampBrown.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampCyan.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampGray.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampGreen.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampLightBlue.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampLightGray.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampLime.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampMagenta.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOrange.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampPink.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampPurple.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampWhite.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockColoredLampYellow.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockFireworkBox.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockInputter.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockInputterAdvanced.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockPhantomBreaker.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockPhantomEnergyface.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockPhantomLiquiface.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockPhantomPlacer.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockPhantomface.json diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java index 628a63863..8ae5cfd8b 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockColoredLamp.java +++ b/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){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java index a30a47613..b420cb2d6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBase.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java index 2ef28c895..11bc17dc2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java index b0f17b2eb..d2497bbf1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java index 77b399785..5c27d120c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockFluidFlowing.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java index eb08d0435..a7de0e08c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java index 5e820217c..0717d9014 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockStair.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java index d2f2dc179..601cc4444 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java index 3b79372c7..ee11aa458 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java +++ b/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); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAllToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAllToolAA.java index f55898e1a..4c70b1aac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAllToolAA.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java index b6e560a42..d622568c9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemArmorAA.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAxeAA.java index 9716101a6..0d0aaac5f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemAxeAA.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java index 1b0751dd1..c06a5fea5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBase.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBucketAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBucketAA.java index 1346cf5d7..db657d632 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemBucketAA.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java index 5a4d2259d..01b3b36d0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemEnergy.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java index d1dc47c3f..963c357ed 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemFoodBase.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java index eef2dd295..15c227873 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemHoeAA.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemPickaxeAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemPickaxeAA.java index 9a063fa29..ea8a11b27 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemPickaxeAA.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemShovelAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemShovelAA.java index fbb380d8a..eab2eed72 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemShovelAA.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java index 06183f132..6f19ca07c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ItemSwordAA.java +++ b/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(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java index 8b76e26b8..012f45116 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java +++ b/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 modelLocationsForRegistering = new HashMap(); + private static Map modelVariantsForRegistering = new HashMap(); + 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 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){ - - 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 subItems = new ArrayList(); - stack.getItem().getSubItems(stack.getItem(), null, subItems); - - for(ItemStack aStack : subItems){ - mesher.register(aStack.getItem(), aStack.getItemDamage(), new ModelResourceLocation(name, "inventory")); - } - } + for(Map.Entry entry : modelLocationsForRegistering.entrySet()){ + Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(entry.getKey().getItem(), entry.getKey().getItemDamage(), new ModelResourceLocation(entry.getValue(), "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 tileClass, RenderTileEntity tileRender, int renderID){ ClientRegistry.bindTileEntitySpecialRenderer(tileClass, tileRender); //TODO Fix inventory rendering diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java index 7ad5c04c1..dbe269822 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/IProxy.java +++ b/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); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java b/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java index 46fe08e15..f11427f56 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ServerProxy.java +++ b/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){ + + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java index 36ff8f015..fff61d9e6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java +++ b/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; diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockAtomicReconstructor.json b/src/main/resources/assets/actuallyadditions/blockstates/blockAtomicReconstructor.json new file mode 100644 index 000000000..661455b79 --- /dev/null +++ b/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 } + } +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockColoredLamp.json b/src/main/resources/assets/actuallyadditions/blockstates/blockColoredLamp.json new file mode 100644 index 000000000..243dff666 --- /dev/null +++ b/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" } + } +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockColoredLampOn.json b/src/main/resources/assets/actuallyadditions/blockstates/blockColoredLampOn.json new file mode 100644 index 000000000..d798a5dd6 --- /dev/null +++ b/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" } + } +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockFireworkBox.json b/src/main/resources/assets/actuallyadditions/blockstates/blockFireworkBox.json new file mode 100644 index 000000000..3e27a417c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockFireworkBox.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "actuallyadditions:blockFireworkBox" } + } +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockInputter.json b/src/main/resources/assets/actuallyadditions/blockstates/blockInputter.json new file mode 100644 index 000000000..f61d3273e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockInputter.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "actuallyadditions:blockInputter" } + } +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockInputterAdvanced.json b/src/main/resources/assets/actuallyadditions/blockstates/blockInputterAdvanced.json new file mode 100644 index 000000000..e886cf707 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockInputterAdvanced.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "actuallyadditions:blockInputterAdvanced" } + } +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomBreaker.json b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomBreaker.json new file mode 100644 index 000000000..06951250e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomBreaker.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "actuallyadditions:blockPhantomBreaker" } + } +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomEnergyface.json b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomEnergyface.json new file mode 100644 index 000000000..8de3a8d69 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomEnergyface.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "actuallyadditions:blockPhantomEnergyface" } + } +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomLiquiface.json b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomLiquiface.json new file mode 100644 index 000000000..897bc9bab --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomLiquiface.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "actuallyadditions:blockPhantomLiquiface" } + } +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomPlacer.json b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomPlacer.json new file mode 100644 index 000000000..f3820bf15 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomPlacer.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "actuallyadditions:blockPhantomPlacer" } + } +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomface.json b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomface.json new file mode 100644 index 000000000..f4a049588 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomface.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "actuallyadditions:blockPhantomface" } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockAtomicReconstructor.json b/src/main/resources/assets/actuallyadditions/models/block/blockAtomicReconstructor.json new file mode 100644 index 000000000..fc39cc403 --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlack.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlack.json new file mode 100644 index 000000000..b58a07632 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlack.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampBlack" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlackOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlackOn.json new file mode 100644 index 000000000..3f389fa3e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlackOn.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOnBlack" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlue.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlue.json new file mode 100644 index 000000000..f7340b8aa --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlue.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampBlue" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlueOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlueOn.json new file mode 100644 index 000000000..d6be052d4 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBlueOn.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOnBlue" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBrown.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBrown.json new file mode 100644 index 000000000..be1970d85 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBrown.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampBrown" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBrownOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBrownOn.json new file mode 100644 index 000000000..9a9eaaa59 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampBrownOn.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOnBrown" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampCyan.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampCyan.json new file mode 100644 index 000000000..06e8bd035 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampCyan.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampCyan" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampCyanOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampCyanOn.json new file mode 100644 index 000000000..73872bd4a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampCyanOn.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOnCyan" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGray.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGray.json new file mode 100644 index 000000000..8d50ff038 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGray.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampGray" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGrayOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGrayOn.json new file mode 100644 index 000000000..366e9f866 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGrayOn.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOnGray" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGreen.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGreen.json new file mode 100644 index 000000000..b4458a516 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGreen.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampGreen" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGreenOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGreenOn.json new file mode 100644 index 000000000..97ef2a9be --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampGreenOn.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOnGreen" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightBlue.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightBlue.json new file mode 100644 index 000000000..879a1db86 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightBlue.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampLightBlue" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightBlueOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightBlueOn.json new file mode 100644 index 000000000..5efb5a904 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightBlueOn.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOnLightBlue" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightGray.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightGray.json new file mode 100644 index 000000000..5a5f401c6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightGray.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampLightGray" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightGrayOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightGrayOn.json new file mode 100644 index 000000000..d9a17201d --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLightGrayOn.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOnLightGray" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLime.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLime.json new file mode 100644 index 000000000..df04b90e5 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLime.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampLime" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLimeOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLimeOn.json new file mode 100644 index 000000000..963a9b4f2 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampLimeOn.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOnLime" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampMagenta.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampMagenta.json new file mode 100644 index 000000000..200bdbf98 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampMagenta.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampMagenta" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampMagentaOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampMagentaOn.json new file mode 100644 index 000000000..9971c4b0c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampMagentaOn.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOnMagenta" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampOrange.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampOrange.json new file mode 100644 index 000000000..13041fc16 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampOrange.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOrange" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampOrangeOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampOrangeOn.json new file mode 100644 index 000000000..90ba5c811 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampOrangeOn.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOnOrange" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPink.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPink.json new file mode 100644 index 000000000..b4c9148cd --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPink.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampPink" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPinkOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPinkOn.json new file mode 100644 index 000000000..c4e998ce2 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPinkOn.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOnPink" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPurple.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPurple.json new file mode 100644 index 000000000..610b96d42 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPurple.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampPurple" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPurpleOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPurpleOn.json new file mode 100644 index 000000000..018618f74 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampPurpleOn.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOnPurple" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampRed.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampRed.json new file mode 100644 index 000000000..b17078a13 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampRed.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampRed" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampRedOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampRedOn.json new file mode 100644 index 000000000..13bca6d0d --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampRedOn.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOnRed" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampWhite.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampWhite.json new file mode 100644 index 000000000..35ee994b2 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampWhite.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampWhite" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampWhiteOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampWhiteOn.json new file mode 100644 index 000000000..565ed6b5e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampWhiteOn.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOnWhite" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampYellow.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampYellow.json new file mode 100644 index 000000000..dcc68f867 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampYellow.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampYellow" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampYellowOn.json b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampYellowOn.json new file mode 100644 index 000000000..5f8c85c54 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockColoredLampYellowOn.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockColoredLampOnYellow" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockFireworkBox.json b/src/main/resources/assets/actuallyadditions/models/block/blockFireworkBox.json new file mode 100644 index 000000000..92d6f0d11 --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockInputter.json b/src/main/resources/assets/actuallyadditions/models/block/blockInputter.json new file mode 100644 index 000000000..7bc5b2f9a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockInputter.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockInputter" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockInputterAdvanced.json b/src/main/resources/assets/actuallyadditions/models/block/blockInputterAdvanced.json new file mode 100644 index 000000000..20dc95824 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockInputterAdvanced.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockInputterAdvanced" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockPhantomBreaker.json b/src/main/resources/assets/actuallyadditions/models/block/blockPhantomBreaker.json new file mode 100644 index 000000000..2f6b1a6b6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockPhantomBreaker.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockPhantomBreaker" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockPhantomEnergyface.json b/src/main/resources/assets/actuallyadditions/models/block/blockPhantomEnergyface.json new file mode 100644 index 000000000..28f93699d --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockPhantomEnergyface.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockPhantomEnergyface" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockPhantomLiquiface.json b/src/main/resources/assets/actuallyadditions/models/block/blockPhantomLiquiface.json new file mode 100644 index 000000000..94c4530e4 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockPhantomLiquiface.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockPhantomLiquiface" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockPhantomPlacer.json b/src/main/resources/assets/actuallyadditions/models/block/blockPhantomPlacer.json new file mode 100644 index 000000000..35eab12dd --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockPhantomPlacer.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockPhantomPlacer" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockPhantomface.json b/src/main/resources/assets/actuallyadditions/models/block/blockPhantomface.json new file mode 100644 index 000000000..71b522ba9 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockPhantomface.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockPhantomface" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockAtomicReconstructor.json b/src/main/resources/assets/actuallyadditions/models/item/blockAtomicReconstructor.json new file mode 100644 index 000000000..e545878e7 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampBlack.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampBlack.json new file mode 100644 index 000000000..5be359866 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampBlue.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampBlue.json new file mode 100644 index 000000000..958223edf --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampBrown.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampBrown.json new file mode 100644 index 000000000..9d37f0f76 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampCyan.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampCyan.json new file mode 100644 index 000000000..d373eedf1 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampGray.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampGray.json new file mode 100644 index 000000000..5eba54608 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampGreen.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampGreen.json new file mode 100644 index 000000000..076706160 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampLightBlue.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampLightBlue.json new file mode 100644 index 000000000..f42814555 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampLightGray.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampLightGray.json new file mode 100644 index 000000000..5eba54608 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampLime.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampLime.json new file mode 100644 index 000000000..8ef419c6a --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampMagenta.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampMagenta.json new file mode 100644 index 000000000..3eda300af --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOrange.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampOrange.json new file mode 100644 index 000000000..ae7be2a4b --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampPink.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampPink.json new file mode 100644 index 000000000..59f04fa4b --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampPurple.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampPurple.json new file mode 100644 index 000000000..ac0e31648 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampWhite.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampWhite.json new file mode 100644 index 000000000..5a8626d73 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampYellow.json b/src/main/resources/assets/actuallyadditions/models/item/blockColoredLampYellow.json new file mode 100644 index 000000000..ed7c96c03 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockFireworkBox.json b/src/main/resources/assets/actuallyadditions/models/item/blockFireworkBox.json new file mode 100644 index 000000000..0de756c02 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockInputter.json b/src/main/resources/assets/actuallyadditions/models/item/blockInputter.json new file mode 100644 index 000000000..3b1bbc2b4 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockInputterAdvanced.json b/src/main/resources/assets/actuallyadditions/models/item/blockInputterAdvanced.json new file mode 100644 index 000000000..1bbd8209b --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockPhantomBreaker.json b/src/main/resources/assets/actuallyadditions/models/item/blockPhantomBreaker.json new file mode 100644 index 000000000..151d4b516 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockPhantomEnergyface.json b/src/main/resources/assets/actuallyadditions/models/item/blockPhantomEnergyface.json new file mode 100644 index 000000000..9b1dd5ae4 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockPhantomLiquiface.json b/src/main/resources/assets/actuallyadditions/models/item/blockPhantomLiquiface.json new file mode 100644 index 000000000..3c723cb29 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockPhantomPlacer.json b/src/main/resources/assets/actuallyadditions/models/item/blockPhantomPlacer.json new file mode 100644 index 000000000..9264444be --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockPhantomface.json b/src/main/resources/assets/actuallyadditions/models/item/blockPhantomface.json new file mode 100644 index 000000000..ee53fe295 --- /dev/null +++ b/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 ] + } + } +} \ No newline at end of file