From 0a9816504b542da7c2e89c1d890bf5d6c340c47e Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Mon, 15 Jun 2020 02:25:33 +0200 Subject: [PATCH] PumpState - Added blockstates, models and TE rendering for mechanical pumps - Removed unused pipe textures - Removed hasStaticPart in IWrenchable as it became obsolete in 1.15 - Bumped version --- gradle.properties | 2 +- src/generated/resources/.cache/cache | 9 +- .../create/blockstates/mechanical_pump.json | 30 +++ .../create/blockstates/radial_chassis.json | 48 ++--- .../resources/assets/create/lang/en_ud.json | 1 + .../resources/assets/create/lang/en_us.json | 1 + .../create/models/item/mechanical_pump.json | 3 + .../loot_tables/blocks/mechanical_pump.json | 19 ++ .../com/simibubi/create/AllBlockPartials.java | 3 + .../java/com/simibubi/create/AllBlocks.java | 10 + .../java/com/simibubi/create/AllShapes.java | 5 +- .../com/simibubi/create/AllTileEntities.java | 7 + src/main/java/com/simibubi/create/Create.java | 2 +- .../contraptions/base/KineticBlock.java | 2 - .../components/actors/DrillBlock.java | 5 - .../components/clock/CuckooClockBlock.java | 5 - .../crafter/MechanicalCrafterBlock.java | 5 - .../components/crank/HandCrankBlock.java | 5 - .../crusher/CrushingWheelBlock.java | 5 - .../components/deployer/DeployerBlock.java | 5 - .../components/fan/EncasedFanBlock.java | 5 - .../components/flywheel/FlywheelBlock.java | 5 - .../components/millstone/MillstoneBlock.java | 5 - .../mixer/MechanicalMixerBlock.java | 5 - .../components/motor/CreativeMotorBlock.java | 5 - .../press/MechanicalPressBlock.java | 5 - .../contraptions/components/saw/SawBlock.java | 5 - .../bearing/BearingBlock.java | 5 - .../piston/MechanicalPistonBlock.java | 5 - .../structureMovement/pulley/PulleyBlock.java | 5 - .../components/turntable/TurntableBlock.java | 5 - .../waterwheel/WaterWheelBlock.java | 5 - .../contraptions/fluids/PipeBlock.java | 19 +- .../contraptions/fluids/PumpBlock.java | 56 +++++ .../contraptions/fluids/PumpRenderer.java | 58 +++++ .../contraptions/fluids/PumpTileEntity.java | 29 +++ .../relays/advanced/SpeedControllerBlock.java | 5 - .../sequencer/SequencedGearshiftBlock.java | 5 - .../contraptions/relays/belt/BeltBlock.java | 5 - .../relays/elementary/ShaftBlock.java | 5 - .../relays/encased/EncasedBeltBlock.java | 5 - .../relays/encased/EncasedShaftBlock.java | 5 - .../contraptions/relays/gauge/GaugeBlock.java | 5 - .../relays/gearbox/GearboxBlock.java | 5 - .../contraptions/wrench/IWrenchable.java | 45 ++-- .../models/block/mechanical_pump/arrow.json | 117 ++++++++++ .../models/block/mechanical_pump/block.json | 92 ++++++++ .../models/block/mechanical_pump/cog.json | 118 ++++++++++ .../models/block/mechanical_pump/item.json | 202 ++++++++++++++++++ .../create/textures/block/copper_pipe.png | Bin 1852 -> 1890 bytes .../create/textures/block/copper_pipe_ld.png | Bin 288 -> 0 bytes .../create/textures/block/copper_pipe_lr.png | Bin 285 -> 0 bytes .../create/textures/block/copper_pipe_lu.png | Bin 286 -> 0 bytes .../create/textures/block/copper_pipe_rd.png | Bin 282 -> 0 bytes .../create/textures/block/copper_pipe_ru.png | Bin 296 -> 0 bytes .../create/textures/block/copper_pipe_ud.png | Bin 264 -> 0 bytes .../assets/create/textures/block/pump.png | Bin 0 -> 676 bytes 57 files changed, 829 insertions(+), 179 deletions(-) create mode 100644 src/generated/resources/assets/create/blockstates/mechanical_pump.json create mode 100644 src/generated/resources/assets/create/models/item/mechanical_pump.json create mode 100644 src/generated/resources/data/create/loot_tables/blocks/mechanical_pump.json create mode 100644 src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java create mode 100644 src/main/java/com/simibubi/create/content/contraptions/fluids/PumpRenderer.java create mode 100644 src/main/java/com/simibubi/create/content/contraptions/fluids/PumpTileEntity.java create mode 100644 src/main/resources/assets/create/models/block/mechanical_pump/arrow.json create mode 100644 src/main/resources/assets/create/models/block/mechanical_pump/block.json create mode 100644 src/main/resources/assets/create/models/block/mechanical_pump/cog.json create mode 100644 src/main/resources/assets/create/models/block/mechanical_pump/item.json delete mode 100644 src/main/resources/assets/create/textures/block/copper_pipe_ld.png delete mode 100644 src/main/resources/assets/create/textures/block/copper_pipe_lr.png delete mode 100644 src/main/resources/assets/create/textures/block/copper_pipe_lu.png delete mode 100644 src/main/resources/assets/create/textures/block/copper_pipe_rd.png delete mode 100644 src/main/resources/assets/create/textures/block/copper_pipe_ru.png delete mode 100644 src/main/resources/assets/create/textures/block/copper_pipe_ud.png create mode 100644 src/main/resources/assets/create/textures/block/pump.png diff --git a/gradle.properties b/gradle.properties index 04c6d8776..5d6ed258b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # mod version info -mod_version=0.2.4d +mod_version=0.3 minecraft_version=1.15.2 forge_version=31.2.3 diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 43d67c370..7e0f7787a 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -179,6 +179,7 @@ da612a05f94dc19e07e250efc35a7b2839d2ee76 assets\create\blockstates\mechanical_pi 94ec340a50b2406f833735f7501a1840c692e32a assets\create\blockstates\mechanical_piston_head.json debef0f5dde74103aaf4422de4bc90e4099b0c47 assets\create\blockstates\mechanical_plough.json 92269fe66d7b83095a2e04e121af0be792f55dd6 assets\create\blockstates\mechanical_press.json +b7c4a0ff0c6f16e14d71fc0fb7fc66d032b65cf3 assets\create\blockstates\mechanical_pump.json 1478fc76afb9b186fd3fddc20c29525d60d692bc assets\create\blockstates\mechanical_saw.json 4e48ad0936647065c2322390e7c0fe115c853a98 assets\create\blockstates\millstone.json 468202df0802e17c75fcad0993daf1bc5300ca91 assets\create\blockstates\minecart_anchor.json @@ -274,7 +275,7 @@ b7829c2ef2c47188713f8cab21b2c9bc7f9c5b79 assets\create\blockstates\portable_stor e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets\create\blockstates\powered_toggle_latch.json 3a739f9d4276828d83f2d2750bf3227c87bcd438 assets\create\blockstates\pulley_magnet.json 469e430d96cb0a5e1aaf6b7cc5d401d488c9e600 assets\create\blockstates\pulse_repeater.json -ab2a1bf8f37f1c64d00538867f4c3a97195bd3c4 assets\create\blockstates\radial_chassis.json +5c1df061eb5efe49beee7219e113206fc31a4733 assets\create\blockstates\radial_chassis.json 8929677f2cc5354aa19ef182af69f9f0b41eb242 assets\create\blockstates\redstone_contact.json c29213b77ac0c78d8979c5f6188d2b265696f9b9 assets\create\blockstates\redstone_link.json 1eac804cba08aebb5f4646758ae1ef9b32e01365 assets\create\blockstates\reinforced_rail.json @@ -326,8 +327,8 @@ c60c3115fd6eeaa3a696428a87a74d184ab7d62d assets\create\blockstates\weathered_lim c77b46d8b459e5c7cc495393546f3fcca8a1fa1d assets\create\blockstates\weathered_limestone_pillar.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets\create\blockstates\zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets\create\blockstates\zinc_ore.json -88f2465e94bac0cd25432195825faaa457fa8b0e assets\create\lang\en_ud.json -8cb43c2910b0dedf4dd87adc900c165bec3d192f assets\create\lang\en_us.json +3afe2434c36e1af9b04d5adda313f31db68c5040 assets\create\lang\en_ud.json +d3bec6b99c6fee4728ed4a49e01ccc4715273d06 assets\create\lang\en_us.json 846200eb548d3bfa2e77b41039de159b4b6cfb45 assets\create\models\block\acacia_window.json 1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets\create\models\block\acacia_window_pane_noside.json 1763ea2c9b981d187f5031ba608f3d5d3be3986a assets\create\models\block\acacia_window_pane_noside_alt.json @@ -1122,6 +1123,7 @@ bbf18e5d54128375139c712e93b35ec25f59f2d0 assets\create\models\item\mechanical_ha f8d0d4b2a890ea7a69ab0c390947b48fe0478d3f assets\create\models\item\mechanical_piston.json 726ae61699dc379a4f535c1be3ec2672a2f03583 assets\create\models\item\mechanical_plough.json 6c2acb80e53256fbb85f76851f335f9248ace6da assets\create\models\item\mechanical_press.json +4e363477e3e8059dd7b2bad04046521b31923d1b assets\create\models\item\mechanical_pump.json bca99d467ec8ead10124becb60ac24b39be83de4 assets\create\models\item\mechanical_saw.json 0eb5726c8c0de462f432411c210d6132b2c446a4 assets\create\models\item\millstone.json 1134bc8ecdfefe5d30ee4973c37aa9a349c368b4 assets\create\models\item\minecart_contraption.json @@ -1878,6 +1880,7 @@ b12efeeef5682966016ce6ea2d171eecd33d9667 data\create\loot_tables\blocks\mechanic 205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\mechanical_piston_head.json d9e217fcc668a04ee495968f8ccf9966271b6cea data\create\loot_tables\blocks\mechanical_plough.json 0e0742d066bda87ba5cc835a4028efb99e70b2f2 data\create\loot_tables\blocks\mechanical_press.json +e94a78187bcf7f235244b2c656732ba9a5821dd0 data\create\loot_tables\blocks\mechanical_pump.json 321daee16d6fad25ecc84da1b2830556d67e2a19 data\create\loot_tables\blocks\mechanical_saw.json efbd4689e7d6740b80357203d1e02196f0752efa data\create\loot_tables\blocks\millstone.json 205f5899101262f31f5c1a88bb7d954918d08d04 data\create\loot_tables\blocks\minecart_anchor.json diff --git a/src/generated/resources/assets/create/blockstates/mechanical_pump.json b/src/generated/resources/assets/create/blockstates/mechanical_pump.json new file mode 100644 index 000000000..3b8c68f80 --- /dev/null +++ b/src/generated/resources/assets/create/blockstates/mechanical_pump.json @@ -0,0 +1,30 @@ +{ + "variants": { + "facing=down": { + "model": "create:block/mechanical_pump/block", + "x": 180 + }, + "facing=up": { + "model": "create:block/mechanical_pump/block" + }, + "facing=north": { + "model": "create:block/mechanical_pump/block", + "x": 90 + }, + "facing=south": { + "model": "create:block/mechanical_pump/block", + "x": 90, + "y": 180 + }, + "facing=west": { + "model": "create:block/mechanical_pump/block", + "x": 90, + "y": 270 + }, + "facing=east": { + "model": "create:block/mechanical_pump/block", + "x": 90, + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/blockstates/radial_chassis.json b/src/generated/resources/assets/create/blockstates/radial_chassis.json index 410cb13c7..7a1df3438 100644 --- a/src/generated/resources/assets/create/blockstates/radial_chassis.json +++ b/src/generated/resources/assets/create/blockstates/radial_chassis.json @@ -29,8 +29,8 @@ }, { "when": { - "axis": "x", - "sticky_south": "true" + "sticky_south": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -39,8 +39,8 @@ }, { "when": { - "axis": "y", - "sticky_south": "true" + "sticky_south": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky" @@ -48,8 +48,8 @@ }, { "when": { - "axis": "z", - "sticky_south": "true" + "sticky_south": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -59,8 +59,8 @@ }, { "when": { - "axis": "x", - "sticky_south": "false" + "sticky_south": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -69,8 +69,8 @@ }, { "when": { - "axis": "y", - "sticky_south": "false" + "sticky_south": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y" @@ -78,8 +78,8 @@ }, { "when": { - "axis": "z", - "sticky_south": "false" + "sticky_south": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_x", @@ -149,8 +149,8 @@ }, { "when": { - "axis": "x", - "sticky_north": "true" + "sticky_north": "true", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky" @@ -158,8 +158,8 @@ }, { "when": { - "axis": "y", - "sticky_north": "true" + "sticky_north": "true", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y_sticky", @@ -168,8 +168,8 @@ }, { "when": { - "axis": "z", - "sticky_north": "true" + "sticky_north": "true", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_x_sticky", @@ -178,8 +178,8 @@ }, { "when": { - "axis": "x", - "sticky_north": "false" + "sticky_north": "false", + "axis": "x" }, "apply": { "model": "create:block/radial_chassis_side_x" @@ -187,8 +187,8 @@ }, { "when": { - "axis": "y", - "sticky_north": "false" + "sticky_north": "false", + "axis": "y" }, "apply": { "model": "create:block/radial_chassis_side_y", @@ -197,8 +197,8 @@ }, { "when": { - "axis": "z", - "sticky_north": "false" + "sticky_north": "false", + "axis": "z" }, "apply": { "model": "create:block/radial_chassis_side_x", diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index 0d1321200..aee54819a 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -180,6 +180,7 @@ "block.create.mechanical_piston_head": "p\u0250\u01DDH uo\u0287s\u0131\u0500 \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW", "block.create.mechanical_plough": "\u0265bno\u05DF\u0500 \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW", "block.create.mechanical_press": "ss\u01DD\u0279\u0500 \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW", + "block.create.mechanical_pump": "d\u026Fn\u0500 \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW", "block.create.mechanical_saw": "\u028D\u0250S \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW", "block.create.millstone": "\u01DDuo\u0287s\u05DF\u05DF\u0131W", "block.create.minecart_anchor": "\u0279o\u0265\u0254u\u2C6F \u0287\u0279\u0250\u0254\u01DDu\u0131W", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 6e909424b..0b6ebae53 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -183,6 +183,7 @@ "block.create.mechanical_piston_head": "Mechanical Piston Head", "block.create.mechanical_plough": "Mechanical Plough", "block.create.mechanical_press": "Mechanical Press", + "block.create.mechanical_pump": "Mechanical Pump", "block.create.mechanical_saw": "Mechanical Saw", "block.create.millstone": "Millstone", "block.create.minecart_anchor": "Minecart Anchor", diff --git a/src/generated/resources/assets/create/models/item/mechanical_pump.json b/src/generated/resources/assets/create/models/item/mechanical_pump.json new file mode 100644 index 000000000..45f76ceb4 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/mechanical_pump.json @@ -0,0 +1,3 @@ +{ + "parent": "create:block/mechanical_pump/item" +} \ No newline at end of file diff --git a/src/generated/resources/data/create/loot_tables/blocks/mechanical_pump.json b/src/generated/resources/data/create/loot_tables/blocks/mechanical_pump.json new file mode 100644 index 000000000..f4bd79ce8 --- /dev/null +++ b/src/generated/resources/data/create/loot_tables/blocks/mechanical_pump.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "create:mechanical_pump" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllBlockPartials.java b/src/main/java/com/simibubi/create/AllBlockPartials.java index 982b89e88..2f8f62937 100644 --- a/src/main/java/com/simibubi/create/AllBlockPartials.java +++ b/src/main/java/com/simibubi/create/AllBlockPartials.java @@ -81,6 +81,9 @@ public enum AllBlockPartials { COPPER_PIPE_RIM_WEST("copper_pipe/rim/west"), COPPER_PIPE_RIM_NORTH("copper_pipe/rim/north"), COPPER_PIPE_RIM_SOUTH("copper_pipe/rim/south"), + + MECHANICAL_PUMP_ARROW("mechanical_pump/arrow"), + MECHANICAL_PUMP_COG("mechanical_pump/cog"), ; diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index c80e24f93..9f9bba636 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -51,6 +51,7 @@ import com.simibubi.create.content.contraptions.components.turntable.TurntableBl import com.simibubi.create.content.contraptions.components.waterwheel.WaterWheelBlock; import com.simibubi.create.content.contraptions.fluids.PipeBlock; import com.simibubi.create.content.contraptions.fluids.PipeModel; +import com.simibubi.create.content.contraptions.fluids.PumpBlock; import com.simibubi.create.content.contraptions.processing.BasinBlock; import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerBlock; import com.simibubi.create.content.contraptions.relays.advanced.sequencer.SequencedGearshiftBlock; @@ -398,6 +399,15 @@ public class AllBlocks { .transform(customItemModel()) .register(); + public static final BlockEntry MECHANICAL_PUMP = + REGISTRATE.block("mechanical_pump", PumpBlock::new) + .initialProperties(SharedProperties::softMetal) + .blockstate(BlockStateGen.directionalBlockProvider(true)) + .transform(StressConfigDefaults.setImpact(4.0)) + .item() + .transform(customItemModel()) + .register(); + // Contraptions public static final BlockEntry MECHANICAL_PISTON = diff --git a/src/main/java/com/simibubi/create/AllShapes.java b/src/main/java/com/simibubi/create/AllShapes.java index 20597aad8..8368ec5a3 100644 --- a/src/main/java/com/simibubi/create/AllShapes.java +++ b/src/main/java/com/simibubi/create/AllShapes.java @@ -64,7 +64,10 @@ public class AllShapes { .forHorizontalAxis(), NIXIE_TUBE_CEILING = shape(0, 12, 0, 16, 16, 16).add(9, 1, 5, 15, 16, 11) .add(1, 1, 5, 7, 16, 11) - .forHorizontalAxis() + .forHorizontalAxis(), + PUMP = shape(2, 0, 2, 14, 5, 14).add(4, 0, 4, 12, 16, 12) + .add(3, 12, 3, 13, 16, 13) + .forDirectional(Direction.UP) ; diff --git a/src/main/java/com/simibubi/create/AllTileEntities.java b/src/main/java/com/simibubi/create/AllTileEntities.java index bb608778d..e5781e042 100644 --- a/src/main/java/com/simibubi/create/AllTileEntities.java +++ b/src/main/java/com/simibubi/create/AllTileEntities.java @@ -45,6 +45,8 @@ import com.simibubi.create.content.contraptions.components.structureMovement.pul import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyTileEntity; import com.simibubi.create.content.contraptions.components.turntable.TurntableTileEntity; import com.simibubi.create.content.contraptions.components.waterwheel.WaterWheelTileEntity; +import com.simibubi.create.content.contraptions.fluids.PumpRenderer; +import com.simibubi.create.content.contraptions.fluids.PumpTileEntity; import com.simibubi.create.content.contraptions.processing.BasinRenderer; import com.simibubi.create.content.contraptions.processing.BasinTileEntity; import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerRenderer; @@ -136,6 +138,9 @@ public class AllTileEntities { public static final TileEntityEntry CUCKOO_CLOCK = register("cuckoo_clock", CuckooClockTileEntity::new, AllBlocks.CUCKOO_CLOCK, AllBlocks.MYSTERIOUS_CUCKOO_CLOCK); + public static final TileEntityEntry MECHANICAL_PUMP = + register("mechanical_pump", PumpTileEntity::new, AllBlocks.MECHANICAL_PUMP); + public static final TileEntityEntry BELT = register("belt", BeltTileEntity::new, AllBlocks.BELT); public static final TileEntityEntry BELT_TUNNEL = register("belt_tunnel", BeltTunnelTileEntity::new, AllBlocks.BELT_TUNNEL); @@ -250,6 +255,8 @@ public class AllTileEntities { bind(HAND_CRANK, HandCrankRenderer::new); bind(CUCKOO_CLOCK, CuckooClockRenderer::new); bind(ANALOG_LEVER, AnalogLeverRenderer::new); + + bind(MECHANICAL_PUMP, PumpRenderer::new); bind(MECHANICAL_PISTON, MechanicalPistonRenderer::new); bind(MECHANICAL_BEARING, BearingRenderer::new); diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index 5377d0594..d049b61c4 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -38,7 +38,7 @@ public class Create { public static final String ID = "create"; public static final String NAME = "Create"; - public static final String VERSION = "0.2.4d"; + public static final String VERSION = "0.3"; public static Logger logger = LogManager.getLogger(); public static ItemGroup baseCreativeTab = new CreateItemGroup(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java b/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java index 05bcb9068..24d713f28 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java @@ -84,8 +84,6 @@ public abstract class KineticBlock extends Block implements IRotate { kte.updateSpeed = true; } - protected abstract boolean hasStaticPart(); - @Override public void onBlockPlacedBy(World worldIn, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) { if (worldIn.isRemote) diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java index f7422b3da..219387d3f 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java @@ -83,11 +83,6 @@ public class DrillBlock extends DirectionalKineticBlock implements IPortableBloc return PushReaction.NORMAL; } - @Override - protected boolean hasStaticPart() { - return true; - } - @Override public MovementBehaviour getMovementBehaviour() { return MOVEMENT; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlock.java index f0455e019..960b20d2a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlock.java @@ -61,11 +61,6 @@ public class CuckooClockBlock extends HorizontalKineticBlock { return this.getDefaultState().with(HORIZONTAL_FACING, context.getPlacementHorizontalFacing().getOpposite()); } - @Override - protected boolean hasStaticPart() { - return true; - } - @Override public boolean hasShaftTowards(IWorldReader world, BlockPos pos, BlockState state, Direction face) { return face == state.get(HORIZONTAL_FACING).getOpposite(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java index a8600a1e8..e19d27f0b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java @@ -57,11 +57,6 @@ public class MechanicalCrafterBlock extends HorizontalKineticBlock implements IT return AllTileEntities.MECHANICAL_CRAFTER.create(); } - @Override - protected boolean hasStaticPart() { - return true; - } - @Override public boolean hasIntegratedCogwheel(IWorldReader world, BlockPos pos, BlockState state) { return true; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java index 54f66dc3c..d375ccca9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java @@ -87,11 +87,6 @@ public class HandCrankBlock extends DirectionalKineticBlock implements ITE getTileEntityClass() { return TurntableTileEntity.class; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java index 5e89056f3..83d2f16c7 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java @@ -34,11 +34,6 @@ public class WaterWheelBlock extends HorizontalKineticBlock implements ITE typeIn) { + super(typeIn); + arrowDirection = new InterpolatedChasingValue(); + arrowDirection.start(1); + } + + @Override + public void tick() { + super.tick(); + if (world.isRemote) { + float speed = getSpeed(); + if (speed != 0) + arrowDirection.target(Math.signum(speed)); + arrowDirection.tick(); + } + } + +} diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java index a62ee04a3..9d0540394 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/SpeedControllerBlock.java @@ -25,11 +25,6 @@ public class SpeedControllerBlock extends HorizontalAxisKineticBlock { return AllTileEntities.ROTATION_SPEED_CONTROLLER.create(); } - @Override - protected boolean hasStaticPart() { - return true; - } - @Override public BlockState getStateForPlacement(BlockItemUseContext context) { BlockState above = context.getWorld().getBlockState(context.getPos().up()); diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java index e41581447..82cee9d3c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java @@ -137,11 +137,6 @@ public class SequencedGearshiftBlock extends HorizontalAxisKineticBlock implemen return super.getRotationAxis(state); } - @Override - protected boolean hasStaticPart() { - return true; - } - @Override public Class getTileEntityClass() { return SequencedGearshiftTileEntity.class; diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java index 62ad662e1..a85c22e84 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java @@ -588,11 +588,6 @@ public class BeltBlock extends HorizontalKineticBlock implements ITEc&8uov{W$@;T4pJim&~HpJ;e!tUv;&v_A~(+T2=z` zThtnXnE=+Hp*6I$p`>P)^4|cpbe;m{r;=JyziY@Z<#RdN@cGwU^Zb^_<_)_EFn@2z zy}XydCmUc``=$6-8D4wyhRp<6GcuWMRz5Xjtl6!>*D&A=j5T@m1W-oTLn)7*?Y)1o z_vOvAN6JVUr9eT~tKCMaQCd?9TOAe$a_Y`jK`$uF2~gYu@eg&)Z|;AD?rWQW{{HyE z{nXzOGClTD{Nb&q{)W(R^xqHsTd|SJr+;i_T1FZR_aBE*wAcmmrZLOR!{|k z=_P%#k>)c1T;C!7{*ezIbJcT^1N{p*jg{szyxO89q5&N;@LITtut&#NtmUNn%rv1E zaUtR`4r@W(K}CEL$p)O}Gjj*R^N=5p#TAc82N3q@R0PCM^H~{Kd?|(pO@BHG`6;nc z#f|tGf$K|d`-7180etVB5Yz|M?olydhu6<+AJNH~?>P<}9E)JTiJJQXr>}_PZdeYs zH(bYWj$?Y%wk$%3ZCMC>D)`XzdrzPR1P;NYA{_eLM7}kO$Of{>>3Jyn&9{^>77%vu zZgLefC_DW=zv5Ij?2w3G@_+HXh4!jPKe*%wLk%1Nppk-E}W>=$USfi1oN3rf$0+YZ21_YX@!AY}90~Y~* zzyJUazyWI3i3tDz0=Y>0dwRHN4<#ew)UZ2^?$ik>1-r_8hI?ANH*<}2UC*!4XUgJttTJGWAR7v*mQC| zw66Wsl*yHqpq*4?HWrsN)2W?vd^>>ml$D@LDk=x$JDsX{`t5+xQC5O-$>?nSW+0in zR0H~NWhFNo;fW`#=P+d@HydJ~X5uq)19XcowD)=V;wURYi`htjBpQ`h zjbsnLOQ*^Q^{3wi;0De1`9n|bz?(W z3DPz|e51Cm@*U7zYVF;dm(S)@z5~)7_Dj5VmQ}t3dQHFoJ>%HOg7%fHX7Uf=OpTI&dbG>H zsbLLahxSISW+^|`btnd0h|mxHqF1tzhED>y0V_Y&x4^&j`B6`dct9F}uuBKRBc}4> zJg{&my8Bhy_xU+7QNa%Q1%b&S%WlW#Z2;Ff6N0*c>Mbfd>|k=u`XTLqU$~BC!Tyo( znpIS7dYtYN%U(4sY_8gtTkVDPux=QH5YsRaxK!}2La#eMCtfYHOxl!lj}c@;MwaIuwg4RL z+O4Kb8YS#NK^~GZVxW0~bv<9M+XV}2xKOWx36^Hh8wHCHTrmCv$6vl0{*_zE00000 LNkvXXu0mjfu3mgn diff --git a/src/main/resources/assets/create/textures/block/copper_pipe_ld.png b/src/main/resources/assets/create/textures/block/copper_pipe_ld.png deleted file mode 100644 index 748d235432de19a6bb4884941fa06fba86ef92fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1SGw4HSYi^#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;8sr;#}J8d-ab#ECIbNmDr5_GmU7l(2Jc`@oSk-&x`t$zB hA|fWO(zp1>X!kYf&BgHSc%TOuJYD@<);T3K0RUO7axMS> diff --git a/src/main/resources/assets/create/textures/block/copper_pipe_lr.png b/src/main/resources/assets/create/textures/block/copper_pipe_lr.png deleted file mode 100644 index 3b3b49910434dab86834030c095977bbffa81651..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1SGw4HSYi^#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;3iKO#}J8d+1``9hYUnq9>2dKC~-!~;-XY+ z!4fI01-xAkSeO_&qvssm{nM#x*5RHnZEwu8-%q~A$iSg!cx+LFjk?0J!xF}tH&YI^ zHeBo|VoOq6Ao1a-*Quo<#f_aybPVTBKAbl@IBV|XInvpI&-eDv|M%Xv({R~VwXMsh zFfFYyY=(MKcI%0sKi=HC`!|G5e8Jz6V@sBCa@c9M eiqCxemjC*XjElTs$Ibv<&*16m=d#Wzp$PzSRdD72 diff --git a/src/main/resources/assets/create/textures/block/copper_pipe_lu.png b/src/main/resources/assets/create/textures/block/copper_pipe_lu.png deleted file mode 100644 index 49d6fc7912119015139d085b424f79e26e09dce2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1SGw4HSYi^#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;AT%3#}J8d)!s_j^6WdN!`p zP`|$N+zdt+olCKs?ktxH%z6CLJp8({0-H{3R%B*!NnlveSqrP@3Hv%Z6?eo1E`9oz z)#2%CMz6$I+xq!e#63HoGoPtJT9%EGXK${3?nLi%m73a1bEa`_T#z93xqkDtvbE;d e{3>={i$Cm{`SQWC4>dsNGkCiCxvX!lvI6;>1s;*b3=DjSL74G){)!Z!;CfFN#}J8d)!x&5O$H*YFPG{DY-r7JT%70g zM`8NE$^Ty}FB4)^ymRf=k(*~D=O|A9{Bncfdp^mfm3+1DyP7UZJlLWANWvm{rb5p~ zrHBi24yXT+GWI+QF867)LT$I~J9Z|i}I{PZIavkpDK(RaY|Y)aZ%-)vE@M5UH5 bdw(mUUSUbUK5ltDnm{r-UW|v@3E; diff --git a/src/main/resources/assets/create/textures/block/copper_pipe_ru.png b/src/main/resources/assets/create/textures/block/copper_pipe_ru.png deleted file mode 100644 index e33c3570aa0a123267b5dbec59ee694c931a9e1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1SGw4HSYi^#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;9gG`#}J8d-gCZwhYbWA9&UU*bAp=T!Yxa^ zRaEj0R9di!zpjl?h?>>#DcHO-+q!vr{zp%L8M}L$>Qj@xg`6#YK4<=}lQR@*Bi?*H zc7~x~`|7YrwU!G~OAYN>1gaCaon0W;T{D-PA#z$*$GP~e5@~m)thkc(KVa{>#T=Wr zR;}J|@Bi<+P-RJn#@z3pS(2@nxxC#eUmvBp)biiSYG2ohCTF+4&GEW%-8ufdj74R2 oU1T!lvI6;>1s;*b3=DjSL74G){)!Z!;9O4^#}J8d)jm(5CIbQ2%X1l-f);U~K3vJo z|7>rHVo<_~H{1X0e)qj`se1Al-pj7`upXZUe4$CWRbkW48e($jF$eX%F_&O zP-@Xw%FrS)b7yYledERdj#uaRG^#9RNsD+rtM}p_HhCt8bCPn>Yug=L1+M;VD3o#D zFmtP#%$9AvFQ=zQc?4WGxE=Q}_IcTh)UxBJFZRt1`og+1G&1#NMvWKHp$wj`elF{r G5}E*puVu#o diff --git a/src/main/resources/assets/create/textures/block/pump.png b/src/main/resources/assets/create/textures/block/pump.png new file mode 100644 index 0000000000000000000000000000000000000000..602d2a9423ed3a27732e13cc42948808f387b57b GIT binary patch literal 676 zcmV;V0$crwP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TAPPDpBwD1Dh>jjQN(vM~4OAeG zxIn@t7#tJZ>%{ij-kX_;;~*}{uh>8O|Gk+v|IbSIS1*O0N07~EAh4lj3{Xlj?hc?N z<05u;eQ@;p4sJhrD)IHoaw**Y(F9Qy8Rssag69VKZiZ;o2l!gsL2b*KMmZ8eshr0l zBPKTDI6R*gQF?goO2`Q4dD0ATZJ|sy(VlIZtmmSPAvCVSN8rx{KO(EtE zXeL2XZP+-TH}K+R1?%tLh~hpjo;ZyQXUq8bxr1U(#>Vr?q_PLf@2PiPSXS_dm}C9@ zTP&9rp{qpnPJ zm_#lg$I+BDjr`=-ud3i&N+ltd91kJujl@5*;PH*sFrC)mT4UxgVE@mIuvmXa>}s~{ zi1o}4euwm6?QXdFtpT&Ui&S!MlHLQ){fhm1;aCp0?%ZQf7x)Q_UJ2+W_^Uwx0000< KMNUMnLSTZZrzaW! literal 0 HcmV?d00001