From 714a725f0d2cdabb26b75170f9fb1d095d7528fe Mon Sep 17 00:00:00 2001 From: stfwi Date: Fri, 20 Dec 2019 16:00:43 +0100 Subject: [PATCH] 1.12: Fixed Small Block Breaker base class to horizontal directed (issue #70). --- 1.12/meta/update.json | 3 ++- 1.12/readme.md | 2 +- .../blocks/BlockDecorBreaker.java | 2 +- .../blockstates/small_block_breaker.json | 2 +- 1.15/Makefile | 18 +++++++++--------- 1.15/gradle.properties | 2 +- 1.15/readme.md | 2 ++ .../java/wile/engineersdecor/ModContent.java | 1 - meta/update.json | 3 ++- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/1.12/meta/update.json b/1.12/meta/update.json index bc93f9b..ccd8366 100644 --- a/1.12/meta/update.json +++ b/1.12/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": { + "1.0.17-b3": "[F] Fixed Small Block Breaker facings to the horizontal range (issue #70, thx JimMiningWorm).", "1.0.17-b2": "[A] Reverse recipes for slabs and slab slices added.\n[M] Inset Floor Edge Light slightly thinner, looks better.", "1.0.17-b1": "[A] Added Milking Machine.\n[M] Window placement improved.\n[M] Made Pipe Valve textures slightly darker to fit IE pipes better when shaded.", "1.0.16": "[R] Release based on v1.0.16-b3. Release-to-release changes: * Added Gas Concrete blocks/walls/stairs/slabs/slab slices. * Added Fluid Collection Funnel * Crafting yield for Clinker/Slag bricks increased. * Block Placer improvements (cocoa planting) and fixes. * Block breaker compat improvements and fixes. * Recipe compat auto detection fixes. * Feature opt-out and tweak config options for mod packs improved.", @@ -72,6 +73,6 @@ }, "promos": { "1.12.2-recommended": "1.0.16", - "1.12.2-latest": "1.0.17-b2" + "1.12.2-latest": "1.0.17-b3" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index 3c4edd1..ea67711 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,7 +10,7 @@ Mod sources for Minecraft version 1.12.2. ---- ## Version history - ~ v1.0.17-b3 [A] + - v1.0.17-b3 [F] Fixed Small Block Breaker facings to the horizontal range (issue #70, thx JimMiningWorm). - v1.0.17-b2 [A] Reverse recipes for slabs and slab slices added. [M] Inset Floor Edge Light slightly thinner, looks better. diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorBreaker.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorBreaker.java index aa31da7..5376939 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorBreaker.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorBreaker.java @@ -35,7 +35,7 @@ import java.util.HashSet; import java.util.Random; -public class BlockDecorBreaker extends BlockDecorDirected +public class BlockDecorBreaker extends BlockDecorDirectedHorizontal { public static final PropertyBool ACTIVE = PropertyBool.create("active"); diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/small_block_breaker.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/small_block_breaker.json index 3696ceb..a1d2be7 100644 --- a/1.12/src/main/resources/assets/engineersdecor/blockstates/small_block_breaker.json +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/small_block_breaker.json @@ -6,7 +6,7 @@ "variants": { "normal": [{}], "inventory": [{}], - "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":-90}, "down": {"x":90} }, + "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90} }, "active": { "true":{ "model": "engineersdecor:device/small_block_breaker_model_active" }, "false":{}} } } diff --git a/1.15/Makefile b/1.15/Makefile index 3c5bf78..e8b450a 100644 --- a/1.15/Makefile +++ b/1.15/Makefile @@ -31,22 +31,22 @@ default: mod all: clean clean-all mod | install mod: data - @echo "[1.14] Building mod using gradle ..." + @echo "[1.15] Building mod using gradle ..." @$(GRADLE) build $(GRADLE_OPTS) data: - @echo "[1.14] Running data generators ..." + @echo "[1.15] Running data generators ..." @djs tasks.js datagen clean: - @echo "[1.14] Cleaning ..." + @echo "[1.15] Cleaning ..." @rm -rf src/generated @rm -rf mcmodsrepo @rm -f build/libs/* @$(GRADLE) clean clean-all: - @echo "[1.14] Cleaning using gradle ..." + @echo "[1.15] Cleaning using gradle ..." @rm -rf mcmodsrepo @rm -f dist/* @rm -rf run/logs/ @@ -61,11 +61,11 @@ mrproper: clean-all @rm -f .classpath init: - @echo "[1.14] Initialising eclipse workspace using gradle ..." + @echo "[1.15] Initialising eclipse workspace using gradle ..." @$(GRADLE) eclipse sanatize: - @echo "[1.14] Running sanatising tasks ..." + @echo "[1.15] Running sanatising tasks ..." @djs tasks.js trailing-whitespaces @djs tasks.js tabs-to-spaces @djs tasks.js sync-languages @@ -74,11 +74,11 @@ sanatize: @git status -s . dist-check: - @echo "[1.14] Running dist checks ..." + @echo "[1.15] Running dist checks ..." @djs tasks.js dist-check dist-files: clean-all init mod - @echo "[1.14] Distribution files ..." + @echo "[1.15] Distribution files ..." @mkdir -p dist @cp build/libs/$(MOD_JAR_PREFIX)* dist/ @djs tasks.js dist @@ -86,7 +86,7 @@ dist-files: clean-all init mod dist: sanatize dist-check dist-files assets: - @echo "[1.14] Running asset generators ..." + @echo "[1.15] Running asset generators ..." @djs tasks.js create-slab-assets @djs tasks.js create-half-slab-assets @djs tasks.js assets diff --git a/1.15/gradle.properties b/1.15/gradle.properties index 326d248..bcfb645 100644 --- a/1.15/gradle.properties +++ b/1.15/gradle.properties @@ -5,4 +5,4 @@ version_minecraft=1.15.1 version_forge_minecraft=1.15.1-30.0.11 version_fml_mappings=20190719-1.14.3 version_jei=1.14.4:6.0.0.10 -version_engineersdecor=1.0.17-b2 +version_engineersdecor=1.0.17-b3 diff --git a/1.15/readme.md b/1.15/readme.md index e5946c2..2d1763b 100644 --- a/1.15/readme.md +++ b/1.15/readme.md @@ -11,6 +11,8 @@ Mod sources for Minecraft version 1.15.1. ## Version history + ~ v1.0.17-b3 [A] + - v1.0.17-b2 [A] Initial port. ---- diff --git a/1.15/src/main/java/wile/engineersdecor/ModContent.java b/1.15/src/main/java/wile/engineersdecor/ModContent.java index 6b0a939..6a2d76c 100644 --- a/1.15/src/main/java/wile/engineersdecor/ModContent.java +++ b/1.15/src/main/java/wile/engineersdecor/ModContent.java @@ -897,7 +897,6 @@ public class ModContent RenderingRegistry.registerEntityRenderingHandler(ET_CHAIR, manager->(new wile.engineersdecor.detail.ModRenderers.InvisibleEntityRenderer(manager)) ); - } } diff --git a/meta/update.json b/meta/update.json index da189ad..8fc3101 100644 --- a/meta/update.json +++ b/meta/update.json @@ -2,13 +2,14 @@ "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "promos": { "1.12.2-recommended": "1.0.16", - "1.12.2-latest": "1.0.17-b2", + "1.12.2-latest": "1.0.17-b3", "1.14.4-recommended": "", "1.14.4-latest": "1.0.17-b2", "1.15.1-recommended": "", "1.15.1-latest": "1.0.17-b2" }, "1.12.2": { + "1.0.17-b3": "[F] Fixed Small Block Breaker facings to the horizontal range (issue #70, thx JimMiningWorm).", "1.0.17-b2": "[A] Reverse recipes for slabs and slab slices added.\n[M] Inset Floor Edge Light slightly thinner, looks better.", "1.0.17-b1": "[A] Added Milking Machine.\n[M] Window placement improved.\n[M] Made Pipe Valve textures slightly darker to fit IE pipes better when shaded.", "1.0.16": "[R] Release based on v1.0.16-b3. Release-to-release changes: * Added Gas Concrete blocks/walls/stairs/slabs/slab slices. * Added Fluid Collection Funnel * Crafting yield for Clinker/Slag bricks increased. * Block Placer improvements (cocoa planting) and fixes. * Block breaker compat improvements and fixes. * Recipe compat auto detection fixes. * Feature opt-out and tweak config options for mod packs improved.",