1.12: Fixed Small Block Breaker base class to horizontal directed (issue #70).

This commit is contained in:
stfwi 2019-12-20 16:00:43 +01:00
parent a733e39c51
commit 714a725f0d
9 changed files with 19 additions and 16 deletions

View file

@ -1,6 +1,7 @@
{ {
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"1.12.2": { "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-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.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.", "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": { "promos": {
"1.12.2-recommended": "1.0.16", "1.12.2-recommended": "1.0.16",
"1.12.2-latest": "1.0.17-b2" "1.12.2-latest": "1.0.17-b3"
} }
} }

View file

@ -10,7 +10,7 @@ Mod sources for Minecraft version 1.12.2.
---- ----
## Version history ## 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. - v1.0.17-b2 [A] Reverse recipes for slabs and slab slices added.
[M] Inset Floor Edge Light slightly thinner, looks better. [M] Inset Floor Edge Light slightly thinner, looks better.

View file

@ -35,7 +35,7 @@ import java.util.HashSet;
import java.util.Random; import java.util.Random;
public class BlockDecorBreaker extends BlockDecorDirected public class BlockDecorBreaker extends BlockDecorDirectedHorizontal
{ {
public static final PropertyBool ACTIVE = PropertyBool.create("active"); public static final PropertyBool ACTIVE = PropertyBool.create("active");

View file

@ -6,7 +6,7 @@
"variants": { "variants": {
"normal": [{}], "normal": [{}],
"inventory": [{}], "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":{}} "active": { "true":{ "model": "engineersdecor:device/small_block_breaker_model_active" }, "false":{}}
} }
} }

View file

@ -31,22 +31,22 @@ default: mod
all: clean clean-all mod | install all: clean clean-all mod | install
mod: data mod: data
@echo "[1.14] Building mod using gradle ..." @echo "[1.15] Building mod using gradle ..."
@$(GRADLE) build $(GRADLE_OPTS) @$(GRADLE) build $(GRADLE_OPTS)
data: data:
@echo "[1.14] Running data generators ..." @echo "[1.15] Running data generators ..."
@djs tasks.js datagen @djs tasks.js datagen
clean: clean:
@echo "[1.14] Cleaning ..." @echo "[1.15] Cleaning ..."
@rm -rf src/generated @rm -rf src/generated
@rm -rf mcmodsrepo @rm -rf mcmodsrepo
@rm -f build/libs/* @rm -f build/libs/*
@$(GRADLE) clean @$(GRADLE) clean
clean-all: clean-all:
@echo "[1.14] Cleaning using gradle ..." @echo "[1.15] Cleaning using gradle ..."
@rm -rf mcmodsrepo @rm -rf mcmodsrepo
@rm -f dist/* @rm -f dist/*
@rm -rf run/logs/ @rm -rf run/logs/
@ -61,11 +61,11 @@ mrproper: clean-all
@rm -f .classpath @rm -f .classpath
init: init:
@echo "[1.14] Initialising eclipse workspace using gradle ..." @echo "[1.15] Initialising eclipse workspace using gradle ..."
@$(GRADLE) eclipse @$(GRADLE) eclipse
sanatize: sanatize:
@echo "[1.14] Running sanatising tasks ..." @echo "[1.15] Running sanatising tasks ..."
@djs tasks.js trailing-whitespaces @djs tasks.js trailing-whitespaces
@djs tasks.js tabs-to-spaces @djs tasks.js tabs-to-spaces
@djs tasks.js sync-languages @djs tasks.js sync-languages
@ -74,11 +74,11 @@ sanatize:
@git status -s . @git status -s .
dist-check: dist-check:
@echo "[1.14] Running dist checks ..." @echo "[1.15] Running dist checks ..."
@djs tasks.js dist-check @djs tasks.js dist-check
dist-files: clean-all init mod dist-files: clean-all init mod
@echo "[1.14] Distribution files ..." @echo "[1.15] Distribution files ..."
@mkdir -p dist @mkdir -p dist
@cp build/libs/$(MOD_JAR_PREFIX)* dist/ @cp build/libs/$(MOD_JAR_PREFIX)* dist/
@djs tasks.js dist @djs tasks.js dist
@ -86,7 +86,7 @@ dist-files: clean-all init mod
dist: sanatize dist-check dist-files dist: sanatize dist-check dist-files
assets: assets:
@echo "[1.14] Running asset generators ..." @echo "[1.15] Running asset generators ..."
@djs tasks.js create-slab-assets @djs tasks.js create-slab-assets
@djs tasks.js create-half-slab-assets @djs tasks.js create-half-slab-assets
@djs tasks.js assets @djs tasks.js assets

View file

@ -5,4 +5,4 @@ version_minecraft=1.15.1
version_forge_minecraft=1.15.1-30.0.11 version_forge_minecraft=1.15.1-30.0.11
version_fml_mappings=20190719-1.14.3 version_fml_mappings=20190719-1.14.3
version_jei=1.14.4:6.0.0.10 version_jei=1.14.4:6.0.0.10
version_engineersdecor=1.0.17-b2 version_engineersdecor=1.0.17-b3

View file

@ -11,6 +11,8 @@ Mod sources for Minecraft version 1.15.1.
## Version history ## Version history
~ v1.0.17-b3 [A]
- v1.0.17-b2 [A] Initial port. - v1.0.17-b2 [A] Initial port.
---- ----

View file

@ -897,7 +897,6 @@ public class ModContent
RenderingRegistry.registerEntityRenderingHandler(ET_CHAIR, RenderingRegistry.registerEntityRenderingHandler(ET_CHAIR,
manager->(new wile.engineersdecor.detail.ModRenderers.InvisibleEntityRenderer<BlockDecorChair.EntityChair>(manager)) manager->(new wile.engineersdecor.detail.ModRenderers.InvisibleEntityRenderer<BlockDecorChair.EntityChair>(manager))
); );
} }
} }

View file

@ -2,13 +2,14 @@
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"promos": { "promos": {
"1.12.2-recommended": "1.0.16", "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-recommended": "",
"1.14.4-latest": "1.0.17-b2", "1.14.4-latest": "1.0.17-b2",
"1.15.1-recommended": "", "1.15.1-recommended": "",
"1.15.1-latest": "1.0.17-b2" "1.15.1-latest": "1.0.17-b2"
}, },
"1.12.2": { "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-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.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.", "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.",