Fixed brightness issue with crystals.

2016-02-25 11:29:48 -05:00 · 2016-02-25 11:29:48 -05:00 · 8077962e08
parent 3fc6b5627f
commit 8077962e08
12 changed files with 1239 additions and 55 deletions
--- a/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java
+++ b/src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java
@ -56,12 +56,6 @@ public class BlockDemonCrystal extends Block
        return 3;
    }

-    @Override
-    public boolean canRenderInLayer(EnumWorldBlockLayer layer)
-    {
-        return layer == EnumWorldBlockLayer.CUTOUT_MIPPED || layer == EnumWorldBlockLayer.TRANSLUCENT;
-    }
-
 //    public boolean canBlockStay(World worldIn, BlockPos pos, IBlockState state)
 //    {
 //        return (worldIn.getLight(pos) >= 8 || worldIn.canSeeSky(pos)) && worldIn.getBlockState(pos.down()).getBlock().canSustainPlant(worldIn, pos.down(), net.minecraft.util.EnumFacing.UP, this);
--- a/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java
+++ b/src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java
@ -210,6 +210,7 @@ public class ModBlocks
        renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 6);
        renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 7);
        renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(demonCrystal));
+        renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(demonPylon));

        renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(dimensionalPortal));
    }
--- a/src/main/resources/assets/bloodmagic/blockstates/BlockDemonPylon.json
+++ b/src/main/resources/assets/bloodmagic/blockstates/BlockDemonPylon.json
@ -0,0 +1,21 @@
+{
+    "forge_marker": 1,
+    "defaults": {
+        "textures": { },
+        "model": "bloodmagic:BlockDemonPylon.obj",
+        "custom": { "flip-v": true },
+        "transform": {
+            "translation": [ 0.5, 0, 0.5]
+        }
+    },
+    "variants": {
+        "normal": [{
+
+        }],
+        "inventory": [{
+            "transform": {
+                "translation": [0.44, -0.1, 0.44]
+            }
+        }]
+    }
+}
--- a/src/main/resources/assets/bloodmagic/models/block/BlockDemonPylon.mtl
+++ b/src/main/resources/assets/bloodmagic/models/block/BlockDemonPylon.mtl
@ -0,0 +1,11 @@
+# Blender MTL File: 'None'
+# Material Count: 1
+
+newmtl None
+Ns 0
+Ka 0.000000 0.000000 0.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
+illum 2
+map_Kd bloodmagic:models/demonpylon
--- a/src/main/resources/assets/bloodmagic/models/block/BlockDemonPylon.obj
+++ b/src/main/resources/assets/bloodmagic/models/block/BlockDemonPylon.obj
--- a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal1.mtl
+++ b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal1.mtl
@ -2,12 +2,10 @@
 # Material Count: 1

 newmtl Material.001
-Ns 96.078431
-Ka 1.000000 1.000000 1.000000
-Kd 0.640000 0.640000 0.640000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
+Ns 0
+Ka 0.000000 0.000000 0.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
 illum 2
 map_Kd crystal
--- a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal2.mtl
+++ b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal2.mtl
@ -2,12 +2,10 @@
 # Material Count: 1

 newmtl Material.001
-Ns 96.078431
-Ka 1.000000 1.000000 1.000000
-Kd 0.640000 0.640000 0.640000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
+Ns 0
+Ka 0.000000 0.000000 0.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
 illum 2
 map_Kd crystal
--- a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal3.mtl
+++ b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal3.mtl
@ -2,12 +2,10 @@
 # Material Count: 1

 newmtl Material.001
-Ns 96.078431
-Ka 1.000000 1.000000 1.000000
-Kd 0.640000 0.640000 0.640000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
+Ns 0
+Ka 0.000000 0.000000 0.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
 illum 2
 map_Kd crystal
--- a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal4.mtl
+++ b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal4.mtl
@ -2,12 +2,10 @@
 # Material Count: 1

 newmtl Material.001
-Ns 96.078431
-Ka 1.000000 1.000000 1.000000
-Kd 0.640000 0.640000 0.640000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
+Ns 0
+Ka 0.000000 0.000000 0.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
 illum 2
 map_Kd crystal
--- a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal5.mtl
+++ b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal5.mtl
@ -2,12 +2,10 @@
 # Material Count: 1

 newmtl Material.001
-Ns 96.078431
-Ka 1.000000 1.000000 1.000000
-Kd 0.640000 0.640000 0.640000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
+Ns 0
+Ka 0.000000 0.000000 0.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
 illum 2
 map_Kd crystal
--- a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal6.mtl
+++ b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal6.mtl
@ -2,12 +2,10 @@
 # Material Count: 1

 newmtl Material.001
-Ns 96.078431
-Ka 1.000000 1.000000 1.000000
-Kd 0.640000 0.640000 0.640000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
+Ns 0
+Ka 0.000000 0.000000 0.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
 illum 2
 map_Kd crystal
--- a/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal7.mtl
+++ b/src/main/resources/assets/bloodmagic/models/block/crystal/Crystal7.mtl
@ -2,12 +2,10 @@
 # Material Count: 1

 newmtl Material.001
-Ns 96.078431
-Ka 1.000000 1.000000 1.000000
-Kd 0.640000 0.640000 0.640000
-Ks 0.500000 0.500000 0.500000
-Ke 0.000000 0.000000 0.000000
-Ni 1.000000
-d 1.000000
+Ns 0
+Ka 0.000000 0.000000 0.000000
+Kd 0.8 0.8 0.8
+Ks 0.8 0.8 0.8
+d 1
 illum 2
 map_Kd crystal