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

1.12/1.14/1.15: Fixed Gloor Grating item jitter. 1.14/1.15: Librarizing, Factory Hopper second standard insertion run added (issue #84), Placer planting race condition circumvention added (issue #83). 1.15: JEI integration enabled (issue #85).

Browse source
This commit is contained in:
stfwi 2020-02-06 10:44:21 +01:00
parent 66b2390ca5
commit 35b1785e9c
126 changed files with 3325 additions and 3043 deletions
Download patch file Download diff file Expand all files Collapse all files

6
1.14/src/main/resources/assets/engineersdecor/blockstates/small_electrical_furnace.json
View file

@ -4,13 +4,9 @@
"facing=south,lit=false": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model", "y": 180 },
"facing=west,lit=false": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model", "y": 270 },
"facing=east,lit=false": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model", "y": 90 },
"facing=up,lit=false": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model", "y": 0 },
"facing=down,lit=false": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model", "y": 0 },
"facing=north,lit=true": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model_lit", "y": 0 },
"facing=south,lit=true": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model_lit", "y": 180 },
"facing=west,lit=true": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model_lit", "y": 270 },
"facing=east,lit=true": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model_lit", "y": 90 },
"facing=up,lit=true": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model_lit", "y": 0 },
"facing=down,lit=true": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model_lit", "y": 0 }
"facing=east,lit=true": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model_lit", "y": 90 }
}
}

6
1.14/src/main/resources/assets/engineersdecor/blockstates/small_lab_furnace.json
View file

@ -4,13 +4,9 @@
"facing=south,lit=false": { "model": "engineersdecor:block/furnace/small_lab_furnace_model", "y": 180 },
"facing=west,lit=false": { "model": "engineersdecor:block/furnace/small_lab_furnace_model", "y": 270 },
"facing=east,lit=false": { "model": "engineersdecor:block/furnace/small_lab_furnace_model", "y": 90 },
"facing=up,lit=false": { "model": "engineersdecor:block/furnace/small_lab_furnace_model", "y": 0 },
"facing=down,lit=false": { "model": "engineersdecor:block/furnace/small_lab_furnace_model", "y": 0 },
"facing=north,lit=true": { "model": "engineersdecor:block/furnace/small_lab_furnace_model_lit", "y": 0 },
"facing=south,lit=true": { "model": "engineersdecor:block/furnace/small_lab_furnace_model_lit", "y": 180 },
"facing=west,lit=true": { "model": "engineersdecor:block/furnace/small_lab_furnace_model_lit", "y": 270 },
"facing=east,lit=true": { "model": "engineersdecor:block/furnace/small_lab_furnace_model_lit", "y": 90 },
"facing=up,lit=true": { "model": "engineersdecor:block/furnace/small_lab_furnace_model", "y": 0 },
"facing=down,lit=true": { "model": "engineersdecor:block/furnace/small_lab_furnace_model", "y": 0 }
"facing=east,lit=true": { "model": "engineersdecor:block/furnace/small_lab_furnace_model_lit", "y": 90 }
}
}

4
1.14/src/main/resources/assets/engineersdecor/blockstates/treated_wood_crafting_table.json
View file

@ -3,8 +3,6 @@
"facing=north": { "model": "engineersdecor:block/crafting_table/treated_wood_crafting_table_model" },
"facing=south": { "model": "engineersdecor:block/crafting_table/treated_wood_crafting_table_model", "y":180 },
"facing=west": { "model": "engineersdecor:block/crafting_table/treated_wood_crafting_table_model", "y":270 },
"facing=east": { "model": "engineersdecor:block/crafting_table/treated_wood_crafting_table_model", "y":90 },
"facing=up": { "model": "engineersdecor:block/crafting_table/treated_wood_crafting_table_model" },
"facing=down": { "model": "engineersdecor:block/crafting_table/treated_wood_crafting_table_model" }
"facing=east": { "model": "engineersdecor:block/crafting_table/treated_wood_crafting_table_model", "y":90 }
}
}

15
1.14/src/main/resources/assets/engineersdecor/models/block/furniture/steel_floor_grating_model.json
View file

@ -173,15 +173,28 @@
}
],
"display": {
"thirdperson_righthand": {
"rotation": [66, 0, 0],
"translation": [0.25, 0, -2.75],
"scale": [0.3, 0.3, 0.3]
},
"firstperson_righthand": {
"rotation": [-4, -1, 58],
"translation": [2.5, 0.25, 1.75],
"scale": [0.3, 0.3, 0.3]
},
"ground": {
"translation": [0, 1.75, 0],
"translation": [0, 1.75, 0],
"scale": [0.2, 0.2, 0.2]
},
"gui": {
"rotation": [30, 225, 0],
"translation": [0, -2, 0],
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"rotation": [-90, 0, 1],
"translation": [0, 0.25, 3.25],
"scale": [0.5, 0.5, 0.5]
}
}

21
1.14/src/main/resources/data/engineersdecor/recipes/testing/collision_test1_diorite.json
View file

@ -1,21 +0,0 @@
{
"conditions": [
{
"type": "engineersdecor:optional",
"experimental": true
}
],
"type": "minecraft:crafting_shaped",
"pattern": [
"DDD",
" D ",
" D "
],
"key": {
"D": { "item": "minecraft:diorite" }
},
"result": {
"item": "minecraft:stone",
"count": 1
}
}

21
1.14/src/main/resources/data/engineersdecor/recipes/testing/collision_test2_diorite.json
View file

@ -1,21 +0,0 @@
{
"conditions": [
{
"type": "engineersdecor:optional",
"experimental": true
}
],
"type": "minecraft:crafting_shaped",
"pattern": [
"DDD",
" D ",
" D "
],
"key": {
"D": { "item": "minecraft:diorite" }
},
"result": {
"item": "minecraft:granite",
"count": 1
}
}

21
1.14/src/main/resources/data/engineersdecor/recipes/testing/collision_test3_diorite.json
View file

@ -1,21 +0,0 @@
{
"conditions": [
{
"type": "engineersdecor:optional",
"experimental": true
}
],
"type": "minecraft:crafting_shaped",
"pattern": [
"DDD",
" D ",
" D "
],
"key": {
"D": { "item": "minecraft:diorite" }
},
"result": {
"item": "minecraft:andesite",
"count": 1
}
}