Got walls working, simplified the code by looking @ botania's implementation.

renevo · renevo · commit 534c098c38b5 · 2016-05-22T02:23:58.000-07:00
Still some missing textures here and there, mostly with wall break particles and waila tooltips. Might be worth shipping a Beta on this build. #29
diff --git a/src/main/java/com/renevo/nethercore/blocks/BlockStoneWall.java b/src/main/java/com/renevo/nethercore/blocks/BlockStoneWall.java
@@ -1,30 +1,23 @@
 package com.renevo.nethercore.blocks;
 
 import com.renevo.nethercore.NetherCoreRegistry;
-import net.minecraft.block.material.Material;
+import net.minecraft.block.Block;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.IStringSerializable;
 
 import java.util.Locale;
 
 public class BlockStoneWall extends EnumBlockWall<BlockStoneWall.WallType> {
-    public static final PropertyEnum<WallType> VARIANT = PropertyEnum.create("variant", WallType.class);
+    public static final PropertyEnum<WallType> VARIANT = PropertyEnum.create("stone_variant", WallType.class);
 
-    public BlockStoneWall() {
-        this(Material.rock);
-    }
-
-    public BlockStoneWall(Material material) {
-        super(material, VARIANT, WallType.class);
+    public BlockStoneWall(Block block) {
+        super(block, VARIANT, WallType.class);
 
         IBlockState blockState = this.blockState.getBaseState();
-        this.setDefaultState(blockState.withProperty(VARIANT, WallType.STONE).withProperty(UP, true).withProperty(NORTH, true).withProperty(EAST, false).withProperty(SOUTH, true).withProperty(WEST, false));
+        this.setDefaultState(blockState.withProperty(VARIANT, WallType.STONE).withProperty(UP, false).withProperty(NORTH, false).withProperty(EAST, false).withProperty(SOUTH, false).withProperty(WEST, false));
         this.setCreativeTab(NetherCoreRegistry.tabNetherCore);
-        this.setHardness(3F);
-        this.setResistance(20F);
         this.setHarvestLevel("pickaxe", 1); // 1 is stone required (0 wood, 1 stone, 2 iron)
-        this.setStepSound(NetherCoreBlocks.soundTypeNetherStone);
     }
 
     public enum WallType implements IStringSerializable, EnumBlockWall.IEnumMeta {
diff --git a/src/main/java/com/renevo/nethercore/blocks/EnumBlockSlab.java b/src/main/java/com/renevo/nethercore/blocks/EnumBlockSlab.java
@@ -19,6 +19,7 @@
 import java.util.Locale;
 import java.util.Random;
 
+// TODO: switch to mantle version
 public abstract class EnumBlockSlab<E extends Enum<E> & EnumBlockSlab.IEnumMeta & IStringSerializable> extends BlockSlab {
     private final E[] values;
     public static final PropertyBool SEAMLESS = PropertyBool.create("seamless");
diff --git a/src/main/java/com/renevo/nethercore/blocks/EnumBlockWall.java b/src/main/java/com/renevo/nethercore/blocks/EnumBlockWall.java
@@ -1,112 +1,35 @@
 package com.renevo.nethercore.blocks;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockFenceGate;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.PropertyBool;
+import net.minecraft.block.BlockWall;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.IStringSerializable;
-import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 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 EnumBlockWall<E extends Enum<E> & EnumBlockWall.IEnumMeta & IStringSerializable> extends Block {
-    public static final PropertyBool UP = PropertyBool.create("up");
-    public static final PropertyBool NORTH = PropertyBool.create("north");
-    public static final PropertyBool EAST = PropertyBool.create("east");
-    public static final PropertyBool SOUTH = PropertyBool.create("south");
-    public static final PropertyBool WEST = PropertyBool.create("west");
-    protected static final AxisAlignedBB[] BASE_BBS = 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[] ACTUAL_BBS;
-
+public class EnumBlockWall<E extends Enum<E> & EnumBlockWall.IEnumMeta & IStringSerializable> extends BlockWall {
     private final E[] values;
     public final PropertyEnum<E> prop;
     private static PropertyEnum<?> tmp;
 
-    public EnumBlockWall(Material material, PropertyEnum<E> prop, Class<E> clazz) {
-        super(preInit(material, prop));
+    public EnumBlockWall(Block block, PropertyEnum<E> prop, Class<E> clazz) {
+        super(preInit(block, prop));
         this.prop = prop;
         values = clazz.getEnumConstants();
     }
 
-    @SuppressWarnings("unchecked")
-    private static Material preInit(Material material, PropertyEnum<?> property) {
+    private static Block preInit(Block block, PropertyEnum<?> property) {
         tmp = property;
-        return material;
-    }
-
-    @Override
-    public boolean isFullCube(IBlockState blockState) {
-        return false;
-    }
-
-    @Override
-    public boolean isPassable(IBlockAccess blockAccess, BlockPos blockPos) {
-        return false;
-    }
-
-    @Override
-    public boolean isOpaqueCube(IBlockState blockState) {
-        return false;
-    }
-
-    @Override
-    public AxisAlignedBB getBoundingBox(IBlockState p_getBoundingBox_1_, IBlockAccess p_getBoundingBox_2_, BlockPos p_getBoundingBox_3_) {
-        p_getBoundingBox_1_ = this.getActualState(p_getBoundingBox_1_, p_getBoundingBox_2_, p_getBoundingBox_3_);
-        return BASE_BBS[getFacingFlags(p_getBoundingBox_1_)];
-    }
-
-    @Override
-    public AxisAlignedBB getSelectedBoundingBox(IBlockState p_getSelectedBoundingBox_1_, World p_getSelectedBoundingBox_2_, BlockPos p_getSelectedBoundingBox_3_) {
-        p_getSelectedBoundingBox_1_ = this.getActualState(p_getSelectedBoundingBox_1_, p_getSelectedBoundingBox_2_, p_getSelectedBoundingBox_3_);
-        return ACTUAL_BBS[getFacingFlags(p_getSelectedBoundingBox_1_)];
-    }
-
-    // face flags... GET YO FACE... not sure what better to call this
-    // basically, this selects the Bounding Box based on the sides that are connected.
-    private static int getFacingFlags(IBlockState blockState) {
-        int faceFlags = 0;
-        if(blockState.getValue(NORTH)) {
-            faceFlags |= 1 << EnumFacing.NORTH.getHorizontalIndex();
-        }
-
-        if(blockState.getValue(EAST)) {
-            faceFlags |= 1 << EnumFacing.EAST.getHorizontalIndex();
-        }
-
-        if(blockState.getValue(SOUTH)) {
-            faceFlags |= 1 << EnumFacing.SOUTH.getHorizontalIndex();
-        }
-
-        if(blockState.getValue(WEST)) {
-            faceFlags |= 1 << EnumFacing.WEST.getHorizontalIndex();
-        }
-
-        return faceFlags;
-    }
-
-    @SuppressWarnings("SimplifiableConditionalExpression") // more readable this way
-    protected boolean canConnectTo(IBlockAccess blockAccess, BlockPos blockPos) {
-        IBlockState block = blockAccess.getBlockState(blockPos);
-        return block.getBlock() == Blocks.barrier
-                ? false
-                : (block.getBlock() != this && !(block.getBlock() instanceof BlockFenceGate)
-                ? (block.getMaterial().isOpaque() && block.isFullCube()
-                ? block.getMaterial() != Material.gourd
-                : false)
-                : true);
+        return block;
     }
 
     @Override
@@ -127,12 +50,6 @@ public int damageDropped(IBlockState state) {
         return getMetaFromState(state);
     }
 
-    @SideOnly(Side.CLIENT)
-    @Override
-    public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos blockPos, EnumFacing enumFacing) {
-        return enumFacing != EnumFacing.DOWN || super.shouldSideBeRendered(blockState, blockAccess, blockPos, enumFacing);
-    }
-
     @Override
     public IBlockState getStateFromMeta(int meta) {
         return this.getDefaultState().withProperty(prop, fromMeta(meta));
@@ -145,12 +62,12 @@ public int getMetaFromState(IBlockState state) {
 
     @Override
     public IBlockState getActualState(IBlockState blockState, IBlockAccess blockAccess, BlockPos blockPos) {
-        return blockState.withProperty(UP, !blockAccess.isAirBlock(blockPos.up())).withProperty(NORTH, this.canConnectTo(blockAccess, blockPos.north())).withProperty(EAST, this.canConnectTo(blockAccess, blockPos.east())).withProperty(SOUTH, this.canConnectTo(blockAccess, blockPos.south())).withProperty(WEST, this.canConnectTo(blockAccess, blockPos.west()));
+        return super.getActualState(blockState, blockAccess, blockPos).withProperty(prop, fromMeta(getMetaFromState(blockState)));
     }
 
     @Override
     protected BlockStateContainer createBlockState() {
-        return new BlockStateContainer(this, UP, NORTH, EAST, WEST, SOUTH, prop == null ? tmp : prop);
+        return new BlockStateContainer(this, VARIANT, UP, NORTH, EAST, WEST, SOUTH, prop == null ? tmp : prop);
     }
 
     protected E fromMeta(int meta) {
@@ -161,10 +78,6 @@ protected E fromMeta(int meta) {
         return values[meta];
     }
 
-    static {
-        ACTUAL_BBS = new AxisAlignedBB[]{BASE_BBS[0].setMaxY(1.5D), BASE_BBS[1].setMaxY(1.5D), BASE_BBS[2].setMaxY(1.5D), BASE_BBS[3].setMaxY(1.5D), BASE_BBS[4].setMaxY(1.5D), BASE_BBS[5].setMaxY(1.5D), BASE_BBS[6].setMaxY(1.5D), BASE_BBS[7].setMaxY(1.5D), BASE_BBS[8].setMaxY(1.5D), BASE_BBS[9].setMaxY(1.5D), BASE_BBS[10].setMaxY(1.5D), BASE_BBS[11].setMaxY(1.5D), BASE_BBS[12].setMaxY(1.5D), BASE_BBS[13].setMaxY(1.5D), BASE_BBS[14].setMaxY(1.5D), BASE_BBS[15].setMaxY(1.5D)};
-    }
-
     public interface IEnumMeta {
         int getMeta();
     }
diff --git a/src/main/java/com/renevo/nethercore/blocks/NetherCoreBlocks.java b/src/main/java/com/renevo/nethercore/blocks/NetherCoreBlocks.java
@@ -63,7 +63,7 @@ public static void init() {
         blockNetherHalfSlab = registerEnumBlock(halfStoneSlab, halfStoneSlab, doubleStoneSlab, "slab_half_stone");
         blockNetherDoubleSlab = registerEnumBlock(doubleStoneSlab, halfStoneSlab, doubleStoneSlab, "slab_double_stone");
 
-        blockNetherStoneWall = registerEnumBlock(new BlockStoneWall(), "wall_stone");
+        blockNetherStoneWall = registerEnumBlock(new BlockStoneWall(blockNetherStone), "wall_stone");
 
         blockNetherGrass = registerBlock(new BlockNetherGrass(), "nether_grass");
 
diff --git a/src/main/java/com/renevo/nethercore/common/ClientProxy.java b/src/main/java/com/renevo/nethercore/common/ClientProxy.java
@@ -1,8 +1,8 @@
 package com.renevo.nethercore.common;
 
 import com.renevo.nethercore.Util;
-import com.renevo.nethercore.blocks.BlockCompressedNetherrack;
 import com.renevo.nethercore.blocks.BlockStoneSlab;
+import com.renevo.nethercore.blocks.BlockStoneWall;
 import com.renevo.nethercore.blocks.NetherCoreBlocks;
 import com.renevo.nethercore.item.NetherCoreItems;
 import net.minecraft.block.Block;
@@ -42,7 +42,6 @@ public void registerModels() {
         registerItemBlockMeta(NetherCoreBlocks.blockCompressedNetherrack);
         registerItemBlockMeta(NetherCoreBlocks.blockNetherOre);
         registerItemBlockMeta(NetherCoreBlocks.blockNetherStone);
-        registerItemBlockMeta(NetherCoreBlocks.blockNetherStoneWall);
 
         // stairs
         itemToAdd = Item.getItemFromBlock(NetherCoreBlocks.blockNetherStoneStairs);
@@ -58,6 +57,13 @@ public void registerModels() {
             ModelLoader.setCustomModelResourceLocation(itemToAdd, t.getMeta(), new ModelResourceLocation(Util.getResource("slab_half_stone"), "half=bottom,variant=" + t.getName().toLowerCase(Locale.US)));
         }
 
+        // walls
+        itemToAdd = Item.getItemFromBlock(NetherCoreBlocks.blockNetherStoneWall);
+        for (BlockStoneWall.WallType wall : BlockStoneWall.WallType.values()) {
+            String variantName = "inventory_" + wall.getName();
+            ModelLoader.setCustomModelResourceLocation(itemToAdd, wall.getMeta(), new ModelResourceLocation(itemToAdd.getRegistryName(), variantName));
+        }
+
         // grass
         itemToAdd = Item.getItemFromBlock(NetherCoreBlocks.blockNetherGrass);
         ModelLoader.setCustomModelResourceLocation(itemToAdd, 0, new ModelResourceLocation(Util.getResource("nether_grass"), "inventory"));
diff --git a/src/main/resources/assets/nethercore/blockstates/wall_stone.json b/src/main/resources/assets/nethercore/blockstates/wall_stone.json
@@ -1,21 +1,69 @@
 {
   "forge_marker": 1,
   "defaults": {
-    "transform": "forge:default-block",
-    "model": "minecraft:wall_post",
+    "model": "nethercore:dummy",
     "textures": {
-      "wall": "nethercore:blocks/nether_stone_cobble"
-    }
+      "texture": "nethercore:blocks/nether_stone"
+    },
+    "uvlock": true,
+    "transform": "forge:default-block"
   },
   "variants": {
-    "inventory": [{}],
-    "normal": [{}],
-    "east": {"true": {}, "false": {}},
-    "north": {"true": {}, "false": {}},
-    "south": {"true": {}, "false": {}},
-    "up": {"true": {}, "false": {}},
-    "west": {"true": {}, "false": {}},
-    "variant": {
+    "inventory_stone": [{
+      "model": "minecraft:wall_inventory",
+      "y": 180,
+      "textures": {
+        "wall": "nethercore:blocks/nether_stone"
+      }
+    }],
+    "inventory_cobblestone": [{
+      "model": "minecraft:wall_inventory",
+      "y": 180,
+      "textures": {
+        "wall": "nethercore:blocks/nether_stone_cobble"
+      }
+    }],
+    "inventory_brick": [{
+      "model": "minecraft:wall_inventory",
+      "y": 180,
+      "textures": {
+        "wall": "minecraft:blocks/nether_brick"
+      }
+    }],
+    "north": {
+      "true": {
+        "submodel": "minecraft:wall_side"
+      },
+      "false": {}
+    },
+    "south": {
+      "true": {
+        "submodel": "minecraft:wall_side",
+        "y": 180
+      },
+      "false": {}
+    },
+    "west": {
+      "true": {
+        "submodel": "minecraft:wall_side",
+        "y": 270
+      },
+      "false": {}
+    },
+    "east": {
+      "true": {
+        "submodel": "minecraft:wall_side",
+        "y": 90
+      },
+      "false": {}
+    },
+    "up": {
+      "true": {
+        "submodel": "minecraft:wall_post"
+      },
+      "false": {}
+    },
+    "stone_variant": {
       "stone": {
         "textures": {
           "wall": "nethercore:blocks/nether_stone"
@@ -31,28 +79,10 @@
           "wall": "minecraft:blocks/nether_brick"
         }
       }
-    }
-  },
-  "multipart": [
-    {
-      "when": { "up": "true" },
-      "apply": { "model": "minecraft:wall_post" }
-    },
-    {
-      "when": { "north": "true" },
-      "apply": { "model": "minecraft:wall_side", "uvlock": true }
-    },
-    {
-      "when": { "east": "true" },
-      "apply": { "model": "minecraft:wall_side", "y": 90, "uvlock": true }
     },
-    {
-      "when": { "south": "true" },
-      "apply": { "model": "minecraft:wall_side", "y": 180, "uvlock": true }
-    },
-    {
-      "when": { "west": "true" },
-      "apply": { "model": "minecraft:wall_side", "y": 270, "uvlock": true }
+    "variant": {
+      "cobblestone": {},
+      "mossy_cobblestone": {}
     }
-  ]
+  }
 }
diff --git a/src/main/resources/assets/nethercore/models/block/dummy.json b/src/main/resources/assets/nethercore/models/block/dummy.json
@@ -0,0 +1,12 @@
+{
+  "__comment": "Dummy for TESRS that still want to set their block break particle without using code",
+  "elements": [
+    {
+      "from": [0, 0, 0],
+      "to": [0, 0, 0],
+      "faces": {
+        "up": { "uv": [ 0, 0, 0, 0 ], "texture": "#texture" }
+      }
+    }
+  ]
+}
