diff --git a/1.12/gradle.properties b/1.12/gradle.properties index f1f2d83..0f14d9b 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.10-b1 +version_engineersdecor=1.0.10-b2 diff --git a/1.12/meta/update.json b/1.12/meta/update.json index 0581559..cf3861a 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.10-b2": "[A] Steel table added.\n[A] Steel floor grating added.", "1.0.10-b1": "[A] Treated wood side table added.\n[F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting).\n[A] Added Exit Sign (texture design by J. Carver).", "1.0.9": "[R] Release based on v1.0.9-b3. Release-to-release changes: * Slabs for clinker, concrete, slag bricks. * Slab slices for sheet metals, treated wood, and concretes. * Language updates. * Block hardness adaptions. * 1st/3rd person item model fixes. * Furnace initialisation issue fixed.", "1.0.9-b3": "[A] Added missing recipes for slabs.\n[A] Added slab slices for IE sheet metals, treated wood, and concretes (stackable \"quater-slabs\").\n[M] Updated 1st/3rd person item model rotations/translations.\n[M] Hardness of valves and furni slightly increased.", @@ -49,6 +50,6 @@ }, "promos": { "1.12.2-recommended": "1.0.9", - "1.12.2-latest": "1.0.10-b1" + "1.12.2-latest": "1.0.10-b2" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index 9c9bfec..9c8725a 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,6 +10,9 @@ Mod sources for Minecraft version 1.12.2. ---- ## Version history + - v1.0.10-b2 [A] Steel table added. + [A] Steel floor grating added. + - v1.0.10-b1 [A] Treated wood side table added. [F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting). diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java index ad0877d..462e498 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecor.java @@ -31,7 +31,6 @@ import net.minecraft.util.*; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.entity.Entity; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nonnull; diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFloorGrating.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFloorGrating.java new file mode 100644 index 0000000..a6b6125 --- /dev/null +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFloorGrating.java @@ -0,0 +1,44 @@ +/* + * @file BlockDecorFloorGrating.java + * @author Stefan Wilhelm (wile) + * @copyright (C) 2019 Stefan Wilhelm + * @license MIT (see https://opensource.org/licenses/MIT) + * + * Floor gratings. + */ +package wile.engineersdecor.blocks; + +import net.minecraft.block.SoundType; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; +import net.minecraft.block.state.IBlockState; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +public class BlockDecorFloorGrating extends BlockDecor +{ + public BlockDecorFloorGrating(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound, @Nullable AxisAlignedBB boundingbox) + { super(registryName, config, material, hardness, resistance, sound, (boundingbox==null) ? (new AxisAlignedBB[]{FULL_BLOCK_AABB}) : (new AxisAlignedBB[]{boundingbox})); } + + @Override + public boolean isFullCube(IBlockState state) + { return false; } + + @Override + public boolean isNormalCube(IBlockState state) + { return false; } + + @Override + public boolean isOpaqueCube(IBlockState state) + { return false; } + + @Override + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing face) + { return BlockFaceShape.SOLID; } + +} 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 de5d527..523c0bd 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java @@ -247,6 +247,20 @@ public class ModBlocks ModAuxiliaries.getPixeledAABB(5.2,5.2,15.7, 10.8,10.8,16.0) ); + public static final BlockDecor STEEL_TABLE = new BlockDecor( + "steel_table", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT, + Material.IRON, 1.0f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(0,0,0, 16,15.9,16) + ); + + public static final BlockDecorFloorGrating STEEL_FLOOR_GRATING = new BlockDecorFloorGrating( + "steel_floor_grating", + BlockDecor.CFG_CUTOUT, + Material.IRON, 1.0f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(0,14,0, 16,16,16) + ); + //-------------------------------------------------------------------------------------------------------------------- public static final BlockDecorWindow TREATED_WOOD_WINDOW = new BlockDecorWindow( @@ -431,6 +445,7 @@ public class ModBlocks TREATED_WOOD_LADDER, TREATED_WOOD_POLE, TREATED_WOOD_TABLE, + STEEL_TABLE, TREATED_WOOD_STOOL, TREATED_WOOD_WINDOW, STEEL_FRAMED_WINDOW, @@ -443,6 +458,7 @@ public class ModBlocks THIN_STEEL_POLE_HEAD, THICK_STEEL_POLE_HEAD, STEEL_DOUBLE_T_SUPPORT, + STEEL_FLOOR_GRATING, SIGN_HOTWIRE, SIGN_DANGER, SIGN_DEFENSE, SIGN_FACTORY_AREA, SIGN_EXIT, SIGN_MODLOGO, TREATED_WOOD_SIDE_TABLE, HALFSLAB_REBARCONCRETE, HALFSLAB_CONCRETE, HALFSLAB_TREATEDWOOD, diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_floor_grating.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_floor_grating.json new file mode 100644 index 0000000..dc7e26c --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_floor_grating.json @@ -0,0 +1,8 @@ +{ + "forge_marker": 1, + "defaults": { "model": "engineersdecor:furniture/steel_floor_grating_model" }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_table.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_table.json new file mode 100644 index 0000000..4c7b05b --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_table.json @@ -0,0 +1,8 @@ +{ + "forge_marker": 1, + "defaults": { "model": "engineersdecor:furniture/steel_table_model" }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} 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 0e5c34a..4440508 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 @@ -85,6 +85,10 @@ tile.engineersdecor.steel_double_t_support.help=§6Horizontal ceiling support be #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.treated_wood_table.name=Treated Wood Table tile.engineersdecor.treated_wood_table.help=§6Robust four-legged wood table.§r Indoor and outdoor use. +tile.engineersdecor.steel_table.name=Steel Table +tile.engineersdecor.steel_table.help=§6Robust four-legged steel table. +tile.engineersdecor.steel_floor_grating.name=Steel Floor Grating +tile.engineersdecor.steel_floor_grating.help=§6Decorative steel floor covering.§r Top aligned. tile.engineersdecor.treated_wood_stool.name=Treated Wood Stool tile.engineersdecor.treated_wood_stool.help=§6Robust Wood Stool.§r Indoor and outdoor use. tile.engineersdecor.treated_wood_crafting_table.name=Treated Wood Crafting Table 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 c41e293..6c7eea8 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 @@ -85,6 +85,10 @@ tile.engineersdecor.steel_double_t_support.help=§6Фрагмент горизо #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.treated_wood_table.name=Стол из обработанного дерева tile.engineersdecor.treated_wood_table.help=§6Прочный деревянный стол с четырьмя ножками .§r Для использования в помещении и на улице. +tile.engineersdecor.steel_table.name=Steel Table +#tile.engineersdecor.steel_table.help=§6Robust four-legged steel table. +tile.engineersdecor.steel_floor_grating.name=Steel Floor Grating +#tile.engineersdecor.steel_floor_grating.help=§6Decorative steel floor covering.§r Top aligned. tile.engineersdecor.treated_wood_stool.name=Табурет из обработанного дерева tile.engineersdecor.treated_wood_stool.help=§6Крепкий деревянный табурет.§r Для использования в помещении и на улице. tile.engineersdecor.treated_wood_crafting_table.name=Верстак из обработанного дерева diff --git a/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang b/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang index 293fbbe..0fa3582 100644 --- a/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang +++ b/1.12/src/main/resources/assets/engineersdecor/lang/zh_cn.lang @@ -83,6 +83,10 @@ tile.engineersdecor.steel_double_t_support.name=Steel Double T Support #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.treated_wood_table.name=经过处理的木桌 tile.engineersdecor.treated_wood_table.help=§6坚固的四足木桌. +tile.engineersdecor.steel_table.name=Steel Table +#tile.engineersdecor.steel_table.help=§6Robust four-legged steel table. +tile.engineersdecor.steel_floor_grating.name=Steel Floor Grating +#tile.engineersdecor.steel_floor_grating.help=§6Decorative steel floor covering.§r Top aligned. tile.engineersdecor.treated_wood_stool.name=Treated Wood Stool #tile.engineersdecor.treated_wood_stool.help=§6Robust Wood Stool.§r Indoor and outdoor use. tile.engineersdecor.treated_wood_crafting_table.name=Treated Wood Crafting Table diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_floor_grating_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_floor_grating_model.json new file mode 100644 index 0000000..ee34d0d --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_floor_grating_model.json @@ -0,0 +1,187 @@ +{ + "parent": "block/cube", + "textures": { + "s": "engineersdecor:blocks/furniture/steel_table_side_texture", + "particle": "engineersdecor:blocks/furniture/steel_table_side_texture", + "t": "engineersdecor:blocks/furniture/steel_table_top_texture" + }, + "elements": [ + { + "from": [0, 14, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 2], "texture": "#s"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#s"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#s"}, + "west": {"uv": [15, 0, 16, 2], "texture": "#s"}, + "up": {"uv": [0, 15, 16, 16], "texture": "#t"}, + "down": {"uv": [0, 0, 16, 1], "texture": "#s"} + } + }, + { + "from": [0, 14, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [0, 0, 16, 2], "texture": "#s"}, + "east": {"uv": [15, 0, 16, 2], "texture": "#s"}, + "south": {"uv": [0, 0, 16, 2], "texture": "#s"}, + "west": {"uv": [0, 0, 1, 2], "texture": "#s"}, + "up": {"uv": [0, 0, 16, 1], "texture": "#t"}, + "down": {"uv": [0, 15, 16, 16], "texture": "#s"} + } + }, + { + "from": [15, 14, 0.75], + "to": [16, 16, 15.25], + "faces": { + "north": {"uv": [0, 0, 1, 2], "texture": "#s"}, + "east": {"uv": [0.75, 0, 15.25, 2], "texture": "#s"}, + "south": {"uv": [15, 0, 16, 2], "texture": "#s"}, + "west": {"uv": [0.75, 0, 15.25, 2], "texture": "#s"}, + "up": {"uv": [15, 0.75, 16, 15.25], "texture": "#t"}, + "down": {"uv": [15, 0.75, 16, 15.25], "texture": "#s"} + } + }, + { + "from": [1, 15, 13.625], + "to": [15, 15.875, 14.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [1.625, 0.125, 2.375, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [13.625, 0.125, 14.375, 1], "texture": "#s"}, + "up": {"uv": [1, 13.625, 15, 14.375], "texture": "#t"}, + "down": {"uv": [1, 1.625, 15, 2.375], "texture": "#t"} + } + }, + { + "from": [1, 15, 12.125], + "to": [15, 15.875, 12.875], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [3.125, 0.125, 3.875, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [12.125, 0.125, 12.875, 1], "texture": "#s"}, + "up": {"uv": [1, 12.125, 15, 12.875], "texture": "#t"}, + "down": {"uv": [1, 3.125, 15, 3.875], "texture": "#t"} + } + }, + { + "from": [1, 15, 10.625], + "to": [15, 15.875, 11.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [4.625, 0.125, 5.375, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [10.625, 0.125, 11.375, 1], "texture": "#s"}, + "up": {"uv": [1, 10.625, 15, 11.375], "texture": "#t"}, + "down": {"uv": [1, 4.625, 15, 5.375], "texture": "#t"} + } + }, + { + "from": [1, 15, 9.125], + "to": [15, 15.875, 9.875], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [6.125, 0.125, 6.875, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [9.125, 0.125, 9.875, 1], "texture": "#s"}, + "up": {"uv": [1, 9.125, 15, 9.875], "texture": "#t"}, + "down": {"uv": [1, 6.125, 15, 6.875], "texture": "#t"} + } + }, + { + "from": [1, 15, 7.625], + "to": [15, 15.875, 8.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [7.625, 0.125, 8.375, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [7.625, 0.125, 8.375, 1], "texture": "#s"}, + "up": {"uv": [1, 7.625, 15, 8.375], "texture": "#t"}, + "down": {"uv": [1, 7.625, 15, 8.375], "texture": "#t"} + } + }, + { + "from": [1, 15, 6.125], + "to": [15, 15.875, 6.875], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [9.125, 0.125, 9.875, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [6.125, 0.125, 6.875, 1], "texture": "#s"}, + "up": {"uv": [1, 6.125, 15, 6.875], "texture": "#t"}, + "down": {"uv": [1, 9.125, 15, 9.875], "texture": "#t"} + } + }, + { + "from": [1, 15, 4.625], + "to": [15, 15.875, 5.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [10.625, 0.125, 11.375, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [4.625, 0.125, 5.375, 1], "texture": "#s"}, + "up": {"uv": [1, 4.625, 15, 5.375], "texture": "#t"}, + "down": {"uv": [1, 10.625, 15, 11.375], "texture": "#t"} + } + }, + { + "from": [1, 15, 3.125], + "to": [15, 15.875, 3.875], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [12.125, 0.125, 12.875, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [3.125, 0.125, 3.875, 1], "texture": "#s"}, + "up": {"uv": [1, 3.125, 15, 3.875], "texture": "#t"}, + "down": {"uv": [1, 12.125, 15, 12.875], "texture": "#t"} + } + }, + { + "from": [1, 15, 1.625], + "to": [15, 15.875, 2.375], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.375]}, + "faces": { + "north": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "east": {"uv": [13.625, 0.125, 14.375, 1], "texture": "#s"}, + "south": {"uv": [1, 0.125, 15, 1], "texture": "#s"}, + "west": {"uv": [1.625, 0.125, 2.375, 1], "texture": "#s"}, + "up": {"uv": [1, 1.625, 15, 2.375], "texture": "#t"}, + "down": {"uv": [1, 13.625, 15, 14.375], "texture": "#t"} + } + }, + { + "from": [0, 14, 1], + "to": [1, 16, 15], + "faces": { + "north": {"uv": [15, 0, 16, 2], "texture": "#s"}, + "east": {"uv": [1, 0, 15, 2], "texture": "#s"}, + "south": {"uv": [0, 0, 1, 2], "texture": "#s"}, + "west": {"uv": [1, 0, 15, 2], "texture": "#s"}, + "up": {"uv": [0, 1, 1, 15], "texture": "#t"}, + "down": {"uv": [0, 1, 1, 15], "texture": "#s"} + } + } + ], + "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] + } + } +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_table_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_table_model.json new file mode 100644 index 0000000..6fddfd3 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/furniture/steel_table_model.json @@ -0,0 +1,383 @@ +{ + "parent": "block/cube", + "textures": { + "s": "engineersdecor:blocks/furniture/steel_table_side_texture", + "particle": "engineersdecor:blocks/furniture/steel_table_side_texture", + "t": "engineersdecor:blocks/furniture/steel_table_top_texture" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [2, 14, 1], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s", "cullface": "down"} + } + }, + { + "from": [14, 0, 0], + "to": [16, 14, 1], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s", "cullface": "down"} + } + }, + { + "from": [14, 0, 15], + "to": [16, 14, 16], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s", "cullface": "down"} + } + }, + { + "from": [0, 0, 15], + "to": [2, 14, 16], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s", "cullface": "down"} + } + }, + { + "from": [0, 0, 14], + "to": [1, 14, 15], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s", "cullface": "down"} + } + }, + { + "from": [0, 0, 1], + "to": [1, 14, 2], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s", "cullface": "down"} + } + }, + { + "from": [15, 0, 1], + "to": [16, 14, 2], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s", "cullface": "down"} + } + }, + { + "from": [15, 0, 14], + "to": [16, 14, 15], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s", "cullface": "down"} + } + }, + { + "from": [0, 14, 14], + "to": [16, 15.875, 16], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#s"} + } + }, + { + "from": [0, 14, 0], + "to": [16, 15.875, 2], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#s"} + } + }, + { + "from": [14, 14, 2], + "to": [16, 15.875, 14], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#s"} + } + }, + { + "from": [2, 15.5, 12.75], + "to": [14, 15.875, 13.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 13.75], + "to": [14, 15.875, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 11.75], + "to": [14, 15.875, 12.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 10.75], + "to": [14, 15.875, 11.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 9.75], + "to": [14, 15.875, 10.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 8.75], + "to": [14, 15.875, 9.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 7.75], + "to": [14, 15.875, 8.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 6.75], + "to": [14, 15.875, 7.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 5.75], + "to": [14, 15.875, 6.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 4.75], + "to": [14, 15.875, 5.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 3.75], + "to": [14, 15.875, 4.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 2.75], + "to": [14, 15.875, 3.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [2, 15.5, 2], + "to": [14, 15.875, 2.25], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8.25]}, + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#t"} + } + }, + { + "from": [0, 14, 2], + "to": [2, 15.875, 14], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#t"}, + "down": {"texture": "#s"} + } + }, + { + "from": [14, 13.5, 14], + "to": [15, 14, 15], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "from": [1, 13.5, 14], + "to": [2, 14, 15], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "from": [14, 13.5, 1], + "to": [15, 14, 2], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + }, + { + "from": [1, 13.5, 1], + "to": [2, 14, 2], + "faces": { + "north": {"texture": "#s"}, + "east": {"texture": "#s"}, + "south": {"texture": "#s"}, + "west": {"texture": "#s"}, + "up": {"texture": "#s"}, + "down": {"texture": "#s"} + } + } + ], + "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] + } + } +} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/furniture/steel_floor_grating_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/furniture/steel_floor_grating_recipe.json new file mode 100644 index 0000000..46eea2d --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/furniture/steel_floor_grating_recipe.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:steel_floor_grating", + "required": ["engineersdecor:thin_steel_pole"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "S S", + " S ", + "S S" + ], + "key": { + "S": { + "item": "engineersdecor:thin_steel_pole", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:steel_floor_grating", + "count": 4 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/furniture/steel_table_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/furniture/steel_table_recipe.json new file mode 100644 index 0000000..37e3056 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/furniture/steel_table_recipe.json @@ -0,0 +1,29 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:steel_table", + "required": ["engineersdecor:steel_floor_grating", "engineersdecor:thin_steel_pole"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "WWW", + "S S", + "S S" + ], + "key": { + "W": { + "item": "engineersdecor:steel_floor_grating", + "data": 0 + }, + "S": { + "item": "engineersdecor:thin_steel_pole", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:steel_table", + "count": 4 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furniture/steel_table_side_texture.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furniture/steel_table_side_texture.png new file mode 100644 index 0000000..758bc24 Binary files /dev/null and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furniture/steel_table_side_texture.png differ diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furniture/steel_table_top_texture.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furniture/steel_table_top_texture.png new file mode 100644 index 0000000..9035c68 Binary files /dev/null and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furniture/steel_table_top_texture.png differ diff --git a/1.14/gradle.properties b/1.14/gradle.properties index fae4637..71965fb 100644 --- a/1.14/gradle.properties +++ b/1.14/gradle.properties @@ -5,7 +5,7 @@ version_minecraft=1.14.4 version_forge_minecraft=1.14.4-28.0.40 version_fml_mappings=20190719-1.14.3 version_jei=1.14.3:6.0.0.8 -version_engineersdecor=1.0.9-b9 +version_engineersdecor=1.0.9-b10 # # jar signing data loaded from signing.properties in the project root. # diff --git a/1.14/readme.md b/1.14/readme.md index 01a74f7..f29ea32 100644 --- a/1.14/readme.md +++ b/1.14/readme.md @@ -10,6 +10,8 @@ Mod sources for Minecraft version 1.14.3. ---- ## Version history + ~ v1.0.9-b10 [U] + - v1.0.9-b9 [U] Update to Forge 1.14.4-28.0.40/20190719-1.14.3 for Forge testing. diff --git a/meta/update.json b/meta/update.json index fc5a346..6804e46 100644 --- a/meta/update.json +++ b/meta/update.json @@ -2,13 +2,14 @@ "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "promos": { "1.12.2-recommended": "1.0.9", - "1.12.2-latest": "1.0.10-b1", + "1.12.2-latest": "1.0.10-b2", "1.13.2-recommended": "", "1.13.2-latest": "1.0.7-b5", "1.14.4-recommended": "", "1.14.4-latest": "1.0.9-b9" }, "1.12.2": { + "1.0.10-b2": "[A] Steel table added.\n[A] Steel floor grating added.", "1.0.10-b1": "[A] Treated wood side table added.\n[F] Fixed recipe collision of Metal Rung Ladder (issue #37, thx ProsperCraft for reporting).\n[A] Added Exit Sign (texture design by J. Carver).", "1.0.9": "[R] Release based on v1.0.9-b3. Release-to-release changes: * Slabs for clinker, concrete, slag bricks. * Slab slices for sheet metals, treated wood, and concretes. * Language updates. * Block hardness adaptions. * 1st/3rd person item model fixes. * Furnace initialisation issue fixed.", "1.0.9-b3": "[A] Added missing recipes for slabs.\n[A] Added slab slices for IE sheet metals, treated wood, and concretes (stackable \"quater-slabs\").\n[M] Updated 1st/3rd person item model rotations/translations.\n[M] Hardness of valves and furni slightly increased.",