diff --git a/1.12/gradle.properties b/1.12/gradle.properties index ca6a25d..569025c 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.7-b2 +version_engineersdecor=1.0.7-b3 diff --git a/1.12/readme.md b/1.12/readme.md index 53e98f6..897db87 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,6 +10,8 @@ Mod sources for Minecraft version 1.12.2. ---- ## Revision history + ~ v1.0.7-b3 [A] Added standalone recipes for signs and factory dropper. + - v1.0.7-b2 [A] Added Defense System Warning sign (design by J. Carver). [M] Factory dropper non-experimental now. GUI click area tuning. "Fast drop" symbol replaced from arrow to dog icon (thx diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorCraftingTable.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorCraftingTable.java index 0a04d0b..6d1bc89 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorCraftingTable.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorCraftingTable.java @@ -80,6 +80,7 @@ public class BlockDecorCraftingTable extends BlockDecorDirected public boolean hasTileEntity(IBlockState state) { return true; } + @Override @Nullable public TileEntity createTileEntity(World world, IBlockState state) { return new BlockDecorCraftingTable.BTileEntity(); } diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorDropper.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorDropper.java index 00212cb..55508cb 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorDropper.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorDropper.java @@ -91,6 +91,7 @@ public class BlockDecorDropper extends BlockDecorDirected public boolean hasTileEntity(IBlockState state) { return true; } + @Override @Nullable public TileEntity createTileEntity(World world, IBlockState state) { return new BlockDecorDropper.BTileEntity(); } diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnace.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnace.java index ff66b3d..ce61559 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnace.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnace.java @@ -96,6 +96,7 @@ public class BlockDecorFurnace extends BlockDecorDirected public boolean hasTileEntity(IBlockState state) { return true; } + @Override @Nullable public TileEntity createTileEntity(World world, IBlockState state) { return new BlockDecorFurnace.BTileEntity(); } diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnaceElectrical.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnaceElectrical.java index 7cec5c3..e73ff59 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnaceElectrical.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnaceElectrical.java @@ -50,6 +50,7 @@ public class BlockDecorFurnaceElectrical extends BlockDecorFurnace super(registryName, config, material, hardness, resistance, sound, unrotatedAABB); } + @Override @Nullable public TileEntity createTileEntity(World world, IBlockState state) { return new BlockDecorFurnaceElectrical.BTileEntity(); } diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorPassiveFluidAccumulator.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorPassiveFluidAccumulator.java index e8f565c..8c38508 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorPassiveFluidAccumulator.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorPassiveFluidAccumulator.java @@ -48,10 +48,12 @@ public class BlockDecorPassiveFluidAccumulator extends BlockDecorDirected public boolean hasTileEntity(IBlockState state) { return true; } + @Override @Nullable public TileEntity createTileEntity(World world, IBlockState state) { return new BlockDecorPassiveFluidAccumulator.BTileEntity(); } + @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { if(world.isRemote) return true; @@ -61,6 +63,7 @@ public class BlockDecorPassiveFluidAccumulator extends BlockDecorDirected return true; } + @Override public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { TileEntity te = world.getTileEntity(pos); if(te instanceof BlockDecorPipeValve.BTileEntity) ((BTileEntity)te).block_changed(); } 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 17f17d3..439a15a 100644 --- a/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/_constants.json @@ -19,6 +19,10 @@ "ingredient": { "type": "forge:ore_dict", "ore": "ingotIron" }, "name": "ingotIron" }, + { + "ingredient": { "type": "forge:ore_dict", "ore": "nuggetIron" }, + "name": "nuggetIron" + }, { "ingredient": { "type": "forge:ore_dict", "ore": "blockIron" }, "name": "blockIron" diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/factory_dropper_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/factory_dropper_recipe_standalone.json new file mode 100644 index 0000000..8572ef7 --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/factory_dropper_recipe_standalone.json @@ -0,0 +1,33 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:factory_dropper", + "missing": ["immersiveengineering:material"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "WWW", + "WDW", + "WPW" + ], + "key": { + "D": { + "item": "#itemDropper", + "data": 0 + }, + "P": { + "item": "#ingotIron", + "data": 0 + }, + "W": { + "item": "#plankWood", + "data": 0 + } + }, + "result": { + "item": "engineersdecor:factory_dropper", + "count": 1 + } +} diff --git a/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/sign_hotwire_recipe_standalone.json b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/sign_hotwire_recipe_standalone.json new file mode 100644 index 0000000..c1d518f --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/recipes/standalone/sign_hotwire_recipe_standalone.json @@ -0,0 +1,24 @@ +{ + "conditions": [ + { + "type": "engineersdecor:grc", + "result": "engineersdecor:sign_hotwire", + "missing": ["immersiveengineering:stone_decoration"] + } + ], + "type": "minecraft:crafting_shaped", + "pattern": [ + "NSN", + "SPS", + "NSN" + ], + "key": { + "S": { "item": "#stickWood" }, + "P": { "item": "#paperAny" }, + "N": { "item": "#nuggetIron" } + }, + "result": { + "item": "engineersdecor:sign_hotwire", + "count": 1 + } +} diff --git a/1.13/readme.md b/1.13/readme.md index 716da2c..9f3792e 100644 --- a/1.13/readme.md +++ b/1.13/readme.md @@ -10,6 +10,9 @@ Mod sources for Minecraft version 1.13.2. ---- ## Revision history + - v1.0.4-b5 [A] Added Factory Dropper. + [A] Added "Caution Defense System Ahead" sign. + - v1.0.4-b4 [U] Updated forge dependency: REQUIRES FORGE >= 1.13.2-25.0.214. [A] Added sign "Electrical hazard"/"Caution hot wire". [A] Added sign "Caution dangerous there" (skull/bones). diff --git a/meta/update.json b/meta/update.json index 67e7419..fccfebc 100644 --- a/meta/update.json +++ b/meta/update.json @@ -39,6 +39,7 @@ "1.0.0-b1": "[A] Initial structure.\n[A] Added clinker bricks and clinker brick stairs.\n[A] Added slag bricks and slag brick stairs.\n[A] Added metal rung ladder.\n[A] Added staggered metal steps ladder.\n[A] Added treated wood ladder.\n[A] Added treated wood pole.\n[A] Added treated wood table." }, "1.13.2": { + "1.0.4-b5": "[A] Added Factory Dropper.\n[A] Added \"Caution Defense System Ahead\" sign.", "1.0.4-b4": "[U] Updated forge dependency: REQUIRES FORGE >= 1.13.2-25.0.214.\n[A] Added sign \"Electrical hazard\"/\"Caution hot wire\".\n[A] Added sign \"Caution dangerous there\" (skull/bones).\n[A] Added horizontal steel double-T support beam with pole connections.", "1.0.4-b3": "[V] Version assignment: All features of v1.0.4-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-iterated.\n[A] Lab furnace ported to 1.13.\n[A] Treated wood crafting table: Added crafting table history/quick craft.\n[A] Treated wood stool: Sitting on the stool implemented.\n[A] Steel poles (thick/thin) with support heads/foots added.\n[E] Prepared position dependent texture variation for walls (clinker, slag, rebar concrete), missing one forge feature yet for completion.\n[E] Prepared multi-layer rendering for windows, needs forge feature implementation.", "1.0.2-b3": "[A] Added treated wood window.\n[A] Added treated wood pole support.\n[A] Added treated wood pole head.\n[A] Added steel framed window.", @@ -52,6 +53,6 @@ "1.12.2-recommended": "1.0.6", "1.12.2-latest": "1.0.7-b2", "1.13.2-recommended": "", - "1.13.2-latest": "1.0.4-b4" + "1.13.2-latest": "1.0.4-b5" } } \ No newline at end of file diff --git a/readme.md b/readme.md index d194f46..7ac5ed3 100644 --- a/readme.md +++ b/readme.md @@ -123,6 +123,17 @@ looking manufacturing contraptions. Current feature set: is full, the oldest stack will be disposed. The processing speed can be increased by connecting electrical RF/FE power. +- *Factory dropper*: Dropper with GUI configurable drop force, direction, stack size, + trigger cool-down delay, and trigger logic. Three trigger slots ("filter slots") can + be used as internal trigger. They emit an internal signal if their item is found in + in the dropper inventory (also at least the stack size of a trigger slot). Internal + triggers can be easily combined with the external redstone signal trigger using + logical *AND* or *OR* gates. If internal triggers match, the dropper will spit out + exactly the stacks in these slots. That allows to drop e.g. always nine lapis, + redstone, nuggets, etc on a conveyor to feed a compression metal press - instantly + and automatically after nine of these items have been inserted into the dropper. + + More to come slowly but steadily. ----