1.12: Added Factory Block Placer/Planter.

2019-10-26 19:08:05 +02:00 · 2019-10-26 19:08:05 +02:00 · 297b840b65
commit 297b840b65
parent 17ab68eb78
33 changed files with 1190 additions and 49 deletions
--- a/1.14/gradle.properties
+++ b/1.14/gradle.properties
@ -2,7 +2,7 @@
 org.gradle.daemon=false
 org.gradle.jvmargs=-Xmx8G
 version_minecraft=1.14.4
-version_forge_minecraft=1.14.4-28.1.61
+version_forge_minecraft=1.14.4-28.1.68
 version_fml_mappings=20190719-1.14.3
 version_jei=1.14.4:6.0.0.10
 version_engineersdecor=1.0.15-b1
--- a/1.14/meta/update.json
+++ b/1.14/meta/update.json
@ -1,6 +1,7 @@
 {
  "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
  "1.14.4": {
+    "1.0.15-b1": "[A] Added Floor Edge Light.\n[U] Updated to Forge1.14.4-28.1.68/20190719-1.14.3.",
    "1.0.14-b1": "[U] Updated to Forge 1.14.4-28.1.40/20190719-1.14.3.\n[A] Factory Hopper added (configurable hopper and item collector).\n[M] Switched to integrated loot table generation.\n[M] Lang file zh_cn updated (scikirbypoke, PR#53).",
    "1.0.13-b2": "[A] Added Steel Mesh Fence.\n[A] Added Broad Window Sill.",
    "1.0.12-b3": "[U] Updated to Forge 1.14.4-28.1.10/20190719-1.14.3.\n[A] Crafting Table: Added recipe collision resolver, also applies to crafting history refabrication.\n[A] Crafting Table: Added rendering of placed items on the top surface of the table.\n[A] Waterlogging of non-full-blocks added.",
@ -27,6 +28,6 @@
  },
  "promos": {
    "1.14.4-recommended": "",
-    "1.14.4-latest": "1.0.14-b1"
+    "1.14.4-latest": "1.0.15-b1"
  }
 }
--- a/1.14/readme.md
+++ b/1.14/readme.md
@ -11,7 +11,8 @@ Mod sources for Minecraft version 1.14.4.

 ## Version history

-    ~ v1.0.15-b1 [U] Updated to Forge1.14.4-28.1.61/20190719-1.14.3.
+    - v1.0.15-b1 [A] Added Floor Edge Light.
+                 [U] Updated to Forge1.14.4-28.1.68/20190719-1.14.3.

    - v1.0.14-b1 [U] Updated to Forge 1.14.4-28.1.40/20190719-1.14.3.
                 [A] Factory Hopper added (configurable hopper and item collector).
--- a/1.14/src/main/java/wile/engineersdecor/ModContent.java
+++ b/1.14/src/main/java/wile/engineersdecor/ModContent.java
@ -222,6 +222,12 @@ public class ModContent
    ModAuxiliaries.getPixeledAABB(5.2,5.2,15.7, 10.8,10.8,16.0)
  )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "iron_inset_light"));

