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

1.14/1.15 Dev snapshot: Labled Crate GUI quickmove, recipe fixes, valve caching removed, missing cap invalidation added.

Browse source
This commit is contained in:
stfwi 2020-03-30 14:18:45 +02:00
parent 05b9f7c31f
commit fd358d98dc
80 changed files with 1544 additions and 905 deletions
Download patch file Download diff file Expand all files Collapse all files

5
1.14/src/main/resources/assets/engineersdecor/lang/en_us.json
View file

@ -4,8 +4,8 @@
"language.region": "United States",
"itemGroup.tabengineersdecor": "Engineer's Decor",
"engineersdecor.config.title": "Engineer's Decor Config",
"engineersdecor.tooltip.hint.extended": "§6[§9SHIFT§r More Info§6]§r",
"engineersdecor.tooltip.hint.help": "§6[§9CTRL-SHIFT§r Help§6]§r",
"engineersdecor.tooltip.hint.extended": "§6[§9shift§r More§6]§r",
"engineersdecor.tooltip.hint.help": "§6[§9ctrl-shift§r Help§6]§r",
"engineersdecor.tooltip.slabpickup.help": "§rFast pickup by left-clicking while looking up/down and holding this slab.",
"engineersdecor.tooltip.requires_rf_power": "Requires RF power.",
"engineersdecor.tooltip.massive_speed_boost_with_rf_power": "Apply RF power to magnificently increase the speed.",
@ -59,6 +59,7 @@
"block.engineersdecor.slag_brick_block.help": "§6A gray-brown brick block with position dependent texture variations.",
"block.engineersdecor.labeled_crate": "Labeled Crate",
"block.engineersdecor.labeled_crate.help": "§6A storage crate with 9x6 slots and a built-in item frame at the front.§r\nPlace an item into the frame slot at the bottom right of the GUI to define the shown label.",
"block.engineersdecor.labeled_crate.tip": "§6Label:§r %1$s\n%2$s slots used / %3$s free\n%4$s total items stored",
"block.engineersdecor.rebar_concrete": "Rebar Concrete Block",
"block.engineersdecor.rebar_concrete.help": "§6Steel reinforced concrete block.§r Expensive but Creeper-proof like obsidian.",
"block.engineersdecor.gas_concrete": "Gas Concrete Block",

1
1.14/src/main/resources/assets/engineersdecor/lang/ru_ru.json
View file

@ -53,6 +53,7 @@
"engineersdecor.config.e_furnace_power_consumption": "Электропечь: потребление энергии",
"block.engineersdecor.labeled_crate": "Labeled Crate",
"block.engineersdecor.labeled_crate.help": "§6A storage crate with 9x6 slots and a built-in item frame at the front.§r\nPlace an item into the frame slot at the bottom right of the GUI to define the shown label.",
"block.engineersdecor.labeled_crate.tip": "§6Label:§r %1$s\n%2$s slots used / %3$s free\n%4$s total items stored",
"block.engineersdecor.clinker_brick_block": "Клинкерный кирпич",
"block.engineersdecor.clinker_brick_block.help": "§6Кирпичный блок с вариациями текстуры, зависящими от положения.§r\nВыглядит темнее и интенсивнее, чем Кирпичный блок.",
"block.engineersdecor.clinker_brick_stained_block": "Грязный клинкерный кирпич",

1
1.14/src/main/resources/assets/engineersdecor/lang/zh_cn.json
View file

@ -53,6 +53,7 @@
"engineersdecor.config.e_furnace_power_consumption": "电炉：能量消耗",
"block.engineersdecor.labeled_crate": "Labeled Crate",
"block.engineersdecor.labeled_crate.help": "§6A storage crate with 9x6 slots and a built-in item frame at the front.§r\nPlace an item into the frame slot at the bottom right of the GUI to define the shown label.",
"block.engineersdecor.labeled_crate.tip": "§6Label:§r %1$s\n%2$s slots used / %3$s free\n%4$s total items stored",
"block.engineersdecor.clinker_brick_block": "过烧砖块",
"block.engineersdecor.clinker_brick_block.help": "§6一种放在不同位置贴图有不同变化的砖块。§r\n比原版砖看起来颜色更深，色度也更高。",
"block.engineersdecor.clinker_brick_stained_block": "污渍过烧砖块",

29
1.14/src/main/resources/assets/engineersdecor/models/block/pipe/straight_pipe_valve_rs_connector_submodel.json
View file

