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

Added Iron Floor Light.

Browse source
This commit is contained in:
stfwi 2019-10-25 19:29:13 +02:00
parent b0673e4176
commit e47f5eda8a
15 changed files with 173 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
1.12/gradle.properties
View file

@ -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
version_engineersdecor=1.0.15-b1

2
1.12/readme.md
View file

@ -10,6 +10,8 @@ Mod sources for Minecraft version 1.12.2.
----
## Version history
~ v1.0.15-b1 [A] Added Floor Edge Light.
-------------------------------------------------------------------
- v1.0.14 [R] Release based on v1.0.14-b1. Release-to-release changes:
* Factory Hopper added.

4
1.12/src/main/java/wile/engineersdecor/ModContent.java
View file

@ -551,6 +551,7 @@ public class ModContent
TREATED_WOOD_WINDOWSILL,
TREATED_WOOD_BROAD_WINDOWSILL,
INSET_LIGHT_IRON,
FLOOR_EDGE_LIGHT_IRON,
TREATED_WOOD_POLE_SUPPORT,
TREATED_WOOD_POLE_HEAD,
THIN_STEEL_POLE,
@ -571,8 +572,7 @@ 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,
FLOOR_EDGE_LIGHT_IRON
TEST_BLOCK,TEST_BLOCK_TEI
};
//--------------------------------------------------------------------------------------------------------------------

2
1.14/gradle.properties
View file

@ -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

3
1.14/meta/update.json
View file

@ -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"
}
}

3
1.14/readme.md
View file

@ -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).

7
1.14/src/main/java/wile/engineersdecor/ModContent.java
View file

@ -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,

7
1.14/src/main/resources/assets/engineersdecor/blockstates/iron_floor_edge_light.json Normal file
View file

@ -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} }
}
}

9
1.14/src/main/resources/assets/engineersdecor/blockstates/iron_inset_light.json
View file

@ -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} }
}

92
1.14/src/main/resources/assets/engineersdecor/models/block/light/floor_edge_light_model.json Normal file
View file

@ -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]
}
}
}

1
1.14/src/main/resources/assets/engineersdecor/models/item/iron_floor_edge_light.json Normal file
View file

@ -0,0 +1 @@
{ "parent": "engineersdecor:block/light/floor_edge_light_model" }

21
1.14/src/main/resources/data/engineersdecor/loot_tables/blocks/iron_floor_edge_light.json Normal file
View file

@ -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"
}
]
}
]
}

16
1.14/src/main/resources/data/engineersdecor/recipes/independent/iron_floor_edge_light_recipe.json Normal file
View file

@ -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"
}
}

16
1.14/src/main/resources/data/engineersdecor/recipes/independent/iron_inset_light_recipe_backcycle.json Normal file
View file

@ -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"
}
}

3
meta/update.json
View file

@ -4,7 +4,7 @@
"1.12.2-recommended": "1.0.14",
"1.12.2-latest": "1.0.14",
"1.14.4-recommended": "",
"1.14.4-latest": "1.0.14-b1"
"1.14.4-latest": "1.0.15-b1"
},
"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.",
@ -68,6 +68,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."
},
"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.",