diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java index 73d95fa11..7fb20b93c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java @@ -65,7 +65,7 @@ public class BlockLaserRelay extends BlockContainerBase{ @Override public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, int meta, EntityLivingBase base){ - return this.getStateFromMeta(meta); + return this.getStateFromMeta(side.ordinal()); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java index 11bc17dc2..ded9017f7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockBushBase.java @@ -28,6 +28,7 @@ public class BlockBushBase extends BlockBush{ public BlockBushBase(String name){ this.name = name; + this.setStepSound(soundTypeGrass); this.register(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java index 601cc4444..64270b3b3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockWallAA.java @@ -10,26 +10,28 @@ package de.ellpeck.actuallyadditions.mod.blocks.base; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.creative.CreativeTab; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; import net.minecraft.block.Block; +import net.minecraft.block.BlockFenceGate; import net.minecraft.block.BlockWall; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.EnumRarity; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import java.util.List; -public class BlockWallAA extends BlockWall{ +public class BlockWallAA extends BlockBase{ - private String name; private int meta; public BlockWallAA(String name, Block base){ @@ -37,44 +39,14 @@ public class BlockWallAA extends BlockWall{ } public BlockWallAA(String name, Block base, int meta){ - super(base); - this.name = name; + super(base.getMaterial(), name); this.meta = meta; - this.register(); - } + this.setHardness(1.5F); + this.setResistance(10F); + this.setStepSound(base.stepSound); - private void register(){ - this.setUnlocalizedName(ModUtil.MOD_ID_LOWER+"."+this.getBaseName()); - GameRegistry.registerBlock(this, this.getItemBlock(), this.getBaseName()); - if(this.shouldAddCreative()){ - this.setCreativeTab(CreativeTab.instance); - } - else{ - this.setCreativeTab(null); - } - - this.registerRendering(); - } - - protected void registerRendering(){ - ActuallyAdditions.proxy.addRenderRegister(new ItemStack(this), new ResourceLocation(ModUtil.MOD_ID_LOWER, this.getBaseName())); - } - - protected String getBaseName(){ - return this.name; - } - - protected Class getItemBlock(){ - return ItemBlockBase.class; - } - - public boolean shouldAddCreative(){ - return true; - } - - public EnumRarity getRarity(ItemStack stack){ - return EnumRarity.COMMON; + 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)); } @SuppressWarnings("unchecked") @@ -88,4 +60,96 @@ public class BlockWallAA extends BlockWall{ public int damageDropped(IBlockState state){ return meta; } + + @Override + public boolean isFullCube(){ + return false; + } + + @Override + public boolean isPassable(IBlockAccess worldIn, BlockPos pos){ + return false; + } + + @Override + public boolean isOpaqueCube(){ + return false; + } + + @Override + public void setBlockBoundsBasedOnState(IBlockAccess worldIn, BlockPos pos){ + boolean flag = this.canConnectTo(worldIn, pos.north()); + boolean flag1 = this.canConnectTo(worldIn, pos.south()); + boolean flag2 = this.canConnectTo(worldIn, pos.west()); + boolean flag3 = this.canConnectTo(worldIn, pos.east()); + float f = 0.25F; + float f1 = 0.75F; + float f2 = 0.25F; + float f3 = 0.75F; + float f4 = 1.0F; + + if(flag){ + f2 = 0.0F; + } + if(flag1){ + f3 = 1.0F; + } + if(flag2){ + f = 0.0F; + } + if(flag3){ + f1 = 1.0F; + } + + if(flag && flag1 && !flag2 && !flag3){ + f4 = 0.8125F; + f = 0.3125F; + f1 = 0.6875F; + } + else if(!flag && !flag1 && flag2 && flag3){ + f4 = 0.8125F; + f2 = 0.3125F; + f3 = 0.6875F; + } + + this.setBlockBounds(f, 0.0F, f2, f1, f4, f3); + } + + @Override + public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state){ + this.setBlockBoundsBasedOnState(worldIn, pos); + this.maxY = 1.5D; + return super.getCollisionBoundingBox(worldIn, pos, state); + } + + public boolean canConnectTo(IBlockAccess worldIn, BlockPos pos){ + Block block = worldIn.getBlockState(pos).getBlock(); + return block != Blocks.barrier && (!(block != this && !(block instanceof BlockFenceGate)) || ((block.getMaterial().isOpaque() && block.isFullCube()) && block.getMaterial() != Material.gourd)); + } + + @Override + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side){ + return side != EnumFacing.DOWN || super.shouldSideBeRendered(worldIn, pos, side); + } + + @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())); + } + + @Override + protected BlockState createBlockState(){ + return new BlockState(this, BlockWall.UP, BlockWall.NORTH, BlockWall.EAST, BlockWall.WEST, BlockWall.SOUTH); + } + + @Override + public IBlockState getStateFromMeta(int meta){ + return this.getDefaultState(); + } + + @Override + public int getMetaFromState(IBlockState state){ + return 0; + } } 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..5f66277c0 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockBlackLotus.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "actuallyadditions:blockBlackLotus" } + } +} 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..be640a579 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenFence.json @@ -0,0 +1,36 @@ +{ + "variants": { + "east=false,north=false,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFencePost" }, + "east=false,north=true,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth" }, + "east=true,north=false,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast" }, + "east=true,north=false,south=true,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouth" }, + "east=true,north=false,south=false,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouth", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast" }, + "east=true,north=false,south=true,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEastWest" }, + "east=false,north=false,south=false,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFencePost" }, + "east=false,north=true,south=false,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth" }, + "east=true,north=false,south=false,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorth", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast" }, + "east=true,north=false,south=true,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthEast", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthAbove" }, + "east=true,north=false,south=false,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthAbove", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast" }, + "east=true,north=false,south=true,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEast", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksGreenFenceNorthSouthEastWest" } + } +} 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..7a6348718 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenSlab.json @@ -0,0 +1,6 @@ +{ + "variants": { + "meta=0": { "model": "actuallyadditions:blockTestifiBucksGreenSlabBottom" }, + "meta=1": { "model": "actuallyadditions:blockTestifiBucksGreenSlabTop" } + } +} 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..97b65d1aa --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksGreenStairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs" }, + "facing=west,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter" }, + "facing=west,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter" }, + "facing=north,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksGreenStairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsOuter", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksGreenStairsInner", "x": 180, "uvlock": true } + } +} 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..4cf3b6c82 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteFence.json @@ -0,0 +1,36 @@ +{ + "variants": { + "east=false,north=false,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFencePost" }, + "east=false,north=true,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth" }, + "east=true,north=false,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast" }, + "east=true,north=false,south=true,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouth" }, + "east=true,north=false,south=false,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouth", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,up=false,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast" }, + "east=true,north=false,south=true,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,up=false,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEastWest" }, + "east=false,north=false,south=false,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFencePost" }, + "east=false,north=true,south=false,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth" }, + "east=true,north=false,south=false,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 180, "uvlock": true }, + "east=false,north=false,south=false,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorth", "y": 270, "uvlock": true }, + "east=true,north=true,south=false,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast" }, + "east=true,north=false,south=true,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 90, "uvlock": true }, + "east=false,north=false,south=true,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 180, "uvlock": true }, + "east=false,north=true,south=false,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthEast", "y": 270, "uvlock": true }, + "east=false,north=true,south=true,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthAbove" }, + "east=true,north=false,south=false,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthAbove", "y": 90, "uvlock": true }, + "east=true,north=true,south=true,up=true,west=false": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast" }, + "east=true,north=false,south=true,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 90, "uvlock": true }, + "east=false,north=true,south=true,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 180, "uvlock": true }, + "east=true,north=true,south=false,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEast", "y": 270, "uvlock": true }, + "east=true,north=true,south=true,up=true,west=true": { "model": "actuallyadditions:blockTestifiBucksWhiteFenceNorthSouthEastWest" } + } +} 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..b499d5a6a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteSlab.json @@ -0,0 +1,6 @@ +{ + "variants": { + "meta=0": { "model": "actuallyadditions:blockTestifiBucksWhiteSlabBottom" }, + "meta=1": { "model": "actuallyadditions:blockTestifiBucksWhiteSlabTop" } + } +} 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..d15addf59 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockTestifiBucksWhiteStairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs" }, + "facing=west,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter" }, + "facing=west,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter" }, + "facing=north,half=bottom,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "actuallyadditions:blockTestifiBucksWhiteStairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsOuter", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "actuallyadditions:blockTestifiBucksWhiteStairsInner", "x": 180, "uvlock": true } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockBlackLotus.json b/src/main/resources/assets/actuallyadditions/models/block/blockBlackLotus.json new file mode 100644 index 000000000..2cd8f388a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockBlackLotus.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "actuallyadditions:blocks/blockBlackLotus" + } +} 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..824957db3 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceInventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_inventory", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorth.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorth.json new file mode 100644 index 000000000..8b4fb26d0 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorth.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_n", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorthEast.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorthEast.json new file mode 100644 index 000000000..e4997d19c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorthEast.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_ne", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorthSouth.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorthSouth.json new file mode 100644 index 000000000..a55a8ca94 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorthSouth.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_ns", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorthSouthAbove.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorthSouthAbove.json new file mode 100644 index 000000000..3e7fd28e2 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorthSouthAbove.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_ns_above", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorthSouthEast.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorthSouthEast.json new file mode 100644 index 000000000..5be16b169 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorthSouthEast.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_nse", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorthSouthEastWest.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorthSouthEastWest.json new file mode 100644 index 000000000..ea710119d --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFenceNorthSouthEastWest.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_nsew", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + } +} 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..4932d58c6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenFencePost.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_post", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenSlabBottom.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenSlabBottom.json new file mode 100644 index 000000000..d25414b47 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenSlabBottom.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "bottom": "actuallyadditions:blocks/blockTestifiBucksGreenWall", + "top": "actuallyadditions:blocks/blockTestifiBucksGreenWall", + "side": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenSlabTop.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenSlabTop.json new file mode 100644 index 000000000..4d4bf4417 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenSlabTop.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "bottom": "actuallyadditions:blocks/blockTestifiBucksGreenWall", + "top": "actuallyadditions:blocks/blockTestifiBucksGreenWall", + "side": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenStairs.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenStairs.json new file mode 100644 index 000000000..f06aa8039 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenStairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "actuallyadditions:blocks/blockTestifiBucksGreenWall", + "top": "actuallyadditions:blocks/blockTestifiBucksGreenWall", + "side": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenStairsInner.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenStairsInner.json new file mode 100644 index 000000000..34b5b94e7 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenStairsInner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "actuallyadditions:blocks/blockTestifiBucksGreenWall", + "top": "actuallyadditions:blocks/blockTestifiBucksGreenWall", + "side": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenStairsOuter.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenStairsOuter.json new file mode 100644 index 000000000..96ce69aa6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksGreenStairsOuter.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "actuallyadditions:blocks/blockTestifiBucksGreenWall", + "top": "actuallyadditions:blocks/blockTestifiBucksGreenWall", + "side": "actuallyadditions:blocks/blockTestifiBucksGreenWall" + } +} 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..0a5bfad64 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceInventory.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_inventory", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorth.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorth.json new file mode 100644 index 000000000..49f70eb52 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorth.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_n", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorthEast.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorthEast.json new file mode 100644 index 000000000..d5762b020 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorthEast.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_ne", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorthSouth.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorthSouth.json new file mode 100644 index 000000000..9679dae9d --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorthSouth.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_ns", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorthSouthAbove.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorthSouthAbove.json new file mode 100644 index 000000000..bf166b510 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorthSouthAbove.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_ns_above", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorthSouthEast.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorthSouthEast.json new file mode 100644 index 000000000..96659843c --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorthSouthEast.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_nse", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorthSouthEastWest.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorthSouthEastWest.json new file mode 100644 index 000000000..1223badcf --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFenceNorthSouthEastWest.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_nsew", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + } +} 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..18244230d --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteFencePost.json @@ -0,0 +1,6 @@ +{ + "parent": "block/wall_post", + "textures": { + "wall": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteSlabBottom.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteSlabBottom.json new file mode 100644 index 000000000..b25b04fd4 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteSlabBottom.json @@ -0,0 +1,8 @@ +{ + "parent": "block/half_slab", + "textures": { + "bottom": "actuallyadditions:blocks/blockTestifiBucksWhiteWall", + "top": "actuallyadditions:blocks/blockTestifiBucksWhiteWall", + "side": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteSlabTop.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteSlabTop.json new file mode 100644 index 000000000..941ae9448 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteSlabTop.json @@ -0,0 +1,8 @@ +{ + "parent": "block/upper_slab", + "textures": { + "bottom": "actuallyadditions:blocks/blockTestifiBucksWhiteWall", + "top": "actuallyadditions:blocks/blockTestifiBucksWhiteWall", + "side": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteStairs.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteStairs.json new file mode 100644 index 000000000..cda06026f --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteStairs.json @@ -0,0 +1,8 @@ +{ + "parent": "block/stairs", + "textures": { + "bottom": "actuallyadditions:blocks/blockTestifiBucksWhiteWall", + "top": "actuallyadditions:blocks/blockTestifiBucksWhiteWall", + "side": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteStairsInner.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteStairsInner.json new file mode 100644 index 000000000..ebd3ee1df --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteStairsInner.json @@ -0,0 +1,8 @@ +{ + "parent": "block/inner_stairs", + "textures": { + "bottom": "actuallyadditions:blocks/blockTestifiBucksWhiteWall", + "top": "actuallyadditions:blocks/blockTestifiBucksWhiteWall", + "side": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteStairsOuter.json b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteStairsOuter.json new file mode 100644 index 000000000..e3d36bcdf --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockTestifiBucksWhiteStairsOuter.json @@ -0,0 +1,8 @@ +{ + "parent": "block/outer_stairs", + "textures": { + "bottom": "actuallyadditions:blocks/blockTestifiBucksWhiteWall", + "top": "actuallyadditions:blocks/blockTestifiBucksWhiteWall", + "side": "actuallyadditions:blocks/blockTestifiBucksWhiteWall" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockBlackLotus.json b/src/main/resources/assets/actuallyadditions/models/item/blockBlackLotus.json new file mode 100644 index 000000000..448efa27a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockBlackLotus.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:blocks/blockBlackLotus" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} 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..c10464080 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksGreenFence.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockTestifiBucksGreenFenceInventory", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksGreenSlab.json b/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksGreenSlab.json new file mode 100644 index 000000000..9dab993f8 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksGreenSlab.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockTestifiBucksGreenSlabBottom", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksGreenStairs.json b/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksGreenStairs.json new file mode 100644 index 000000000..a9fb38819 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksGreenStairs.json @@ -0,0 +1,13 @@ +{ + "parent": "actuallyadditions:block/blockTestifiBucksGreenStairs", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} 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..2a487daf3 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksWhiteFence.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockTestifiBucksWhiteFenceInventory", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksWhiteSlab.json b/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksWhiteSlab.json new file mode 100644 index 000000000..f323b337e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksWhiteSlab.json @@ -0,0 +1,10 @@ +{ + "parent": "actuallyadditions:block/blockTestifiBucksWhiteSlabBottom", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksWhiteStairs.json b/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksWhiteStairs.json new file mode 100644 index 000000000..37460dfd7 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/blockTestifiBucksWhiteStairs.json @@ -0,0 +1,13 @@ +{ + "parent": "actuallyadditions:block/blockTestifiBucksWhiteStairs", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 180, 0 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemBattery.json b/src/main/resources/assets/actuallyadditions/models/item/itemBattery.json new file mode 100644 index 000000000..5b11ee9ce --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemBattery.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemBattery" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemBatteryDouble.json b/src/main/resources/assets/actuallyadditions/models/item/itemBatteryDouble.json new file mode 100644 index 000000000..13ed302b6 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemBatteryDouble.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemBatteryDouble" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemBatteryQuadruple.json b/src/main/resources/assets/actuallyadditions/models/item/itemBatteryQuadruple.json new file mode 100644 index 000000000..327a98ddb --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemBatteryQuadruple.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemBatteryQuadruple" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemBatteryQuintuple.json b/src/main/resources/assets/actuallyadditions/models/item/itemBatteryQuintuple.json new file mode 100644 index 000000000..cf16d5de9 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemBatteryQuintuple.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemBatteryQuintuple" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemBatteryTriple.json b/src/main/resources/assets/actuallyadditions/models/item/itemBatteryTriple.json new file mode 100644 index 000000000..eff130296 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemBatteryTriple.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemBatteryTriple" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemBucketCanolaOil.json b/src/main/resources/assets/actuallyadditions/models/item/itemBucketCanolaOil.json new file mode 100644 index 000000000..9d4cc28c8 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemBucketCanolaOil.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemBucketCanolaOil" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemBucketOil.json b/src/main/resources/assets/actuallyadditions/models/item/itemBucketOil.json new file mode 100644 index 000000000..75c941074 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemBucketOil.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemBucketOil" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemCoffeeBeans.json b/src/main/resources/assets/actuallyadditions/models/item/itemCoffeeBeans.json new file mode 100644 index 000000000..2677e5f3e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemCoffeeBeans.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemCoffeeBeans" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemGrowthRing.json b/src/main/resources/assets/actuallyadditions/models/item/itemGrowthRing.json new file mode 100644 index 000000000..6a168e784 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemGrowthRing.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemGrowthRing" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemPhantomConnector.json b/src/main/resources/assets/actuallyadditions/models/item/itemPhantomConnector.json new file mode 100644 index 000000000..bbc5cf49a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemPhantomConnector.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemPhantomConnector" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemRiceSeed.json b/src/main/resources/assets/actuallyadditions/models/item/itemRiceSeed.json new file mode 100644 index 000000000..723b390dd --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemRiceSeed.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemRiceSeed" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemSuctionRing.json b/src/main/resources/assets/actuallyadditions/models/item/itemSuctionRing.json new file mode 100644 index 000000000..5fc36c5bb --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemSuctionRing.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemSuctionRing" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemTeleStaff.json b/src/main/resources/assets/actuallyadditions/models/item/itemTeleStaff.json new file mode 100644 index 000000000..2488f5e93 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemTeleStaff.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemTeleStaff" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemWaterRemovalRing.json b/src/main/resources/assets/actuallyadditions/models/item/itemWaterRemovalRing.json new file mode 100644 index 000000000..e833b971a --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemWaterRemovalRing.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemWaterRemovalRing" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemWingsOfTheBats.json b/src/main/resources/assets/actuallyadditions/models/item/itemWingsOfTheBats.json new file mode 100644 index 000000000..16ce4d11b --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemWingsOfTheBats.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "actuallyadditions:items/itemWingsOfTheBats" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +}