Merge pull request #6 from zekroTJA/dev

Dev

CHANGELOG.md

@@ -1,3 +1,4 @@
 [version will be automatically inserted here by CD]
 
-- Update to Forge 14.23.5.2854
+- The Infuser now has proper break particles. 
+- Version is now properly displayed in the mod list.

build.gradle

@@ -39,12 +39,6 @@ minecraft {
 
             // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
-
-//            mods {
-//                magicsstaffs {
-//                    source sourceSets.main
-//                }
-//            }
         }
 
         server {
@@ -55,12 +49,6 @@ minecraft {
 
             // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
-
-//            mods {
-//                magicsstaffs {
-//                    source sourceSets.main
-//                }
-//            }
         }
     }
 }
@@ -93,14 +81,14 @@ dependencies {
 processResources {
     // this will ensure that this task is redone when the versions change.
     inputs.property "version", project.version
-//    inputs.property "mcversion", project.minecraft.version
+    inputs.property "mcversion", version_minecraft
 
     // replace stuff in mcmod.info, nothing else
     from(sourceSets.main.resources.srcDirs) {
         include 'mcmod.info'
 
-        // replace version and mcversion
-        // expand 'version':project.version , 'mcversion':project.minecraft.version
+         // replace version and mcversion
+         expand 'version': project.version, 'mcversion': version_minecraft
     }
 
     // copy everything else except the mcmod.info

src/main/java/de/zekro/magicstaffs/MagicStaffs.java

@@ -35,7 +35,7 @@ public class MagicStaffs {
     // General Mod Properties
     public static final String MOD_ID = "magicstaffs";
     public static final String NAME = "Magic Staffs";
-    public static final String VERSION = "0.9";
+    public static final String VERSION = "0.10.1";
 
     public static ConfigHandler configHandler;
 

src/main/java/de/zekro/magicstaffs/blocks/infuser/BlockInfuser.java

@@ -36,6 +36,7 @@ public class BlockInfuser extends BlockBase implements ITileEntityProvider {
     public BlockInfuser(String name, CreativeTabs tabs) {
         super(name, Material.ROCK, tabs);
         setHardness(5);
+        setLightOpacity(0);
         setDefaultState(getBlockState().getBaseState()
                 .withProperty(BlockHorizontal.FACING, EnumFacing.NORTH));
     }
@@ -140,16 +141,6 @@ protected BlockStateContainer createBlockState() {
         return new BlockStateContainer(this, BlockHorizontal.FACING);
     }
 
-//    @Override
-//    public IBlockState getStateFromMeta(int meta) {
-//        EnumFacing facing = EnumFacing.getFront(meta);
-//
-//        if (facing.getAxis() == EnumFacing.Axis.Y)
-//            facing = EnumFacing.NORTH;
-//
-//        return this.getDefaultState().withProperty(BlockHorizontal.FACING, facing);
-//    }
-
     @Override
     public int getMetaFromState(IBlockState state)
     {

src/main/resources/assets/magicstaffs/models/block/infuser.json

@@ -1,5 +1,6 @@
 {
     "textures": {
+        "particle": "magicstaffs:blocks/infuser_bottom",
         "infuser_top": "magicstaffs:blocks/infuser_top",
         "infuser_side": "magicstaffs:blocks/infuser_side",
         "infuser_bottom": "magicstaffs:blocks/infuser_bottom"