+  public static final BlockDecorDirected.WaterLoggable FLOOR_EDGE_LIGHT_IRON = (BlockDecorDirected.WaterLoggable)(new BlockDecorDirected.WaterLoggable(
+    BlockDecor.CFG_CUTOUT|BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_HORIZIONTAL,
+    Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL).lightValue(15),
+    ModAuxiliaries.getPixeledAABB(5,0,0, 11,2,1)
+  )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "iron_floor_edge_light"));
+
  public static final BlockDecor.WaterLoggable STEEL_TABLE = (BlockDecor.WaterLoggable)(new BlockDecor.WaterLoggable(
    BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT,
    Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(2f, 15f).sound(SoundType.WOOD),
@ -511,6 +517,7 @@ public class ModContent
    STEEL_FRAMED_WINDOW,
    STEEL_TABLE,
    INSET_LIGHT_IRON,
+    FLOOR_EDGE_LIGHT_IRON,
    STEEL_FLOOR_GRATING,
    STEEL_MESH_FENCE,
    TREATED_WOOD_POLE,
--- a/1.14/src/main/resources/assets/engineersdecor/blockstates/iron_floor_edge_light.json
+++ b/1.14/src/main/resources/assets/engineersdecor/blockstates/iron_floor_edge_light.json
@ -0,0 +1,7 @@
+{
+  "forge_marker": 1,
+  "defaults": { "model": "engineersdecor:block/light/floor_edge_light_model" },
+  "variants": {
+    "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":-90}, "down": {"x":90} }
+  }
+}
--- a/1.14/src/main/resources/assets/engineersdecor/blockstates/iron_inset_light.json
+++ b/1.14/src/main/resources/assets/engineersdecor/blockstates/iron_inset_light.json
@ -1,13 +1,6 @@
 {
  "forge_marker": 1,
-  "defaults": {
-    "model": "engineersdecor:block/light/inset_light_model",
-    "textures": {
-      "light": "engineersdecor:block/light/lamp_glass_warm_square_texture",
-      "side": "engineersdecor:block/iestyle/steel_texture",
-      "particle": "engineersdecor:block/iestyle/steel_texture"
-    }
-  },
+  "defaults": { "model": "engineersdecor:block/light/inset_light_model" },
  "variants": {
    "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":-90}, "down": {"x":90} }
  }
--- a/1.14/src/main/resources/assets/engineersdecor/lang/en_us.json
+++ b/1.14/src/main/resources/assets/engineersdecor/lang/en_us.json
@ -128,7 +128,9 @@
 "block.engineersdecor.treated_wood_side_table": "Treated Wood Side Table",
 "block.engineersdecor.treated_wood_side_table.help": "§6Needed after the work's done.",
 "block.engineersdecor.iron_inset_light": "Inset Light",
- "block.engineersdecor.iron_inset_light.help": "§6Small glowstone light source, sunk into the floor, ceiling or wall.§r\n Useful to light up places where electrical light installations are problematic. Light level like a torch.",
+ "block.engineersdecor.iron_inset_light.help": "§6Small glowstone light source, sunk into the floor, ceiling or wall.§r\n Useful to light up places where electrical light installations are problematic.",
+ "block.engineersdecor.iron_floor_edge_light": "Inset Floor Edge Light",
+ "block.engineersdecor.iron_floor_edge_light.help": "§6Small glowstone light source, placed at the edge of a floor block.§r\n Useful to light up places where electrical light installations are problematic.",
 "block.engineersdecor.treated_wood_window": "Treated Wood Window",
 "block.engineersdecor.treated_wood_window.help": "§6Wood framed triple glazed window. Well insulating.§r Does not connect to adjacent blocks like glass panes.",
 "block.engineersdecor.treated_wood_windowsill": "Treated Wood Window Sill",
@ -156,7 +158,9 @@
 "block.engineersdecor.factory_dropper": "Factory Dropper",
 "block.engineersdecor.factory_dropper.help": "§6Dropper suitable for advanced factory automation.§r Has twelve round-robin selected slots. Drop force, angle, stack size, and cool-down delay adjustable in the GUI. Three stack compare slots with logical AND or OR can be used as internal trigger source. Internal trigger can be AND'ed or OR'ed with the external redstone signal trigger. Trigger simulation buttons for testing. Pre-opens shutter door when internal trigger conditions are met. Drops all matching stacks simultaneously. Click on all elements in the GUI to see how it works.",
 "block.engineersdecor.factory_hopper": "Factory Hopper",
