diff --git a/1.12/gradle.properties b/1.12/gradle.properties index c72f4b8..204940b 100644 --- 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.3-b4 +version_engineersdecor=1.0.3-b5 diff --git a/1.12/meta/update.json b/1.12/meta/update.json index 3a236fa..f34c068 100644 --- 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.3-b5": "[F] Fixed typo in en-en lang file.\n[F] Fixed IE concrete texture missing bailout in log if IE is not installed.\n[F] Using forge multi-layer models for windows to circumvent glitches.\n[M] Changed creative tab logo to the mod logo.\n[A] Added alternative recipes for crafting table and furnace if main IE ingredients are missing (for \"stand-alone\" mod usage).", "1.0.3-b4": "[A] Lab furnace supports electrical speedup when a IE external is placed in one of the two auxiliary slots.\n[F] Fixed window rendering issue (issue #15, thanks to ILLOMIURGE).\n[M] Updated ru_ru lang file (Yaroslavik).", "1.0.3-b3": "[A] Added sitting on treated wood stool, Zombies included.\n[A] Added steel framed window.\n[A] Added treated wood pole support head/foot and heavy duty support.\n[A] Added language Russian language support, thanks to yaroslav4167.\n[A] Added config for furnace smelting speed (percent of vanilla furnace).\n[A] Added config for furnace fuel efficiency (in percent, ref is vanilla).\n[F] Treated pole model changed to circumvent potential texture bleeding.\n[M] Treated wood table bounding box aligned with the legs.\n[M] Treated wood crafting table bounding box aligned with the legs.\n[M] Treated wood window can be vertically placed for rooflights.\n[M] Treated wood window can be vertically placed for rooflights.", "1.0.3-b2": "[A] Added config options for selective feature opt-outs (soft opt-out).\n[A] Added config skip registration of opt-out features (hard opt-out).\n[A] Added config to disable all internal recipes (for packs).\n[A] Added JEI API adapter for soft opt-outs.\n[A] Added lab furnace recipe override config to smelt ores to nuggets that would normally be smelted into ingots. Can be changed on-the-fly.", @@ -22,6 +23,6 @@ }, "promos": { "1.12.2-recommended": "1.0.2", - "1.12.2-latest": "1.0.3-b4" + "1.12.2-latest": "1.0.3-b5" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index d1d9874..aec7d8b 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,6 +10,13 @@ Mod sources for Minecraft version 1.12.2. ---- ## Revision history + - v1.0.3-b5 [F] Fixed typo in en-en lang file. + [F] Fixed IE concrete texture missing bailout in log if IE is not installed. + [F] Using forge multi-layer models for windows to circumvent glitches. + [M] Changed creative tab logo to the mod logo. + [A] Added alternative recipes for crafting table and furnace if main + IE ingredients are missing (for "stand-alone" mod usage). + - v1.0.3-b4 [A] Lab furnace supports electrical speedup when a IE external is placed in one of the two auxiliary slots. [F] Fixed window rendering issue (issue #15, thanks to ILLOMIURGE). diff --git a/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java b/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java index b515a1b..052d6ef 100644 --- a/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java +++ b/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java @@ -138,7 +138,7 @@ public class ModEngineersDecor @Override @SideOnly(Side.CLIENT) public @Nonnull ItemStack createIcon() - { return new ItemStack(ModBlocks.TREATED_WOOD_LADDER); } + { return new ItemStack(ModBlocks.SIGN_MODLOGO); } }); //-------------------------------------------------------------------------------------------------------------------- diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWindow.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWindow.java index 44df0be..74f31f5 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWindow.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWindow.java @@ -32,6 +32,11 @@ public class BlockDecorWindow extends BlockDecorDirected public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.TRANSLUCENT; } + @Override + @SideOnly(Side.CLIENT) + public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) + { return (layer==BlockRenderLayer.CUTOUT) || (layer==BlockRenderLayer.TRANSLUCENT); } + @Override @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java index 24d1506..cc64623 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java @@ -134,6 +134,13 @@ public class ModBlocks ModAuxiliaries.getPixeledAABB(1,0,1, 15,15,16.0) ); + public static final BlockDecorDirected SIGN_MODLOGO = new BlockDecorDirected( + "sign_decor", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_OPPOSITE_PLACEMENT|(1< 0)) { + int num_missing = 0; for(JsonElement e: missing) { if(!e.isJsonPrimitive()) continue; final ResourceLocation rl = new ResourceLocation(((JsonPrimitive)e).getAsString()); - // At least one item missing, enable this recipe as alternative recipe for another one that check the missing item as required item. - // --> e.g. if IE not installed there is no slag. One recipe requires slag, and another one (for the same result) is used if there - // is no slag. - if((!block_registry.containsKey(rl)) && (!item_registry.containsKey(rl))) return exclude(); + if((!block_registry.containsKey(rl)) && (!item_registry.containsKey(rl))) ++num_missing; } - return exclude(); // all required there, but there is no item missing, so another recipe + // At least one item missing, enable this recipe as alternative recipe for another one that check the missing item as required item. + // --> e.g. if IE not installed there is no slag. One recipe requires slag, and another one (for the same result) is used if there + // is no slag. + return (num_missing == 0) ? (exclude()) : (RECIPE_INCLUDE); } else { return RECIPE_INCLUDE; // no missing given, means include if result and required are all there. } diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/concrete_wall.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/concrete_wall.json index 7956471..6801e12 100644 --- a/1.12/src/main/resources/assets/engineersdecor/blockstates/concrete_wall.json +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/concrete_wall.json @@ -3,8 +3,8 @@ "defaults": { "model": "engineersdecor:wall/concrete_wall_default", "textures": { - "wall": "immersiveengineering:blocks/stone_decoration_concrete", - "particle": "immersiveengineering:blocks/stone_decoration_concrete" + "wall": "engineersdecor:blocks/iestyle/stone_decoration_concrete_by_blusunrize", + "particle": "engineersdecor:blocks/iestyle/stone_decoration_concrete_by_blusunrize" } }, "variants": { diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/sign_decor.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/sign_decor.json new file mode 100644 index 0000000..f555db6 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/sign_decor.json @@ -0,0 +1,9 @@ +{ + "forge_marker": 1, + "defaults": { "model": "engineersdecor:sign/sign_decor_model" }, + "variants": { + "normal": [{}], + "facing": { "north":{"y":0}, "south":{"y":180}, "west":{"y":270}, "east":{"y":90}, "up": {"x":0}, "down": {"x":0} }, + "inventory": [{}] + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_framed_window.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_framed_window.json index 186b07c..f8d2f86 100644 --- a/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_framed_window.json +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_framed_window.json @@ -1,11 +1,19 @@ { "forge_marker": 1, "defaults": { - "model": "engineersdecor:furniture/steel_framed_window_model" - }, + "model": "forge:multi-layer", + "transform": "forge:default-block", + "custom": { + "base": "engineersdecor:steel_framed_window#frame", + "Cutout": "engineersdecor:steel_framed_window#frame", + "Translucent": "engineersdecor:steel_framed_window#pane" + } +}, "variants": { "normal": [{}], + "inventory": [{}], "facing": { "north": {"y":0}, "south": {"y":0}, "west": {"y":90}, "east": {"y":90}, "up": {"x":90}, "down": {"x":90} }, - "inventory": [{}] + "frame": [ {"model":"engineersdecor:furniture/steel_framed_window_submodel" }], + "pane": [ {"model":"engineersdecor:furniture/framed_window_glasspane_submodel" }] } } diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/treated_wood_window.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/treated_wood_window.json index 2fa2dc7..9be1120 100644 --- a/1.12/src/main/resources/assets/engineersdecor/blockstates/treated_wood_window.json +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/treated_wood_window.json @@ -1,11 +1,19 @@ { "forge_marker": 1, "defaults": { - "model": "engineersdecor:furniture/treated_wood_window_model" + "model": "forge:multi-layer", + "transform": "forge:default-block", + "custom": { + "base": "engineersdecor:treated_wood_window#frame", + "Cutout": "engineersdecor:treated_wood_window#frame", + "Translucent": "engineersdecor:treated_wood_window#pane" + } }, "variants": { "normal": [{}], + "inventory": [{}], "facing": { "north": {"y":0}, "south": {"y":0}, "west": {"y":90}, "east": {"y":90}, "up": {"x":90}, "down": {"x":90} }, - "inventory": [{}] + "frame": [ {"model":"engineersdecor:furniture/treated_wood_window_submodel" }], + "pane": [ {"model":"engineersdecor:furniture/framed_window_glasspane_submodel" }] } } diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang b/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang index b3b7940..3da8f77 100644 --- a/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang +++ b/1.12/src/main/resources/assets/engineersdecor/lang/en_us.lang @@ -74,12 +74,15 @@ tile.engineersdecor.treated_wood_windowsill.help=§6Simple window decoration. tile.engineersdecor.steel_framed_window.name=Steel framed window tile.engineersdecor.steel_framed_window.help=§6Steel framed tripple glazed window. Well insulating. §r Does not connect to adjacent blocks like glass panes. #----------------------------------------------------------------------------------------------------------- -tile.engineersdecor.small_lab_furnace.name=Small laboratry furnace +tile.engineersdecor.small_lab_furnace.name=Small laboratory furnace tile.engineersdecor.small_lab_furnace.help=§6Small metal cased lab kiln.§r Solid fuel consuming, updraught. \ Slightly hotter and better isolated than a cobblestone furnace, therefore more efficient. \ Two auxiliary slots e.g. for storage. Two stack internal hopper fifos for input, output, \ and fuel. Place an external heater into a aux slot and connect power for electrical \ smelting speed boost. #----------------------------------------------------------------------------------------------------------- +tile.engineersdecor.sign_decor.name=Sign plate (Engineer's decor logo) +tile.engineersdecor.sign_decor.help=§6This should not be craftable or visible in JEI. Used for creative tab and screenshots. +#----------------------------------------------------------------------------------------------------------- # EOF #----------------------------------------------------------------------------------------------------------- diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang index 41be774..5b301b2 100644 --- a/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang +++ b/1.12/src/main/resources/assets/engineersdecor/lang/ru_ru.lang @@ -77,5 +77,8 @@ tile.engineersdecor.steel_framed_window.name=Окно со стальной ра tile.engineersdecor.small_lab_furnace.name=Компактная лабораторная печь tile.engineersdecor.small_lab_furnace.help=§6Лабораторная печь в металлическом корпусе.§r Подача твёрдого топлива - сверху. Немного горячее чем каменная, поэтому быстрее. Два внутренних слота для ввода, выхода и топлива. #----------------------------------------------------------------------------------------------------------- +tile.engineersdecor.sign_decor.name=Sign plate (Engineer's decor logo) +#tile.engineersdecor.sign_decor.help=§6This should not be craftable or visible in JEI. Used for creative tab and screenshots. +#----------------------------------------------------------------------------------------------------------- # EOF #----------------------------------------------------------------------------------------------------------- diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/framed_window_glasspane_submodel.json b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/framed_window_glasspane_submodel.json new file mode 100644 index 0000000..2c9d639 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/framed_window_glasspane_submodel.json @@ -0,0 +1,17 @@ +{ + "parent": "block/cube", + "ambientocclusion": false, + "textures": { + "glass": "engineersdecor:blocks/glass/window_glass_texture" + }, + "elements": [ + { + "from": [1, 1, 7.5], + "to": [15, 15, 8.5], + "faces": { + "north": {"texture": "#glass"}, + "south": {"texture": "#glass"} + } + } + ] +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_framed_window_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_framed_window_model.json deleted file mode 100644 index fc91c48..0000000 --- a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_framed_window_model.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "parent": "block/cube", - "ambientocclusion": false, - "textures": { - "glass": "engineersdecor:blocks/glass/window_glass_texture", - "frame": "engineersdecor:blocks/iestyle/steel_texture", - "particle": "engineersdecor:blocks/iestyle/steel_texture" - }, - "elements": [ - { - "from": [1, 1, 7.5], - "to": [15, 15, 8.5], - "faces": { - "north": {"uv": [1, 1, 15, 15], "texture": "#glass"}, - "south": {"uv": [1, 1, 15, 15], "texture": "#glass"} - } - }, - { - "from": [1, 0, 7.5], - "to": [15, 1, 8.5], - "faces": { - "north": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "south": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "up": {"uv": [1, 7.5, 15, 8.5], "texture": "#frame"}, - "down": {"uv": [1, 7.5, 15, 8.5], "texture": "#frame"} - } - }, - { - "from": [0, 1, 7.5], - "to": [1, 15, 8.5], - "faces": { - "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "east": {"uv": [7.5, 1, 8.5, 15], "texture": "#frame"}, - "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, - "west": {"uv": [7.5, 1, 8.5, 15], "texture": "#frame"} - } - }, - { - "from": [0, 0, 7.5], - "to": [1, 1, 8.5], - "faces": { - "north": {"uv": [15, 15, 16, 16], "texture": "#frame"}, - "south": {"uv": [0, 15, 1, 16], "texture": "#frame"}, - "west": {"uv": [7.5, 15, 8.5, 16], "texture": "#frame"}, - "down": {"uv": [0, 7.5, 1, 8.5], "texture": "#frame"} - } - }, - { - "from": [0, 15, 7.5], - "to": [1, 16, 8.5], - "faces": { - "north": {"uv": [15, 0, 16, 1], "texture": "#frame"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#frame"}, - "west": {"uv": [7.5, 0, 8.5, 1], "texture": "#frame"}, - "up": {"uv": [0, 7.5, 1, 8.5], "texture": "#frame"} - } - }, - { - "from": [1, 15, 7.5], - "to": [15, 16, 8.5], - "faces": { - "north": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "south": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "up": {"uv": [1, 7.5, 15, 8.5], "texture": "#frame"}, - "down": {"uv": [1, 7.5, 15, 8.5], "texture": "#frame"} - } - }, - { - "from": [15, 1, 7.5], - "to": [16, 15, 8.5], - "faces": { - "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, - "east": {"uv": [7.5, 1, 8.5, 15], "texture": "#frame"}, - "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "west": {"uv": [7.5, 1, 8.5, 15], "texture": "#frame"} - } - }, - { - "from": [15, 15, 7.5], - "to": [16, 16, 8.5], - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#frame"}, - "east": {"uv": [7.5, 0, 8.5, 1], "texture": "#frame"}, - "south": {"uv": [15, 0, 16, 1], "texture": "#frame"}, - "up": {"uv": [15, 7.5, 16, 8.5], "texture": "#frame"} - } - }, - { - "from": [15, 0, 7.5], - "to": [16, 1, 8.5], - "faces": { - "north": {"uv": [0, 15, 1, 16], "texture": "#frame"}, - "east": {"uv": [7.5, 15, 8.5, 16], "texture": "#frame"}, - "south": {"uv": [15, 15, 16, 16], "texture": "#frame"}, - "down": {"uv": [15, 7.5, 16, 8.5], "texture": "#frame"} - } - } - ], - "display": { - "ground": { - "scale": [0.2, 0.2, 0.2] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, - { - "name": "group", - "children": [] - }, - { - "name": "group2", - "children": [1, 2, 3, 4, 5, 6, 7, 8] - }, - { - "name": "group3", - "children": [] - } - ] -} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_framed_window_submodel.json b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_framed_window_submodel.json new file mode 100644 index 0000000..96a9cc4 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_framed_window_submodel.json @@ -0,0 +1,67 @@ +{ + "parent": "block/cube", + "ambientocclusion": false, + "textures": { + "frame": "engineersdecor:blocks/iestyle/steel_texture", + "particle": "engineersdecor:blocks/iestyle/steel_texture" + }, + "elements": [ + { + "from": [1, 0, 7.5], + "to": [15, 1, 8.5], + "faces": { + "north": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} + } + }, + { + "from": [0, 0, 7.5], + "to": [1, 16, 8.5], + "faces": { + "north": {"texture": "#frame"}, + "east": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "west": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} + } + }, + { + "from": [1, 15, 7.5], + "to": [15, 16, 8.5], + "faces": { + "north": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} + } + }, + { + "from": [15, 0, 7.5], + "to": [16, 16, 8.5], + "faces": { + "north": {"texture": "#frame"}, + "east": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "west": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} + } + } + ], + "display": { + "ground": { + "scale": [0.2, 0.2, 0.2] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.9, 0.9, 0.9], + "translation": [ 3, -8, -3] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_model.json deleted file mode 100644 index 0fd6159..0000000 --- a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_model.json +++ /dev/null @@ -1,285 +0,0 @@ -{ - "parent": "block/cube", - "ambientocclusion": false, - "textures": { - "glass": "engineersdecor:blocks/glass/window_glass_texture", - "frame": "engineersdecor:blocks/iestyle/treated_wood_rough_texture", - "particle": "engineersdecor:blocks/iestyle/treated_wood_rough_texture" - }, - "elements": [ - { - "from": [1, 1, 7.5], - "to": [15, 15, 8.5], - "faces": { - "north": {"uv": [1, 1, 15, 15], "texture": "#glass"}, - "south": {"uv": [1, 1, 15, 15], "texture": "#glass"} - } - }, - { - "from": [1, 0, 8.5], - "to": [15, 1, 9.25], - "faces": { - "north": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "south": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "up": {"uv": [1, 8.5, 15, 9.25], "texture": "#frame"}, - "down": {"uv": [1, 6.75, 15, 7.5], "texture": "#frame"} - } - }, - { - "from": [0, 1, 8.5], - "to": [1, 15, 9.25], - "faces": { - "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "east": {"uv": [6.75, 1, 7.5, 15], "texture": "#frame"}, - "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, - "west": {"uv": [8.5, 1, 9.25, 15], "texture": "#frame"} - } - }, - { - "from": [0, 0, 8.5], - "to": [1, 1, 9.25], - "faces": { - "north": {"uv": [15, 15, 16, 16], "texture": "#frame"}, - "south": {"uv": [0, 15, 1, 16], "texture": "#frame"}, - "west": {"uv": [8.5, 15, 9.25, 16], "texture": "#frame"}, - "down": {"uv": [0, 6.75, 1, 7.5], "texture": "#frame"} - } - }, - { - "from": [0, 15, 8.5], - "to": [1, 16, 9.25], - "faces": { - "north": {"uv": [15, 0, 16, 1], "texture": "#frame"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#frame"}, - "west": {"uv": [8.5, 0, 9.25, 1], "texture": "#frame"}, - "up": {"uv": [0, 8.5, 1, 9.25], "texture": "#frame"} - } - }, - { - "from": [1, 15, 8.5], - "to": [15, 16, 9.25], - "faces": { - "north": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "south": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "up": {"uv": [1, 8.5, 15, 9.25], "texture": "#frame"}, - "down": {"uv": [1, 6.75, 15, 7.5], "texture": "#frame"} - } - }, - { - "from": [15, 1, 8.5], - "to": [16, 15, 9.25], - "faces": { - "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, - "east": {"uv": [6.75, 1, 7.5, 15], "texture": "#frame"}, - "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "west": {"uv": [8.5, 1, 9.25, 15], "texture": "#frame"} - } - }, - { - "from": [15, 15, 8.5], - "to": [16, 16, 9.25], - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#frame"}, - "east": {"uv": [6.75, 0, 7.5, 1], "texture": "#frame"}, - "south": {"uv": [15, 0, 16, 1], "texture": "#frame"}, - "up": {"uv": [15, 8.5, 16, 9.25], "texture": "#frame"} - } - }, - { - "from": [15, 0, 8.5], - "to": [16, 1, 9.25], - "faces": { - "north": {"uv": [0, 15, 1, 16], "texture": "#frame"}, - "east": {"uv": [6.75, 15, 7.5, 16], "texture": "#frame"}, - "south": {"uv": [15, 15, 16, 16], "texture": "#frame"}, - "down": {"uv": [15, 6.75, 16, 7.5], "texture": "#frame"} - } - }, - { - "from": [1, 0, 7.5], - "to": [15, 1, 8.5], - "faces": { - "north": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "south": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "up": {"uv": [1, 7.5, 15, 8.5], "texture": "#frame"}, - "down": {"uv": [1, 7.5, 15, 8.5], "texture": "#frame"} - } - }, - { - "from": [0, 1, 7.5], - "to": [1, 15, 8.5], - "faces": { - "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "east": {"uv": [7.5, 1, 8.5, 15], "texture": "#frame"}, - "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, - "west": {"uv": [7.5, 1, 8.5, 15], "texture": "#frame"} - } - }, - { - "from": [0, 0, 7.5], - "to": [1, 1, 8.5], - "faces": { - "north": {"uv": [15, 15, 16, 16], "texture": "#frame"}, - "south": {"uv": [0, 15, 1, 16], "texture": "#frame"}, - "west": {"uv": [7.5, 15, 8.5, 16], "texture": "#frame"}, - "down": {"uv": [0, 7.5, 1, 8.5], "texture": "#frame"} - } - }, - { - "from": [0, 15, 7.5], - "to": [1, 16, 8.5], - "faces": { - "north": {"uv": [15, 0, 16, 1], "texture": "#frame"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#frame"}, - "west": {"uv": [7.5, 0, 8.5, 1], "texture": "#frame"}, - "up": {"uv": [0, 7.5, 1, 8.5], "texture": "#frame"} - } - }, - { - "from": [1, 15, 7.5], - "to": [15, 16, 8.5], - "faces": { - "north": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "south": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "up": {"uv": [1, 7.5, 15, 8.5], "texture": "#frame"}, - "down": {"uv": [1, 7.5, 15, 8.5], "texture": "#frame"} - } - }, - { - "from": [15, 1, 7.5], - "to": [16, 15, 8.5], - "faces": { - "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, - "east": {"uv": [7.5, 1, 8.5, 15], "texture": "#frame"}, - "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "west": {"uv": [7.5, 1, 8.5, 15], "texture": "#frame"} - } - }, - { - "from": [15, 15, 7.5], - "to": [16, 16, 8.5], - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#frame"}, - "east": {"uv": [7.5, 0, 8.5, 1], "texture": "#frame"}, - "south": {"uv": [15, 0, 16, 1], "texture": "#frame"}, - "up": {"uv": [15, 7.5, 16, 8.5], "texture": "#frame"} - } - }, - { - "from": [15, 0, 7.5], - "to": [16, 1, 8.5], - "faces": { - "north": {"uv": [0, 15, 1, 16], "texture": "#frame"}, - "east": {"uv": [7.5, 15, 8.5, 16], "texture": "#frame"}, - "south": {"uv": [15, 15, 16, 16], "texture": "#frame"}, - "down": {"uv": [15, 7.5, 16, 8.5], "texture": "#frame"} - } - }, - { - "from": [1, 0, 6.75], - "to": [15, 1, 7.5], - "faces": { - "north": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "south": {"uv": [1, 15, 15, 16], "texture": "#frame"}, - "up": {"uv": [1, 6.75, 15, 7.5], "texture": "#frame"}, - "down": {"uv": [1, 8.5, 15, 9.25], "texture": "#frame"} - } - }, - { - "from": [0, 1, 6.75], - "to": [1, 15, 7.5], - "faces": { - "north": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "east": {"uv": [8.5, 1, 9.25, 15], "texture": "#frame"}, - "south": {"uv": [0, 1, 1, 15], "texture": "#frame"}, - "west": {"uv": [6.75, 1, 7.5, 15], "texture": "#frame"} - } - }, - { - "from": [0, 0, 6.75], - "to": [1, 1, 7.5], - "faces": { - "north": {"uv": [15, 15, 16, 16], "texture": "#frame"}, - "south": {"uv": [0, 15, 1, 16], "texture": "#frame"}, - "west": {"uv": [6.75, 15, 7.5, 16], "texture": "#frame"}, - "down": {"uv": [0, 8.5, 1, 9.25], "texture": "#frame"} - } - }, - { - "from": [0, 15, 6.75], - "to": [1, 16, 7.5], - "faces": { - "north": {"uv": [15, 0, 16, 1], "texture": "#frame"}, - "south": {"uv": [0, 0, 1, 1], "texture": "#frame"}, - "west": {"uv": [6.75, 0, 7.5, 1], "texture": "#frame"}, - "up": {"uv": [0, 6.75, 1, 7.5], "texture": "#frame"} - } - }, - { - "from": [1, 15, 6.75], - "to": [15, 16, 7.5], - "faces": { - "north": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "south": {"uv": [1, 0, 15, 1], "texture": "#frame"}, - "up": {"uv": [1, 6.75, 15, 7.5], "texture": "#frame"}, - "down": {"uv": [1, 8.5, 15, 9.25], "texture": "#frame"} - } - }, - { - "from": [15, 1, 6.75], - "to": [16, 15, 7.5], - "faces": { - "north": {"uv": [0, 1, 1, 15], "texture": "#frame"}, - "east": {"uv": [8.5, 1, 9.25, 15], "texture": "#frame"}, - "south": {"uv": [15, 1, 16, 15], "texture": "#frame"}, - "west": {"uv": [6.75, 1, 7.5, 15], "texture": "#frame"} - } - }, - { - "from": [15, 15, 6.75], - "to": [16, 16, 7.5], - "faces": { - "north": {"uv": [0, 0, 1, 1], "texture": "#frame"}, - "east": {"uv": [8.5, 0, 9.25, 1], "texture": "#frame"}, - "south": {"uv": [15, 0, 16, 1], "texture": "#frame"}, - "up": {"uv": [15, 6.75, 16, 7.5], "texture": "#frame"} - } - }, - { - "from": [15, 0, 6.75], - "to": [16, 1, 7.5], - "faces": { - "north": {"uv": [0, 15, 1, 16], "texture": "#frame"}, - "east": {"uv": [8.5, 15, 9.25, 16], "texture": "#frame"}, - "south": {"uv": [15, 15, 16, 16], "texture": "#frame"}, - "down": {"uv": [15, 8.5, 16, 9.25], "texture": "#frame"} - } - } - ], - "display": { - "ground": { - "scale": [0.2, 0.2, 0.2] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [0, - { - "name": "group", - "children": [1, 2, 3, 4, 5, 6, 7, 8] - }, - { - "name": "group2", - "children": [9, 10, 11, 12, 13, 14, 15, 16] - }, - { - "name": "group3", - "children": [17, 18, 19, 20, 21, 22, 23, 24] - } - ] -} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_submodel.json b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_submodel.json new file mode 100644 index 0000000..e591e0e --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_submodel.json @@ -0,0 +1,54 @@ +{ + "parent": "block/cube", + "ambientocclusion": false, + "textures": { + "frame": "engineersdecor:blocks/iestyle/treated_wood_rough_texture", + "particle": "engineersdecor:blocks/iestyle/treated_wood_rough_texture" + }, + "elements": [ + { + "from": [1, 0, 6.5], + "to": [15, 1, 9.5], + "faces": { + "north": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} + } + }, + { + "from": [0, 0, 6.5], + "to": [1, 16, 9.5], + "faces": { + "north": {"texture": "#frame"}, + "east": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "west": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} + } + }, + { + "from": [1, 15, 6.5], + "to": [15, 16, 9.5], + "faces": { + "north": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} + } + }, + { + "from": [15, 0, 6.5], + "to": [16, 16, 9.5], + "faces": { + "north": {"texture": "#frame"}, + "east": {"texture": "#frame"}, + "south": {"texture": "#frame"}, + "west": {"texture": "#frame"}, + "up": {"texture": "#frame"}, + "down": {"texture": "#frame"} + } + } + ] +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_decor_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_decor_model.json new file mode 100644 index 0000000..e632e1e --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/sign/sign_decor_model.json @@ -0,0 +1,36 @@ +{ + "parent": "block/cube", + "textures": { + "s": "engineersdecor:blocks/iestyle/treated_wood_rough_texture", + "f": "engineersdecor:blocks/sign/engineersdecor-logo", + "particle": "engineersdecor:blocks/iestyle/treated_wood_rough_texture" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 0.5], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#f"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + } + ], + "display": { + "ground": { + "translation": [0, 0, 7], + "scale": [0.7, 0.7, 0.7] + }, + "gui": { + "rotation": [0, 0, 0], + "translation": [0, 0.5, 0] + }, + "fixed": { + "rotation": [0, 180, 0], + "translation": [0, 0, -7.3] + } + } +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json b/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json index b1352f9..12f9f28 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json @@ -1,249 +1,138 @@ [ { - "ingredient": { - "type": "forge:ore_dict", - "ore": "itemSlag" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "itemSlag" }, "name": "itemSlag" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "plankTreatedWood" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "plankTreatedWood" }, "name": "plankTreatedWood" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "slabTreatedWood" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "slabTreatedWood" }, "name": "slabTreatedWood" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "stickTreatedWood" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "stickTreatedWood" }, "name": "stickTreatedWood" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "plateIron" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "ingotIron" }, + "name": "ingotIron" + }, + { + "ingredient": { "type": "forge:ore_dict", "ore": "plateIron" }, "name": "plateIron" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "plateSteel" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "plateSteel" }, "name": "plateSteel" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "plateAluminium" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "plateAluminium" }, "name": "plateAluminium" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "stickSteel" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "stickSteel" }, "name": "stickSteel" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "stickIron" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "stickIron" }, "name": "stickIron" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "stickAluminium" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "stickAluminium" }, "name": "stickAluminium" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "plankWood" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "plankWood" }, "name": "plankWood" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "stickWood" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "stickWood" }, "name": "stickWood" }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "slabSheetmetalIron" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "slabSheetmetalIron" }, "name": "slabSheetmetalIron" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "slabSheetmetalSteel" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "slabSheetmetalSteel" }, "name": "slabSheetmetalSteel" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "slabSheetmetalAluminium" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "slabSheetmetalAluminium" }, "name": "slabSheetmetalAluminium" }, - { - "ingredient": { - "type": "forge:ore_dict", - "ore": "sand" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "sand" }, "name": "sand" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "sandstone" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "sandstone" }, "name": "sandstone" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "bricksStone" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "bricksStone" }, "name": "bricksStone" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "ingotBrick" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "ingotBrick" }, "name": "ingotBrick" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "ingotBrickNether" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "ingotBrickNether" }, "name": "ingotBrickNether" }, - { "ingredient": [ - { - "type": "forge:ore_dict", - "ore": "plateIron" - }, - { - "type": "forge:ore_dict", - "ore": "plateSteel" - }, - { - "type": "forge:ore_dict", - "ore": "plateCopper" - }, - { - "type": "forge:ore_dict", - "ore": "plateAluminium" - }, - { - "type": "forge:ore_dict", - "ore": "plateNickel" - }, - { - "type": "forge:ore_dict", - "ore": "plateLead" - } + { "type": "forge:ore_dict", "ore": "plateIron" }, + { "type": "forge:ore_dict", "ore": "plateSteel" }, + { "type": "forge:ore_dict", "ore": "plateCopper" }, + { "type": "forge:ore_dict", "ore": "plateAluminium" }, + { "type": "forge:ore_dict", "ore": "plateNickel" }, + { "type": "forge:ore_dict", "ore": "plateLead" } ], "name": "plateAnyMetal" }, - { "ingredient": [ - { - "type": "forge:ore_dict", - "ore": "ingotBrick" - }, - { - "type": "forge:ore_dict", - "ore": "ingotBrickNether" - } + { "type": "forge:ore_dict", "ore": "ingotBrick" }, + { "type": "forge:ore_dict", "ore": "ingotBrickNether" } ], "name": "ingotAnyBrick" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "dustGlowstone" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "dustGlowstone" }, "name": "luminescentDust" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "glowstone" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "glowstone" }, "name": "luminescentBlock" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "paneGlass" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "paneGlass" }, "name": "paneGlass" }, { - "ingredient": { - "type": "forge:ore_dict", - "ore": "blockGlass" - }, + "ingredient": { "type": "forge:ore_dict", "ore": "blockGlass" }, "name": "blockGlass" }, { - "ingredient": { - "item": "minecraft:diamond", - "data": 0 - }, + "ingredient": { "item": "minecraft:diamond", "data": 0 }, "name": "itemDiamond" }, { - "ingredient": { - "item": "minecraft:crafting_table", - "data": 0 - }, + "ingredient": { "item": "minecraft:crafting_table", "data": 0 }, "name": "itemCraftingTable" }, { - "ingredient": { - "item": "minecraft:hopper", - "data": 0 - }, + "ingredient": { "item": "minecraft:hopper", "data": 0 }, "name": "anyHopper" }, { "ingredient": [ - { - "type": "forge:ore_dict", - "ore": "stickIron" - }, - { - "type": "forge:ore_dict", - "ore": "stickSteel" - } + { "type": "forge:ore_dict", "ore": "stickIron" }, + { "type": "forge:ore_dict", "ore": "stickSteel" } ], "name": "stickFerroMetal" }, @@ -251,27 +140,35 @@ "conditions": [ { "type": "minecraft:item_exists", "item": "immersiveengineering:stone_decoration" } ], - "ingredient": { - "item": "immersiveengineering:stone_decoration", - "data": 5 - }, + "ingredient": { "item": "immersiveengineering:stone_decoration", "data": 5 }, "name": "blockConcreteIe" }, { "conditions": [ { "type": "minecraft:item_exists", "item": "immersiveengineering:wooden_device0" } ], - "ingredient": { - "item": "immersiveengineering:wooden_device0", - "data": 0 - }, + "ingredient": { "item": "immersiveengineering:wooden_device0", "data": 0 }, "name": "crateTreatedWood" }, { - "ingredient": { - "item": "minecraft:furnace", - "data": 0 - }, + "conditions": [ + { "type": "engineersdecor:grc", "missing": ["immersiveengineering:stone_decoration"] } + ], + "ingredient": [ + { "item": "minecraft:concrete", "data": 32767 }, + { "item": "minecraft:concrete_powder", "data": 32767 } + ], + "name": "blockConcreteMc" + }, + { + "ingredient": [ + { "item": "minecraft:chest" }, + { "type": "forge:ore_dict", "ore": "chestWood" } + ], + "name": "itemAnyChest" + }, + { + "ingredient": { "item": "minecraft:furnace", "data": 0 }, "name": "itemFurnace" } ] \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_recipe_standalone.json new file mode 100644 index 0000000..e549f2e --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_recipe_standalone.json @@ -0,0 +1,29 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:rebar_concrete", + "missing": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SCS", + "CSC", + "SCS" + ], + "key": { + "C": { + "item": "#blockConcreteMc", + "data": 0 + }, + "S": { + "item": "#ingotIron", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:rebar_concrete", + "count": 4 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/small_lab_furnace_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/small_lab_furnace_recipe_standalone.json new file mode 100644 index 0000000..a488383 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/small_lab_furnace_recipe_standalone.json @@ -0,0 +1,33 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:small_lab_furnace", + "missing": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "HPP", + "PFP", + "PPP" + ], + "key": { + "F": { + "item": "#itemFurnace", + "data": 0 + }, + "P": { + "item": "#ingotIron", + "data": 0 + }, + "H": { + "item": "#anyHopper", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:small_lab_furnace", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_crafting_table_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_crafting_table_recipe_standalone.json new file mode 100644 index 0000000..6d47d69 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_crafting_table_recipe_standalone.json @@ -0,0 +1,32 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:treated_wood_crafting_table", + "missing": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "PP", + "SC" + ], + "key": { + "P": { + "item": "#plankWood", + "data": 0 + }, + "C": { + "item": "#itemCraftingTable", + "data": 0 + }, + "S": { + "item": "#itemAnyChest", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:treated_wood_crafting_table", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/iestyle/ironsheet_roof.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/iestyle/ironsheet_roof.png deleted file mode 100644 index 23dff87..0000000 Binary files a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/iestyle/ironsheet_roof.png and /dev/null differ diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/iestyle/ironsheet_roof_top.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/iestyle/ironsheet_roof_top.png deleted file mode 100644 index a5f0382..0000000 Binary files a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/iestyle/ironsheet_roof_top.png and /dev/null differ diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/iestyle/stone_decoration_concrete_by_blusunrize.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/iestyle/stone_decoration_concrete_by_blusunrize.png new file mode 100644 index 0000000..b19d0ef Binary files /dev/null and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/iestyle/stone_decoration_concrete_by_blusunrize.png differ diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/sign/engineersdecor-logo.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/sign/engineersdecor-logo.png new file mode 100644 index 0000000..567f937 Binary files /dev/null and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/sign/engineersdecor-logo.png differ diff --git a/1.13/readme.md b/1.13/readme.md index 87f280c..cb5bbe3 100644 --- a/1.13/readme.md +++ b/1.13/readme.md @@ -10,6 +10,8 @@ Mod sources for Minecraft version 1.13.2. ---- ## Revision history + ~ v1.0.2-b4 [A] + - v1.0.2-b3 [A] Added treated wood window. [A] Added treated wood pole support. [A] Added treated wood pole head. diff --git a/credits.md b/credits.md index 5076bac..c0bfab6 100644 --- a/credits.md +++ b/credits.md @@ -14,7 +14,11 @@ Mod components derived/inspired by IE: IE components used in this mod: - - immersiveengineering:textures/block/stone_decoration_concrete.png (for IE - concrete wall). + - Image pattern of wooden GUIs (background, slots) to make them look + identical to the IE GUI style. - - Image pattern of wooden GUIs (background, slots, etc.). + - immersiveengineering:textures/block/stone_decoration_concrete.png (for IE + concrete wall). The texture had to be copied into this mod to prevent + reported bailouts if IE is not installed, local path in the mod is + "engineersdecor:blocks/iestyle/stone_decoration_concrete_by_blusunrize", + used in block "engineersdecor:concrete_wall". diff --git a/meta/update.json b/meta/update.json index c69a202..47a5d55 100644 --- a/meta/update.json +++ b/meta/update.json @@ -1,6 +1,7 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": { + "1.0.3-b5": "[F] Fixed typo in en-en lang file.\n[F] Fixed IE concrete texture missing bailout in log if IE is not installed.\n[F] Using forge multi-layer models for windows to circumvent glitches.\n[M] Changed creative tab logo to the mod logo.\n[A] Added alternative recipes for crafting table and furnace if main IE ingredients are missing (for \"stand-alone\" mod usage).", "1.0.3-b4": "[A] Lab furnace supports electrical speedup when a IE external is placed in one of the two auxiliary slots.\n[F] Fixed window rendering issue (issue #15, thanks to ILLOMIURGE).\n[M] Updated ru_ru lang file (Yaroslavik).", "1.0.3-b3": "[A] Added sitting on treated wood stool, Zombies included.\n[A] Added steel framed window.\n[A] Added treated wood pole support head/foot and heavy duty support.\n[A] Added language Russian language support, thanks to yaroslav4167.\n[A] Added config for furnace smelting speed (percent of vanilla furnace).\n[A] Added config for furnace fuel efficiency (in percent, ref is vanilla).\n[F] Treated pole model changed to circumvent potential texture bleeding.\n[M] Treated wood table bounding box aligned with the legs.\n[M] Treated wood crafting table bounding box aligned with the legs.\n[M] Treated wood window can be vertically placed for rooflights.\n[M] Treated wood window can be vertically placed for rooflights.", "1.0.3-b2": "[A] Added config options for selective feature opt-outs (soft opt-out).\n[A] Added config skip registration of opt-out features (hard opt-out).\n[A] Added config to disable all internal recipes (for packs).\n[A] Added JEI API adapter for soft opt-outs.\n[A] Added lab furnace recipe override config to smelt ores to nuggets that would normally be smelted into ingots. Can be changed on-the-fly.", @@ -30,7 +31,7 @@ }, "promos": { "1.12.2-recommended": "1.0.2", - "1.12.2-latest": "1.0.3-b4", + "1.12.2-latest": "1.0.3-b5", "1.13.2-recommended": "", "1.13.2-latest": "1.0.2-b3" }