1.15: Dense Grit Dirt added. Bulb light added. Ceiling Edge Light added.
This commit is contained in:
stfwi
parent
dced568836
commit
727967ca20
20 changed files with 505 additions and 7 deletions
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/",
|
||||
"1.15.2": {
|
||||
"1.1.1-b1": "[A] Dense Grit Dirt added.\n[A] Ceiling Edge Light added.\n[A] Iron Bulb Light added.",
|
||||
"1.1.0": "[R] Release build v1.1.0. Changes: * GUI button/slider tooltips added (1.5s delay). * IE Sheet Metal Slab Slices added. * Config options extended/updated. * Block Placer improvements. * Block Breaker drop trajectory improved. * Dense Grit Sand textures enhanced. * Pipe Valve redstone connector display fixes. * Compatibility bug fixes.\n[F] Block Placer also defers placements if falling item stacks are in front of it (thx Cid).",
|
||||
"1.1.0-b3": "[!] Forge update, requires Forge 1.15.2-31.2.20.\n[F] Block Placer defers placements if collidable entities are in the way (issue #98, thx DrakoAlcarus).\n[M] Block Breaker item drop trajectories have lower speed (fall slightly straighter down).\n[M] Pipe Valves redstone connector also shown if the adjacent block can connect redstone in general.\n[F] Added Block verification during TE ticking in case devices are moved (issue #101, thx D0CTOR-ZED).",
|
||||
"1.1.0-b2": "[A] Added tooltips for buttons/settings in device GUIs (1.5s display delay).\n[U] Updated Forge/Mappings.",
|
||||
|
|
@ -25,6 +26,6 @@
|
|||
},
|
||||
"promos": {
|
||||
"1.15.2-recommended": "1.1.0",
|
||||
"1.15.2-latest": "1.1.0"
|
||||
"1.15.2-latest": "1.1.1-b1"
|
||||
}
|
||||
}
|
||||
|
|
@ -11,7 +11,9 @@ Mod sources for Minecraft version 1.15.1.
|
|||
|
||||
## Version history
|
||||
|
||||
~ v1.1.1-b1 [F]
|
||||
- v1.1.1-b1 [A] Dense Grit Dirt added.
|
||||
[A] Ceiling Edge Light added.
|
||||
[A] Iron Bulb Light added.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
- v1.1.0 [R] Release build v1.1.0. Changes:
|
||||
|
|
|
|||
|
|
@ -288,6 +288,26 @@ public class ModContent
|
|||
Auxiliaries.getPixeledAABB(5,0,0, 11,2,0.5)
|
||||
)).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "iron_floor_edge_light"));
|
||||
|
||||
public static final DecorBlock.DirectedWaterLoggable CEILING_EDGE_LIGHT_IRON = (DecorBlock.DirectedWaterLoggable)(new DecorBlock.DirectedWaterLoggable(
|
||||
DecorBlock.CFG_CUTOUT|DecorBlock.CFG_LOOK_PLACEMENT|DecorBlock.CFG_HORIZIONTAL,
|
||||
Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL).lightValue(15).notSolid(),
|
||||
new AxisAlignedBB[]{
|
||||
Auxiliaries.getPixeledAABB( 0,15.5,0, 16,16,2.0),
|
||||
Auxiliaries.getPixeledAABB( 0,14.0,0, 16,16,0.5),
|
||||
Auxiliaries.getPixeledAABB( 0,14.0,0, 1,16,2.0),
|
||||
Auxiliaries.getPixeledAABB(15,14.0,0, 16,16,2.0),
|
||||
}
|
||||
)).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "iron_ceiling_edge_light"));
|
||||
|
||||
public static final DecorBlock.DirectedWaterLoggable BULB_LIGHT_IRON = (DecorBlock.DirectedWaterLoggable)(new DecorBlock.DirectedWaterLoggable(
|
||||
DecorBlock.CFG_CUTOUT|DecorBlock.CFG_FACING_PLACEMENT|DecorBlock.CFG_OPPOSITE_PLACEMENT,
|
||||
Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL).lightValue(15).notSolid(),
|
||||
new AxisAlignedBB[]{
|
||||
Auxiliaries.getPixeledAABB(6.5,6.5,1, 9.5,9.5,4),
|
||||
Auxiliaries.getPixeledAABB(6.0,6.0,0, 10.0,10.0,1.0)
|
||||
}
|
||||
)).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "iron_bulb_light"));
|
||||
|
||||
public static final DecorBlock.WaterLoggable STEEL_TABLE = (DecorBlock.WaterLoggable)(new DecorBlock.WaterLoggable(
|
||||
DecorBlock.CFG_CUTOUT,
|
||||
Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(2f, 15f).sound(SoundType.METAL).notSolid(),
|
||||
|
|
@ -702,6 +722,7 @@ public class ModContent
|
|||
PASSIVE_FLUID_ACCUMULATOR,
|
||||
SMALL_FLUID_FUNNEL,
|
||||
DENSE_GRIT_SAND,
|
||||
DENSE_GRIT_DIRT,
|
||||
CLINKER_BRICK_BLOCK,
|
||||
CLINKER_BRICK_SLAB,
|
||||
CLINKER_BRICK_STAIRS,
|
||||
|
|
@ -749,6 +770,8 @@ public class ModContent
|
|||
STEEL_TABLE,
|
||||
INSET_LIGHT_IRON,
|
||||
FLOOR_EDGE_LIGHT_IRON,
|
||||
CEILING_EDGE_LIGHT_IRON,
|
||||
BULB_LIGHT_IRON,
|
||||
STEEL_FLOOR_GRATING,
|
||||
STEEL_MESH_FENCE,
|
||||
STEEL_MESH_FENCE_GATE,
|
||||
|
|
@ -769,7 +792,6 @@ public class ModContent
|
|||
};
|
||||
|
||||
private static final Block devBlocks[] = {
|
||||
DENSE_GRIT_DIRT // texture needs improvments, looks too blurry yet.
|
||||
//TEST_BLOCK
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ displayName="Engineer's Decor"
|
|||
description="Adds cosmetic blocks for the engineer's workshop, factory and home."
|
||||
authors="wilechaote"
|
||||
credits="BluSunrize, Damien Hazard, malte0811, et al., the Forge Smiths, the Modders of the World."
|
||||
updateJSONURL="https://raw.githubusercontent.com/stfwi/engineers-decor/develop/meta/update.json"
|
||||
updateJSONURL="https://raw.githubusercontent.com/stfwi/engineers-decor/develop/1.15/meta/update.json"
|
||||
displayURL="https://github.com/stfwi/engineers-decor/"
|
||||
logoFile="logo.png"
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
"variants": {
|
||||
"facing=north": { "model": "engineersdecor:block/light/bulb_light_model" },
|
||||
"facing=south": { "model": "engineersdecor:block/light/bulb_light_model", "y":180 },
|
||||
"facing=west": { "model": "engineersdecor:block/light/bulb_light_model", "y":270 },
|
||||
"facing=east": { "model": "engineersdecor:block/light/bulb_light_model", "y":90 },
|
||||
"facing=up": { "model": "engineersdecor:block/light/bulb_light_model", "x":270 },
|
||||
"facing=down": { "model": "engineersdecor:block/light/bulb_light_model", "x":90 }
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
"variants": {
|
||||
"facing=north": { "model": "engineersdecor:block/light/ceiling_edge_light_model" },
|
||||
"facing=south": { "model": "engineersdecor:block/light/ceiling_edge_light_model", "y":180 },
|
||||
"facing=west": { "model": "engineersdecor:block/light/ceiling_edge_light_model", "y":270 },
|
||||
"facing=east": { "model": "engineersdecor:block/light/ceiling_edge_light_model", "y":90 },
|
||||
"facing=up": { "model": "engineersdecor:block/light/ceiling_edge_light_model", "x":270 },
|
||||
"facing=down": { "model": "engineersdecor:block/light/ceiling_edge_light_model", "x":90 }
|
||||
}
|
||||
}
|
||||
|
|
@ -121,6 +121,10 @@
|
|||
"block.engineersdecor.halfslab_sheetmetal_steel.help": "§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices.",
|
||||
"block.engineersdecor.halfslab_treated_wood": "Treated Wood Slice",
|
||||
"block.engineersdecor.halfslab_treated_wood.help": "§6Vertically stackable slice.§r Right/left click with the slice stack on the top or bottom surface to add/remove slices.",
|
||||
"block.engineersdecor.iron_bulb_light": "Iron Bulb Light",
|
||||
"block.engineersdecor.iron_bulb_light.help": "§6Small glowstone light source§r, placed on the ceiling, walls, fence posts or metal poles.",
|
||||
"block.engineersdecor.iron_ceiling_edge_light": "Ceiling Edge Light",
|
||||
"block.engineersdecor.iron_ceiling_edge_light.help": "§6Small glowstone light source§r, placed at the edge of a ceiling block.",
|
||||
"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.iron_inset_light": "Inset Light",
|
||||
|
|
|
|||
|
|
@ -121,6 +121,10 @@
|
|||
"block.engineersdecor.halfslab_sheetmetal_steel.help": "§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей.",
|
||||
"block.engineersdecor.halfslab_treated_wood": "Часть обработанного дерева",
|
||||
"block.engineersdecor.halfslab_treated_wood.help": "§6Вертикально наращиваемая часть.§rПравый/левый щелчок со стеком частей на верхней или нижней поверхности для добавления/удаления частей.",
|
||||
"block.engineersdecor.iron_bulb_light": "Iron Bulb Light",
|
||||
"block.engineersdecor.iron_bulb_light.help": "§6Small glowstone light source§r, placed on the ceiling, walls, fence posts or metal poles.",
|
||||
"block.engineersdecor.iron_ceiling_edge_light": "Ceiling Edge Light",
|
||||
"block.engineersdecor.iron_ceiling_edge_light.help": "§6Small glowstone light source§r, placed at the edge of a ceiling block.",
|
||||
"block.engineersdecor.iron_floor_edge_light": "Встраиваемый снизу осветитель",
|
||||
"block.engineersdecor.iron_floor_edge_light.help": "§6Маленький источник света, интегрируемый в нижнюю грань блока.§r\n Полезно для освещения мест, где проблематичны электрические осветительные установки.",
|
||||
"block.engineersdecor.iron_inset_light": "Встраиваемый осветитель",
|
||||
|
|
|
|||
|
|
@ -121,6 +121,10 @@
|
|||
"block.engineersdecor.halfslab_sheetmetal_steel.help": "§6可垂直堆叠的切片。§r手持切片右/左击切片堆叠的顶端或底部来添加/移除切片。",
|
||||
"block.engineersdecor.halfslab_treated_wood": "防腐木切片",
|
||||
"block.engineersdecor.halfslab_treated_wood.help": "§6可垂直堆叠的切片。§r手持切片右/左击切片堆叠的顶端或底部来添加/移除切片。",
|
||||
"block.engineersdecor.iron_bulb_light": "Iron Bulb Light",
|
||||
"block.engineersdecor.iron_bulb_light.help": "§6Small glowstone light source§r, placed on the ceiling, walls, fence posts or metal poles.",
|
||||
"block.engineersdecor.iron_ceiling_edge_light": "Ceiling Edge Light",
|
||||
"block.engineersdecor.iron_ceiling_edge_light.help": "§6Small glowstone light source§r, placed at the edge of a ceiling block.",
|
||||
"block.engineersdecor.iron_floor_edge_light": "嵌入地板边缘灯",
|
||||
"block.engineersdecor.iron_floor_edge_light.help": "§6小型荧石光源，置于地板方块边缘。§r\n 用于照亮电力光源难以安装的地方。",
|
||||
"block.engineersdecor.iron_inset_light": "嵌入灯",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,267 @@
|
|||
{
|
||||
"parent": "block/block",
|
||||
"textures": {
|
||||
"light": "engineersdecor:block/light/lamp_glass_warm_square_texture",
|
||||
"particle": "engineersdecor:block/iestyle/steel_texture",
|
||||
"side": "engineersdecor:block/iestyle/steel_texture"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"from": [6.5, 6.5, 1],
|
||||
"to": [9.5, 9.5, 4],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 11]},
|
||||
"faces": {
|
||||
"north": {"uv": [6.5, 6.5, 9.5, 9.5], "texture": "#light"},
|
||||
"east": {"uv": [12, 6.5, 15, 9.5], "texture": "#light"},
|
||||
"south": {"uv": [6.5, 6.5, 9.5, 9.5], "texture": "#light"},
|
||||
"west": {"uv": [1, 6.5, 4, 9.5], "texture": "#light"},
|
||||
"up": {"uv": [6.5, 1, 9.5, 4], "texture": "#light"},
|
||||
"down": {"uv": [6.5, 12, 9.5, 15], "texture": "#light"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [7, 9.5, 1],
|
||||
"to": [7.25, 9.75, 4.25],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 14]},
|
||||
"faces": {
|
||||
"north": {"uv": [8.5, 6, 9, 6.5], "texture": "#side"},
|
||||
"east": {"uv": [11.625, 6, 15, 6.25], "texture": "#side"},
|
||||
"south": {"uv": [7, 6, 7.5, 6.5], "texture": "#side"},
|
||||
"west": {"uv": [1, 6, 4.375, 6.5], "texture": "#side"},
|
||||
"up": {"uv": [7, 1, 7.5, 4.375], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [7, 11.625, 7.5, 15], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [7, 6.5, 4],
|
||||
"to": [7.25, 9.5, 4.25],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 7.75, 17]},
|
||||
"faces": {
|
||||
"north": {"uv": [8.75, 6.5, 9, 9.5], "texture": "#side"},
|
||||
"east": {"uv": [11.75, 6.5, 12, 9.5], "texture": "#side"},
|
||||
"south": {"uv": [7, 6.5, 7.25, 9.5], "texture": "#side"},
|
||||
"west": {"uv": [4, 6.5, 4.25, 9.5], "texture": "#side"},
|
||||
"up": {"uv": [7, 4, 7.25, 4.25], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [7, 11.75, 7.25, 12], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [8.75, 6.5, 4],
|
||||
"to": [9, 9.5, 4.25],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [9.75, 7.75, 17]},
|
||||
"faces": {
|
||||
"north": {"uv": [7, 6.5, 7.25, 9.5], "texture": "#side"},
|
||||
"east": {"uv": [11.75, 6.5, 12, 9.5], "texture": "#side"},
|
||||
"south": {"uv": [8.75, 6.5, 9, 9.5], "texture": "#side"},
|
||||
"west": {"uv": [4, 6.5, 4.25, 9.5], "texture": "#side"},
|
||||
"up": {"uv": [8.75, 4, 9, 4.25], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [8.75, 11.75, 9, 12], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [9, 8.75, 4],
|
||||
"to": [9.5, 9, 4.25],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [10.125, 7.75, 17]},
|
||||
"faces": {
|
||||
"north": {"uv": [6.5, 7, 7, 7.25], "texture": "#side"},
|
||||
"east": {"uv": [11.75, 7, 12, 7.25], "texture": "#side"},
|
||||
"south": {"uv": [9, 7, 9.5, 7.25], "texture": "#side"},
|
||||
"west": {"uv": [4, 7, 4.25, 7.25], "texture": "#side"},
|
||||
"up": {"uv": [9, 4, 9.5, 4.25], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [9, 11.75, 9.5, 12], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [9, 7, 4],
|
||||
"to": [9.5, 7.25, 4.25],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [10.125, 6, 17]},
|
||||
"faces": {
|
||||
"north": {"uv": [6.5, 7, 7, 7.25], "texture": "#side"},
|
||||
"east": {"uv": [11.75, 7, 12, 7.25], "texture": "#side"},
|
||||
"south": {"uv": [9, 7, 9.5, 7.25], "texture": "#side"},
|
||||
"west": {"uv": [4, 7, 4.25, 7.25], "texture": "#side"},
|
||||
"up": {"uv": [9, 4, 9.5, 4.25], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [9, 11.75, 9.5, 12], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [7.25, 8.75, 4],
|
||||
"to": [8.75, 9, 4.25],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [9.375, 7.75, 17]},
|
||||
"faces": {
|
||||
"north": {"uv": [7.25, 7, 8.75, 7.25], "texture": "#side"},
|
||||
"east": {"uv": [11.75, 7, 12, 7.25], "texture": "#side"},
|
||||
"south": {"uv": [7.25, 7, 8.75, 7.25], "texture": "#side"},
|
||||
"west": {"uv": [4, 7, 4.25, 7.25], "texture": "#side"},
|
||||
"up": {"uv": [7.25, 4, 8.75, 4.25], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [7.25, 11.75, 8.75, 12], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [7.25, 7, 4],
|
||||
"to": [8.75, 7.25, 4.25],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [9.375, 6, 17]},
|
||||
"faces": {
|
||||
"north": {"uv": [7.25, 7, 8.75, 7.25], "texture": "#side"},
|
||||
"east": {"uv": [11.75, 7, 12, 7.25], "texture": "#side"},
|
||||
"south": {"uv": [7.25, 7, 8.75, 7.25], "texture": "#side"},
|
||||
"west": {"uv": [4, 7, 4.25, 7.25], "texture": "#side"},
|
||||
"up": {"uv": [7.25, 4, 8.75, 4.25], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [7.25, 11.75, 8.75, 12], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [6.5, 8.75, 4],
|
||||
"to": [7, 9, 4.25],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8.5, 7.75, 17]},
|
||||
"faces": {
|
||||
"north": {"uv": [9, 7, 9.5, 7.25], "texture": "#side"},
|
||||
"east": {"uv": [11.75, 7, 12, 7.25], "texture": "#side"},
|
||||
"south": {"uv": [6.5, 7, 7, 7.25], "texture": "#side"},
|
||||
"west": {"uv": [4, 7, 4.25, 7.25], "texture": "#side"},
|
||||
"up": {"uv": [6.5, 4, 7, 4.25], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [6.5, 11.75, 7, 12], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [6.5, 7, 4],
|
||||
"to": [7, 7.25, 4.25],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8.5, 6, 17]},
|
||||
"faces": {
|
||||
"north": {"uv": [9, 7, 9.5, 7.25], "texture": "#side"},
|
||||
"east": {"uv": [11.75, 7, 12, 7.25], "texture": "#side"},
|
||||
"south": {"uv": [6.5, 7, 7, 7.25], "texture": "#side"},
|
||||
"west": {"uv": [4, 7, 4.25, 7.25], "texture": "#side"},
|
||||
"up": {"uv": [6.5, 4, 7, 4.25], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [6.5, 11.75, 7, 12], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [7, 6.25, 1],
|
||||
"to": [7.25, 6.5, 4.25],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4.75, 14]},
|
||||
"faces": {
|
||||
"north": {"uv": [8.5, 6, 9, 6.5], "texture": "#side"},
|
||||
"east": {"uv": [11.625, 6, 15, 6.25], "texture": "#side"},
|
||||
"south": {"uv": [7, 6, 7.5, 6.5], "texture": "#side"},
|
||||
"west": {"uv": [1, 6, 4.375, 6.5], "texture": "#side"},
|
||||
"up": {"uv": [7, 1, 7.5, 4.375], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [7, 11.625, 7.5, 15], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [8.75, 9.5, 1],
|
||||
"to": [9, 9.75, 4.25],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [9.5, 8, 14]},
|
||||
"faces": {
|
||||
"north": {"uv": [8.5, 6, 9, 6.5], "texture": "#side"},
|
||||
"east": {"uv": [11.625, 6, 15, 6.25], "texture": "#side"},
|
||||
"south": {"uv": [7, 6, 7.5, 6.5], "texture": "#side"},
|
||||
"west": {"uv": [1, 6, 4.375, 6.5], "texture": "#side"},
|
||||
"up": {"uv": [7, 1, 7.5, 4.375], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [7, 11.625, 7.5, 15], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [9.5, 8.75, 1],
|
||||
"to": [9.75, 9, 4.25],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [10.5, 7.25, 14]},
|
||||
"faces": {
|
||||
"north": {"uv": [8.5, 6, 9, 6.5], "texture": "#side"},
|
||||
"east": {"uv": [11.625, 6, 15, 6.25], "texture": "#side"},
|
||||
"south": {"uv": [7, 6, 7.5, 6.5], "texture": "#side"},
|
||||
"west": {"uv": [1, 6, 4.375, 6.5], "texture": "#side"},
|
||||
"up": {"uv": [7, 1, 7.5, 4.375], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [7, 11.625, 7.5, 15], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [6.25, 8.75, 1],
|
||||
"to": [6.5, 9, 4.25],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [7.25, 7.25, 14]},
|
||||
"faces": {
|
||||
"north": {"uv": [8.5, 6, 9, 6.5], "texture": "#side"},
|
||||
"east": {"uv": [11.625, 6, 15, 6.25], "texture": "#side"},
|
||||
"south": {"uv": [7, 6, 7.5, 6.5], "texture": "#side"},
|
||||
"west": {"uv": [1, 6, 4.375, 6.5], "texture": "#side"},
|
||||
"up": {"uv": [7, 1, 7.5, 4.375], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [7, 11.625, 7.5, 15], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [9.5, 7, 1],
|
||||
"to": [9.75, 7.25, 4.25],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [10.5, 5.5, 14]},
|
||||
"faces": {
|
||||
"north": {"uv": [8.5, 6, 9, 6.5], "texture": "#side"},
|
||||
"east": {"uv": [11.625, 6, 15, 6.25], "texture": "#side"},
|
||||
"south": {"uv": [7, 6, 7.5, 6.5], "texture": "#side"},
|
||||
"west": {"uv": [1, 6, 4.375, 6.5], "texture": "#side"},
|
||||
"up": {"uv": [7, 1, 7.5, 4.375], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [7, 11.625, 7.5, 15], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [6.25, 7, 1],
|
||||
"to": [6.5, 7.25, 4.25],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [7.25, 5.5, 14]},
|
||||
"faces": {
|
||||
"north": {"uv": [8.5, 6, 9, 6.5], "texture": "#side"},
|
||||
"east": {"uv": [11.625, 6, 15, 6.25], "texture": "#side"},
|
||||
"south": {"uv": [7, 6, 7.5, 6.5], "texture": "#side"},
|
||||
"west": {"uv": [1, 6, 4.375, 6.5], "texture": "#side"},
|
||||
"up": {"uv": [7, 1, 7.5, 4.375], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [7, 11.625, 7.5, 15], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [8.75, 6.25, 1],
|
||||
"to": [9, 6.5, 4.25],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [9.5, 4.75, 14]},
|
||||
"faces": {
|
||||
"north": {"uv": [8.5, 6, 9, 6.5], "texture": "#side"},
|
||||
"east": {"uv": [11.625, 6, 15, 6.25], "texture": "#side"},
|
||||
"south": {"uv": [7, 6, 7.5, 6.5], "texture": "#side"},
|
||||
"west": {"uv": [1, 6, 4.375, 6.5], "texture": "#side"},
|
||||
"up": {"uv": [7, 1, 7.5, 4.375], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [7, 11.625, 7.5, 15], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [6, 6, 0],
|
||||
"to": [10, 10, 1],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [6, 6, 10, 10], "texture": "#side"},
|
||||
"east": {"uv": [15, 6, 16, 10], "texture": "#side"},
|
||||
"south": {"uv": [6, 6, 10, 10], "texture": "#side"},
|
||||
"west": {"uv": [0, 6, 1, 10], "texture": "#side"},
|
||||
"up": {"uv": [6, 0, 10, 1], "rotation": 180, "texture": "#side"},
|
||||
"down": {"uv": [6, 15, 10, 16], "rotation": 180, "texture": "#side"}
|
||||
}
|
||||
}
|
||||
],
|
||||
"display": {
|
||||
"thirdperson_righthand": {
|
||||
"rotation": [-3, -60, 0],
|
||||
"translation": [-5, 0, 2.25],
|
||||
"scale": [0.7, 0.7, 0.7]
|
||||
},
|
||||
"firstperson_righthand": {
|
||||
"rotation": [5, -52, 0],
|
||||
"translation": [-3, -0.75, 1.25]
|
||||
},
|
||||
"ground": {
|
||||
"translation": [0, 1.5, 6],
|
||||
"scale": [0.7, 0.7, 0.7]
|
||||
},
|
||||
"gui": {
|
||||
"rotation": [16, 30, 0],
|
||||
"translation": [3.75, -1.5, 0]
|
||||
},
|
||||
"fixed": {
|
||||
"rotation": [0, 180, 0],
|
||||
"translation": [0, 0, -8.05]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,96 @@
|
|||
{
|
||||
"parent": "block/block",
|
||||
"textures": {
|
||||
"light": "engineersdecor:block/light/lamp_glass_warm_square_texture",
|
||||
"particle": "engineersdecor:block/iestyle/steel_texture",
|
||||
"side": "engineersdecor:block/iestyle/steel_texture"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"from": [1, 14, 0.75],
|
||||
"to": [15, 16, 1.25],
|
||||
"rotation": {"angle": 45, "axis": "x", "origin": [8, 15, 1]},
|
||||
"faces": {
|
||||
"north": {"uv": [1, 0, 15, 2], "texture": "#light"},
|
||||
"east": {"uv": [14.75, 0, 15.25, 2], "texture": "#light"},
|
||||
"south": {"uv": [1, 8, 15, 10], "texture": "#light"},
|
||||
"west": {"uv": [0.75, 0, 1.25, 2], "texture": "#light"},
|
||||
"up": {"uv": [1, 0.75, 15, 1.25], "texture": "#light"},
|
||||
"down": {"uv": [1, 14.75, 15, 15.25], "texture": "#light"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [15, 14, 0],
|
||||
"to": [16, 16, 2],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [15.5, 15, 1]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 1, 2], "texture": "#side"},
|
||||
"east": {"uv": [14, 0, 16, 2], "texture": "#side"},
|
||||
"south": {"uv": [15, 0, 16, 2], "texture": "#side"},
|
||||
"west": {"uv": [0, 0, 2, 2], "texture": "#side"},
|
||||
"up": {"uv": [15, 0, 16, 2], "texture": "#side"},
|
||||
"down": {"uv": [15, 14, 16, 16], "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [0, 14, 0],
|
||||
"to": [1, 16, 2],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [0.5, 15, 1]},
|
||||
"faces": {
|
||||
"north": {"uv": [15, 0, 16, 2], "texture": "#side"},
|
||||
"east": {"uv": [14, 0, 16, 2], "texture": "#side"},
|
||||
"south": {"uv": [0, 0, 1, 2], "texture": "#side"},
|
||||
"west": {"uv": [0, 0, 2, 2], "texture": "#side"},
|
||||
"up": {"uv": [0, 0, 1, 2], "texture": "#side"},
|
||||
"down": {"uv": [0, 14, 1, 16], "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [1, 15.5, 0],
|
||||
"to": [15, 16, 2],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [1.5, 16.5, 1]},
|
||||
"faces": {
|
||||
"north": {"uv": [1, 0, 15, 0.5], "texture": "#side"},
|
||||
"south": {"uv": [1, 0, 15, 0.5], "texture": "#side"},
|
||||
"up": {"uv": [1, 0, 15, 2], "texture": "#side"},
|
||||
"down": {"uv": [1, 14, 15, 16], "texture": "#side"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [1, 14, 0],
|
||||
"to": [15, 15.5, 0.5],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [1.5, 16, 1]},
|
||||
"faces": {
|
||||
"north": {"uv": [1, 0.5, 15, 2], "texture": "#side"},
|
||||
"south": {"uv": [1, 0.5, 15, 2], "texture": "#side"},
|
||||
"up": {"uv": [1, 0, 15, 0.5], "texture": "#side"},
|
||||
"down": {"uv": [1, 15.5, 15, 16], "texture": "#side"}
|
||||
}
|
||||
}
|
||||
],
|
||||
"display": {
|
||||
"thirdperson_righthand": {
|
||||
"rotation": [-15, -180, -55],
|
||||
"translation": [-8.25, 0, -2.5],
|
||||
"scale": [0.4, 0.4, 0.4]
|
||||
},
|
||||
"firstperson_righthand": {
|
||||
"rotation": [-3, -72, -25],
|
||||
"translation": [-5, -0.75, 3.75],
|
||||
"scale": [0.6, 0.6, 0.6]
|
||||
},
|
||||
"ground": {
|
||||
"translation": [0, -1.5, 2.75],
|
||||
"scale": [0.4, 0.4, 0.4]
|
||||
},
|
||||
"gui": {
|
||||
"rotation": [30, 30, 0],
|
||||
"translation": [2, -2.75, 0],
|
||||
"scale": [0.7, 0.7, 0.7]
|
||||
},
|
||||
"fixed": {
|
||||
"rotation": [0, 180, 0],
|
||||
"translation": [0, 0, -7.8]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1 @@
|
|||
{ "parent": "engineersdecor:block/light/bulb_light_model" }
|
||||
|
|
@ -0,0 +1 @@
|
|||
{ "parent": "engineersdecor:block/light/ceiling_edge_light_model" }
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"type": "minecraft:block",
|
||||
"pools": [
|
||||
{
|
||||
"name": "iron_bulb_light_dlt",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:copy_name",
|
||||
"source": "block_entity"
|
||||
}
|
||||
],
|
||||
"name": "engineersdecor:iron_bulb_light"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
{
|
||||
"type": "minecraft:block",
|
||||
"pools": [
|
||||
{
|
||||
"name": "iron_ceiling_edge_light_dlt",
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:copy_name",
|
||||
"source": "block_entity"
|
||||
}
|
||||
],
|
||||
"name": "engineersdecor:iron_ceiling_edge_light"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "engineersdecor:optional",
|
||||
"result": "engineersdecor:iron_bulb_light",
|
||||
"required": ["engineersdecor:iron_ceiling_edge_light"]
|
||||
}
|
||||
],
|
||||
"type": "minecraft:crafting_shapeless",
|
||||
"ingredients": [
|
||||
{ "item": "engineersdecor:iron_ceiling_edge_light" }
|
||||
],
|
||||
"result": {
|
||||
"item": "engineersdecor:iron_bulb_light"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"conditions": [
|
||||
{
|
||||
"type": "engineersdecor:optional",
|
||||
"result": "engineersdecor:iron_ceiling_edge_light",
|
||||
"required": ["engineersdecor:iron_floor_edge_light"]
|
||||
}
|
||||
],
|
||||
"type": "minecraft:crafting_shapeless",
|
||||
"ingredients": [
|
||||
{ "item": "engineersdecor:iron_floor_edge_light" }
|
||||
],
|
||||
"result": {
|
||||
"item": "engineersdecor:iron_ceiling_edge_light"
|
||||
}
|
||||
}
|
||||
|
|
@ -3,12 +3,12 @@
|
|||
{
|
||||
"type": "engineersdecor:optional",
|
||||
"result": "engineersdecor:iron_inset_light",
|
||||
"required": ["engineersdecor:iron_floor_edge_light"]
|
||||
"required": ["engineersdecor:iron_bulb_light"]
|
||||
}
|
||||
],
|
||||
"type": "minecraft:crafting_shapeless",
|
||||
"ingredients": [
|
||||
{ "item": "engineersdecor:iron_floor_edge_light" }
|
||||
{ "item": "engineersdecor:iron_bulb_light" }
|
||||
],
|
||||
"result": {
|
||||
"item": "engineersdecor:iron_inset_light"
|
||||
|
|
|
|||
|
|
@ -324,6 +324,7 @@
|
|||
var latest_beta = "";
|
||||
for(var ver in history) { latest_beta=ver; break; }
|
||||
for(var ver in history) if(ver.search(/(rc|b|a)/) < 0) { latest_release=ver; break; }
|
||||
if(latest_release=="") latest_release = latest_beta;
|
||||
var update_json = {}
|
||||
update_json["homepage"] = constants.project_download_inet_page();
|
||||
update_json[mc_version] = history;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
"1.14.4-recommended": "1.1.0",
|
||||
"1.14.4-latest": "1.1.0",
|
||||
"1.15.2-recommended": "1.1.0",
|
||||
"1.15.2-latest": "1.1.0"
|
||||
"1.15.2-latest": "1.1.1-b1"
|
||||
},
|
||||
"1.12.2": {
|
||||
"1.1.1": "[R] Maintenance release.\n[F] Fixed Snow laying on Steel Mesh Fence (issue #107, thx TheTinyPebble).",
|
||||
|
|
@ -159,6 +159,7 @@
|
|||
"1.0.7-b3": "[A] Initial 1.14.2 port of decorative blocks."
|
||||
},
|
||||
"1.15.2": {
|
||||
"1.1.1-b1": "[A] Dense Grit Dirt added.\n[A] Ceiling Edge Light added.\n[A] Iron Bulb Light added.",
|
||||
"1.1.0": "[R] Release build v1.1.0. Changes: * GUI button/slider tooltips added (1.5s delay). * IE Sheet Metal Slab Slices added. * Config options extended/updated. * Block Placer improvements. * Block Breaker drop trajectory improved. * Dense Grit Sand textures enhanced. * Pipe Valve redstone connector display fixes. * Compatibility bug fixes.\n[F] Block Placer also defers placements if falling item stacks are in front of it (thx Cid).",
|
||||
"1.1.0-b3": "[!] Forge update, requires Forge 1.15.2-31.2.20.\n[F] Block Placer defers placements if collidable entities are in the way (issue #98, thx DrakoAlcarus).\n[M] Block Breaker item drop trajectories have lower speed (fall slightly straighter down).\n[M] Pipe Valves redstone connector also shown if the adjacent block can connect redstone in general.\n[F] Added Block verification during TE ticking in case devices are moved (issue #101, thx D0CTOR-ZED).",
|
||||
"1.1.0-b2": "[A] Added tooltips for buttons/settings in device GUIs (1.5s display delay).\n[U] Updated Forge/Mappings.",
|
||||
|
|
|
|||
Loading…
Reference in a new issue