diff --git a/build.gradle b/build.gradle index bf757b8..230fd14 100644 --- a/build.gradle +++ b/build.gradle @@ -68,8 +68,8 @@ compileJava { } dependencies { - deobfCompile "slimeknights.mantle:Mantle:${config.minecraft_version}-${config.mantle_version}" - deobfCompile "slimeknights:TConstruct:${config.minecraft_version}-${config.tinkers_version}" + deobfCompile "slimeknights.mantle:Mantle:${config.minecraft_minor_version}-${config.mantle_version}" + deobfCompile "slimeknights:TConstruct:${config.minecraft_minor_version}-${config.tinkers_version}" deobfCompile "mezz.jei:jei_${config.minecraft_version}:${config.jei_version}" deobfCompile "mcp.mobius.waila:Waila:${config.waila_version}" } diff --git a/build.properties b/build.properties index 8e36cf7..ec16b4e 100644 --- a/build.properties +++ b/build.properties @@ -1,10 +1,11 @@ mod_version=2.0.2 -minecraft_version=1.9.4 -forge_version=12.17.0.1976 +minecraft_version=1.10.2 +minecraft_minor_version=1.10 +forge_version=12.18.0.2007-1.10.0 mappings=snapshot_20160518 mantle_version=0.10.+ tinkers_version=2.3.+ -jei_version=3.6.+ +jei_version=3.7.+ waila_version=1.7.0-B3_1.9.4 diff --git a/src/main/java/com/renevo/nethercore/NetherCore.java b/src/main/java/com/renevo/nethercore/NetherCore.java index ba314bb..7717720 100644 --- a/src/main/java/com/renevo/nethercore/NetherCore.java +++ b/src/main/java/com/renevo/nethercore/NetherCore.java @@ -13,8 +13,8 @@ @Mod( modid = Util.MODID, - dependencies = "required-after:Forge@[12.17,);required-after:mantle@[1.9.4-0.10,)", - acceptedMinecraftVersions = "1.9.4", + dependencies = "required-after:Forge@[12.18,);required-after:mantle@[1.10,)", + acceptedMinecraftVersions = "1.10.2", updateJSON = "https://raw.githubusercontent.com/RenEvo/nethercore/master/update.json", useMetadata = true, guiFactory="com.renevo.nethercore.client.gui.config.ModGuiFactory") diff --git a/src/main/java/com/renevo/nethercore/NetherCoreRegistry.java b/src/main/java/com/renevo/nethercore/NetherCoreRegistry.java index c614c59..a4012e6 100644 --- a/src/main/java/com/renevo/nethercore/NetherCoreRegistry.java +++ b/src/main/java/com/renevo/nethercore/NetherCoreRegistry.java @@ -170,6 +170,7 @@ public static void registerRecipes() { addWallRecipe(NetherCoreItems.stone, NetherCoreItems.wallStone, false); addWallRecipe(NetherCoreItems.stoneCobble, NetherCoreItems.wallStoneCobble, false); addWallRecipe(new ItemStack(Blocks.NETHER_BRICK), NetherCoreItems.wallNetherBrick, true); + addWallRecipe(new ItemStack(Blocks.field_189879_dh /*Red Nether Brick */), NetherCoreItems.wallRedNetherBrick, false); } public static void registerIntegrations() { diff --git a/src/main/java/com/renevo/nethercore/blocks/BlockStoneWall.java b/src/main/java/com/renevo/nethercore/blocks/BlockStoneWall.java index 0228e5f..437af42 100644 --- a/src/main/java/com/renevo/nethercore/blocks/BlockStoneWall.java +++ b/src/main/java/com/renevo/nethercore/blocks/BlockStoneWall.java @@ -23,7 +23,8 @@ public BlockStoneWall(Block block) { public enum WallType implements IStringSerializable, EnumBlockWall.IEnumMeta { STONE, COBBLESTONE, - BRICK; + BRICK, + REDBRICK; public final int meta; diff --git a/src/main/resources/assets/nethercore/blockstates/wall_stone.json b/src/main/resources/assets/nethercore/blockstates/wall_stone.json index 71890b3..cd4b330 100644 --- a/src/main/resources/assets/nethercore/blockstates/wall_stone.json +++ b/src/main/resources/assets/nethercore/blockstates/wall_stone.json @@ -30,6 +30,13 @@ "wall": "minecraft:blocks/nether_brick" } }], + "inventory_redbrick": [{ + "model": "minecraft:wall_inventory", + "y": 180, + "textures": { + "wall": "minecraft:blocks/red_nether_brick" + } + }], "north": { "true": { "submodel": "minecraft:wall_side" @@ -78,6 +85,11 @@ "textures": { "wall": "minecraft:blocks/nether_brick" } + }, + "redbrick": { + "textures": { + "wall": "minecraft:blocks/red_nether_brick" + } } }, "variant": { diff --git a/src/main/resources/assets/nethercore/lang/en_US.lang b/src/main/resources/assets/nethercore/lang/en_US.lang index d0d8e86..b5dc0ec 100644 --- a/src/main/resources/assets/nethercore/lang/en_US.lang +++ b/src/main/resources/assets/nethercore/lang/en_US.lang @@ -48,6 +48,7 @@ tile.nethercore.slab_half_stone.road.name=Nether Stone Brick Road Slab tile.nethercore.wall_stone.stone.name=Nether Stone Wall tile.nethercore.wall_stone.cobblestone.name=Nether Cobblestone Wall tile.nethercore.wall_stone.brick.name=Nether Brick Wall +tile.nethercore.wall_stone.redbrick.name=Red Nether Brick Wall tile.nethercore.nether_grass.name=Nether Growth tile.nethercore.nether_grass.tooltip=Prevents mob spawns in the Nether diff --git a/update.json b/update.json index 0776675..f9dda0e 100644 --- a/update.json +++ b/update.json @@ -7,6 +7,8 @@ "1.9-recommended": "2.0.1", "1.9.4-latest": "2.0.2", "1.9.4-recommended": "2.0.2", + "1.10.2-latest": "2.0.2", + "1.10.2-recommended": "2.0.2", "latest": "1.3.7", "recommended": "1.3.7" }, @@ -34,5 +36,8 @@ }, "1.9.4": { "2.0.2": "Initial 1.9.4 Release Version" + }, + "1.10.2": { + "2.0.2": "Initial 1.10.2 Release Version" } } \ No newline at end of file