- "block.engineersdecor.factory_hopper.help": "§6Hopper suitable for advanced factory automation.§r",
+ "block.engineersdecor.factory_hopper.help": "§6Hopper suitable for advanced factory automation.§r Can transfer half-stacks, max collection range 9x9.\n GUI Slider controls: Collection range (0 to 4), insertion delay (0.5s to 10s), insertion stack size (1 to 32).\\n GUI Redstone controls: Not inverted / inverted (default), pulse mode / continuous mode (default).",
+ "block.engineersdecor.factory_placer": "Factory Block Placer",
+ "block.engineersdecor.factory_placer.help": "§6Allows placing blocks and planting crops or trees.§r\n GUI Redstone controls: Not inverted / inverted (default), pulse mode / continuous mode (default).\\n Also supports spike planing from underneath the soil. Spits out items that it cannot place or plant.",
 "block.engineersdecor.small_mineral_smelter": "Small Mineral Melting Furnace",
 "block.engineersdecor.small_mineral_smelter.help": "§6High temperature, high insulation electrical stone melting furnace.§r\n Heats up mineral blocks to magma blocks, and finally to lava. Due to the miniturized device size the process is rather inefficient - much time and energy is needed to liquefy a stone block.",
 "block.engineersdecor.small_solar_panel": "Small Solar Panel",
--- a/1.14/src/main/resources/assets/engineersdecor/lang/ru_ru.json
+++ b/1.14/src/main/resources/assets/engineersdecor/lang/ru_ru.json
@ -128,6 +128,7 @@
 "block.engineersdecor.treated_wood_side_table.help": "§6Needed after the work's done.",
 "block.engineersdecor.iron_inset_light": "Встраиваемый осветитель",
 "block.engineersdecor.iron_inset_light.help": "§6Маленький источник света, интегрируемый в стены, пол или потолок.§r\n Полезно для освещения мест, где проблематичны электрические осветительные установки. Уровень света - как факел.",
+ "block.engineersdecor.iron_floor_edge_light": "Inset Floor Edge Light",
 "block.engineersdecor.treated_wood_window": "Обработанное деревянное окно",
 "block.engineersdecor.treated_wood_window.help": "§6Деревянный каркас окна с тройным остеклением. Ну и шумоизоляция.",
 "block.engineersdecor.treated_wood_windowsill": "Обработанный деревянный подоконник",
@ -153,6 +154,7 @@
 "block.engineersdecor.factory_dropper": "Фабричный выбрасыватель",
 "block.engineersdecor.factory_dropper.help": "§6Выбрасыватель подходит для продвинутой автоматизации производства.§r Имеет 12 выборочных слотов. Сила броска, угол, размер стопки и задержка настраиваются в GUI. 3 слота сравнения стека с логическим И или ИЛИ могут использоваться в качестве внутреннего источника запуска. Внутренний триггер может быть И или ИЛИ с внешним триггерным сигналом красного камня. Триггерные кнопки симуляции для тестирования. Предварительно открывает дверцу затвора, когда выполняются условия внутреннего запуска. Сбрасывает все соответствующие стеки одновременно. Нажмите на все элементы в GUI, чтобы увидеть, как это работает.",
 "block.engineersdecor.factory_hopper": "Factory Hopper",
+ "block.engineersdecor.factory_placer": "Factory Block Placer",
 "block.engineersdecor.small_mineral_smelter": "Small Mineral Melting Furnace",
 "block.engineersdecor.small_solar_panel": "Small Solar Panel",
 "block.engineersdecor.small_tree_cutter": "Small Tree Cutter",
--- a/1.14/src/main/resources/assets/engineersdecor/lang/zh_cn.json
+++ b/1.14/src/main/resources/assets/engineersdecor/lang/zh_cn.json
@ -129,6 +129,7 @@
 "block.engineersdecor.treated_wood_side_table.help": "§6干完活后需要喝杯茶。",
 "block.engineersdecor.iron_inset_light": "嵌入灯",
 "block.engineersdecor.iron_inset_light.help": "§6小型荧石光源，能嵌入地板、天花板或墙里。§r\n 用于照亮电力光源难以安装的地方。 亮度与火把一样。",
+ "block.engineersdecor.iron_floor_edge_light": "Inset Floor Edge Light",
 "block.engineersdecor.treated_wood_window": "防腐木窗",
 "block.engineersdecor.treated_wood_window.help": "§6木框三层玻璃窗。绝缘良好。§r不像玻璃板一样连接到相邻方块。",
 "block.engineersdecor.treated_wood_windowsill": "防腐木窗台",
