From 7d20f2a4d3c7eeea9d2c9e57a9730ccbf0431c37 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Mon, 9 Sep 2019 23:52:16 +1000 Subject: [PATCH] 2.8.1 Updated default piece pack so glass and stained glass walls no longer overwrite glass pane recipes. Whoops! From previous commits: Pieces can now emit redstone signals. --- gradle.properties | 2 +- .../shnupbups/extrapieces/ExtraPieces.java | 2 +- .../extrapieces/register/ModBlocks.java | 34 +++++++++---------- src/main/resources/fabric.mod.json | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gradle.properties b/gradle.properties index 45bbdde3..e5106e26 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.6.1+build.165 # Mod Properties - mod_version = 2.8.0 + mod_version = 2.8.1 maven_group = com.shnupbups archives_base_name = extrapieces diff --git a/src/main/java/com/shnupbups/extrapieces/ExtraPieces.java b/src/main/java/com/shnupbups/extrapieces/ExtraPieces.java index 7cc4a24e..403b2734 100644 --- a/src/main/java/com/shnupbups/extrapieces/ExtraPieces.java +++ b/src/main/java/com/shnupbups/extrapieces/ExtraPieces.java @@ -23,7 +23,7 @@ public class ExtraPieces implements ModInitializer { public static final String mod_id = "extrapieces"; public static final String mod_name = "Extra Pieces"; - public static final String piece_pack_version = "2.8.0"; + public static final String piece_pack_version = "2.8.1"; public static final Logger logger = LogManager.getFormatterLogger(mod_name); public static ArtificeResourcePack datapack; diff --git a/src/main/java/com/shnupbups/extrapieces/register/ModBlocks.java b/src/main/java/com/shnupbups/extrapieces/register/ModBlocks.java index 1eca3eb2..d6b461cf 100644 --- a/src/main/java/com/shnupbups/extrapieces/register/ModBlocks.java +++ b/src/main/java/com/shnupbups/extrapieces/register/ModBlocks.java @@ -320,23 +320,23 @@ public static void generateDefaultSets() { STRIPPED_JUNGLE_WOOD_PIECES = PieceSets.createDefaultSet(Blocks.STRIPPED_JUNGLE_WOOD, "stripped_jungle_wood").setTexture("stripped_jungle_log"); STRIPPED_ACACIA_WOOD_PIECES = PieceSets.createDefaultSet(Blocks.STRIPPED_ACACIA_WOOD, "stripped_acacia_wood").setTexture("stripped_acacia_log"); STRIPPED_DARK_OAK_WOOD_PIECES = PieceSets.createDefaultSet(Blocks.STRIPPED_DARK_OAK_WOOD, "stripped_dark_oak_wood").setTexture("stripped_dark_oak_log"); - GLASS_PIECES = PieceSets.createDefaultSet(Blocks.GLASS, "glass"); - WHITE_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.WHITE_STAINED_GLASS, "white_stained_glass"); - ORANGE_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.ORANGE_STAINED_GLASS, "orange_stained_glass"); - MAGENTA_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.MAGENTA_STAINED_GLASS, "magenta_stained_glass"); - LIGHT_BLUE_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.LIGHT_BLUE_STAINED_GLASS, "light_blue_stained_glass"); - YELLOW_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.YELLOW_STAINED_GLASS, "yellow_stained_glass"); - LIME_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.LIME_STAINED_GLASS, "lime_stained_glass"); - PINK_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.PINK_STAINED_GLASS, "pink_stained_glass"); - GRAY_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.GRAY_STAINED_GLASS, "gray_stained_glass"); - LIGHT_GRAY_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.LIGHT_GRAY_STAINED_GLASS, "light_gray_stained_glass"); - CYAN_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.CYAN_STAINED_GLASS, "cyan_stained_glass"); - PURPLE_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.PURPLE_STAINED_GLASS, "purple_stained_glass"); - BLUE_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.BLUE_STAINED_GLASS, "blue_stained_glass"); - BROWN_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.BROWN_STAINED_GLASS, "brown_stained_glass"); - GREEN_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.GREEN_STAINED_GLASS, "green_stained_glass"); - RED_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.RED_STAINED_GLASS, "red_stained_glass"); - BLACK_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.BLACK_STAINED_GLASS, "black_stained_glass"); + GLASS_PIECES = PieceSets.createDefaultSet(Blocks.GLASS, "glass").setUncraftable(PieceTypes.WALL); + WHITE_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.WHITE_STAINED_GLASS, "white_stained_glass").setUncraftable(PieceTypes.WALL); + ORANGE_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.ORANGE_STAINED_GLASS, "orange_stained_glass").setUncraftable(PieceTypes.WALL); + MAGENTA_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.MAGENTA_STAINED_GLASS, "magenta_stained_glass").setUncraftable(PieceTypes.WALL); + LIGHT_BLUE_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.LIGHT_BLUE_STAINED_GLASS, "light_blue_stained_glass").setUncraftable(PieceTypes.WALL); + YELLOW_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.YELLOW_STAINED_GLASS, "yellow_stained_glass").setUncraftable(PieceTypes.WALL); + LIME_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.LIME_STAINED_GLASS, "lime_stained_glass").setUncraftable(PieceTypes.WALL); + PINK_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.PINK_STAINED_GLASS, "pink_stained_glass").setUncraftable(PieceTypes.WALL); + GRAY_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.GRAY_STAINED_GLASS, "gray_stained_glass").setUncraftable(PieceTypes.WALL); + LIGHT_GRAY_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.LIGHT_GRAY_STAINED_GLASS, "light_gray_stained_glass").setUncraftable(PieceTypes.WALL); + CYAN_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.CYAN_STAINED_GLASS, "cyan_stained_glass").setUncraftable(PieceTypes.WALL); + PURPLE_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.PURPLE_STAINED_GLASS, "purple_stained_glass").setUncraftable(PieceTypes.WALL); + BLUE_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.BLUE_STAINED_GLASS, "blue_stained_glass").setUncraftable(PieceTypes.WALL); + BROWN_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.BROWN_STAINED_GLASS, "brown_stained_glass").setUncraftable(PieceTypes.WALL); + GREEN_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.GREEN_STAINED_GLASS, "green_stained_glass").setUncraftable(PieceTypes.WALL); + RED_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.RED_STAINED_GLASS, "red_stained_glass").setUncraftable(PieceTypes.WALL); + BLACK_STAINED_GLASS_PIECES = PieceSets.createDefaultSet(Blocks.BLACK_STAINED_GLASS, "black_stained_glass").setUncraftable(PieceTypes.WALL); ExtraPieces.debugLog("Generated Default Sets"); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c2878131..02df183b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "extrapieces", - "version": "2.8.0", + "version": "2.8.1", "name": "Extra Pieces", "description": "Adds more block shapes to Minecraft!",