1.12: v1.0.14 release commit.

2019-10-25 18:40:51 +02:00 · 2019-10-25 18:40:51 +02:00 · 17ab68eb78
commit 17ab68eb78
parent 0d8c86bf8d
15 changed files with 213 additions and 28 deletions
--- a/1.12/gradle.properties
+++ b/1.12/gradle.properties
@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx8G
 version_minecraft=1.12.2
 version_forge=14.23.5.2768
 version_jei=4.10.0.198
-version_engineersdecor=1.0.14-b1
+version_engineersdecor=1.0.14
--- a/1.12/meta/update.json
+++ b/1.12/meta/update.json
@ -1,6 +1,7 @@
 {
  "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
  "1.12.2": {
+    "1.0.14": "[R] Release based on v1.0.14-b1. Release-to-release changes: * Factory Hopper added. * Small Waste Incinerator improved. * Lang updates. * Recipe fixes.",
    "1.0.14-b1": "[A] Factory Hopper added (configurable hopper and item collector).\n[M] Small Waste Incinerator Fifo shifting improved.\n[M] Lang file zh_cn updated (scikirbypoke, PR#53).\n[F] Fixed conditional recipe constant for redstone pipe valve (thx @albert_ac).",
    "1.0.13": "[R] Release based on v1.0.13-b2. Release-to-release changes: * Small Tree Cutter device added. * Small Solar Panel added. * Steel Mesh Fence added. * Broad Window Sill added.",
    "1.0.13-b2": "[A] Added Steel Mesh Fence.\n[A] Added Broad Window Sill.\n[A] Small Tree Cutter can chop Dynamic Trees, chops at tree trunk radius 7 or higher.",
@ -61,7 +62,7 @@
    "1.0.0-b1": "[A] Initial structure.\n[A] Added clinker bricks and clinker brick stairs.\n[A] Added slag bricks and slag brick stairs.\n[A] Added metal rung ladder.\n[A] Added staggered metal steps ladder.\n[A] Added treated wood ladder.\n[A] Added treated wood pole.\n[A] Added treated wood table."
  },
  "promos": {
-    "1.12.2-recommended": "1.0.13",
-    "1.12.2-latest": "1.0.14-b1"
+    "1.12.2-recommended": "1.0.14",
+    "1.12.2-latest": "1.0.14"
  }
 }
--- a/1.12/readme.md
+++ b/1.12/readme.md
@ -10,6 +10,14 @@ Mod sources for Minecraft version 1.12.2.
 ----
 ## Version history