@ -156,6 +157,7 @@
 "block.engineersdecor.factory_dropper": "工厂掉落器",
 "block.engineersdecor.factory_dropper.help": "§6适用于高级工厂自动化的掉落器。§r有十二个轮询选择的储物格。 掉落的力度、角度、一叠数量和冷却延时可在GUI调节。三个 内部比较槽带有逻辑与或逻辑或功能，可用作内部触发源。内部触发 还能和外部红石信号触发再进行逻辑与或逻辑或。触发模拟按钮仅作测试用途。 当内部触发条件满足时，预先打开卷帘门。所有符合条件的物品 会同时掉落。点击GUI的各处来了解如何运作。",
 "block.engineersdecor.factory_hopper": "Factory Hopper",
+ "block.engineersdecor.factory_placer": "Factory Block Placer",
 "block.engineersdecor.small_mineral_smelter": "小型矿物熔炼炉",
 "block.engineersdecor.small_mineral_smelter.help": "§6高温、高绝缘电熔石炉。§r\n 把矿物块加热成岩浆块，最后变成熔岩。由于 小型化的设备大小，该过程效率不高，需要大量时间和能源 来液化一块石头。",
 "block.engineersdecor.small_solar_panel": "小型太阳能板",
--- a/1.14/src/main/resources/assets/engineersdecor/models/block/light/floor_edge_light_model.json
+++ b/1.14/src/main/resources/assets/engineersdecor/models/block/light/floor_edge_light_model.json
@ -0,0 +1,92 @@
+{
+	"parent": "block/cube",
+	"textures": {
+		"light": "engineersdecor:block/light/lamp_glass_warm_square_texture",
+		"side": "engineersdecor:block/iestyle/steel_texture",
+		"particle": "engineersdecor:block/iestyle/steel_texture"
+	},
+	"elements": [
+		{
+			"from": [6, 0.1875, 0.5],
+			"to": [10, 1.8125, 1],
+			"faces": {
+				"north": {"uv": [6, 14.1875, 10, 15.8125], "texture": "#light"},
+				"south": {"uv": [6, 14.1875, 10, 15.8125], "texture": "#light"},
+				"up": {"uv": [6, 0.5, 10, 1], "texture": "#light"}
+			}
+		},
+		{
+			"from": [10, 0.1875, 0.5],
+			"to": [11, 1.8125, 1],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.125]},
+			"faces": {
+				"north": {"uv": [5, 14.1875, 6, 15.8125], "texture": "#side"},
+				"east": {"uv": [15, 14.1875, 15.5, 15.8125], "texture": "#side"},
+				"south": {"uv": [10, 14.1875, 11, 15.8125], "texture": "#side"},
+				"west": {"uv": [0.5, 14.1875, 1, 15.8125], "texture": "#side"},
+				"up": {"uv": [10, 0.5, 11, 1], "texture": "#side"},
+				"down": {"uv": [10, 15, 11, 15.5], "texture": "#side"}
+			}
+		},
+		{
+			"from": [5, 0.1875, 0.5],
+			"to": [6, 1.8125, 1],
+			"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.125]},
+			"faces": {
+				"north": {"uv": [10, 14.1875, 11, 15.8125], "texture": "#side"},
+				"east": {"uv": [15, 14.1875, 15.5, 15.8125], "texture": "#side"},
+				"south": {"uv": [5, 14.1875, 6, 15.8125], "texture": "#side"},
+				"west": {"uv": [0.5, 14.1875, 1, 15.8125], "texture": "#side"},
+				"up": {"uv": [5, 0.5, 6, 1], "texture": "#side"},
+				"down": {"uv": [5, 15, 6, 15.5], "texture": "#side"}
+			}
+		},
+		{
+			"from": [5, 0, 0],
+			"to": [11, 2, 0.5],
+			"faces": {
+				"north": {"uv": [5, 14, 11, 16], "texture": "#side"},
+				"east": {"uv": [15.5, 14, 16, 16], "texture": "#side"},
+				"south": {"uv": [5, 14, 11, 16], "texture": "#side"},
+				"west": {"uv": [0, 14, 0.5, 16], "texture": "#side"},
+				"up": {"uv": [5, 0, 11, 0.5], "texture": "#side"},
+				"down": {"uv": [5, 15.5, 11, 16], "texture": "#side"}
+			}
+		},
+		{
+			"from": [5, 0, 0.5],
+			"to": [11, 0.1875, 1],
+			"faces": {
+				"north": {"uv": [5, 15.8125, 11, 16], "texture": "#side"},
+				"east": {"uv": [15, 15.8125, 15.5, 16], "texture": "#side"},
+				"south": {"uv": [5, 15.8125, 11, 16], "texture": "#side"},
+				"west": {"uv": [0.5, 15.8125, 1, 16], "texture": "#side"},
+				"up": {"uv": [5, 0.5, 11, 1], "texture": "#side"},
+				"down": {"uv": [5, 15, 11, 15.5], "texture": "#side"}
+			}
+		}
+	],
+	"display": {
+		"thirdperson_righthand": {
+			"rotation": [0, -6, 96],
+			"translation": [-5.5, 0.5, 4.75],
+			"scale": [0.7, 0.7, 0.7]
+		},
+		"firstperson_righthand": {
+			"translation": [-3, -0.75, 1.25]
+		},
+		"ground": {
+			"translation": [0, 2.5, 6],
+			"scale": [0.7, 0.7, 0.7]
+		},
+		"gui": {
+			"rotation": [30, 30, 0],
+			"translation": [7.5, 3, 0],
+			"scale": [2, 2, 2]
+		},
+		"fixed": {
+			"rotation": [0, 180, 0],
+			"translation": [0, 0, -7.8]
+		}
+	}
+}
--- a/1.14/src/main/resources/assets/engineersdecor/models/item/iron_floor_edge_light.json
+++ b/1.14/src/main/resources/assets/engineersdecor/models/item/iron_floor_edge_light.json
@ -0,0 +1 @@
+{ "parent": "engineersdecor:block/light/floor_edge_light_model" }
--- a/1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/iron_floor_edge_light.json
+++ b/1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/iron_floor_edge_light.json
@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "name": "iron_floor_edge_light_dlt",
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:copy_name",
+              "source": "block_entity"
+            }
+          ],
+          "name": "engineersdecor:iron_floor_edge_light"
+        }
+      ]
+    }
+  ]
+}
--- a/1.14/src/main/resources/data/engineersdecor/recipes/independent/iron_floor_edge_light_recipe.json
+++ b/1.14/src/main/resources/data/engineersdecor/recipes/independent/iron_floor_edge_light_recipe.json
@ -0,0 +1,16 @@
+{
+  "conditions": [
+    {
+      "type": "engineersdecor:optional",
+      "result": "engineersdecor:iron_floor_edge_light",
+      "required": ["engineersdecor:iron_inset_light"]
+    }
+  ],
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    { "item": "engineersdecor:iron_inset_light" }
+  ],
+  "result": {
+    "item": "engineersdecor:iron_floor_edge_light"
+  }
+}
--- a/1.14/src/main/resources/data/engineersdecor/recipes/independent/iron_inset_light_recipe_backcycle.json
+++ b/1.14/src/main/resources/data/engineersdecor/recipes/independent/iron_inset_light_recipe_backcycle.json
@ -0,0 +1,16 @@
+{
+  "conditions": [
+    {
+      "type": "engineersdecor:optional",
+      "result": "engineersdecor:iron_inset_light",
+      "required": ["engineersdecor:iron_floor_edge_light"]
+    }
+  ],
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    { "item": "engineersdecor:iron_floor_edge_light" }
+  ],
+  "result": {
+    "item": "engineersdecor:iron_inset_light"
+  }
+}
				`@ -0,0 +1 @@`
				`{ "parent": "engineersdecor:block/light/floor_edge_light_model" }`