Merge pull request #9 from KELETU66666/master

New model for engines

.gitignore

@@ -11,6 +11,7 @@ build.xml
 Icon?
 ehthumbs.db
 Thumbs.db
+gradle.properties
 #gradle stuff
 /.gradle
 /build/

src/main/java/com/verdantartifice/thaumicwonders/common/blocks/devices/BlockInspirationEngine.java

@@ -7,11 +7,15 @@
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import thaumcraft.common.blocks.IBlockFacingHorizontal;
 
-public class BlockInspirationEngine extends BlockDeviceTW<TileInspirationEngine> {
+public class BlockInspirationEngine extends BlockDeviceTW<TileInspirationEngine> implements IBlockFacingHorizontal {
     public BlockInspirationEngine() {
         super(Material.IRON, TileInspirationEngine.class, "inspiration_engine");
         this.setSoundType(SoundType.METAL);
@@ -31,4 +35,10 @@ public boolean isOpaqueCube(IBlockState state) {
     public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) {
         return BlockFaceShape.UNDEFINED;
     }
+
+    @SideOnly(Side.CLIENT)
+    public BlockRenderLayer getRenderLayer()
+    {
+        return BlockRenderLayer.CUTOUT;
+    }
 }

src/main/java/com/verdantartifice/thaumicwonders/common/blocks/devices/BlockMadnessEngine.java

@@ -7,11 +7,15 @@
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.IBlockState;
+import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import thaumcraft.common.blocks.IBlockFacingHorizontal;
 
-public class BlockMadnessEngine extends BlockDeviceTW<TileMadnessEngine> {
+public class BlockMadnessEngine extends BlockDeviceTW<TileMadnessEngine> implements IBlockFacingHorizontal {
     public BlockMadnessEngine() {
         super(Material.IRON, TileMadnessEngine.class, "madness_engine");
         this.setSoundType(SoundType.METAL);
@@ -31,4 +35,10 @@ public boolean isOpaqueCube(IBlockState state) {
     public BlockFaceShape getBlockFaceShape(IBlockAccess worldIn, IBlockState state, BlockPos pos, EnumFacing face) {
         return BlockFaceShape.UNDEFINED;
     }
+
+    @SideOnly(Side.CLIENT)
+    public BlockRenderLayer getRenderLayer()
+    {
+        return BlockRenderLayer.CUTOUT;
+    }
 }

src/main/java/com/verdantartifice/thaumicwonders/common/tiles/devices/AbstractTileResearchEngine.java

@@ -130,7 +130,7 @@ public Aspect getSuctionType(EnumFacing face) {
 
     @Override
     public boolean isConnectable(EnumFacing face) {
-        return face != EnumFacing.UP;
+        return face == this.getFacing().getOpposite();
     }
 
     @Override

src/main/resources/assets/thaumicwonders/blockstates/inspiration_engine.json

@@ -1,10 +1,15 @@
 {
     "forge_marker": 1,
     "defaults": {
-        "model": "thaumicwonders:inspiration_engine",
-        "transform": "forge:default-block"
-     },
+        "model": "thaumicwonders:inspiration_engine.obj",
+        "transform": "forge:default-block",
+        "textures": {"#material_all": "thaumicwonders:blocks/inspiration_engine"}
+    },
     "variants": {
-        "normal": [{}], "inventory": [{}]
+        "normal": [{}], "inventory": [{}],
+        "facing=north": {"model": "thaumicwonders:inspiration_engine.obj"},
+        "facing=south": {"model": "thaumicwonders:inspiration_engine.obj","y": 180},
+        "facing=east": {"model": "thaumicwonders:inspiration_engine.obj","y": 90},
+        "facing=west": {"model": "thaumicwonders:inspiration_engine.obj","y": 270}
     }
-}
+}

src/main/resources/assets/thaumicwonders/blockstates/madness_engine.json

@@ -1,10 +1,15 @@
 {
     "forge_marker": 1,
     "defaults": {
-        "model": "thaumicwonders:madness_engine",
-        "transform": "forge:default-block"
-     },
+        "model": "thaumicwonders:madness_engine.obj",
+        "transform": "forge:default-block",
+        "textures": {"#material_all": "thaumicwonders:blocks/madness_engine"}
+    },
     "variants": {
-        "normal": [{}], "inventory": [{}]
+        "normal": [{}], "inventory": [{}],
+        "facing=north": {"model": "thaumicwonders:madness_engine.obj"},
+        "facing=south": {"model": "thaumicwonders:madness_engine.obj","y": 180},
+        "facing=east": {"model": "thaumicwonders:madness_engine.obj","y": 90},
+        "facing=west": {"model": "thaumicwonders:madness_engine.obj","y": 270}
     }
-}
+}

src/main/resources/assets/thaumicwonders/models/block/inspiration_engine.mtl

@@ -0,0 +1,4 @@
+# Made in Blockbench 4.10.4
+newmtl material_all
+map_Kd thaumicwonders:blcoks/inspiration_engine
+newmtl none