@ -1,31 +1,20 @@
{
"textures": {
"rsside": "engineersdecor:block/pipe/straight_pipe_valve_side_redstone_texture",
"particle": "engineersdecor:block/pipe/straight_pipe_valve_side_redstone_texture",
"particle": "engineersdecor:block/pipe/straight_pipe_valve_side_texture",
"rsside": "engineersdecor:block/pipe/straight_pipe_valve_side_texture",
"rsend": "engineersdecor:block/pipe/straight_pipe_valve_side_redstone_cn_texture"
},
"elements": [
{
"from": [5, 5, 2],
"from": [5, 5, 0],
"to": [11, 11, 3],
"faces": {
"north": {"uv": [5, 5, 11, 11], "rotation": 90, "texture": "#rsend"},
"east": {"uv": [13, 5, 14, 11], "texture": "#rsside"},
"west": {"uv": [13, 5, 14, 11], "rotation": 180, "texture": "#rsside"},
"up": {"uv": [13, 5, 14, 11], "rotation": 270, "texture": "#rsside"},
"down": {"uv": [13, 5, 14, 11], "rotation": 90, "texture": "#rsside"}
}
},
{
"from": [4, 4, 0],
"to": [12, 12, 2],
"faces": {
"north": {"uv": [4, 4, 12, 12], "rotation": 90, "texture": "#rsend"},
"east": {"uv": [13, 4, 16, 12], "texture": "#rsside"},
"south": {"uv": [4, 4, 12, 12], "texture": "#rsend"},
"west": {"uv": [13, 4, 16, 12], "rotation": 180, "texture": "#rsside"},
"up": {"uv": [13, 4, 16, 12], "rotation": 270, "texture": "#rsside"},
"down": {"uv": [13, 4, 16, 12], "rotation": 90, "texture": "#rsside"}
"east": {"uv": [10, 5, 13, 11], "texture": "#rsside"},
"south": {"uv": [5, 5, 11, 11], "texture": "#rsend"},
"west": {"uv": [3, 5, 6, 11], "texture": "#rsside"},
"up": {"uv": [5, 0, 11, 3], "texture": "#rsside"},
"down": {"uv": [5, 13, 11, 16], "texture": "#rsside"}
}
}
],
@ -41,7 +30,7 @@
"scale": [0.4, 0.4, 0.4]
},
"ground": {
"translation": [0, 1.75, 0],
"translation": [0, 1.75, 0],
"scale": [0.2, 0.2, 0.2]
},
"gui": {

18
1.14/src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/en_us/entries/crafting/labeled_crate.json Normal file
View file

@ -0,0 +1,18 @@
{
"name": "Labeled Crate",
"icon": "engineersdecor:labeled_crate",
"category": "crafting",
"sortnum": 5020,
"pages": [
{
"type": "spotlight",
"title": "Labeled Crate",
"item": "engineersdecor:labeled_crate",
"text": "A high capacity storage crate with space for a custom label at the front.$(br2)In addition to the 54 inventory slots, one slot at the bottom right can be used to define the object shown in the built-in Item Frame."
},
{
"type": "text",
"text": "$(o)§nQuick Move All Tweaks$()$(br)When using Quick-Move-All (aka shift-ctrl-left-click) on a slot for moving all identical items between the crate storage and the player inventory, the GUI will fill up existing stacks, and then try to insert further stacks into empty slots next to already existing stacks. If no appropriate locations are found, the stacks are moved into the player inventory, and as last option into the hotbar."
}
]
}

2
1.14/src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/en_us/entries/crafting/small_electrical_furnace.json
View file

@ -2,7 +2,7 @@
"name": "Small Electrical Furnace",
"icon": "engineersdecor:small_electrical_furnace",
"category": "crafting",
"sortnum": 5030,
"sortnum": 5040,
"pages": [
{
"type": "spotlight",

2
1.14/src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/en_us/entries/crafting/small_lab_furnace.json
View file

@ -2,7 +2,7 @@
"name": "Small Laboratory Furnace",
"icon": "engineersdecor:small_lab_furnace",
"category": "crafting",
"sortnum": 5020,
"sortnum": 5030,
"pages": [
{
"type": "spotlight",

2
1.14/src/main/resources/data/engineersdecor/patchouli_books/engineersdecor_manual/en_us/entries/crafting/small_mineral_smelter.json
View file

@ -2,7 +2,7 @@
"name": "Mineral Melting Furnace",
"icon": "engineersdecor:small_mineral_smelter",
"category": "crafting",
"sortnum": 5040,
"sortnum": 5050,
"pages": [
{
"type": "spotlight",

2
1.14/src/main/resources/data/engineersdecor/recipes/dependent/factory_dropper_recipe.json
View file

@ -19,7 +19,7 @@
"key": {
"D": { "item": "minecraft:dropper" },
"P": { "tag" : "forge:plates/iron" },
"W": { "item": "forge:treated_wood" }
"W": { "tag" : "forge:treated_wood" }
},
"result": {
"item": "engineersdecor:factory_dropper",

7
1.14/src/main/resources/data/engineersdecor/recipes/dependent/panzerglass_block_recipe.json
View file

@ -6,20 +6,19 @@
{
"type": "engineersdecor:optional",
"result": "engineersdecor:panzerglass_block",
"required": ["#forge:glass", "#forge:rods/steel", "#forge:gems/diamond"]
"required": ["#forge:glass", "#forge:rods/iron"]
}
],
"recipe": {
"type": "minecraft:crafting_shaped",
"pattern": [
"SGS",
"GDG",
"GSG",
"SGS"
],
"key": {
"G": { "tag": "forge:glass" },
"S": { "tag": "forge:rods/steel" },
"D": { "tag": "forge:gems/diamond" }
"S": { "tag": "forge:rods/iron" }
},
"result": {
"item": "engineersdecor:panzerglass_block",

2
1.14/src/main/resources/data/engineersdecor/recipes/dependent/small_electrical_furnace_recipe.json
View file

@ -17,7 +17,7 @@
"PPP"
],
"key": {
"F": { "tag" : "minecraft:furnace" },
"F": { "item": "minecraft:furnace" },
"C": { "item": "immersiveengineering:connector_lv" },
"H": { "item": "immersiveengineering:conveyor_basic" },
"P": { "tag" : "forge:plates/iron" }