From 16c2c22cf726a144c95a043fabbb43206e1c936b Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Tue, 3 May 2016 21:26:02 +0200 Subject: [PATCH] Finished models --- .../mod/blocks/BlockCoffeeMachine.java | 2 +- .../mod/blocks/BlockCrystal.java | 8 +-- .../mod/blocks/BlockWallAA.java | 20 ++++--- .../mod/items/ItemCrystal.java | 2 +- .../mod/items/ItemDrill.java | 2 +- .../mod/items/ItemFoods.java | 2 +- .../actuallyadditions/mod/items/ItemMisc.java | 2 +- .../blockstates/blockAtomicReconstructor.json | 28 ++++++++++ .../blockstates/blockBlackLotus.json | 14 +++++ .../blockstates/blockCanola.json | 23 ++++++++ .../blockstates/blockCanolaPress.json | 16 ++++++ .../blockstates/blockChiseledQuartzSlab.json | 20 +++++++ .../blockstates/blockChiseledQuartzStair.json | 54 +++++++++++++++++++ .../blockstates/blockChiseledQuartzWall.json | 19 +++++++ .../blockstates/blockCoffee.json | 23 ++++++++ .../blockstates/blockCoffeeMachine.json | 17 ++++++ .../blockstates/blockColoredLamp.json | 29 ++++++++++ .../blockstates/blockColoredLampOn.json | 29 ++++++++++ .../blockstates/blockCompost.json | 11 ++++ .../blockstates/blockCrystal.json | 19 +++++++ .../blockstates/blockFeeder.json | 16 ++++++ .../blockstates/blockFermentingBarrel.json | 16 ++++++ .../blockstates/blockFireworkBox.json | 16 ++++++ .../blockstates/blockFishingNet.json | 11 ++++ .../blockstates/blockFlax.json | 23 ++++++++ .../blockstates/blockFurnaceSolar.json | 11 ++++ .../blockstates/blockGiantChest.json | 16 ++++++ .../blockstates/blockLampPowerer.json | 28 ++++++++++ .../blockstates/blockLaserRelay.json | 19 +++++++ .../blockstates/blockPhantomBooster.json | 11 ++++ .../blockstates/blockPhantomBreaker.json | 14 +++++ .../blockstates/blockPhantomEnergyface.json | 14 +++++ .../blockstates/blockPhantomLiquiface.json | 14 +++++ .../blockstates/blockPhantomPlacer.json | 14 +++++ .../blockstates/blockPhantomface.json | 14 +++++ .../blockstates/blockPillarQuartzSlab.json | 20 +++++++ .../blockstates/blockPillarQuartzStair.json | 54 +++++++++++++++++++ .../blockstates/blockPillarQuartzWall.json | 19 +++++++ .../blockstates/blockQuartzSlab.json | 20 +++++++ .../blockstates/blockQuartzStair.json | 54 +++++++++++++++++++ .../blockstates/blockQuartzWall.json | 19 +++++++ .../blockstates/blockRice.json | 23 ++++++++ .../blockstates/blockSmileyCloud.json | 17 ++++++ .../blockTestifiBucksGreenFence.json | 19 +++++++ .../blockTestifiBucksGreenSlab.json | 20 +++++++ .../blockTestifiBucksGreenStairs.json | 54 +++++++++++++++++++ .../blockTestifiBucksGreenWall.json | 14 +++++ .../blockTestifiBucksWhiteFence.json | 19 +++++++ .../blockTestifiBucksWhiteSlab.json | 20 +++++++ .../blockTestifiBucksWhiteStairs.json | 54 +++++++++++++++++++ .../blockTestifiBucksWhiteWall.json | 14 +++++ .../blockstates/blockTreasureChest.json | 26 +++++++++ .../blockstates/blockWild.json | 17 ++++++ .../blockChiseledQuartzWallInventory.json | 6 +++ .../block/blockChiseledQuartzWallPost.json | 6 +++ .../block/blockChiseledQuartzWallSide.json | 6 +++ .../block/blockPillarQuartzWallInventory.json | 6 +++ .../block/blockPillarQuartzWallPost.json | 6 +++ .../block/blockPillarQuartzWallSide.json | 6 +++ .../block/blockQuartzWallInventory.json | 6 +++ .../models/block/blockQuartzWallPost.json | 6 +++ .../models/block/blockQuartzWallSide.json | 6 +++ .../blockTestifiBucksGreenFenceInventory.json | 6 +++ .../blockTestifiBucksGreenFencePost.json | 6 +++ .../blockTestifiBucksGreenFenceSide.json | 6 +++ .../blockTestifiBucksWhiteFenceInventory.json | 6 +++ .../blockTestifiBucksWhiteFencePost.json | 6 +++ .../blockTestifiBucksWhiteFenceSide.json | 6 +++ .../models/item/blockChiseledQuartzWall.json | 3 ++ .../models/item/blockPillarQuartzWall.json | 3 ++ .../models/item/blockQuartzWall.json | 3 ++ .../item/blockTestifiBucksGreenFence.json | 3 ++ .../item/blockTestifiBucksWhiteFence.json | 3 ++ 73 files changed, 1146 insertions(+), 19 deletions(-) create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockAtomicReconstructor.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockBlackLotus.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockCanola.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockCanolaPress.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzSlab.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzStair.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzWall.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockCoffee.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockCoffeeMachine.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/blockCompost.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockCrystal.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockFeeder.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockFermentingBarrel.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockFireworkBox.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockFishingNet.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockFlax.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockFurnaceSolar.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockGiantChest.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockLampPowerer.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelay.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockPhantomBooster.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/blockstates/blockPillarQuartzSlab.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockPillarQuartzStair.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockPillarQuartzWall.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockQuartzSlab.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockQuartzStair.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockQuartzWall.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockRice.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockSmileyCloud.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenFence.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenSlab.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenStairs.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenWall.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteFence.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteSlab.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteStairs.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteWall.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockTreasureChest.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockWild.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallInventory.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallPost.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallSide.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockPillarQuartzWallInventory.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockPillarQuartzWallPost.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockPillarQuartzWallSide.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockQuartzWallInventory.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockQuartzWallPost.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockQuartzWallSide.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceInventory.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFencePost.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceSide.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceInventory.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFencePost.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceSide.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockChiseledQuartzWall.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockPillarQuartzWall.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockQuartzWall.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksGreenFence.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksWhiteFence.json diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java index 5c1aafa9e..08d4f9c75 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java @@ -34,7 +34,7 @@ import net.minecraft.world.World; public class BlockCoffeeMachine extends BlockContainerBase{ - private static final AxisAlignedBB AABB = new AxisAlignedBB(0.0625, 0, 0.0625, 1-0.0625*2, 1-0.0625, 1-0.0625); + private static final AxisAlignedBB AABB = new AxisAlignedBB(0.0625, 0, 0.0625, 1-0.0625, 1-0.0625*2, 1-0.0625); private static final PropertyInteger META = PropertyInteger.create("meta", 0, 3); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java index 72142abc1..59ddb5ecd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrystal.java @@ -14,7 +14,6 @@ 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.items.metalists.TheCrystals; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -25,7 +24,6 @@ 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.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -63,13 +61,9 @@ public class BlockCrystal extends BlockBase{ @Override protected void registerRendering(){ - ResourceLocation[] resLocs = new ResourceLocation[allCrystals.length]; for(int i = 0; i < allCrystals.length; i++){ - String name = this.getRegistryName()+allCrystals[i].name; - resLocs[i] = new ResourceLocation(ModUtil.MOD_ID, name); - ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ModelResourceLocation(name, "inventory")); + ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ModelResourceLocation(this.getRegistryName(), META.getName()+"="+i)); } - ActuallyAdditions.proxy.addRenderVariant(Item.getItemFromBlock(this), resLocs); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java index 40900050a..e75e7b0c4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java @@ -34,8 +34,9 @@ import java.util.List; public class BlockWallAA extends BlockBase{ - protected static final AxisAlignedBB[] field_185751_g = new AxisAlignedBB[]{new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.3125D, 0.0D, 0.0D, 0.6875D, 0.875D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.3125D, 1.0D, 0.875D, 0.6875D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D)}; - protected static final AxisAlignedBB[] field_185750_B = new AxisAlignedBB[]{field_185751_g[0].setMaxY(1.5D), field_185751_g[1].setMaxY(1.5D), field_185751_g[2].setMaxY(1.5D), field_185751_g[3].setMaxY(1.5D), field_185751_g[4].setMaxY(1.5D), field_185751_g[5].setMaxY(1.5D), field_185751_g[6].setMaxY(1.5D), field_185751_g[7].setMaxY(1.5D), field_185751_g[8].setMaxY(1.5D), field_185751_g[9].setMaxY(1.5D), field_185751_g[10].setMaxY(1.5D), field_185751_g[11].setMaxY(1.5D), field_185751_g[12].setMaxY(1.5D), field_185751_g[13].setMaxY(1.5D), field_185751_g[14].setMaxY(1.5D), field_185751_g[15].setMaxY(1.5D)}; + protected static final AxisAlignedBB[] AABB_BY_INDEX = new AxisAlignedBB[] {new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.3125D, 0.0D, 0.0D, 0.6875D, 0.875D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.75D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.3125D, 1.0D, 0.875D, 0.6875D), new AxisAlignedBB(0.0D, 0.0D, 0.25D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.25D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 0.75D), new AxisAlignedBB(0.0D, 0.0D, 0.0D, 1.0D, 1.0D, 1.0D)}; + protected static final AxisAlignedBB[] CLIP_AABB_BY_INDEX = new AxisAlignedBB[] {AABB_BY_INDEX[0].setMaxY(1.5D), AABB_BY_INDEX[1].setMaxY(1.5D), AABB_BY_INDEX[2].setMaxY(1.5D), AABB_BY_INDEX[3].setMaxY(1.5D), AABB_BY_INDEX[4].setMaxY(1.5D), AABB_BY_INDEX[5].setMaxY(1.5D), AABB_BY_INDEX[6].setMaxY(1.5D), AABB_BY_INDEX[7].setMaxY(1.5D), AABB_BY_INDEX[8].setMaxY(1.5D), AABB_BY_INDEX[9].setMaxY(1.5D), AABB_BY_INDEX[10].setMaxY(1.5D), AABB_BY_INDEX[11].setMaxY(1.5D), AABB_BY_INDEX[12].setMaxY(1.5D), AABB_BY_INDEX[13].setMaxY(1.5D), AABB_BY_INDEX[14].setMaxY(1.5D), AABB_BY_INDEX[15].setMaxY(1.5D)}; + private int meta; public BlockWallAA(String name, Block base){ this(name, base, 0); @@ -53,7 +54,7 @@ public class BlockWallAA extends BlockBase{ this.setDefaultState(this.blockState.getBaseState().withProperty(BlockWall.UP, false).withProperty(BlockWall.NORTH, false).withProperty(BlockWall.EAST, false).withProperty(BlockWall.SOUTH, false).withProperty(BlockWall.WEST, false)); } - private static int figureOutSomeWallStuff(IBlockState state){ + private static int yesThisIsCopyPastedFromBlockWallAndIHaveNoIdeaWhatThisMethodDoes(IBlockState state){ int i = 0; if(state.getValue(BlockWall.NORTH)){ @@ -77,7 +78,12 @@ public class BlockWallAA extends BlockBase{ @Override public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos){ - return state.withProperty(BlockWall.UP, !worldIn.isAirBlock(pos.up())).withProperty(BlockWall.NORTH, this.canConnectTo(worldIn, pos.north())).withProperty(BlockWall.EAST, this.canConnectTo(worldIn, pos.east())).withProperty(BlockWall.SOUTH, this.canConnectTo(worldIn, pos.south())).withProperty(BlockWall.WEST, this.canConnectTo(worldIn, pos.west())); + boolean flag = this.canConnectTo(worldIn, pos.north()); + boolean flag1 = this.canConnectTo(worldIn, pos.east()); + boolean flag2 = this.canConnectTo(worldIn, pos.south()); + boolean flag3 = this.canConnectTo(worldIn, pos.west()); + boolean flag4 = flag && !flag1 && flag2 && !flag3 || !flag && flag1 && !flag2 && flag3; + return state.withProperty(BlockWall.UP, !flag4 || !worldIn.isAirBlock(pos.up())).withProperty(BlockWall.NORTH, flag).withProperty(BlockWall.EAST, flag1).withProperty(BlockWall.SOUTH, flag2).withProperty(BlockWall.WEST, flag3); } @Override @@ -99,13 +105,13 @@ public class BlockWallAA extends BlockBase{ @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos){ state = this.getActualState(state, source, pos); - return field_185751_g[figureOutSomeWallStuff(state)]; + return AABB_BY_INDEX[yesThisIsCopyPastedFromBlockWallAndIHaveNoIdeaWhatThisMethodDoes(state)]; } @Override - public AxisAlignedBB getSelectedBoundingBox(IBlockState blockState, World worldIn, BlockPos pos){ + public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, World worldIn, BlockPos pos){ blockState = this.getActualState(blockState, worldIn, pos); - return field_185750_B[figureOutSomeWallStuff(blockState)]; + return CLIP_AABB_BY_INDEX[yesThisIsCopyPastedFromBlockWallAndIHaveNoIdeaWhatThisMethodDoes(blockState)]; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java index 63b5fc788..0ae367752 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystal.java @@ -62,7 +62,7 @@ public class ItemCrystal extends ItemBase{ ResourceLocation[] resLocs = new ResourceLocation[BlockCrystal.allCrystals.length]; for(int i = 0; i < BlockCrystal.allCrystals.length; i++){ String name = this.getRegistryName()+BlockCrystal.allCrystals[i].name; - resLocs[i] = new ResourceLocation(ModUtil.MOD_ID, name); + resLocs[i] = new ResourceLocation(name); ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ModelResourceLocation(name, "inventory")); } ActuallyAdditions.proxy.addRenderVariant(this, resLocs); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java index 3058c18fd..625788ed8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDrill.java @@ -347,7 +347,7 @@ public class ItemDrill extends ItemEnergy{ ResourceLocation[] resLocs = new ResourceLocation[16]; for(int i = 0; i < 16; i++){ String name = this.getRegistryName()+TheColoredLampColors.values()[i].name; - resLocs[i] = new ResourceLocation(ModUtil.MOD_ID, name); + resLocs[i] = new ResourceLocation(name); ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ModelResourceLocation(name, "inventory")); } ActuallyAdditions.proxy.addRenderVariant(this, resLocs); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java index 505e79916..4acc25e4f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java @@ -106,7 +106,7 @@ public class ItemFoods extends ItemFoodBase{ ResourceLocation[] resLocs = new ResourceLocation[allFoods.length]; for(int i = 0; i < allFoods.length; i++){ String name = this.getRegistryName()+allFoods[i].name; - resLocs[i] = new ResourceLocation(ModUtil.MOD_ID, name); + resLocs[i] = new ResourceLocation(name); ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ModelResourceLocation(name, "inventory")); } ActuallyAdditions.proxy.addRenderVariant(this, resLocs); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java index 80e88f81d..00999d360 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java @@ -63,7 +63,7 @@ public class ItemMisc extends ItemBase{ ResourceLocation[] resLocs = new ResourceLocation[allMiscItems.length]; for(int i = 0; i < allMiscItems.length; i++){ String name = this.getRegistryName()+allMiscItems[i].name; - resLocs[i] = new ResourceLocation(ModUtil.MOD_ID, name); + resLocs[i] = new ResourceLocation(name); ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this, 1, i), new ModelResourceLocation(name, "inventory")); } ActuallyAdditions.proxy.addRenderVariant(this, resLocs); 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..323f41ede --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockAtomicReconstructor.json @@ -0,0 +1,28 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube", + "textures": { + "particle": "actuallyadditions:blocks/blockAtomicReconstructor", + "down": "#particle", + "up": "actuallyadditions:blocks/blockAtomicReconstructorTop", + "south": "#particle", + "north": "actuallyadditions:blocks/blockAtomicReconstructorFront", + "east": "#particle", + "west": "#particle" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "meta": { + "0": { "x" : 90 }, + "1": { "x" : 270 }, + "2": { "y" : 0 }, + "3": { "y" : 180 }, + "4": { "y" : 270 }, + "5": { "y" : 90 } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockBlackLotus.json b/src/main/resources/assets/actuallyadditions/blockstates/blockBlackLotus.json new file mode 100644 index 000000000..746308517 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockBlackLotus.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cross", + "textures": { + "cross": "actuallyadditions:blocks/blockBlackLotus" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockCanola.json b/src/main/resources/assets/actuallyadditions/blockstates/blockCanola.json new file mode 100644 index 000000000..292029962 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockCanola.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:crop", + "textures": { + "crop": "actuallyadditions:blocks/blockCanolaStage1" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "age": { + "0": { "textures": { "crop": "actuallyadditions:blocks/blockCanolaStage1" } }, + "1": { "textures": { "crop": "actuallyadditions:blocks/blockCanolaStage2" } }, + "2": { "textures": { "crop": "actuallyadditions:blocks/blockCanolaStage2" } }, + "3": { "textures": { "crop": "actuallyadditions:blocks/blockCanolaStage2" } }, + "4": { "textures": { "crop": "actuallyadditions:blocks/blockCanolaStage3" } }, + "5": { "textures": { "crop": "actuallyadditions:blocks/blockCanolaStage3" } }, + "6": { "textures": { "crop": "actuallyadditions:blocks/blockCanolaStage3" } }, + "7": { "textures": { "crop": "actuallyadditions:blocks/blockCanolaStage4" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockCanolaPress.json b/src/main/resources/assets/actuallyadditions/blockstates/blockCanolaPress.json new file mode 100644 index 000000000..e6e9fd014 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockCanolaPress.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "side": "actuallyadditions:blocks/blockCanolaPress", + "bottom": "#top", + "top": "actuallyadditions:blocks/blockCanolaPressTop" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzSlab.json b/src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzSlab.json new file mode 100644 index 000000000..61816ef58 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzSlab.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled", + "top": "#bottom", + "side": "#bottom" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "meta": { + "0": {}, + "1": { "model": "minecraft:upper_slab" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzStair.json b/src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzStair.json new file mode 100644 index 000000000..e64773e72 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzStair.json @@ -0,0 +1,54 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled", + "top": "#bottom", + "side": "#bottom" + } + }, + "variants": { + "normal": { "model": "minecraft:stairs" }, + "inventory": { "model": "minecraft:stairs" }, + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzWall.json b/src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzWall.json new file mode 100644 index 000000000..e0fb94fbe --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockChiseledQuartzWall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "actuallyadditions:blockChiseledQuartzWallPost" } + }, + { "when": { "north": "true" }, + "apply": { "model": "actuallyadditions:blockChiseledQuartzWallSide", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "actuallyadditions:blockChiseledQuartzWallSide", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "actuallyadditions:blockChiseledQuartzWallSide", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "actuallyadditions:blockChiseledQuartzWallSide", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockCoffee.json b/src/main/resources/assets/actuallyadditions/blockstates/blockCoffee.json new file mode 100644 index 000000000..e5e4e9fe7 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockCoffee.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:crop", + "textures": { + "crop": "actuallyadditions:blocks/blockCoffeeStage1" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "age": { + "0": { "textures": { "crop": "actuallyadditions:blocks/blockCoffeeStage1" } }, + "1": { "textures": { "crop": "actuallyadditions:blocks/blockCoffeeStage2" } }, + "2": { "textures": { "crop": "actuallyadditions:blocks/blockCoffeeStage2" } }, + "3": { "textures": { "crop": "actuallyadditions:blocks/blockCoffeeStage3" } }, + "4": { "textures": { "crop": "actuallyadditions:blocks/blockCoffeeStage4" } }, + "5": { "textures": { "crop": "actuallyadditions:blocks/blockCoffeeStage4" } }, + "6": { "textures": { "crop": "actuallyadditions:blocks/blockCoffeeStage5" } }, + "7": { "textures": { "crop": "actuallyadditions:blocks/blockCoffeeStage6" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockCoffeeMachine.json b/src/main/resources/assets/actuallyadditions/blockstates/blockCoffeeMachine.json new file mode 100644 index 000000000..e5a656040 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockCoffeeMachine.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "actuallyadditions:blockCoffeeMachine", + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "meta": { + "0": { "y" : 180 }, + "1": { "y" : 0 }, + "2": { "y" : 90 }, + "3": { "y" : 270 } + } + } +} \ No newline at end of file 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..141db12a5 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockColoredLamp.json @@ -0,0 +1,29 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "meta": { + "0": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampWhite" } }, + "1": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOrange" } }, + "2": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampMagenta" } }, + "3": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampLightBlue" } }, + "4": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampYellow" } }, + "5": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampLime" } }, + "6": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampPink" } }, + "7": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampGray" } }, + "8": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampLightGray" } }, + "9": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampCyan" } }, + "10": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampPurple" } }, + "11": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampBlue" } }, + "12": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampBrown" } }, + "13": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampGreen" } }, + "14": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampRed" } }, + "15": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampBlack" } } + } + } +} \ No newline at end of file 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..04f4cd249 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockColoredLampOn.json @@ -0,0 +1,29 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "meta": { + "0": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnWhite" } }, + "1": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnOrange" } }, + "2": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnMagenta" } }, + "3": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnLightBlue" } }, + "4": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnYellow" } }, + "5": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnLime" } }, + "6": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnPink" } }, + "7": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnGray" } }, + "8": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnLightGray" } }, + "9": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnCyan" } }, + "10": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnPurple" } }, + "11": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnBlue" } }, + "12": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnBrown" } }, + "13": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnGreen" } }, + "14": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnRed" } }, + "15": { "textures" : { "all" : "actuallyadditions:blocks/blockColoredLampOnBlack" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockCompost.json b/src/main/resources/assets/actuallyadditions/blockstates/blockCompost.json new file mode 100644 index 000000000..fa7aee26b --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockCompost.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "actuallyadditions:blockCompost", + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockCrystal.json b/src/main/resources/assets/actuallyadditions/blockstates/blockCrystal.json new file mode 100644 index 000000000..762a9aab9 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockCrystal.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "meta": { + "0": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalRed" } }, + "1": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalBlue" } }, + "2": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalLightBlue" } }, + "3": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalBlack" } }, + "4": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalGreen" } }, + "5": { "textures" : { "all" : "actuallyadditions:blocks/blockCrystalWhite" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockFeeder.json b/src/main/resources/assets/actuallyadditions/blockstates/blockFeeder.json new file mode 100644 index 000000000..b5991fc59 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockFeeder.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "side": "actuallyadditions:blocks/blockFeeder", + "bottom": "#top", + "top": "actuallyadditions:blocks/blockFeederTop" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockFermentingBarrel.json b/src/main/resources/assets/actuallyadditions/blockstates/blockFermentingBarrel.json new file mode 100644 index 000000000..31c1e4fe0 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockFermentingBarrel.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "side": "actuallyadditions:blocks/blockFermentingBarrel", + "bottom": "#top", + "top": "actuallyadditions:blocks/blockFermentingBarrelTop" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file 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..040c8d451 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockFireworkBox.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "side": "actuallyadditions:blocks/blockFireworkBox", + "bottom": "#side", + "top": "actuallyadditions:blocks/blockFireworkBoxTop" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockFishingNet.json b/src/main/resources/assets/actuallyadditions/blockstates/blockFishingNet.json new file mode 100644 index 000000000..69132a90d --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockFishingNet.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "actuallyadditions:blockFishingNet", + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockFlax.json b/src/main/resources/assets/actuallyadditions/blockstates/blockFlax.json new file mode 100644 index 000000000..7ed1088df --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockFlax.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:crop", + "textures": { + "crop": "actuallyadditions:blocks/blockFlaxStage1" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "age": { + "0": { "textures": { "crop": "actuallyadditions:blocks/blockFlaxStage1" } }, + "1": { "textures": { "crop": "actuallyadditions:blocks/blockFlaxStage2" } }, + "2": { "textures": { "crop": "actuallyadditions:blocks/blockFlaxStage2" } }, + "3": { "textures": { "crop": "actuallyadditions:blocks/blockFlaxStage3" } }, + "4": { "textures": { "crop": "actuallyadditions:blocks/blockFlaxStage4" } }, + "5": { "textures": { "crop": "actuallyadditions:blocks/blockFlaxStage4" } }, + "6": { "textures": { "crop": "actuallyadditions:blocks/blockFlaxStage5" } }, + "7": { "textures": { "crop": "actuallyadditions:blocks/blockFlaxStage6" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockFurnaceSolar.json b/src/main/resources/assets/actuallyadditions/blockstates/blockFurnaceSolar.json new file mode 100644 index 000000000..ec0aa1e5c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockFurnaceSolar.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "actuallyadditions:blockFurnaceSolar", + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockGiantChest.json b/src/main/resources/assets/actuallyadditions/blockstates/blockGiantChest.json new file mode 100644 index 000000000..c3a8f16e4 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockGiantChest.json @@ -0,0 +1,16 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_bottom_top", + "textures": { + "side": "actuallyadditions:blocks/blockGiantChest", + "bottom": "actuallyadditions:blocks/blockGiantChestBottom", + "top": "actuallyadditions:blocks/blockGiantChestTop" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockLampPowerer.json b/src/main/resources/assets/actuallyadditions/blockstates/blockLampPowerer.json new file mode 100644 index 000000000..792cdcd96 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockLampPowerer.json @@ -0,0 +1,28 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube", + "textures": { + "particle": "actuallyadditions:blocks/blockLampPowerer", + "down": "#particle", + "up": "#particle", + "south": "#particle", + "north": "actuallyadditions:blocks/blockLampPowererFront", + "east": "#particle", + "west": "#particle" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "meta": { + "0": { "x" : 90 }, + "1": { "x" : 270 }, + "2": { "y" : 0 }, + "3": { "y" : 180 }, + "4": { "y" : 270 }, + "5": { "y" : 90 } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelay.json b/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelay.json new file mode 100644 index 000000000..3ad16948c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockLaserRelay.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "actuallyadditions:blockLaserRelay", + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "meta": { + "0": { "x": 180 }, + "1": {}, + "2": { "x": 90 }, + "3": { "x": 270 }, + "4": { "x": 90, "y": 270 }, + "5": { "x": 270, "y": 270 } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomBooster.json b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomBooster.json new file mode 100644 index 000000000..a176bd833 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomBooster.json @@ -0,0 +1,11 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "actuallyadditions:blockPhantomBooster", + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file 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..575be757f --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomBreaker.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockPhantomBreaker" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file 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..96d57a530 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomEnergyface.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockPhantomEnergyface" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file 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..bba3caad1 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomLiquiface.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockPhantomLiquiface" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file 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..da99bdd00 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomPlacer.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockPhantomPlacer" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file 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..82d693611 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockPhantomface.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockPhantomface" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockPillarQuartzSlab.json b/src/main/resources/assets/actuallyadditions/blockstates/blockPillarQuartzSlab.json new file mode 100644 index 000000000..6850084a0 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockPillarQuartzSlab.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "actuallyadditions:blocks/blockMiscBlackQuartzPillar", + "top": "#bottom", + "side": "#bottom" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "meta": { + "0": {}, + "1": { "model": "minecraft:upper_slab" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockPillarQuartzStair.json b/src/main/resources/assets/actuallyadditions/blockstates/blockPillarQuartzStair.json new file mode 100644 index 000000000..a96f642ba --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockPillarQuartzStair.json @@ -0,0 +1,54 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "actuallyadditions:blocks/blockMiscBlackQuartzPillar", + "top": "#bottom", + "side": "#bottom" + } + }, + "variants": { + "normal": { "model": "minecraft:stairs" }, + "inventory": { "model": "minecraft:stairs" }, + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockPillarQuartzWall.json b/src/main/resources/assets/actuallyadditions/blockstates/blockPillarQuartzWall.json new file mode 100644 index 000000000..5b033d2a7 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockPillarQuartzWall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "actuallyadditions:blockPillarQuartzWallPost" } + }, + { "when": { "north": "true" }, + "apply": { "model": "actuallyadditions:blockPillarQuartzWallSide", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "actuallyadditions:blockPillarQuartzWallSide", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "actuallyadditions:blockPillarQuartzWallSide", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "actuallyadditions:blockPillarQuartzWallSide", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockQuartzSlab.json b/src/main/resources/assets/actuallyadditions/blockstates/blockQuartzSlab.json new file mode 100644 index 000000000..e0c091c27 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockQuartzSlab.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "actuallyadditions:blocks/blockMiscBlackQuartz", + "top": "#bottom", + "side": "#bottom" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "meta": { + "0": {}, + "1": { "model": "minecraft:upper_slab" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockQuartzStair.json b/src/main/resources/assets/actuallyadditions/blockstates/blockQuartzStair.json new file mode 100644 index 000000000..f64d8e0b1 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockQuartzStair.json @@ -0,0 +1,54 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "actuallyadditions:blocks/blockMiscBlackQuartz", + "top": "#bottom", + "side": "#bottom" + } + }, + "variants": { + "normal": { "model": "minecraft:stairs" }, + "inventory": { "model": "minecraft:stairs" }, + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockQuartzWall.json b/src/main/resources/assets/actuallyadditions/blockstates/blockQuartzWall.json new file mode 100644 index 000000000..726aa6850 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockQuartzWall.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "actuallyadditions:blockQuartzWallPost" } + }, + { "when": { "north": "true" }, + "apply": { "model": "actuallyadditions:blockQuartzWallSide", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "actuallyadditions:blockQuartzWallSide", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "actuallyadditions:blockQuartzWallSide", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "actuallyadditions:blockQuartzWallSide", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockRice.json b/src/main/resources/assets/actuallyadditions/blockstates/blockRice.json new file mode 100644 index 000000000..98c31ee72 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockRice.json @@ -0,0 +1,23 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:crop", + "textures": { + "crop": "actuallyadditions:blocks/blockRiceStage1" + } + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "age": { + "0": { "textures": { "crop": "actuallyadditions:blocks/blockRiceStage1" } }, + "1": { "textures": { "crop": "actuallyadditions:blocks/blockRiceStage2" } }, + "2": { "textures": { "crop": "actuallyadditions:blocks/blockRiceStage2" } }, + "3": { "textures": { "crop": "actuallyadditions:blocks/blockRiceStage3" } }, + "4": { "textures": { "crop": "actuallyadditions:blocks/blockRiceStage4" } }, + "5": { "textures": { "crop": "actuallyadditions:blocks/blockRiceStage4" } }, + "6": { "textures": { "crop": "actuallyadditions:blocks/blockRiceStage5" } }, + "7": { "textures": { "crop": "actuallyadditions:blocks/blockRiceStage6" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockSmileyCloud.json b/src/main/resources/assets/actuallyadditions/blockstates/blockSmileyCloud.json new file mode 100644 index 000000000..614e008ba --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockSmileyCloud.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "actuallyadditions:blockSmileyCloud", + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "meta": { + "0": { "y" : 0 }, + "1": { "y" : 180 }, + "2": { "y" : 270 }, + "3": { "y" : 90 } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenFence.json b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenFence.json new file mode 100644 index 000000000..f7415555c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenFence.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "actuallyadditions:blockTestifiBucksGreenFencePost" } + }, + { "when": { "north": "true" }, + "apply": { "model": "actuallyadditions:blockTestifiBucksGreenFenceSide", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "actuallyadditions:blockTestifiBucksGreenFenceSide", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "actuallyadditions:blockTestifiBucksGreenFenceSide", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "actuallyadditions:blockTestifiBucksGreenFenceSide", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenSlab.json b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenSlab.json new file mode 100644 index 000000000..416fd8e2c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenSlab.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "actuallyadditions:blocks/blockTestifiBucksGreenWall", + "top": "#bottom", + "side": "#bottom" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "meta": { + "0": {}, + "1": { "model": "minecraft:upper_slab" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenStairs.json b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenStairs.json new file mode 100644 index 000000000..6b94a6e85 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenStairs.json @@ -0,0 +1,54 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "actuallyadditions:blocks/blockTestifiBucksGreenWall", + "top": "#bottom", + "side": "#bottom" + } + }, + "variants": { + "normal": { "model": "minecraft:stairs" }, + "inventory": { "model": "minecraft:stairs" }, + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenWall.json b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenWall.json new file mode 100644 index 000000000..aac2e55e0 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenWall.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteFence.json b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteFence.json new file mode 100644 index 000000000..53a97c100 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteFence.json @@ -0,0 +1,19 @@ +{ + "multipart": [ + { "when": { "up": "true" }, + "apply": { "model": "actuallyadditions:blockTestifiBucksWhiteFencePost" } + }, + { "when": { "north": "true" }, + "apply": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceSide", "uvlock": true } + }, + { "when": { "east": "true" }, + "apply": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceSide", "y": 90, "uvlock": true } + }, + { "when": { "south": "true" }, + "apply": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceSide", "y": 180, "uvlock": true } + }, + { "when": { "west": "true" }, + "apply": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceSide", "y": 270, "uvlock": true } + } + ] +} diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteSlab.json b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteSlab.json new file mode 100644 index 000000000..243043710 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteSlab.json @@ -0,0 +1,20 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "actuallyadditions:blocks/blockTestifiBucksWhiteWall", + "top": "#bottom", + "side": "#bottom" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "meta": { + "0": {}, + "1": { "model": "minecraft:upper_slab" } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteStairs.json b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteStairs.json new file mode 100644 index 000000000..f6fbe75ba --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteStairs.json @@ -0,0 +1,54 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "actuallyadditions:blocks/blockTestifiBucksWhiteWall", + "top": "#bottom", + "side": "#bottom" + } + }, + "variants": { + "normal": { "model": "minecraft:stairs" }, + "inventory": { "model": "minecraft:stairs" }, + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteWall.json b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteWall.json new file mode 100644 index 000000000..f1f89c3bc --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteWall.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockTreasureChest.json b/src/main/resources/assets/actuallyadditions/blockstates/blockTreasureChest.json new file mode 100644 index 000000000..68fdfa6fe --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockTreasureChest.json @@ -0,0 +1,26 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube", + "textures": { + "particle": "actuallyadditions:blocks/blockTreasureChest", + "down": "actuallyadditions:blocks/blockTreasureChestBottom", + "up": "actuallyadditions:blocks/blockTreasureChestTop", + "south": "#particle", + "north": "actuallyadditions:blocks/blockTreasureChestFront", + "east": "#particle", + "west": "#particle" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "meta": { + "0": { "y" : 0 }, + "1": { "y" : 180 }, + "2": { "y" : 270 }, + "3": { "y" : 90 } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockWild.json b/src/main/resources/assets/actuallyadditions/blockstates/blockWild.json new file mode 100644 index 000000000..4755635d0 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockWild.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cross", + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}], + "meta": { + "0": { "textures" : { "cross" : "actuallyadditions:blocks/blockCanolaStage4" } }, + "1": { "textures" : { "cross" : "actuallyadditions:blocks/blockFlaxStage6" } }, + "2": { "textures" : { "cross" : "actuallyadditions:blocks/blockRiceStage6" } }, + "3": { "textures" : { "cross" : "actuallyadditions:blocks/blockCoffeeStage6" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallInventory.json b/src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallInventory.json new file mode 100644 index 000000000..1cb504a30 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallInventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallPost.json b/src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallPost.json new file mode 100644 index 000000000..0fcadaea6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallPost.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallSide.json b/src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallSide.json new file mode 100644 index 000000000..48e5c7195 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockChiseledQuartzWallSide.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "actuallyadditions:blocks/blockMiscBlackQuartzChiseled" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockPillarQuartzWallInventory.json b/src/main/resources/assets/actuallyadditions/models/block/blockPillarQuartzWallInventory.json new file mode 100644 index 000000000..9968403f8 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockPillarQuartzWallInventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "actuallyadditions:blocks/blockMiscBlackQuartzPillar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockPillarQuartzWallPost.json b/src/main/resources/assets/actuallyadditions/models/block/blockPillarQuartzWallPost.json new file mode 100644 index 000000000..a82929d56 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockPillarQuartzWallPost.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "actuallyadditions:blocks/blockMiscBlackQuartzPillar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockPillarQuartzWallSide.json b/src/main/resources/assets/actuallyadditions/models/block/blockPillarQuartzWallSide.json new file mode 100644 index 000000000..b9d06b9c6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockPillarQuartzWallSide.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "actuallyadditions:blocks/blockMiscBlackQuartzPillar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockQuartzWallInventory.json b/src/main/resources/assets/actuallyadditions/models/block/blockQuartzWallInventory.json new file mode 100644 index 000000000..c51b0152a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockQuartzWallInventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "actuallyadditions:blocks/blockMiscBlackQuartz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockQuartzWallPost.json b/src/main/resources/assets/actuallyadditions/models/block/blockQuartzWallPost.json new file mode 100644 index 000000000..9eab47d78 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockQuartzWallPost.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "actuallyadditions:blocks/blockMiscBlackQuartz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockQuartzWallSide.json b/src/main/resources/assets/actuallyadditions/models/block/blockQuartzWallSide.json new file mode 100644 index 000000000..b30814a7e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockQuartzWallSide.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "actuallyadditions:blocks/blockMiscBlackQuartz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceInventory.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceInventory.json new file mode 100644 index 000000000..5024ce629 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceInventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFencePost.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFencePost.json new file mode 100644 index 000000000..5470b62d1 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFencePost.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceSide.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceSide.json new file mode 100644 index 000000000..976609a77 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceSide.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceInventory.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceInventory.json new file mode 100644 index 000000000..d6e873ba2 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceInventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFencePost.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFencePost.json new file mode 100644 index 000000000..7f819af28 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFencePost.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_post", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceSide.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceSide.json new file mode 100644 index 000000000..453cebf2e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceSide.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_side", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockChiseledQuartzWall.json b/src/main/resources/assets/actuallyadditions/models/item/blockChiseledQuartzWall.json new file mode 100644 index 000000000..3b8270803 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockChiseledQuartzWall.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/blockChiseledQuartzWallInventory" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockPillarQuartzWall.json b/src/main/resources/assets/actuallyadditions/models/item/blockPillarQuartzWall.json new file mode 100644 index 000000000..f8282b53d --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockPillarQuartzWall.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/blockPillarQuartzWallInventory" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockQuartzWall.json b/src/main/resources/assets/actuallyadditions/models/item/blockQuartzWall.json new file mode 100644 index 000000000..22b4b32ed --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockQuartzWall.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/blockQuartzWallInventory" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksGreenFence.json b/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksGreenFence.json new file mode 100644 index 000000000..d1d956e1f --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksGreenFence.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/blockTestifiBucksGreenFenceInventory" +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksWhiteFence.json b/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksWhiteFence.json new file mode 100644 index 000000000..0e11467ab --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksWhiteFence.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/blockTestifiBucksWhiteFenceInventory" +} \ No newline at end of file