+                  -------------------------------------------------------------------
+    - v1.0.14     [R] Release based on v1.0.14-b1. Release-to-release changes:
+                      * Factory Hopper added.
+                      * Small Waste Incinerator improved.
+                      * Lang updates.
+                      * Recipe fixes.
+                  -------------------------------------------------------------------
+
    - v1.0.14-b1  [A] Factory Hopper added (configurable hopper and item collector).
                  [M] Small Waste Incinerator Fifo shifting improved.
                  [M] Lang file zh_cn updated (scikirbypoke, PR#53).
--- a/1.12/src/main/java/wile/engineersdecor/ModContent.java
+++ b/1.12/src/main/java/wile/engineersdecor/ModContent.java
@ -12,27 +12,58 @@
 */
 package wile.engineersdecor;

-import wile.engineersdecor.detail.*;
-import wile.engineersdecor.blocks.*;
-import wile.engineersdecor.items.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
-import net.minecraft.tileentity.TileEntity;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Collections;
-import javax.annotation.Nonnull;
+import wile.engineersdecor.blocks.BlockDecor;
+import wile.engineersdecor.blocks.BlockDecorChair;
+import wile.engineersdecor.blocks.BlockDecorCraftingTable;
+import wile.engineersdecor.blocks.BlockDecorDirected;
+import wile.engineersdecor.blocks.BlockDecorDropper;
+import wile.engineersdecor.blocks.BlockDecorFence;
+import wile.engineersdecor.blocks.BlockDecorFloorGrating;
+import wile.engineersdecor.blocks.BlockDecorFull;
+import wile.engineersdecor.blocks.BlockDecorFurnace;
+import wile.engineersdecor.blocks.BlockDecorFurnaceElectrical;
+import wile.engineersdecor.blocks.BlockDecorGlassBlock;
+import wile.engineersdecor.blocks.BlockDecorHalfSlab;
+import wile.engineersdecor.blocks.BlockDecorHopper;
+import wile.engineersdecor.blocks.BlockDecorHorizontalSupport;
+import wile.engineersdecor.blocks.BlockDecorLadder;
+import wile.engineersdecor.blocks.BlockDecorMineralSmelter;
+import wile.engineersdecor.blocks.BlockDecorPassiveFluidAccumulator;
+import wile.engineersdecor.blocks.BlockDecorPipeValve;
+import wile.engineersdecor.blocks.BlockDecorSlab;
+import wile.engineersdecor.blocks.BlockDecorSolarPanel;
+import wile.engineersdecor.blocks.BlockDecorStairs;
+import wile.engineersdecor.blocks.BlockDecorStraightPole;
+import wile.engineersdecor.blocks.BlockDecorTest;
+import wile.engineersdecor.blocks.BlockDecorTreeCutter;
+import wile.engineersdecor.blocks.BlockDecorWall;
+import wile.engineersdecor.blocks.BlockDecorWasteIncinerator;
+import wile.engineersdecor.blocks.BlockDecorWindow;
+import wile.engineersdecor.blocks.BlockDecorWindowSill;
+import wile.engineersdecor.detail.ModAuxiliaries;
+import wile.engineersdecor.detail.ModConfig;
+import wile.engineersdecor.detail.ModTesrs;
+import wile.engineersdecor.items.ItemDecor;

@SuppressWarnings("unused")
 public class ModContent
@ -279,11 +310,18 @@ public class ModContent

  public static final BlockDecorDirected INSET_LIGHT_IRON = new BlockDecorDirected(
    "iron_inset_light",
-    BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT|(14<<BlockDecor.CFG_LIGHT_VALUE_SHIFT),
+    BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT|(15<<BlockDecor.CFG_LIGHT_VALUE_SHIFT),
    Material.IRON, 0.5f, 15f, SoundType.METAL,
    ModAuxiliaries.getPixeledAABB(5.2,5.2,15.7, 10.8,10.8,16.0)
  );

+  public static final BlockDecorDirected FLOOR_EDGE_LIGHT_IRON = new BlockDecorDirected(
+    "iron_floor_edge_light",
+    BlockDecor.CFG_CUTOUT|BlockDecor.CFG_LOOK_PLACEMENT|BlockDecor.CFG_HORIZIONTAL|(15<<BlockDecor.CFG_LIGHT_VALUE_SHIFT),
+    Material.IRON, 0.5f, 15f, SoundType.METAL,
+    ModAuxiliaries.getPixeledAABB(5,0,0, 11,2,1)
+  );
+
  public static final BlockDecor STEEL_TABLE = new BlockDecor(
    "steel_table",
    BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT,
@ -533,7 +571,8 @@ public class ModContent
    SIGN_MINDSTEP,
    PANZERGLASS_SLAB,                         // @todo: check if another class is needed due to is_side_visible
    TREATED_WOOD_FLOOR,                       // @todo: check if textures need improvement
-    TEST_BLOCK,TEST_BLOCK_TEI
+    TEST_BLOCK,TEST_BLOCK_TEI,
+    FLOOR_EDGE_LIGHT_IRON
  };

  //--------------------------------------------------------------------------------------------------------------------
--- a/1.12/src/main/resources/assets/engineersdecor/blockstates/iron_floor_edge_light.json
+++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/iron_floor_edge_light.json
@ -0,0 +1,9 @@
+{
+  "forge_marker": 1,
+  "defaults": { "model": "engineersdecor:light/floor_edge_light_model" },
+  "variants": {
+    "normal": [{}],
+    "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {}, "down": {} },
+    "inventory": [{}]
+  }
+}
--- a/1.12/src/main/resources/assets/engineersdecor/blockstates/iron_inset_light.json
+++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/iron_inset_light.json
@ -1,13 +1,6 @@
 {
  "forge_marker": 1,
-  "defaults": {
-    "model": "engineersdecor:light/inset_light_model",
-    "textures": {
-      "light": "engineersdecor:blocks/light/lamp_glass_warm_square_texture",
-      "side": "engineersdecor:blocks/iestyle/steel_texture",
-      "particle": "engineersdecor:blocks/iestyle/steel_texture"
-    }
-  },
+  "defaults": { "model": "engineersdecor:light/inset_light_model" },
  "variants": {
    "normal": [{}],
    "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":-90}, "down": {"x":90} },
--- a/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang
+++ b/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang
@ -102,8 +102,10 @@ tile.engineersdecor.treated_wood_side_table.name=Treated Wood Side Table
 tile.engineersdecor.treated_wood_side_table.help=§6Needed after the work's done.
 tile.engineersdecor.iron_inset_light.name=Inset Light
 tile.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.
+                                          Useful to light up places where electrical light installations are problematic.
+tile.engineersdecor.iron_floor_edge_light.name=Inset Floor Edge Light
+tile.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.
 tile.engineersdecor.treated_wood_window.name=Treated Wood Window
 tile.engineersdecor.treated_wood_window.help=§6Wood framed triple glazed window. Well insulating.§r Does not connect to adjacent blocks like glass panes.
 tile.engineersdecor.treated_wood_windowsill.name=Treated Wood Window Sill
--- a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang
+++ b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang
@ -101,6 +101,9 @@ tile.engineersdecor.iron_inset_light.name=Встраиваемый освети
 tile.engineersdecor.iron_inset_light.help=§6Маленький источник света, интегрируемый в стены, пол или потолок.§r\n\
                                               Полезно для освещения мест, где проблематичны электрические осветительные установки.\
                                               Уровень света - как факел.
+tile.engineersdecor.iron_floor_edge_light.name=Inset Floor Edge Light
+#tile.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.
 tile.engineersdecor.treated_wood_window.name=Обработанное деревянное окно
 tile.engineersdecor.treated_wood_window.help=§6Деревянный каркас окна с тройным остеклением. Ну и шумоизоляция.
 tile.engineersdecor.treated_wood_windowsill.name=Обработанный деревянный подоконник
--- a/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang
+++ b/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang
@ -104,6 +104,9 @@ tile.engineersdecor.iron_inset_light.name=嵌入灯
 tile.engineersdecor.iron_inset_light.help=§6小型荧石光源，能嵌入地板、天花板或墙里。§r\n\
                                          用于照亮电力光源难以安装的地方。\
                                          亮度与火把一样。
+tile.engineersdecor.iron_floor_edge_light.name=Inset Floor Edge Light
+#tile.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.
 tile.engineersdecor.treated_wood_window.name=防腐木窗
 tile.engineersdecor.treated_wood_window.help=§6木框三层玻璃窗。绝缘良好。§r不像玻璃板一样连接到相邻方块。
 tile.engineersdecor.treated_wood_windowsill.name=防腐木窗台
--- a/1.12/src/main/resources/assets/engineersdecor/models/block/light/floor_edge_light_model.json
+++ b/1.12/src/main/resources/assets/engineersdecor/models/block/light/floor_edge_light_model.json
@ -0,0 +1,92 @@
+{
+	"parent": "block/cube",
+	"textures": {
+		"light": "engineersdecor:blocks/light/lamp_glass_warm_square_texture",
+		"side": "engineersdecor:blocks/iestyle/steel_texture",
+		"particle": "engineersdecor:blocks/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.12/src/main/resources/assets/engineersdecor/recipes/independent/iron_floor_edge_light_recipe.json
+++ b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/iron_floor_edge_light_recipe.json
@ -0,0 +1,16 @@
+{
+  "conditions": [
+    {
+      "type": "engineersdecor:grc",
+      "result": "engineersdecor:iron_floor_edge_light",
+      "required": ["engineersdecor:iron_inset_light"]
+    }
+  ],
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    { "item": "engineersdecor:iron_inset_light", "data": 0 }
+  ],
+  "result": {
+    "item": "engineersdecor:iron_floor_edge_light"
+  }
+}
--- a/1.12/src/main/resources/assets/engineersdecor/recipes/independent/iron_inset_light_recipe_backcycle.json
+++ b/1.12/src/main/resources/assets/engineersdecor/recipes/independent/iron_inset_light_recipe_backcycle.json
@ -0,0 +1,16 @@
+{
+  "conditions": [
+    {
+      "type": "engineersdecor:grc",
+      "result": "engineersdecor:iron_inset_light",
+      "required": ["engineersdecor:iron_floor_edge_light"]
+    }
+  ],
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    { "item": "engineersdecor:iron_floor_edge_light", "data": 0 }
+  ],
+  "result": {
+    "item": "engineersdecor:iron_inset_light"
+  }
+}