better render method + default textures

Author: RedthMC

src/main/java/de/timmi6790/barrier/mixins/blocks/MixinBlockBarrier.java

@@ -4,21 +4,46 @@
 import de.timmi6790.barrier.Cache;
 import de.timmi6790.barrier.McMod;
 import lombok.Getter;
+import net.minecraft.block.Block;
 import net.minecraft.block.BlockBarrier;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.block.material.Material;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.init.Blocks;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumWorldBlockLayer;
+import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(BlockBarrier.class)
-public class MixinBlockBarrier {
+public class MixinBlockBarrier extends Block {
     @Getter(lazy = true)
     private final Cache cache = McMod.getInstance().getCache();
 
+    public MixinBlockBarrier(Material blockMaterialIn) {
+        super(blockMaterialIn);
+    }
+
     @Inject(method = "getRenderType", at = @At("HEAD"), cancellable = true)
     public void getRenderType(final CallbackInfoReturnable<Integer> cir) {
         if (this.getCache().isVisibleBarrier()) {
             cir.setReturnValue(3);
         }
     }
+
+    @SideOnly(Side.CLIENT)
+    public EnumWorldBlockLayer getBlockLayer() {
+        return EnumWorldBlockLayer.CUTOUT;
+    }
+
+    @SideOnly(Side.CLIENT)
+    public boolean shouldSideBeRendered(IBlockAccess worldIn, BlockPos pos, EnumFacing side) {
+        return worldIn.getBlockState(pos).getBlock() != this && super.shouldSideBeRendered(worldIn, pos, side);
+    }
 }

src/main/java/de/timmi6790/barrier/mixins/blocks/MixinBlockStateMapper.java

@@ -0,0 +1,27 @@
+package de.timmi6790.barrier.mixins.blocks;
+
+
+import de.timmi6790.barrier.Cache;
+import de.timmi6790.barrier.McMod;
+import lombok.Getter;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockBarrier;
+import net.minecraft.client.renderer.block.statemap.BlockStateMapper;
+import net.minecraft.init.Blocks;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Set;
+
+@Mixin(BlockStateMapper.class)
+public class MixinBlockStateMapper {
+    @Getter(lazy = true)
+    private final Cache cache = McMod.getInstance().getCache();
+
+    @Redirect(method = "putAllStateModelLocations", at = @At(value = "INVOKE", target = "Ljava/util/Set;contains(Ljava/lang/Object;)Z"))
+    public boolean getRenderType(Set instance, Object o) {
+        return o != Blocks.barrier && instance.contains(o);
+    }
+}

src/main/resources/assets/minecraft/blockstates/barrier.json

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

src/main/resources/assets/minecraft/models/block/barrier.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "items/barrier"
+    }
+}

src/main/resources/assets/minecraft/textures/blocks/barrier.png

@@ -5,5 +5,8 @@
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "blocks.MixinBlockBarrier"
+  ],
+  "client": [
+    "blocks.MixinBlockStateMapper"
   ]
 }