diff --git a/build.gradle b/build.gradle index c4d8d97f..e4ca299a 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ dependencies { compile "mezz.jei:jei_${config.jei_mc_version}:${config.jei_version}" } -version = "${project.config.mod_version}." + (System.getenv("BUILD_NUMBER") ?: "29") +version = "${project.config.mod_version}." + (System.getenv("BUILD_NUMBER") ?: "1") println config.mc_version + "-" + config.forge_version // Setup the Forge/Minecraft plugin data. Specify the preferred Forge/Minecraft version here. diff --git a/src/main/java/cofh/core/block/BlockCore.java b/src/main/java/cofh/core/block/BlockCore.java index 8a13aacc..9b0c5b59 100644 --- a/src/main/java/cofh/core/block/BlockCore.java +++ b/src/main/java/cofh/core/block/BlockCore.java @@ -1,6 +1,7 @@ package cofh.core.block; import net.minecraft.block.Block; +import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; public class BlockCore extends Block { @@ -8,14 +9,15 @@ public class BlockCore extends Block { protected String modName; protected String name; - public BlockCore(Material material) { + public BlockCore(Material material, String modName) { - this(material, "cofh"); + super(material); + this.modName = modName; } - public BlockCore(Material material, String modName) { + public BlockCore(Material material, MapColor blockMapColor, String modName) { - super(material); + super(material, blockMapColor); this.modName = modName; } diff --git a/src/main/java/cofh/core/block/BlockCoreTile.java b/src/main/java/cofh/core/block/BlockCoreTile.java index fc3d1671..7293c22e 100644 --- a/src/main/java/cofh/core/block/BlockCoreTile.java +++ b/src/main/java/cofh/core/block/BlockCoreTile.java @@ -45,13 +45,6 @@ public abstract class BlockCoreTile extends BlockCore implements ITileEntityProvider, IBlockInfo, IDismantleable, IInitializer { - public BlockCoreTile(Material material) { - - super(material); - - setSoundType(SoundType.STONE); - } - public BlockCoreTile(Material material, String modName) { super(material, modName); @@ -186,7 +179,7 @@ public int getComparatorInputOverride(IBlockState blockState, World world, Block public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); - return tile instanceof TileCore && tile.hasWorld() ? ((TileCore) tile).getLightValue() : 0; + return tile instanceof TileCore && tile.hasWorld() ? ((TileCore) tile).getLightValue() : super.getLightValue(state, world, pos); } @Override