diff --git a/1.12/gradle.properties b/1.12/gradle.properties index 1f35193..46f3a09 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.4-b3 +version_engineersdecor=1.0.4-b4 diff --git a/1.12/meta/update.json b/1.12/meta/update.json index 69f0d43..d209192 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.4-b4": "[F] Clinker/slag brick wall side cullfacing disabled to prevent texture leaks when connecting to concrete walls.\n[F] Unused treated wood pole texture regions filled (optifine).\n[F] Using mipped cutout format for window multi-layer model (issue #19, thanks rixmswey for reporting and details).\n[M] Recipe tuning, added standalone recipe for all mod blocks.\n[M] In-game CTRL-SHIFT tooltip documentation updated.\n[M] Panzer glass block: Ambient occlusion and light opacity tuned.\n[M] Stairs: Light opacity tuned.\n[A] Tooltip documentation added for mod stairs.\n[E] Horizontal steel double-T support beam (config:experimental).", "1.0.4-b3": "[A] Added thin (4x4x16) and thick (6x6x16) steel hollow poles.\n[A] Added support head/foot components for thin and thick steel poles.", "1.0.4-b2": "[A] Added position dependent texture variation to clinker wall, slag brick wall and rebar concrete wall.", "1.0.4-b1": "[A] Crafting table: JEI integration for recipe placement added.\n[A] Crafting table: History re-fab added, allowing to quickly select and re-craft recent recipes. Selection with arrow buttons, ingredient placement by clicking the result slot. Automatic item distribution on shift-click. Quick-move buttons.\n[F] Crafting table textures modified to prevent optifine glitches on the edges of the legs.", @@ -27,6 +28,6 @@ }, "promos": { "1.12.2-recommended": "1.0.3", - "1.12.2-latest": "1.0.4-b3" + "1.12.2-latest": "1.0.4-b4" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index 53d6d1c..3c7cc14 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,6 +10,18 @@ Mod sources for Minecraft version 1.12.2. ---- ## Revision history + - v1.0.4-b4 [F] Clinker/slag brick wall side cullfacing disabled to prevent + texture leaks when connecting to concrete walls. + [F] Unused treated wood pole texture regions filled (optifine). + [F] Using mipped cutout format for window multi-layer model + (issue #19, thanks rixmswey for reporting and details). + [M] Recipe tuning, added standalone recipe for all mod blocks. + [M] In-game CTRL-SHIFT tooltip documentation updated. + [M] Panzer glass block: Ambient occlusion and light opacity tuned. + [M] Stairs: Light opacity tuned. + [A] Tooltip documentation added for mod stairs. + [E] Horizontal steel double-T support beam (config:experimental). + - v1.0.4-b3 [A] Added thin (4x4x16) and thick (6x6x16) steel hollow poles. [A] Added support head/foot components for thin and thick steel poles. diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorGlassBlock.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorGlassBlock.java index 468f461..3bbe38e 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorGlassBlock.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorGlassBlock.java @@ -50,7 +50,7 @@ public class BlockDecorGlassBlock extends BlockDecor @SideOnly(Side.CLIENT) @SuppressWarnings("deprecation") public float getAmbientOcclusionLightValue(IBlockState state) - { return 1.0F; } + { return 0.9F; } @Override public boolean isOpaqueCube(IBlockState state) @@ -59,7 +59,7 @@ public class BlockDecorGlassBlock extends BlockDecor @Override @SuppressWarnings("deprecation") public boolean isFullCube(IBlockState state) - { return false; } + { return true; } @Override @SuppressWarnings("deprecation") @@ -68,7 +68,7 @@ public class BlockDecorGlassBlock extends BlockDecor @Override public int getLightOpacity(IBlockState state, IBlockAccess world, BlockPos pos) - { return 0; } + { return 2; } @Override public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorHorizontalSupport.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorHorizontalSupport.java new file mode 100644 index 0000000..7d96ba5 --- /dev/null +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorHorizontalSupport.java @@ -0,0 +1,112 @@ +/* + * @file BlockDecorDirected.java + * @author Stefan Wilhelm (wile) + * @copyright (C) 2019 Stefan Wilhelm + * @license MIT (see https://opensource.org/licenses/MIT) + * + * Smaller (cutout) block with a defined facing. + */ +package wile.engineersdecor.blocks; + +import net.minecraft.block.SoundType; +import net.minecraft.block.properties.PropertyBool; +import wile.engineersdecor.detail.ModAuxiliaries; +import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockFaceShape; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.world.World; +import net.minecraft.world.IBlockAccess; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Arrays; + + +public class BlockDecorHorizontalSupport extends BlockDecor +{ + public static final PropertyBool EASTWEST = PropertyBool.create("eastwest"); + protected final ArrayList AABBs; + + public BlockDecorHorizontalSupport(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound, @Nonnull AxisAlignedBB unrotatedAABB) + { + super(registryName, config|CFG_HORIZIONTAL, material, hardness, resistance, sound); + final boolean is_horizontal = ((config & CFG_HORIZIONTAL)!=0); + AABBs = new ArrayList(Arrays.asList( + ModAuxiliaries.getRotatedAABB(unrotatedAABB, EnumFacing.NORTH, true), + ModAuxiliaries.getRotatedAABB(unrotatedAABB, EnumFacing.WEST, true) + )); + + } + + @Override + public boolean isOpaqueCube(IBlockState state) + { return false; } + + @Override + public boolean isFullCube(IBlockState state) + { return false; } + + @Override + public boolean isNormalCube(IBlockState state) + { return false; } + + @Override + public boolean canCreatureSpawn(IBlockState state, IBlockAccess world, BlockPos pos, net.minecraft.entity.EntityLiving.SpawnPlacementType type) + { return false; } + + @Override + @SuppressWarnings("deprecation") + public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing face) + { return BlockFaceShape.UNDEFINED; } + + @Override + @SuppressWarnings("deprecation") + public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) + { return AABBs.get(state.getValue(EASTWEST) ? 0x1 : 0x0); } + + @Override + @Nullable + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) + { return getBoundingBox(state, world, pos); } + + @Override + public IBlockState getStateFromMeta(int meta) + { return this.getDefaultState().withProperty(EASTWEST, ((meta & 0x1) != 0)); } + + @Override + public int getMetaFromState(IBlockState state) + { return state.getValue(EASTWEST) ? 0x1 : 0x0; } + + @Override + protected BlockStateContainer createBlockState() + { return new BlockStateContainer(this, EASTWEST); } + + @Override + public IBlockState withRotation(IBlockState state, Rotation rot) + { return (rot==Rotation.CLOCKWISE_180) ? state : state.withProperty(EASTWEST, !state.getValue(EASTWEST)); } + + @Override + public IBlockState withMirror(IBlockState state, Mirror mirrorIn) + { return state; } + + @Override + @SuppressWarnings("deprecation") + public boolean canPlaceBlockOnSide(World world, BlockPos pos, EnumFacing side) + { return super.canPlaceBlockOnSide(world, pos, side); } + + @Override + @SuppressWarnings("deprecation") + public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) + { + facing = placer.getHorizontalFacing(); + return getDefaultState().withProperty(EASTWEST, (facing==EnumFacing.EAST)||(facing==EnumFacing.WEST)); + } + +} diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorStairs.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorStairs.java index b30705a..8623453 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorStairs.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorStairs.java @@ -8,9 +8,21 @@ */ package wile.engineersdecor.blocks; +import net.minecraft.block.material.EnumPushReaction; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import wile.engineersdecor.ModEngineersDecor; +import wile.engineersdecor.detail.ModAuxiliaries; + import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.List; public class BlockDecorStairs extends net.minecraft.block.BlockStairs @@ -21,10 +33,49 @@ public class BlockDecorStairs extends net.minecraft.block.BlockStairs setCreativeTab(ModEngineersDecor.CREATIVE_TAB_ENGINEERSDECOR); setRegistryName(ModEngineersDecor.MODID, registryName); setTranslationKey(ModEngineersDecor.MODID + "." + registryName); + setLightLevel(0); + setLightOpacity(64); } + @Override + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) + { ModAuxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true); } + + @Override + @SuppressWarnings("deprecation") + public boolean isOpaqueCube(IBlockState state) + { return false; } + + @Override + @SuppressWarnings("deprecation") + public boolean isFullCube(IBlockState state) + { return false; } + + @Override + @SuppressWarnings("deprecation") + public boolean isNormalCube(IBlockState state) + { return false; } + + @Override + public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) + { return 0; } + @Override public boolean canSpawnInBlock() { return false; } + @Override + public boolean canCreatureSpawn(IBlockState state, IBlockAccess world, BlockPos pos, net.minecraft.entity.EntityLiving.SpawnPlacementType type) + { return false; } + + @Override + @SuppressWarnings("deprecation") + public EnumPushReaction getPushReaction(IBlockState state) + { return EnumPushReaction.NORMAL; } + + @Override + public boolean hasTileEntity(IBlockState state) + { return false; } + } 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 74f31f5..18ddb0c 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWindow.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorWindow.java @@ -35,7 +35,7 @@ public class BlockDecorWindow extends BlockDecorDirected @Override @SideOnly(Side.CLIENT) public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer) - { return (layer==BlockRenderLayer.CUTOUT) || (layer==BlockRenderLayer.TRANSLUCENT); } + { return (layer==BlockRenderLayer.CUTOUT_MIPPED) || (layer==BlockRenderLayer.TRANSLUCENT); } @Override @SideOnly(Side.CLIENT) 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 86adbe4..1284018 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java @@ -169,6 +169,14 @@ public class ModBlocks ModAuxiliaries.getPixeledAABB(0,0,15.6, 16,16,16.0) ); + public static final BlockDecorHorizontalSupport STEEL_DOUBLE_T_SUPPORT = new BlockDecorHorizontalSupport( + "steel_double_t_support", + BlockDecor.CFG_CUTOUT|BlockDecor.CFG_HORIZIONTAL|BlockDecor.CFG_LOOK_PLACEMENT, + Material.IRON, 1.0f, 15f, SoundType.METAL, + ModAuxiliaries.getPixeledAABB(5,11,0, 11,16,16) + ); + + private static final Block modBlocks[] = { TREATED_WOOD_CRAFTING_TABLE, CLINKER_BRICK_BLOCK, @@ -201,7 +209,8 @@ public class ModBlocks THIN_STEEL_POLE, THICK_STEEL_POLE, THIN_STEEL_POLE_HEAD, - THICK_STEEL_POLE_HEAD + THICK_STEEL_POLE_HEAD, + STEEL_DOUBLE_T_SUPPORT }; private static final Block devBlocks[] = { diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_double_t_support.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_double_t_support.json new file mode 100644 index 0000000..898457d --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/steel_double_t_support.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "engineersdecor:hsupport/steel_double_t_support_model", + "textures": { + "particle": "engineersdecor:blocks/hsupport/steel_double_t_support_side_texture", + "side": "engineersdecor:blocks/hsupport/steel_double_t_support_side_texture", + "top": "engineersdecor:blocks/hsupport/steel_double_t_support_top_texture", + "end": "engineersdecor:blocks/hsupport/steel_double_t_support_end_texture" + } + }, + "variants": { + "normal": [{}], + "eastwest": { "false":{"y":0}, "true": {"y":90}}, + "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 f8d2f86..6b4f0ab 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 @@ -5,7 +5,7 @@ "transform": "forge:default-block", "custom": { "base": "engineersdecor:steel_framed_window#frame", - "Cutout": "engineersdecor:steel_framed_window#frame", + "Mipped Cutout": "engineersdecor:steel_framed_window#frame", "Translucent": "engineersdecor:steel_framed_window#pane" } }, 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 9be1120..65d2ea8 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 @@ -5,7 +5,7 @@ "transform": "forge:default-block", "custom": { "base": "engineersdecor:treated_wood_window#frame", - "Cutout": "engineersdecor:treated_wood_window#frame", + "Mipped Cutout": "engineersdecor:treated_wood_window#frame", "Translucent": "engineersdecor:treated_wood_window#pane" } }, 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 5bbe86b..ec57b44 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 @@ -12,13 +12,13 @@ engineersdecor.tooltip.hint.help=§6[§9CTRL-SHIFT§r Help§6]§r #----------------------------------------------------------------------------------------------------------- # Stone/"ceramic material" based blocks #----------------------------------------------------------------------------------------------------------- -tile.engineersdecor.clinker_brick_block.name=Clinker brick +tile.engineersdecor.clinker_brick_block.name=Clinker brick block tile.engineersdecor.clinker_brick_block.help=§6A brick block with position dependent texture variations.§r\nLooks slightly darker and more color intensive than the vanilla brick block. -tile.engineersdecor.slag_brick_block.name=Slag brick +tile.engineersdecor.slag_brick_block.name=Slag brick block tile.engineersdecor.slag_brick_block.help=§6A gray-brown brick block with position dependent texture variations. -tile.engineersdecor.rebar_concrete.name=Rebar concrete +tile.engineersdecor.rebar_concrete.name=Rebar concrete block tile.engineersdecor.rebar_concrete.help=§6Steel reinforced concrete block.§r Expensive but Creeper-proof like obsidian. -tile.engineersdecor.panzerglass_block.name=Panzer glass +tile.engineersdecor.panzerglass_block.name=Panzer glass block tile.engineersdecor.panzerglass_block.help=§6Reinforced glass block.§r Expensive, explosion-proof. Dark gray tint, faint structural lines visible, multi texture for seemless look. tile.engineersdecor.rebar_concrete_tile.name=Rebar concrete tile tile.engineersdecor.rebar_concrete_tile.help=§6Steel reinforced concrete tile.§r Expensive but Creeper-proof like obsidian. @@ -49,7 +49,7 @@ tile.engineersdecor.rebar_concrete_tile_stairs.name=Rebar concrete tile stairs tile.engineersdecor.rebar_concrete_tile_stairs.help=§6Steel reinforced concrete tile stairs.§r Expensive but Creeper-proof like obsidian. #----------------------------------------------------------------------------------------------------------- tile.engineersdecor.treated_wood_pole.name=Straight treated wood pole -tile.engineersdecor.treated_wood_pole.help=§6Straight pole fragment with the diameter of a wire relay.§r\n\ +tile.engineersdecor.treated_wood_pole.help=§6Straight pole fragment with a diameter of a wire relay.§r\n\ Can be useful as alternative to the wire posts if special special lengths are needed, \ or as support for structures. tile.engineersdecor.treated_wood_pole_head.name=Straight treated wood pole head/foot @@ -70,7 +70,10 @@ tile.engineersdecor.treated_wood_table.help=§6Robust four-legged wood table.§r 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 -tile.engineersdecor.treated_wood_crafting_table.help=§6Robust and weather-proof. Eight storage slots. Keeps inventory. +tile.engineersdecor.treated_wood_crafting_table.help=§6Robust and weather-proof.§r Eight storage slots, keeps inventory, no vanilla recipe book.\n\ + Click up/down arrow buttons for crafting history selection, output slot for item placement, X-button \ + to clear crafting grid and history. Shift-click stack: player-to-storage stack transfer when crafting \ + grid empty, otherwise player-to-grid stack transfer. Automatically distributes the clicked stack. tile.engineersdecor.iron_inset_light.name=Inset light tile.engineersdecor.iron_inset_light.help=§6Small glowstone light source, sunk into the floor, ceiling or wall.§r\n\ Useful to light up places where electrical light installations are problematic.\ @@ -89,6 +92,9 @@ tile.engineersdecor.small_lab_furnace.help=§6Small metal cased lab kiln.§r Sol and fuel. Place an external heater into a aux slot and connect power for electrical \ smelting speed boost. #----------------------------------------------------------------------------------------------------------- +tile.engineersdecor.steel_double_t_support.name=Steel double T support +tile.engineersdecor.steel_double_t_support.help=§6Horizontal ceiling support bream fragment. +#----------------------------------------------------------------------------------------------------------- tile.engineersdecor.sign_decor.name=Sign plate (Engineer's decor) tile.engineersdecor.sign_decor.help=§6This should not be craftable or visible in JEI. Used for creative tab and screenshots. 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 dd469bc..618c5a3 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,9 @@ tile.engineersdecor.steel_framed_window.name=Окно со стальной ра tile.engineersdecor.small_lab_furnace.name=Компактная лабораторная печь tile.engineersdecor.small_lab_furnace.help=§6Лабораторная печь в металлическом корпусе.§r Подача твёрдого топлива - сверху. Немного горячее чем каменная, поэтому быстрее. Два внутренних слота для ввода, выхода и топлива. #----------------------------------------------------------------------------------------------------------- +tile.engineersdecor.steel_double_t_support.name=Steel double T support +#tile.engineersdecor.steel_double_t_support.help=§6Horizontal ceiling support bream fragment. +#----------------------------------------------------------------------------------------------------------- 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. 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 index 96a9cc4..1f22774 100644 --- 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 @@ -1,6 +1,5 @@ { "parent": "block/cube", - "ambientocclusion": false, "textures": { "frame": "engineersdecor:blocks/iestyle/steel_texture", "particle": "engineersdecor:blocks/iestyle/steel_texture" 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 index e591e0e..6efae70 100644 --- 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 @@ -1,6 +1,5 @@ { "parent": "block/cube", - "ambientocclusion": false, "textures": { "frame": "engineersdecor:blocks/iestyle/treated_wood_rough_texture", "particle": "engineersdecor:blocks/iestyle/treated_wood_rough_texture" diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/hsupport/steel_double_t_support_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/hsupport/steel_double_t_support_model.json new file mode 100644 index 0000000..cee71a6 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/hsupport/steel_double_t_support_model.json @@ -0,0 +1,67 @@ +{ + "parent": "block/cube", + "textures": { + "end": "engineersdecor:blocks/hsupport/steel_double_t_support_end_texture", + "side": "engineersdecor:blocks/hsupport/steel_double_t_support_side_texture", + "top": "engineersdecor:blocks/hsupport/steel_double_t_support_top_texture", + "particle": "engineersdecor:blocks/hsupport/steel_double_t_support_end_texture" + }, + "elements": [ + { + "from": [5, 15, 0], + "to": [11, 16, 16], + "faces": { + "north": {"texture": "#end"}, + "east": {"texture": "#side"}, + "south": {"texture": "#end"}, + "west": {"texture": "#side"}, + "up": {"texture": "#top"}, + "down": {"texture": "#top"} + } + }, + { + "from": [9, 12, 0], + "to": [10, 15, 16], + "faces": { + "north": {"texture": "#end"}, + "east": {"texture": "#side"}, + "south": {"texture": "#end"}, + "west": {"texture": "#side"} + } + }, + { + "from": [6, 12, 0], + "to": [7, 15, 16], + "faces": { + "north": {"texture": "#end"}, + "east": {"texture": "#side"}, + "south": {"texture": "#end"}, + "west": {"texture": "#side"} + } + }, + { + "from": [5, 11, 0], + "to": [11, 12, 16], + "faces": { + "north": {"texture": "#end"}, + "east": {"texture": "#side"}, + "south": {"texture": "#end"}, + "west": {"texture": "#side"}, + "up": {"texture": "#top"}, + "down": {"texture": "#top"} + } + } + ], + "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/wall/clinker_brick_wall_side.json b/1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_side.json index 7c1db34..a32a7bc 100644 --- a/1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_side.json +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/wall/clinker_brick_wall_side.json @@ -10,7 +10,7 @@ "from": [4.125, 0, 0], "to": [11.875, 15.98, 8], "faces": { - "north": {"texture": "#wall", "cullface": "north"}, + "north": {"texture": "#wall"}, "east": {"texture": "#wall"}, "west": {"texture": "#wall"}, "up": {"texture": "#top"}, diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_post.json b/1.12/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_post.json index d88fb8a..6a5d732 100644 --- a/1.12/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_post.json +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_post.json @@ -1,5 +1,4 @@ { - "credit": "I made this with the Blockbench", "textures": { "wall": "engineersdecor:blocks/concrete/rebar_concrete_texture0", "particle": "engineersdecor:blocks/concrete/rebar_concrete_texture0" diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_side.json b/1.12/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_side.json index de382a6..495ac64 100644 --- a/1.12/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_side.json +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_side.json @@ -1,5 +1,4 @@ { - "credit": "I made this with the Blockbench", "textures": { "wall": "engineersdecor:blocks/concrete/rebar_concrete_texture0", "particle": "engineersdecor:blocks/concrete/rebar_concrete_texture0" diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/wall/slag_brick_wall_post.json b/1.12/src/main/resources/assets/engineersdecor/models/block/wall/slag_brick_wall_post.json index a3309be..78cfbde 100644 --- a/1.12/src/main/resources/assets/engineersdecor/models/block/wall/slag_brick_wall_post.json +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/wall/slag_brick_wall_post.json @@ -1,5 +1,4 @@ { - "credit": "I made this with the Blockbench", "textures": { "postside": "engineersdecor:blocks/slag_brick/slag_brick_pole_side", "top": "engineersdecor:blocks/slag_brick/slag_brick_top", diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/wall/slag_brick_wall_side.json b/1.12/src/main/resources/assets/engineersdecor/models/block/wall/slag_brick_wall_side.json index 7a228bc..67c0eac 100644 --- a/1.12/src/main/resources/assets/engineersdecor/models/block/wall/slag_brick_wall_side.json +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/wall/slag_brick_wall_side.json @@ -1,5 +1,4 @@ { - "credit": "I made this with the Blockbench", "textures": { "wall": "engineersdecor:blocks/slag_brick/slag_brick_wall0", "top": "engineersdecor:blocks/slag_brick/slag_brick_top", 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 36329d4..634950b 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json @@ -55,6 +55,10 @@ "ingredient": { "type": "forge:ore_dict", "ore": "plankWood" }, "name": "plankWood" }, + { + "ingredient": { "type": "forge:ore_dict", "ore": "slabWood" }, + "name": "slabWood" + }, { "ingredient": { "type": "forge:ore_dict", "ore": "stickWood" }, "name": "stickWood" diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_block_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_block_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe.json index 89aae07..6a3be11 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/clinker_brick_wall_recipe.json @@ -7,7 +7,6 @@ ], "type": "minecraft:crafting_shaped", "pattern": [ - " ", "BBB", "BBB" ], diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/concrete_wall_recipe_with_ie_installed.json b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete_wall_recipe_ie_required.json similarity index 97% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/concrete_wall_recipe_with_ie_installed.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/concrete_wall_recipe_ie_required.json index 87a9306..1a94e64 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/concrete_wall_recipe_with_ie_installed.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/concrete_wall_recipe_ie_required.json @@ -8,7 +8,6 @@ ], "type": "minecraft:crafting_shaped", "pattern": [ - " ", "CCC", "CCC" ], diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/iron_inset_light_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/iron_inset_light_recipe.json index 9fec78e..c7cce26 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/iron_inset_light_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/iron_inset_light_recipe.json @@ -2,12 +2,12 @@ "conditions": [ { "type": "engineersdecor:grc", - "result": "engineersdecor:iron_inset_light" + "result": "engineersdecor:iron_inset_light", + "required": ["immersiveengineering:material"] } ], "type": "minecraft:crafting_shaped", "pattern": [ - " ", "GGG", "PLP" ], diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/metal_rung_ladder_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/metal_rung_ladder_recipe.json index 9fdde71..2f51f83 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/metal_rung_ladder_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/metal_rung_ladder_recipe.json @@ -9,8 +9,7 @@ "type": "minecraft:crafting_shaped", "pattern": [ "S S", - "SSS", - " " + "SSS" ], "key": { "S": { diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_block_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_recipe.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_block_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe.json index 4ec19fa..61baf76 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_wall_recipe.json @@ -7,7 +7,6 @@ ], "type": "minecraft:crafting_shaped", "pattern": [ - " ", "CCC", "CCC" ], diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_recipe_with_slag.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_block_recipe.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_recipe_with_slag.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_block_recipe.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_wall_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_wall_recipe.json index d5f3e25..a140b2a 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_wall_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_wall_recipe.json @@ -7,7 +7,6 @@ ], "type": "minecraft:crafting_shaped", "pattern": [ - " ", "BBB", "BBB" ], diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/iron_inset_light_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/iron_inset_light_recipe_standalone.json new file mode 100644 index 0000000..c344c33 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/iron_inset_light_recipe_standalone.json @@ -0,0 +1,32 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:iron_inset_light", + "missing": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "GGG", + "PLP" + ], + "key": { + "P": { + "item": "#ingotIron", + "data": 0 + }, + "L": { + "item": "#luminescentBlock", + "data": 0 + }, + "G": { + "item": "#paneGlass", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:iron_inset_light", + "count": 8 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/metal_rung_ladder_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/metal_rung_ladder_recipe_standalone.json new file mode 100644 index 0000000..2748ac9 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/metal_rung_ladder_recipe_standalone.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:metal_rung_ladder", + "missing": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "S S", + "SSS", + " " + ], + "key": { + "S": { + "item": "#ingotIron", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:metal_rung_ladder", + "count": 4 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/metal_rung_steps_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/metal_rung_steps_recipe_standalone.json new file mode 100644 index 0000000..1f8b73b --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/metal_rung_steps_recipe_standalone.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:metal_rung_steps", + "missing": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + " SS", + "SS ", + " SS" + ], + "key": { + "S": { + "item": "#ingotIron", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:metal_rung_steps", + "count": 4 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/panzerglass_block_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/panzerglass_block_recipe_standalone.json new file mode 100644 index 0000000..4f09ade --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/panzerglass_block_recipe_standalone.json @@ -0,0 +1,33 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:panzerglass_block", + "missing": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "SGS", + "GDG", + "SGS" + ], + "key": { + "G": { + "item": "#blockGlass", + "data": 0 + }, + "S": { + "item": "#ingotIron", + "data": 0 + }, + "D": { + "item": "#itemDiamond", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:panzerglass_block", + "count": 8 + } +} 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/standalone/rebar_concrete_block_recipe_standalone.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/rebar_concrete_recipe_standalone.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/standalone/rebar_concrete_block_recipe_standalone.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_recipe_without_slag.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/slag_brick_block_recipe_standalone.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/slag_brick_recipe_without_slag.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/standalone/slag_brick_block_recipe_standalone.json 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/standalone/small_lab_furnace_recipe_standalone.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/small_lab_furnace_recipe_standalone.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/standalone/small_lab_furnace_recipe_standalone.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/steel_framed_window_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/steel_framed_window_recipe_standalone.json new file mode 100644 index 0000000..53b7e07 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/steel_framed_window_recipe_standalone.json @@ -0,0 +1,29 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:steel_framed_window", + "missing": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "WGW", + "GGG", + "WGW" + ], + "key": { + "W": { + "item": "#ingotIron", + "data": 0 + }, + "G": { + "item": "#paneGlass", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:steel_framed_window", + "count": 9 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_rightalign.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/thin_steel_pole_recipe_standalone.json similarity index 53% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_rightalign.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/standalone/thin_steel_pole_recipe_standalone.json index 6c57651..67409b4 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_rightalign.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/thin_steel_pole_recipe_standalone.json @@ -3,23 +3,23 @@ { "type": "engineersdecor:grc", "result": "engineersdecor:thin_steel_pole", - "required": ["engineersdecor:thin_steel_pole"] + "missing": ["immersiveengineering:material"] } ], "type": "minecraft:crafting_shaped", "pattern": [ - " PP", - " PP", - " PP" + " S", + " S ", + "S " ], "key": { - "P": { - "item": "engineersdecor:thin_steel_pole", + "S": { + "item": "#ingotIron", "data": 0 } }, "result": { - "item": "engineersdecor:thick_steel_pole", - "count": 4 + "item": "engineersdecor:thin_steel_pole", + "count": 12 } } 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/standalone/treated_wood_crafting_table_recipe_standalone.json similarity index 100% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_crafting_table_recipe_standalone.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_crafting_table_recipe_standalone.json diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_ladder_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_ladder_recipe_standalone.json new file mode 100644 index 0000000..69cf9c6 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_ladder_recipe_standalone.json @@ -0,0 +1,25 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:treated_wood_ladder", + "missing": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "LL", + "LL", + "LL" + ], + "key": { + "L": { + "item": "minecraft:ladder", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:treated_wood_ladder", + "count": 6 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_pole_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_pole_recipe_standalone.json new file mode 100644 index 0000000..074058b --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_pole_recipe_standalone.json @@ -0,0 +1,29 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:treated_wood_pole", + "missing": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "S", + "W", + "W" + ], + "key": { + "W": { + "item": "#plankWood", + "data": 0 + }, + "S": { + "item": "#slabWood", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:treated_wood_pole", + "count": 6 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_stool_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_stool_recipe_standalone.json new file mode 100644 index 0000000..3a3c78c --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_stool_recipe_standalone.json @@ -0,0 +1,28 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:treated_wood_stool", + "missing": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "WWW", + " S " + ], + "key": { + "W": { + "item": "#slabWood", + "data": 0 + }, + "S": { + "item": "engineersdecor:treated_wood_pole", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:treated_wood_stool", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_table_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_table_recipe_standalone.json new file mode 100644 index 0000000..b9e954b --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_table_recipe_standalone.json @@ -0,0 +1,29 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:treated_wood_table", + "missing": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "WWW", + "S S", + "S S" + ], + "key": { + "W": { + "item": "#slabWood", + "data": 0 + }, + "S": { + "item": "engineersdecor:treated_wood_pole", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:treated_wood_table", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_window_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_window_recipe_standalone.json new file mode 100644 index 0000000..05948b1 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_window_recipe_standalone.json @@ -0,0 +1,29 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:treated_wood_window", + "missing": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "WGW", + "GGG", + "WGW" + ], + "key": { + "W": { + "item": "#slabWood", + "data": 0 + }, + "G": { + "item": "#paneGlass", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:treated_wood_window", + "count": 9 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_windowsill_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_windowsill_recipe_standalone.json new file mode 100644 index 0000000..4d3c63b --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/treated_wood_windowsill_recipe_standalone.json @@ -0,0 +1,26 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:treated_wood_windowsill", + "missing": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "WWW", + "S S" + ], + "key": { + "W": { + "item": "#slabWood" + }, + "S": { + "item": "engineersdecor:treated_wood_pole" + } + }, + "result": { + "item": "engineersdecor:treated_wood_windowsill", + "count": 4 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/steel_double_t_support_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/steel_double_t_support_recipe.json new file mode 100644 index 0000000..64741fa --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/steel_double_t_support_recipe.json @@ -0,0 +1,24 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:steel_double_t_support", + "required": ["engineersdecor:thin_steel_pole"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "PPP", + " P ", + "PPP" + ], + "key": { + "P": { + "item": "engineersdecor:thin_steel_pole" + } + }, + "result": { + "item": "engineersdecor:steel_double_t_support", + "count": 6 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_leftalign.json b/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe.json similarity index 92% rename from 1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_leftalign.json rename to 1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe.json index e7554e1..3c14d5b 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/thin_steel_pole_recipe_leftalign.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/thick_steel_pole_recipe.json @@ -8,9 +8,9 @@ ], "type": "minecraft:crafting_shaped", "pattern": [ - "PP ", - "PP ", - "PP " + "PP", + "PP", + "PP" ], "key": { "P": { diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_ladder_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_ladder_recipe.json index cd81662..8546d3f 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_ladder_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_ladder_recipe.json @@ -20,6 +20,6 @@ }, "result": { "item": "engineersdecor:treated_wood_ladder", - "count": 4 + "count": 3 } } diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_recipe.json index 62330e4..801bc97 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_pole_recipe.json @@ -8,9 +8,9 @@ ], "type": "minecraft:crafting_shaped", "pattern": [ - " S ", - " W ", - " W " + "S", + "W", + "W" ], "key": { "W": { diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_stool_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_stool_recipe.json index 92fd712..85cdeb1 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_stool_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_stool_recipe.json @@ -8,7 +8,6 @@ ], "type": "minecraft:crafting_shaped", "pattern": [ - " ", "WWW", " S " ], diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_windowsill_recipe.json b/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_windowsill_recipe.json index 15a9277..95ddba1 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_windowsill_recipe.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/treated_wood_windowsill_recipe.json @@ -9,8 +9,7 @@ "type": "minecraft:crafting_shaped", "pattern": [ "WWW", - "S S", - " " + "S S" ], "key": { "W": { diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/hsupport/steel_double_t_support_end_texture.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/hsupport/steel_double_t_support_end_texture.png new file mode 100644 index 0000000..9584364 Binary files /dev/null and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/hsupport/steel_double_t_support_end_texture.png differ diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/hsupport/steel_double_t_support_side_texture.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/hsupport/steel_double_t_support_side_texture.png new file mode 100644 index 0000000..9584364 Binary files /dev/null and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/hsupport/steel_double_t_support_side_texture.png differ diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/hsupport/steel_double_t_support_top_texture.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/hsupport/steel_double_t_support_top_texture.png new file mode 100644 index 0000000..9584364 Binary files /dev/null and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/hsupport/steel_double_t_support_top_texture.png differ diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/treated_wood_pole_side_texture.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/treated_wood_pole_side_texture.png index 533f852..478d321 100644 Binary files a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/treated_wood_pole_side_texture.png and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/treated_wood_pole_side_texture.png differ diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/treated_wood_pole_top_texture.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/treated_wood_pole_top_texture.png index 4605187..33a66c4 100644 Binary files a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/treated_wood_pole_top_texture.png and b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/pole/treated_wood_pole_top_texture.png differ diff --git a/meta/update.json b/meta/update.json index ec78a2f..d833541 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.4-b4": "[F] Clinker/slag brick wall side cullfacing disabled to prevent texture leaks when connecting to concrete walls.\n[F] Unused treated wood pole texture regions filled (optifine).\n[F] Using mipped cutout format for window multi-layer model (issue #19, thanks rixmswey for reporting and details).\n[M] Recipe tuning, added standalone recipe for all mod blocks.\n[M] In-game CTRL-SHIFT tooltip documentation updated.\n[M] Panzer glass block: Ambient occlusion and light opacity tuned.\n[M] Stairs: Light opacity tuned.\n[A] Tooltip documentation added for mod stairs.\n[E] Horizontal steel double-T support beam (config:experimental).", "1.0.4-b3": "[A] Added thin (4x4x16) and thick (6x6x16) steel hollow poles.\n[A] Added support head/foot components for thin and thick steel poles.", "1.0.4-b2": "[A] Added position dependent texture variation to clinker wall, slag brick wall and rebar concrete wall.", "1.0.4-b1": "[A] Crafting table: JEI integration for recipe placement added.\n[A] Crafting table: History re-fab added, allowing to quickly select and re-craft recent recipes. Selection with arrow buttons, ingredient placement by clicking the result slot. Automatic item distribution on shift-click. Quick-move buttons.\n[F] Crafting table textures modified to prevent optifine glitches on the edges of the legs.", @@ -36,7 +37,7 @@ }, "promos": { "1.12.2-recommended": "1.0.3", - "1.12.2-latest": "1.0.4-b3", + "1.12.2-latest": "1.0.4-b4", "1.13.2-recommended": "", "1.13.2-latest": "1.0.4-b3" }