MinecraftMods/EngineersDecor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

1.12: Missing slab recipes added. Slab slices added. Item displays fixed. Block hardness fixes. 1.14: Updated to 1.14.3. Mineral Smelter concept implementation.

Browse source
This commit is contained in:
stfwi 2019-07-04 21:26:30 +02:00
parent 973da5d4b3
commit 8b99f38f17
11 changed files with 51 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
1.12/Makefile
View file

@ -51,7 +51,7 @@ clean-all: clean
@$(GRADLE) clean cleanCache
mrproper: clean-all
@rm -rf meta/*
@rm -f meta/*.*
@rm -rf run/
@rm -rf out/
@rm -f .project

3
1.12/meta/update.json
View file

@ -1,6 +1,7 @@
{
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"1.12.2": {
"1.0.9-b3": "[A] Added missing recipes for slabs.\n[A] Added slab slices for IE sheet metals, treated wood, and concretes (stackable \"quater-slabs\").\n[M] Updated 1st/3rd person item model rotations/translations.\n[M] Hardness of valves and furni slightly increased.",
"1.0.9-b2": "[A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete, and Stained Clinker. Texture variations like the base blocks. Allow fast pick-up (see tooltip help or config).\n[F] Fixed lab/electrical furnace initialisation issue (first item inserted was smelted directly).",
"1.0.9-b1": "[U] Lang file ru_ru updated (PR#31, yaroslav4167).\n[M] Block hardness adaptions (issue #32).",
"1.0.8": "[R] Release based on v1.0.8-b2. Release-to-release changes: * Added factory area sign. * Added stained clinker. * Config opt-out fixes, detailed feature selection possible now. * Recipe adaptions and fixes. * Lang files updated.\n[A] Added stained clinker brick block/stairs. Can be mixed with \"normal\" clinkers.\n[A] Added opt-out option for CTRL-SHIFT tooltips.\n[M] Recipe condition requirements updated, recipes categorized.",
@ -46,6 +47,6 @@
},
"promos": {
"1.12.2-recommended": "1.0.8",
"1.12.2-latest": "1.0.9-b2"
"1.12.2-latest": "1.0.9-b3"
}
}

2
1.12/readme.md
View file

@ -10,7 +10,7 @@ Mod sources for Minecraft version 1.12.2.
----
## Version history
~ v1.0.9-b3 [A] Added missing recipes for slabs.
- v1.0.9-b3 [A] Added missing recipes for slabs.
[A] Added slab slices for IE sheet metals, treated wood,
and concretes (stackable "quater-slabs").
[M] Updated 1st/3rd person item model rotations/translations.

18
1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorMineralSmelter.java
View file

@ -154,12 +154,30 @@ public class BlockDecorMineralSmelter extends BlockDecorDirectedHorizontal
if(te.accepts_lava_container(stack)) {
if(stack.isItemEqualIgnoreDurability(BTileEntity.BUCKET_STACK)) { // check how this works with item capabilities or so
if(te.fluid_level() >= BTileEntity.MAX_BUCKET_EXTRACT_FLUID_LEVEL) {
if(stack.getCount() > 1) {
int target_stack_index = -1;
for(int i=0; i<player.inventory.getSizeInventory(); ++i) {
if(player.inventory.getStackInSlot(i).isEmpty()) {
target_stack_index = i;
break;
}
}
if(target_stack_index >= 0) {
te.reset_process();
stack.shrink(1);
player.setHeldItem(hand, stack);
player.inventory.setInventorySlotContents(target_stack_index, BTileEntity.LAVA_BUCKET_STACK.copy());
world.playSound(null, pos, SoundEvents.ITEM_BUCKET_FILL_LAVA, SoundCategory.BLOCKS, 1f, 1f);
dirty = true;
}
} else {
te.reset_process();
player.setHeldItem(hand, BTileEntity.LAVA_BUCKET_STACK.copy());
world.playSound(null, pos, SoundEvents.ITEM_BUCKET_FILL_LAVA, SoundCategory.BLOCKS, 1f, 1f);
dirty = true;
}
}
}
} else if(stack.getItem() == Items.AIR) {
final ItemStack istack = te.getStackInSlot(1).copy();
if(te.phase() > BTileEntity.PHASE_WARMUP) player.setFire(1);

2
1.13/Makefile
View file

@ -47,7 +47,7 @@ clean-all:
@$(GRADLE) clean cleanCache
mrproper: clean-all
@rm -rf meta/*
@rm -f meta/*.*
@rm -rf run/
@rm -rf out/
@rm -f .project

3
1.14/Makefile
View file

@ -42,13 +42,14 @@ clean:
clean-all:
@echo "[1.14] Cleaning using gradle ..."
@rm -rf mcmodsrepo
@rm -f dist/*
@rm -rf run/logs/
@rm -rf run/crash-reports/
@$(GRADLE) clean
mrproper: clean-all
@rm -rf meta/*
@rm -f meta/*.*
@rm -rf run/
@rm -rf out/
@rm -f .project

6
1.14/gradle.properties
View file

@ -1,10 +1,10 @@
# @file gradle.properties
org.gradle.daemon=false
org.gradle.jvmargs=-Xmx8G
version_minecraft=1.14.2
version_forge_minecraft=1.14.2-26.0.63
version_minecraft=1.14.3
version_forge_minecraft=1.14.3-27.0.17
version_fml_mappings=20190621-1.14.2
version_engineersdecor=1.0.8-b3
version_engineersdecor=1.0.9-b1
#
# jar signing data loaded from signing.properties in the project root.
#

7
1.14/meta/update.json
View file

@ -1,6 +1,7 @@
{
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"1.14.2": {
"1.14.3": {
"1.0.9-b1": "[U] Updated to MC1.14.3, Forge 1.14.3-27.0.17/20190621-1.14.2.\n[A] Added Small Mineral Smelter.",
"1.0.8-b3": "[A] Ported slabs and slab slices from 1.12.2.\n[A] IE independent (\"standalone\") recipes ported.",
"1.0.8-b2": "[U] Updated to Forge BETA 1.14.2-26.0.63/20190621-1.14.2, code adapted to new mappings.\n[M] Updated 1st/3rd person item model rotations/translations.",
"1.0.8-b1": "[V] Feature set of 1.12 ported.\n[A] CTRL-SHIFT tooltips ported.\n[A] Ported stained clinker block/stairs.\n[M] Updated textures.\n[I] Issue: Scoped recipe constants still not working.",
@ -9,7 +10,7 @@
"1.0.7-b3": "[A] Initial 1.14.2 port of decorative blocks."
},
"promos": {
"1.14.2-recommended": "",
"1.14.2-latest": "1.0.8-b3"
"1.14.3-recommended": "",
"1.14.3-latest": "1.0.9-b1"
}
}

7
1.14/readme.md
View file

@ -1,7 +1,7 @@
## Engineer's Decor (MC1.14.2)
## Engineer's Decor (MC1.14.3)
Mod sources for Minecraft version 1.14.2.
Mod sources for Minecraft version 1.14.3.
- Description, credits, and features: Please see the readme in the repository root.
@ -10,6 +10,9 @@ Mod sources for Minecraft version 1.14.2.
----
## Version history
- v1.0.9-b1 [U] Updated to MC1.14.3, Forge 1.14.3-27.0.17/20190621-1.14.2.
[A] Added Small Mineral Smelter.
- v1.0.8-b3 [A] Ported slabs and slab slices from 1.12.2.
[A] IE independent ("standalone") recipes ported.

10
meta/update.json
View file

@ -1,6 +1,7 @@
{
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"1.12.2": {
"1.0.9-b3": "[A] Added missing recipes for slabs.\n[A] Added slab slices for IE sheet metals, treated wood, and concretes (stackable \"quater-slabs\").\n[M] Updated 1st/3rd person item model rotations/translations.\n[M] Hardness of valves and furni slightly increased.",
"1.0.9-b2": "[A] Added slabs for Clinker Brick, Slag Brick, Rebar Concrete, and Stained Clinker. Texture variations like the base blocks. Allow fast pick-up (see tooltip help or config).\n[F] Fixed lab/electrical furnace initialisation issue (first item inserted was smelted directly).",
"1.0.9-b1": "[U] Lang file ru_ru updated (PR#31, yaroslav4167).\n[M] Block hardness adaptions (issue #32).",
"1.0.8": "[R] Release based on v1.0.8-b2. Release-to-release changes: * Added factory area sign. * Added stained clinker. * Config opt-out fixes, detailed feature selection possible now. * Recipe adaptions and fixes. * Lang files updated.\n[A] Added stained clinker brick block/stairs. Can be mixed with \"normal\" clinkers.\n[A] Added opt-out option for CTRL-SHIFT tooltips.\n[M] Recipe condition requirements updated, recipes categorized.",
@ -59,7 +60,8 @@
"1.0.0-a2": "[A] Added panzer glass.",
"1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta."
},
"1.14.2": {
"1.14.3": {
"1.0.9-b1": "[U] Updated to MC1.14.3, Forge 1.14.3-27.0.17/20190621-1.14.2.\n[A] Added Small Mineral Smelter.",
"1.0.8-b3": "[A] Ported slabs and slab slices from 1.12.2.\n[A] IE independent (\"standalone\") recipes ported.",
"1.0.8-b2": "[U] Updated to Forge BETA 1.14.2-26.0.63/20190621-1.14.2, code adapted to new mappings.\n[M] Updated 1st/3rd person item model rotations/translations.",
"1.0.8-b1": "[V] Feature set of 1.12 ported.\n[A] CTRL-SHIFT tooltips ported.\n[A] Ported stained clinker block/stairs.\n[M] Updated textures.\n[I] Issue: Scoped recipe constants still not working.",
@ -69,10 +71,10 @@
},
"promos": {
"1.12.2-recommended": "1.0.8",
"1.12.2-latest": "1.0.9-b2",
"1.12.2-latest": "1.0.9-b3",
"1.13.2-recommended": "",
"1.13.2-latest": "1.0.7-b5",
"1.14.2-recommended": "",
"1.14.2-latest": "1.0.8-b3"
"1.14.3-recommended": "",
"1.14.3-latest": "1.0.9-b1"
}
}

8
tasks.js
View file

@ -13,20 +13,20 @@ tasks["update-json"] = function() {
var update_jsons = {
"1.12.2": JSON.parse(fs.readfile(root_dir + "/1.12/meta/update.json")),
"1.13.2": JSON.parse(fs.readfile(root_dir + "/1.13/meta/update.json")),
"1.14.2": JSON.parse(fs.readfile(root_dir + "/1.14/meta/update.json"))
"1.14.3": JSON.parse(fs.readfile(root_dir + "/1.14/meta/update.json"))
};
var update_json = {
homepage: "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
"1.12.2": update_jsons["1.12.2"]["1.12.2"],
"1.13.2": update_jsons["1.13.2"]["1.13.2"],
"1.14.2": update_jsons["1.14.2"]["1.14.2"],
"1.14.3": update_jsons["1.14.3"]["1.14.3"],
promos: {
"1.12.2-recommended": update_jsons["1.12.2"]["promos"]["1.12.2-recommended"],
"1.12.2-latest": update_jsons["1.12.2"]["promos"]["1.12.2-latest"],
"1.13.2-recommended": update_jsons["1.13.2"]["promos"]["1.13.2-recommended"],
"1.13.2-latest": update_jsons["1.13.2"]["promos"]["1.13.2-latest"],
"1.14.2-recommended": update_jsons["1.14.2"]["promos"]["1.14.2-recommended"],
"1.14.2-latest": update_jsons["1.14.2"]["promos"]["1.14.2-latest"]
"1.14.3-recommended": update_jsons["1.14.3"]["promos"]["1.14.3-recommended"],
"1.14.3-latest": update_jsons["1.14.3"]["promos"]["1.14.3-latest"]
}
}
fs.mkdir(root_dir + "/meta");