From e701569feea593ec67c5a8409bd27606e2cfe37b Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Fri, 30 Oct 2020 19:28:33 +0100 Subject: [PATCH] Automatic Acrobatics - Added the item drain - Refactored pulley renderers - Fixed belt funnel not dropping filters - Fixed funnel filter slot positioning on upward facing funnels - Sails can now be sheared - Fixed the kinetic connectivity of the rotation speed controller - Valve handles can now by dyed in world - Seats can now be dyed in world - Fixed Stockpile Switch emitting redstone power towards its detection target - Organized Imports - Fixed server launch issues --- src/generated/resources/.cache/cache | 4 +- .../crafting/kinetics/item_drain.json | 32 +++ .../crafting/kinetics/encased_fan.json | 9 +- .../recipes/crafting/kinetics/item_drain.json | 18 ++ .../java/com/simibubi/create/AllBlocks.java | 71 ++--- .../com/simibubi/create/AllTileEntities.java | 8 + .../jei/FilterGhostIngredientHandler.java | 13 +- .../contraptions/RotationPropagator.java | 25 +- .../components/actors/SeatBlock.java | 21 +- .../components/crank/ValveHandleBlock.java | 39 ++- .../contraptions/components/saw/SawBlock.java | 3 - .../components/saw/SawRenderer.java | 5 +- .../structureMovement/Contraption.java | 1 - .../structureMovement/bearing/SailBlock.java | 23 +- .../pulley/AbstractPulleyRenderer.java | 109 ++++++++ .../pulley/PulleyRenderer.java | 93 ++----- .../contraptions/fluids/OpenEndedPipe.java | 1 - .../fluids/actors/HosePulleyRenderer.java | 84 +++--- .../fluids/actors/ItemDrainBlock.java | 79 +++++- .../fluids/actors/ItemDrainItemHandler.java | 70 +++++ .../fluids/actors/ItemDrainRenderer.java | 182 +++++++++++++ .../fluids/actors/ItemDrainTileEntity.java | 257 ++++++++++++++++++ .../fluids/actors/SpoutTileEntity.java | 4 +- .../fluids/tank/FluidTankModel.java | 11 +- .../curiosities/ChromaticCompoundItem.java | 13 +- .../logistics/block/depot/DepotBlock.java | 4 +- .../logistics/block/depot/DepotRenderer.java | 2 +- .../block/funnel/BeltFunnelBlock.java | 15 +- .../funnel/FunnelFilterSlotPositioning.java | 4 +- .../mechanicalArm/ArmInteractionPoint.java | 2 +- .../block/mechanicalArm/ArmTileEntity.java | 10 +- .../block/redstone/StockpileSwitchBlock.java | 2 + .../item/filter/FilterScreenPacket.java | 5 +- .../logistics/item/filter/ItemAttribute.java | 16 +- .../filter/attribute/BookAuthorAttribute.java | 12 +- .../filter/attribute/BookCopyAttribute.java | 12 +- .../filter/attribute/EnchantAttribute.java | 10 +- .../attribute/FluidContentsAttribute.java | 12 +- .../filter/attribute/ItemNameAttribute.java | 16 +- .../AstralSorceryAmuletAttribute.java | 7 +- .../AstralSorceryAttunementAttribute.java | 7 +- .../AstralSorceryCrystalAttribute.java | 7 +- .../AstralSorceryPerkGemAttribute.java | 7 +- .../data/recipe/StandardRecipeGen.java | 14 +- .../fluid/SmartFluidTankBehaviour.java | 2 +- .../models/block/rope_pulley/rope_coil.json | 19 +- 46 files changed, 1072 insertions(+), 288 deletions(-) create mode 100644 src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/item_drain.json create mode 100644 src/generated/resources/data/create/recipes/crafting/kinetics/item_drain.json create mode 100644 src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyRenderer.java create mode 100644 src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainItemHandler.java create mode 100644 src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainRenderer.java create mode 100644 src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainTileEntity.java diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index c1a39e1d7..6035cda1c 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1597,6 +1597,7 @@ c023b9221d7983487d21e5ecc7d92246cfc7e791 data/create/advancements/recipes/create 9af3d92d11c3f520df3e22f3069042bf34585010 data/create/advancements/recipes/create.base/crafting/kinetics/green_valve_handle_from_other_valve_handle.json dbb96a4db4ef8172af73a626bed9727278d804bd data/create/advancements/recipes/create.base/crafting/kinetics/hand_crank.json 21cd686e1f3a4004d8e9bd3d92675bd61fb2b4db data/create/advancements/recipes/create.base/crafting/kinetics/hose_pulley.json +58450edb1767e9d56256186acba954ca09481548 data/create/advancements/recipes/create.base/crafting/kinetics/item_drain.json a71b626b6ee58a4eabee56f67c48f041a1323506 data/create/advancements/recipes/create.base/crafting/kinetics/large_cogwheel.json eb007bb079bbe6b6aaad2ca90f5af84261e3f8ea data/create/advancements/recipes/create.base/crafting/kinetics/light_blue_seat.json 571da50fbf5f2fcd3363b3dab91e7233e0ebffa0 data/create/advancements/recipes/create.base/crafting/kinetics/light_blue_seat_from_other_seat.json @@ -2584,7 +2585,7 @@ ad1c3ce1e98b8483512bdd754f2e5930c7b3ae85 data/create/recipes/crafting/kinetics/d be86df1c4d7af14bc5dcfe044d07c03b6c6d2a75 data/create/recipes/crafting/kinetics/depot.json 9c5d30f25a130d591b924c50e5c83e3b787c2758 data/create/recipes/crafting/kinetics/empty_blaze_burner.json 860f9c4aa677d2354bcf5fe3e6d28cc7cf56dd06 data/create/recipes/crafting/kinetics/encased_belt.json -e416a453316cc6a2f68795b0ab9c91a842d72510 data/create/recipes/crafting/kinetics/encased_fan.json +b07496e4ba5bc56a2c5a395b612c68ba21328867 data/create/recipes/crafting/kinetics/encased_fan.json 0dd0cc11eaa6789fc612af3231ed247893852178 data/create/recipes/crafting/kinetics/filter.json 30ae02825e54c0cc07be8f4decf9d432e7d61ba2 data/create/recipes/crafting/kinetics/fluid_pipe.json 86ad4d2820e8e2b01de8d977af7796119dfb7430 data/create/recipes/crafting/kinetics/fluid_tank.json @@ -2602,6 +2603,7 @@ b7fa20d10c0e0e7270b1c0d6f3881b8e25b39bea data/create/recipes/crafting/kinetics/g 63edaccace961a65aa7bd406d36894c7ca4816b8 data/create/recipes/crafting/kinetics/green_valve_handle_from_other_valve_handle.json 9f08bdaeec88e04a43c2dc103869f9648deee079 data/create/recipes/crafting/kinetics/hand_crank.json d10639b0c3999481531fe0a9383a1bb4af60225e data/create/recipes/crafting/kinetics/hose_pulley.json +f4fbb11ef55f3431bd387f3f6f258513bfbc8011 data/create/recipes/crafting/kinetics/item_drain.json 237541c1c318b8426734c1c43be31fbd01413d39 data/create/recipes/crafting/kinetics/large_cogwheel.json a33e3301fc6d3a446e61a1c4b8a93aff079baeba data/create/recipes/crafting/kinetics/light_blue_seat.json 958bb5d3aeb8d8e5dbf5d97cf5fd9ff5151575dc data/create/recipes/crafting/kinetics/light_blue_seat_from_other_seat.json diff --git a/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/item_drain.json b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/item_drain.json new file mode 100644 index 000000000..7f33fb16a --- /dev/null +++ b/src/generated/resources/data/create/advancements/recipes/create.base/crafting/kinetics/item_drain.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "create:crafting/kinetics/item_drain" + ] + }, + "criteria": { + "has_item": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "create:copper_casing" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "create:crafting/kinetics/item_drain" + } + } + }, + "requirements": [ + [ + "has_item", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/encased_fan.json b/src/generated/resources/data/create/recipes/crafting/kinetics/encased_fan.json index 467bb81a7..677c6d765 100644 --- a/src/generated/resources/data/create/recipes/crafting/kinetics/encased_fan.json +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/encased_fan.json @@ -3,20 +3,17 @@ "pattern": [ " S ", "RAR", - "BPB" + " P " ], "key": { "S": { "item": "create:shaft" }, "A": { - "item": "create:andesite_alloy" + "item": "create:andesite_casing" }, "R": { - "tag": "minecraft:planks" - }, - "B": { - "item": "minecraft:iron_bars" + "item": "create:cogwheel" }, "P": { "item": "create:propeller" diff --git a/src/generated/resources/data/create/recipes/crafting/kinetics/item_drain.json b/src/generated/resources/data/create/recipes/crafting/kinetics/item_drain.json new file mode 100644 index 000000000..f46acc293 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crafting/kinetics/item_drain.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "P", + "S" + ], + "key": { + "P": { + "item": "minecraft:iron_bars" + }, + "S": { + "item": "create:copper_casing" + } + }, + "result": { + "item": "create:item_drain" + } +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index b7f73ff3f..4ac25c014 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -554,8 +554,7 @@ public class AllBlocks { .initialProperties(SharedProperties::softMetal) .properties(Block.Properties::nonOpaque) .blockstate(new FluidTankGenerator()::generate) - .onRegister(CreateRegistrate - .blockModel(() -> m -> new FluidTankModel(m, AllSpriteShifts.FLUID_TANK, AllSpriteShifts.COPPER_CASING))) + .onRegister(CreateRegistrate.blockModel(() -> FluidTankModel::standard)) .addLayer(() -> RenderType::getCutoutMipped) .item(FluidTankItem::new) .model(AssetLookup.customItemModel("_", "block_single_window")) @@ -567,8 +566,7 @@ public class AllBlocks { .initialProperties(SharedProperties::softMetal) .properties(Block.Properties::nonOpaque) .blockstate(new FluidTankGenerator("creative_")::generate) - .onRegister(CreateRegistrate.blockModel( - () -> m -> new FluidTankModel(m, AllSpriteShifts.CREATIVE_FLUID_TANK, AllSpriteShifts.CREATIVE_CASING))) + .onRegister(CreateRegistrate.blockModel(() -> FluidTankModel::creative)) .addLayer(() -> RenderType::getCutoutMipped) .item(FluidTankItem::new) .model((c, p) -> p.withExistingParent(c.getName(), p.modLoc("block/fluid_tank/block_single_window")) @@ -786,42 +784,45 @@ public class AllBlocks { .simpleItem() .register(); + public static final BlockEntry[] SEATS = new BlockEntry[DyeColor.values().length]; + static { // SEATS for (DyeColor colour : DyeColor.values()) { String colourName = colour.getName(); SeatMovementBehaviour movementBehaviour = new SeatMovementBehaviour(); - REGISTRATE.block(colourName + "_seat", p -> new SeatBlock(p, colour == DyeColor.RED)) - .initialProperties(SharedProperties::wooden) - .onRegister(addMovementBehaviour(movementBehaviour)) - .blockstate((c, p) -> { - p.simpleBlock(c.get(), p.models() - .withExistingParent(colourName + "_seat", p.modLoc("block/seat")) - .texture("1", p.modLoc("block/seat/top_" + colourName)) - .texture("2", p.modLoc("block/seat/side_" + colourName))); - }) - .recipe((c, p) -> { - ShapedRecipeBuilder.shapedRecipe(c.get()) - .patternLine("#") - .patternLine("-") - .key('#', DyeHelper.getWoolOfDye(colour)) - .key('-', ItemTags.WOODEN_SLABS) - .addCriterion("has_wool", p.hasItem(ItemTags.WOOL)) - .build(p, Create.asResource("crafting/kinetics/" + c.getName())); - ShapedRecipeBuilder.shapedRecipe(c.get()) - .patternLine("#") - .patternLine("-") - .key('#', DyeHelper.getTagOfDye(colour)) - .key('-', AllItemTags.SEATS.tag) - .addCriterion("has_seat", p.hasItem(AllItemTags.SEATS.tag)) - .build(p, Create.asResource("crafting/kinetics/" + c.getName() + "_from_other_seat")); - }) - .onRegisterAfter(Item.class, v -> TooltipHelper.referTo(v, "block.create.seat")) - .tag(AllBlockTags.SEATS.tag) - .item() - .tag(AllItemTags.SEATS.tag) - .build() - .register(); + SEATS[colour.ordinal()] = + REGISTRATE.block(colourName + "_seat", p -> new SeatBlock(p, colour == DyeColor.RED)) + .initialProperties(SharedProperties::wooden) + .onRegister(addMovementBehaviour(movementBehaviour)) + .blockstate((c, p) -> { + p.simpleBlock(c.get(), p.models() + .withExistingParent(colourName + "_seat", p.modLoc("block/seat")) + .texture("1", p.modLoc("block/seat/top_" + colourName)) + .texture("2", p.modLoc("block/seat/side_" + colourName))); + }) + .recipe((c, p) -> { + ShapedRecipeBuilder.shapedRecipe(c.get()) + .patternLine("#") + .patternLine("-") + .key('#', DyeHelper.getWoolOfDye(colour)) + .key('-', ItemTags.WOODEN_SLABS) + .addCriterion("has_wool", p.hasItem(ItemTags.WOOL)) + .build(p, Create.asResource("crafting/kinetics/" + c.getName())); + ShapedRecipeBuilder.shapedRecipe(c.get()) + .patternLine("#") + .patternLine("-") + .key('#', DyeHelper.getTagOfDye(colour)) + .key('-', AllItemTags.SEATS.tag) + .addCriterion("has_seat", p.hasItem(AllItemTags.SEATS.tag)) + .build(p, Create.asResource("crafting/kinetics/" + c.getName() + "_from_other_seat")); + }) + .onRegisterAfter(Item.class, v -> TooltipHelper.referTo(v, "block.create.seat")) + .tag(AllBlockTags.SEATS.tag) + .item() + .tag(AllItemTags.SEATS.tag) + .build() + .register(); } } diff --git a/src/main/java/com/simibubi/create/AllTileEntities.java b/src/main/java/com/simibubi/create/AllTileEntities.java index e9fe27c1f..8d24eb6bc 100644 --- a/src/main/java/com/simibubi/create/AllTileEntities.java +++ b/src/main/java/com/simibubi/create/AllTileEntities.java @@ -50,6 +50,8 @@ import com.simibubi.create.content.contraptions.fluids.PumpRenderer; import com.simibubi.create.content.contraptions.fluids.PumpTileEntity; import com.simibubi.create.content.contraptions.fluids.actors.HosePulleyRenderer; import com.simibubi.create.content.contraptions.fluids.actors.HosePulleyTileEntity; +import com.simibubi.create.content.contraptions.fluids.actors.ItemDrainRenderer; +import com.simibubi.create.content.contraptions.fluids.actors.ItemDrainTileEntity; import com.simibubi.create.content.contraptions.fluids.actors.SpoutRenderer; import com.simibubi.create.content.contraptions.fluids.actors.SpoutTileEntity; import com.simibubi.create.content.contraptions.fluids.pipes.FluidPipeTileEntity; @@ -257,6 +259,12 @@ public class AllTileEntities { .renderer(() -> SpoutRenderer::new) .register(); + public static final TileEntityEntry ITEM_DRAIN = Create.registrate() + .tileEntity("item_drain", ItemDrainTileEntity::new) + .validBlocks(AllBlocks.ITEM_DRAIN) + .renderer(() -> ItemDrainRenderer::new) + .register(); + public static final TileEntityEntry BELT = Create.registrate() .tileEntity("belt", BeltTileEntity::new) .validBlocks(AllBlocks.BELT) diff --git a/src/main/java/com/simibubi/create/compat/jei/FilterGhostIngredientHandler.java b/src/main/java/com/simibubi/create/compat/jei/FilterGhostIngredientHandler.java index 7ec3d405e..7b6d085b0 100644 --- a/src/main/java/com/simibubi/create/compat/jei/FilterGhostIngredientHandler.java +++ b/src/main/java/com/simibubi/create/compat/jei/FilterGhostIngredientHandler.java @@ -1,21 +1,24 @@ package com.simibubi.create.compat.jei; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.ParametersAreNonnullByDefault; + +import org.apache.logging.log4j.LogManager; + import com.simibubi.create.content.logistics.item.filter.AbstractFilterContainer; import com.simibubi.create.content.logistics.item.filter.AbstractFilterScreen; import com.simibubi.create.content.logistics.item.filter.AttributeFilterScreen; import com.simibubi.create.content.logistics.item.filter.FilterScreenPacket; import com.simibubi.create.foundation.networking.AllPackets; + import mcp.MethodsReturnNonnullByDefault; import mezz.jei.api.gui.handlers.IGhostIngredientHandler; import net.minecraft.client.renderer.Rectangle2d; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; -import org.apache.logging.log4j.LogManager; - -import javax.annotation.ParametersAreNonnullByDefault; -import java.util.ArrayList; -import java.util.List; @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault diff --git a/src/main/java/com/simibubi/create/content/contraptions/RotationPropagator.java b/src/main/java/com/simibubi/create/content/contraptions/RotationPropagator.java index 5eba3d335..4f444d6d9 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/RotationPropagator.java +++ b/src/main/java/com/simibubi/create/content/contraptions/RotationPropagator.java @@ -9,8 +9,10 @@ import java.util.List; import com.simibubi.create.AllBlocks; import com.simibubi.create.content.contraptions.base.IRotate; import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerBlock; import com.simibubi.create.content.contraptions.relays.advanced.SpeedControllerTileEntity; import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; +import com.simibubi.create.content.contraptions.relays.elementary.CogWheelBlock; import com.simibubi.create.content.contraptions.relays.encased.DirectionalShaftHalvesTileEntity; import com.simibubi.create.content.contraptions.relays.encased.EncasedBeltBlock; import com.simibubi.create.content.contraptions.relays.encased.SplitShaftTileEntity; @@ -123,13 +125,13 @@ public class RotationPropagator { private static float getConveyedSpeed(KineticTileEntity from, KineticTileEntity to) { final BlockState stateFrom = from.getBlockState(); final BlockState stateTo = to.getBlockState(); - final BlockPos diff = to.getPos() - .subtract(from.getPos()); // Rotation Speed Controller <-> Large Gear - if (isLargeCogToSpeedController(stateFrom, stateTo, diff)) + if (isLargeCogToSpeedController(stateFrom, stateTo, to.getPos() + .subtract(from.getPos()))) return SpeedControllerTileEntity.getConveyedSpeed(from, to, true); - if (isLargeCogToSpeedController(stateTo, stateFrom, diff)) + if (isLargeCogToSpeedController(stateTo, stateFrom, from.getPos() + .subtract(to.getPos()))) return SpeedControllerTileEntity.getConveyedSpeed(to, from, false); float rotationSpeedModifier = getRotationSpeedModifier(from, to); @@ -188,7 +190,12 @@ public class RotationPropagator { private static boolean isLargeCogToSpeedController(BlockState from, BlockState to, BlockPos diff) { if (!isLargeCog(from) || !AllBlocks.ROTATION_SPEED_CONTROLLER.has(to)) return false; - if (!diff.equals(BlockPos.ZERO.up()) && !diff.equals(BlockPos.ZERO.down())) + if (!diff.equals(BlockPos.ZERO.down())) + return false; + Axis axis = from.get(CogWheelBlock.AXIS); + if (axis.isVertical()) + return false; + if (to.get(SpeedControllerBlock.HORIZONTAL_AXIS) == axis) return false; return true; } @@ -395,12 +402,12 @@ public class RotationPropagator { public static boolean isConnected(KineticTileEntity from, KineticTileEntity to) { final BlockState stateFrom = from.getBlockState(); final BlockState stateTo = to.getBlockState(); - final BlockPos diff = to.getPos() - .subtract(from.getPos()); - if (isLargeCogToSpeedController(stateFrom, stateTo, diff)) + if (isLargeCogToSpeedController(stateFrom, stateTo, to.getPos() + .subtract(from.getPos()))) return true; - if (isLargeCogToSpeedController(stateTo, stateFrom, diff)) + if (isLargeCogToSpeedController(stateTo, stateFrom, from.getPos() + .subtract(to.getPos()))) return true; return getRotationSpeedModifier(from, to) != 0; } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatBlock.java index f0211af6b..f6ac7143b 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatBlock.java @@ -5,7 +5,9 @@ import java.util.List; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllShapes; +import com.simibubi.create.foundation.utility.DyeHelper; import mcp.MethodsReturnNonnullByDefault; import net.minecraft.block.Block; @@ -16,6 +18,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.MobEntity; import net.minecraft.entity.item.minecart.AbstractMinecartEntity; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.DyeColor; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.pathfinding.PathNodeType; @@ -85,11 +88,25 @@ public class SeatBlock extends Block { } @Override - public ActionResultType onUse(BlockState p_225533_1_, World world, BlockPos pos, PlayerEntity player, - Hand p_225533_5_, BlockRayTraceResult p_225533_6_) { + public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, + BlockRayTraceResult p_225533_6_) { if (player.isSneaking()) return ActionResultType.PASS; + ItemStack heldItem = player.getHeldItem(hand); + for (DyeColor color : DyeColor.values()) { + if (!heldItem.getItem() + .isIn(DyeHelper.getTagOfDye(color))) + continue; + if (world.isRemote) + return ActionResultType.SUCCESS; + + BlockState newState = AllBlocks.SEATS[color.ordinal()].getDefaultState(); + if (newState != state) + world.setBlockState(pos, newState); + return ActionResultType.SUCCESS; + } + List seats = world.getEntitiesWithinAABB(SeatEntity.class, new AxisAlignedBB(pos)); if (!seats.isEmpty()) { SeatEntity seatEntity = seats.get(0); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java index ee0d66d43..e622237db 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java @@ -3,10 +3,20 @@ package com.simibubi.create.content.contraptions.components.crank; import javax.annotation.ParametersAreNonnullByDefault; import com.simibubi.create.AllBlockPartials; +import com.simibubi.create.AllBlocks; +import com.simibubi.create.foundation.utility.DyeHelper; +import net.minecraft.block.BlockState; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.DyeColor; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Hand; import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -17,29 +27,50 @@ public class ValveHandleBlock extends HandCrankBlock { public static ValveHandleBlock copper(Properties properties) { return new ValveHandleBlock(properties, true); } - + public static ValveHandleBlock dyed(Properties properties) { return new ValveHandleBlock(properties, false); } - + private ValveHandleBlock(Properties properties, boolean inCreativeTab) { super(properties); this.inCreativeTab = inCreativeTab; } + @Override + public ActionResultType onUse(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn, + BlockRayTraceResult hit) { + ItemStack heldItem = player.getHeldItem(handIn); + for (DyeColor color : DyeColor.values()) { + if (!heldItem.getItem() + .isIn(DyeHelper.getTagOfDye(color))) + continue; + if (worldIn.isRemote) + return ActionResultType.SUCCESS; + + BlockState newState = AllBlocks.DYED_VALVE_HANDLES[color.ordinal()].getDefaultState() + .with(FACING, state.get(FACING)); + if (newState != state) + worldIn.setBlockState(pos, newState); + return ActionResultType.SUCCESS; + } + + return super.onUse(state, worldIn, pos, player, handIn, hit); + } + @Override public void fillItemGroup(ItemGroup group, NonNullList p_149666_2_) { if (group != ItemGroup.SEARCH && !inCreativeTab) return; super.fillItemGroup(group, p_149666_2_); } - + @Override @OnlyIn(Dist.CLIENT) public AllBlockPartials getRenderedHandle() { return null; } - + @Override public int getRotationSpeed() { return 16; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java index c7dade697..dfb3817bb 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java @@ -12,14 +12,11 @@ import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import mcp.MethodsReturnNonnullByDefault; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.material.PushReaction; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.BlockItemUseContext; -import net.minecraft.state.BooleanProperty; -import net.minecraft.state.StateContainer.Builder; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.Direction; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java index 5c6478a38..a161df9d8 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawRenderer.java @@ -10,7 +10,10 @@ import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext; import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringRenderer; import com.simibubi.create.foundation.tileEntity.renderer.SafeTileEntityRenderer; -import com.simibubi.create.foundation.utility.*; +import com.simibubi.create.foundation.utility.AngleHelper; +import com.simibubi.create.foundation.utility.MatrixStacker; +import com.simibubi.create.foundation.utility.SuperByteBuffer; +import com.simibubi.create.foundation.utility.VecHelper; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java index 4c1169d55..b21309879 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java @@ -25,7 +25,6 @@ import com.simibubi.create.AllMovementBehaviours; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.components.actors.SeatBlock; import com.simibubi.create.content.contraptions.components.actors.SeatEntity; -import com.simibubi.create.content.contraptions.components.saw.SawBlock; import com.simibubi.create.content.contraptions.components.structureMovement.chassis.AbstractChassisBlock; import com.simibubi.create.content.contraptions.components.structureMovement.chassis.ChassisTileEntity; import com.simibubi.create.content.contraptions.components.structureMovement.glue.SuperGlueEntity; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/SailBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/SailBlock.java index 2fb7a5ed1..03b2ca366 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/SailBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/SailBlock.java @@ -5,6 +5,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import javax.annotation.Nullable; + import com.simibubi.create.AllBlocks; import com.simibubi.create.AllShapes; import com.simibubi.create.foundation.block.ProperDirectionalBlock; @@ -20,6 +22,7 @@ import net.minecraft.item.BlockItem; import net.minecraft.item.BlockItemUseContext; import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; +import net.minecraft.item.ShearsItem; import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; import net.minecraft.util.Hand; @@ -80,6 +83,12 @@ public class SailBlock extends ProperDirectionalBlock { return ActionResultType.SUCCESS; } + if (heldItem.getItem() instanceof ShearsItem) { + if (!world.isRemote) + applyDye(state, world, pos, null); + return ActionResultType.SUCCESS; + } + if (frame) return ActionResultType.PASS; @@ -95,9 +104,10 @@ public class SailBlock extends ProperDirectionalBlock { return ActionResultType.PASS; } - protected void applyDye(BlockState state, World world, BlockPos pos, DyeColor color) { - BlockState newState = AllBlocks.DYED_SAILS[color.ordinal()].getDefaultState() - .with(FACING, state.get(FACING)); + protected void applyDye(BlockState state, World world, BlockPos pos, @Nullable DyeColor color) { + BlockState newState = + (color == null ? AllBlocks.SAIL_FRAME : AllBlocks.DYED_SAILS[color.ordinal()]).getDefaultState() + .with(FACING, state.get(FACING)); // Dye the block itself if (state != newState) { @@ -142,7 +152,7 @@ public class SailBlock extends ProperDirectionalBlock { continue; BlockState adjacentState = world.getBlockState(offset); Block block = adjacentState.getBlock(); - if (!(block instanceof SailBlock) || ((SailBlock) block).frame) + if (!(block instanceof SailBlock) || ((SailBlock) block).frame && color != null) continue; if (state != adjacentState) world.setBlockState(offset, newState); @@ -165,13 +175,14 @@ public class SailBlock extends ProperDirectionalBlock { return AllShapes.SAIL_FRAME_COLLISION.get(state.get(FACING)); return getShape(state, p_220071_2_, p_220071_3_, p_220071_4_); } - + @Override public ItemStack getPickBlock(BlockState state, RayTraceResult target, IBlockReader world, BlockPos pos, PlayerEntity player) { ItemStack pickBlock = super.getPickBlock(state, target, world, pos, player); if (pickBlock.isEmpty()) - return AllBlocks.SAIL.get().getPickBlock(state, target, world, pos, player); + return AllBlocks.SAIL.get() + .getPickBlock(state, target, world, pos, player); return pickBlock; } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyRenderer.java new file mode 100644 index 000000000..e93ecf899 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/AbstractPulleyRenderer.java @@ -0,0 +1,109 @@ +package com.simibubi.create.content.contraptions.components.structureMovement.pulley; + +import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.IVertexBuilder; +import com.simibubi.create.AllBlockPartials; +import com.simibubi.create.content.contraptions.base.IRotate; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; +import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; +import com.simibubi.create.foundation.utility.AngleHelper; +import com.simibubi.create.foundation.utility.SuperByteBuffer; + +import net.minecraft.block.BlockState; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.util.Direction; +import net.minecraft.util.Direction.Axis; +import net.minecraft.util.Direction.AxisDirection; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IWorld; +import net.minecraft.world.World; + +public abstract class AbstractPulleyRenderer extends KineticTileEntityRenderer { + + private AllBlockPartials halfRope; + private AllBlockPartials halfMagnet; + + public AbstractPulleyRenderer(TileEntityRendererDispatcher dispatcher, AllBlockPartials halfRope, + AllBlockPartials halfMagnet) { + super(dispatcher); + this.halfRope = halfRope; + this.halfMagnet = halfMagnet; + } + + @Override + public boolean isGlobalRenderer(KineticTileEntity p_188185_1_) { + return true; + } + + @Override + protected void renderSafe(KineticTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffer, + int light, int overlay) { + super.renderSafe(te, partialTicks, ms, buffer, light, overlay); + float offset = getOffset(te, partialTicks); + boolean running = isRunning(te); + + Axis rotationAxis = ((IRotate) te.getBlockState() + .getBlock()).getRotationAxis(te.getBlockState()); + kineticRotationTransform(getRotatedCoil(te), te, rotationAxis, AngleHelper.rad(offset * 180), light) + .renderInto(ms, buffer.getBuffer(RenderType.getSolid())); + + World world = te.getWorld(); + BlockState blockState = te.getBlockState(); + BlockPos pos = te.getPos(); + + SuperByteBuffer halfMagnet = this.halfMagnet.renderOn(blockState); + SuperByteBuffer halfRope = this.halfRope.renderOn(blockState); + SuperByteBuffer magnet = renderMagnet(te); + SuperByteBuffer rope = renderRope(te); + + IVertexBuilder vb = buffer.getBuffer(RenderType.getSolid()); + if (running || offset == 0) + renderAt(world, offset > .25f ? magnet : halfMagnet, offset, pos, ms, vb); + + float f = offset % 1; + if (offset > .75f && (f < .25f || f > .75f)) + renderAt(world, halfRope, f > .75f ? f - 1 : f, pos, ms, vb); + + if (!running) + return; + + for (int i = 0; i < offset - 1.25f; i++) + renderAt(world, rope, offset - i - 1, pos, ms, vb); + } + + private void renderAt(IWorld world, SuperByteBuffer partial, float offset, BlockPos pulleyPos, MatrixStack ms, + IVertexBuilder buffer) { + BlockPos actualPos = pulleyPos.down((int) offset); + int light = WorldRenderer.getLightmapCoordinates(world, world.getBlockState(actualPos), actualPos); + partial.translate(0, -offset, 0) + .light(light) + .renderInto(ms, buffer); + } + + protected abstract Axis getShaftAxis(KineticTileEntity te); + + protected abstract AllBlockPartials getCoil(); + + protected abstract SuperByteBuffer renderRope(KineticTileEntity te); + + protected abstract SuperByteBuffer renderMagnet(KineticTileEntity te); + + protected abstract float getOffset(KineticTileEntity te, float partialTicks); + + protected abstract boolean isRunning(KineticTileEntity te); + + @Override + protected BlockState getRenderedBlockState(KineticTileEntity te) { + return shaft(getShaftAxis(te)); + } + + protected SuperByteBuffer getRotatedCoil(KineticTileEntity te) { + BlockState blockState = te.getBlockState(); + return getCoil().renderOnDirectionalSouth(blockState, + Direction.getFacingFromAxis(AxisDirection.POSITIVE, getShaftAxis(te))); + } + +} diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyRenderer.java index 7fb9d23a4..01b88c2c3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyRenderer.java @@ -1,53 +1,45 @@ package com.simibubi.create.content.contraptions.components.structureMovement.pulley; -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateClient; import com.simibubi.create.content.contraptions.base.KineticTileEntity; -import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntity; import com.simibubi.create.foundation.utility.SuperByteBuffer; -import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.util.Direction; -import net.minecraft.util.Direction.AxisDirection; -import net.minecraft.util.math.BlockPos; +import net.minecraft.util.Direction.Axis; import net.minecraft.util.math.MathHelper; -import net.minecraft.world.IWorld; -import net.minecraft.world.World; -public class PulleyRenderer extends KineticTileEntityRenderer { +public class PulleyRenderer extends AbstractPulleyRenderer { public PulleyRenderer(TileEntityRendererDispatcher dispatcher) { - super(dispatcher); - } - - @Override - public boolean isGlobalRenderer(KineticTileEntity p_188185_1_) { - return true; + super(dispatcher, AllBlockPartials.ROPE_HALF, AllBlockPartials.ROPE_HALF_MAGNET); } @Override - protected void renderSafe(KineticTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffer, - int light, int overlay) { - super.renderSafe(te, partialTicks, ms, buffer, light, overlay); + protected Axis getShaftAxis(KineticTileEntity te) { + return te.getBlockState().get(PulleyBlock.HORIZONTAL_AXIS); + } + @Override + protected AllBlockPartials getCoil() { + return AllBlockPartials.ROPE_COIL; + } + + @Override + protected SuperByteBuffer renderRope(KineticTileEntity te) { + return CreateClient.bufferCache.renderBlock(AllBlocks.ROPE.getDefaultState()); + } + + @Override + protected SuperByteBuffer renderMagnet(KineticTileEntity te) { + return CreateClient.bufferCache.renderBlock(AllBlocks.PULLEY_MAGNET.getDefaultState()); + } + + @Override + protected float getOffset(KineticTileEntity te, float partialTicks) { PulleyTileEntity pulley = (PulleyTileEntity) te; - World world = te.getWorld(); - BlockState blockState = te.getBlockState(); - BlockPos pos = te.getPos(); - - SuperByteBuffer halfMagnet = AllBlockPartials.ROPE_HALF_MAGNET.renderOn(blockState); - SuperByteBuffer halfRope = AllBlockPartials.ROPE_HALF.renderOn(blockState); - SuperByteBuffer magnet = CreateClient.bufferCache.renderBlock(AllBlocks.PULLEY_MAGNET.getDefaultState()); - SuperByteBuffer rope = CreateClient.bufferCache.renderBlock(AllBlocks.ROPE.getDefaultState()); - boolean running = pulley.running; boolean moving = running && (pulley.movedContraption == null || !pulley.movedContraption.isStalled()); float offset = pulley.getInterpolatedOffset(moving ? partialTicks : 0.5f); @@ -56,45 +48,16 @@ public class PulleyRenderer extends KineticTileEntityRenderer { ContraptionEntity e = pulley.movedContraption; PulleyContraption c = (PulleyContraption) pulley.movedContraption.getContraption(); double entityPos = MathHelper.lerp(partialTicks, e.lastTickPosY, e.getY()); - offset = (float) -(entityPos - c.getAnchor().getY() - c.initialOffset); + offset = (float) -(entityPos - c.getAnchor() + .getY() - c.initialOffset); } - renderPulleyRope(ms, buffer, world, pos, halfMagnet, halfRope, magnet, rope, running, offset); - } - - public static void renderPulleyRope(MatrixStack ms, IRenderTypeBuffer buffer, World world, BlockPos pos, - SuperByteBuffer halfMagnet, SuperByteBuffer halfRope, SuperByteBuffer magnet, SuperByteBuffer rope, - boolean running, float offset) { - IVertexBuilder vb = buffer.getBuffer(RenderType.getSolid()); - if (running || offset == 0) - renderAt(world, offset > .25f ? magnet : halfMagnet, offset, pos, ms, vb); - - float f = offset % 1; - if (offset > .75f && (f < .25f || f > .75f)) - renderAt(world, halfRope, f > .75f ? f - 1 : f, pos, ms, vb); - - if (!running) - return; - - for (int i = 0; i < offset - 1.25f; i++) - renderAt(world, rope, offset - i - 1, pos, ms, vb); - } - - public static void renderAt(IWorld world, SuperByteBuffer partial, float offset, BlockPos pulleyPos, - MatrixStack ms, IVertexBuilder buffer) { - BlockPos actualPos = pulleyPos.down((int) offset); - int light = WorldRenderer.getLightmapCoordinates(world, world.getBlockState(actualPos), actualPos); - partial.translate(0, -offset, 0).light(light).renderInto(ms, buffer); + return offset; } @Override - protected SuperByteBuffer getRotatedModel(KineticTileEntity te) { - BlockState blockState = te.getBlockState(); - return AllBlockPartials.ROPE_COIL.renderOnDirectionalSouth(blockState, horizontalFacing(blockState)); - } - - public Direction horizontalFacing(BlockState blockState) { - return Direction.getFacingFromAxis(AxisDirection.POSITIVE, blockState.get(PulleyBlock.HORIZONTAL_AXIS)); + protected boolean isRunning(KineticTileEntity te) { + return ((PulleyTileEntity) te).running; } } diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java index bca6ec22e..71b01f6eb 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java @@ -51,7 +51,6 @@ public class OpenEndedPipe { .isReplaceable()) return; - // TODO different pipe end types if (pulling) { if (fluidState.isEmpty() || !fluidState.isSource()) return; diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyRenderer.java index 2fc5797bf..af76354d6 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyRenderer.java @@ -1,70 +1,50 @@ package com.simibubi.create.content.contraptions.fluids.actors; -import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.content.contraptions.base.IRotate; import com.simibubi.create.content.contraptions.base.KineticTileEntity; -import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer; -import com.simibubi.create.content.contraptions.components.structureMovement.pulley.PulleyRenderer; -import com.simibubi.create.foundation.utility.AngleHelper; +import com.simibubi.create.content.contraptions.components.structureMovement.pulley.AbstractPulleyRenderer; import com.simibubi.create.foundation.utility.SuperByteBuffer; -import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.Direction.Axis; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -public class HosePulleyRenderer extends KineticTileEntityRenderer { +public class HosePulleyRenderer extends AbstractPulleyRenderer { public HosePulleyRenderer(TileEntityRendererDispatcher dispatcher) { - super(dispatcher); + super(dispatcher, AllBlockPartials.HOSE_HALF, AllBlockPartials.HOSE_HALF_MAGNET); } @Override - public boolean isGlobalRenderer(KineticTileEntity p_188185_1_) { + protected Axis getShaftAxis(KineticTileEntity te) { + return te.getBlockState() + .get(HosePulleyBlock.HORIZONTAL_FACING) + .rotateY() + .getAxis(); + } + + @Override + protected AllBlockPartials getCoil() { + return AllBlockPartials.HOSE_COIL; + } + + @Override + protected SuperByteBuffer renderRope(KineticTileEntity te) { + return AllBlockPartials.HOSE.renderOn(te.getBlockState()); + } + + @Override + protected SuperByteBuffer renderMagnet(KineticTileEntity te) { + return AllBlockPartials.HOSE_MAGNET.renderOn(te.getBlockState()); + } + + @Override + protected float getOffset(KineticTileEntity te, float partialTicks) { + return ((HosePulleyTileEntity) te).getInterpolatedOffset(partialTicks); + } + + @Override + protected boolean isRunning(KineticTileEntity te) { return true; } - @Override - protected void renderSafe(KineticTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffer, - int light, int overlay) { - super.renderSafe(te, partialTicks, ms, buffer, light, overlay); - HosePulleyTileEntity pulley = (HosePulleyTileEntity) te; - float offset = pulley.getInterpolatedOffset(partialTicks); - - Axis rotationAxis = ((IRotate) te.getBlockState() - .getBlock()).getRotationAxis(te.getBlockState()); - kineticRotationTransform(getRotatedCoil(te), te, rotationAxis, AngleHelper.rad(offset * 180), light).renderInto(ms, - buffer.getBuffer(RenderType.getSolid())); - - World world = te.getWorld(); - BlockState blockState = te.getBlockState(); - BlockPos pos = te.getPos(); - - SuperByteBuffer halfMagnet = AllBlockPartials.HOSE_HALF_MAGNET.renderOn(blockState); - SuperByteBuffer halfRope = AllBlockPartials.HOSE_HALF.renderOn(blockState); - SuperByteBuffer magnet = AllBlockPartials.HOSE_MAGNET.renderOn(blockState); - SuperByteBuffer rope = AllBlockPartials.HOSE.renderOn(blockState); - - PulleyRenderer.renderPulleyRope(ms, buffer, world, pos, halfMagnet, halfRope, magnet, rope, true, offset); - } - - @Override - protected BlockState getRenderedBlockState(KineticTileEntity te) { - return shaft(te.getBlockState() - .get(HosePulleyBlock.HORIZONTAL_FACING) - .rotateY() - .getAxis()); - } - - protected SuperByteBuffer getRotatedCoil(KineticTileEntity te) { - BlockState blockState = te.getBlockState(); - return AllBlockPartials.HOSE_COIL.renderOnDirectionalSouth(blockState, - blockState.get(HosePulleyBlock.HORIZONTAL_FACING) - .rotateY()); - } - } diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainBlock.java index 9ea0ab495..16f2a9470 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainBlock.java @@ -1,24 +1,71 @@ package com.simibubi.create.content.contraptions.fluids.actors; import com.simibubi.create.AllShapes; +import com.simibubi.create.AllTileEntities; +import com.simibubi.create.content.contraptions.processing.EmptyingByBasin; +import com.simibubi.create.content.contraptions.wrench.IWrenchable; +import com.simibubi.create.foundation.block.ITE; +import com.simibubi.create.foundation.fluid.FluidHelper; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.item.ItemGroup; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; -import net.minecraft.util.NonNullList; +import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; +import net.minecraft.world.World; -public class ItemDrainBlock extends Block { +public class ItemDrainBlock extends Block implements IWrenchable, ITE { public ItemDrainBlock(Properties p_i48440_1_) { super(p_i48440_1_); } + @Override + public ActionResultType onUse(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn, + BlockRayTraceResult hit) { + ItemStack heldItem = player.getHeldItem(handIn); + + try { + ItemDrainTileEntity te = getTileEntity(worldIn, pos); + if (!heldItem.isEmpty()) { + te.internalTank.allowInsertion(); + ActionResultType tryExchange = tryExchange(worldIn, player, handIn, heldItem, te); + te.internalTank.forbidInsertion(); + if (tryExchange.isAccepted()) + return tryExchange; + } + + ItemStack heldItemStack = te.getHeldItemStack(); + if (!worldIn.isRemote && !heldItemStack.isEmpty()) { + player.inventory.placeItemBackInInventory(worldIn, heldItemStack); + te.heldItem = null; + te.notifyUpdate(); + } + return ActionResultType.SUCCESS; + } catch (TileEntityException e) { + } + + return ActionResultType.PASS; + } + + protected ActionResultType tryExchange(World worldIn, PlayerEntity player, Hand handIn, ItemStack heldItem, + ItemDrainTileEntity te) { + if (FluidHelper.tryEmptyItemIntoTE(worldIn, player, handIn, heldItem, te)) + return ActionResultType.SUCCESS; + if (EmptyingByBasin.canItemBeEmptied(worldIn, heldItem)) + return ActionResultType.SUCCESS; + return ActionResultType.PASS; + } + @Override public VoxelShape getShape(BlockState p_220053_1_, IBlockReader p_220053_2_, BlockPos p_220053_3_, ISelectionContext p_220053_4_) { @@ -26,6 +73,30 @@ public class ItemDrainBlock extends Block { } @Override - public void fillItemGroup(ItemGroup p_149666_1_, NonNullList p_149666_2_) {} + public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) { + if (!state.hasTileEntity() || state.getBlock() == newState.getBlock()) + return; + withTileEntityDo(worldIn, pos, te -> { + ItemStack heldItemStack = te.getHeldItemStack(); + if (!heldItemStack.isEmpty()) + InventoryHelper.spawnItemStack(worldIn, pos.getX(), pos.getY(), pos.getZ(), heldItemStack); + }); + worldIn.removeTileEntity(pos); + } + + @Override + public boolean hasTileEntity(BlockState state) { + return true; + } + + @Override + public TileEntity createTileEntity(BlockState state, IBlockReader world) { + return AllTileEntities.ITEM_DRAIN.create(); + } + + @Override + public Class getTileEntityClass() { + return ItemDrainTileEntity.class; + } } diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainItemHandler.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainItemHandler.java new file mode 100644 index 000000000..a0e98baa8 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainItemHandler.java @@ -0,0 +1,70 @@ +package com.simibubi.create.content.contraptions.fluids.actors; + +import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.Direction; +import net.minecraftforge.items.IItemHandler; + +public class ItemDrainItemHandler implements IItemHandler { + + private ItemDrainTileEntity te; + private Direction side; + + public ItemDrainItemHandler(ItemDrainTileEntity te, Direction side) { + this.te = te; + this.side = side; + } + + @Override + public int getSlots() { + return 1; + } + + @Override + public ItemStack getStackInSlot(int slot) { + return te.getHeldItemStack(); + } + + @Override + public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + if (!te.getHeldItemStack() + .isEmpty()) + return stack; + if (!simulate) { + TransportedItemStack heldItem = new TransportedItemStack(stack); + heldItem.prevBeltPosition = 0; + te.setHeldItem(heldItem, side.getOpposite()); + te.notifyUpdate(); + } + return ItemStack.EMPTY; + } + + @Override + public ItemStack extractItem(int slot, int amount, boolean simulate) { + TransportedItemStack held = te.heldItem; + if (held == null) + return ItemStack.EMPTY; + + ItemStack stack = held.stack.copy(); + ItemStack extracted = stack.split(amount); + if (!simulate) { + te.heldItem.stack = stack; + if (stack.isEmpty()) + te.heldItem = null; + te.notifyUpdate(); + } + return extracted; + } + + @Override + public int getSlotLimit(int slot) { + return 64; + } + + @Override + public boolean isItemValid(int slot, ItemStack stack) { + return true; + } + +} diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainRenderer.java new file mode 100644 index 000000000..8ee36ac2f --- /dev/null +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainRenderer.java @@ -0,0 +1,182 @@ +package com.simibubi.create.content.contraptions.fluids.actors; + +import java.util.Random; + +import com.mojang.blaze3d.matrix.MatrixStack; +import com.simibubi.create.content.contraptions.processing.EmptyingByBasin; +import com.simibubi.create.content.contraptions.relays.belt.BeltHelper; +import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack; +import com.simibubi.create.foundation.fluid.FluidRenderer; +import com.simibubi.create.foundation.tileEntity.behaviour.fluid.SmartFluidTankBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment; +import com.simibubi.create.foundation.tileEntity.renderer.SmartTileEntityRenderer; +import com.simibubi.create.foundation.utility.MatrixStacker; +import com.simibubi.create.foundation.utility.VecHelper; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Direction; +import net.minecraft.util.Direction.Axis; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; +import net.minecraftforge.fluids.FluidStack; + +public class ItemDrainRenderer extends SmartTileEntityRenderer { + + public ItemDrainRenderer(TileEntityRendererDispatcher dispatcher) { + super(dispatcher); + } + + @Override + protected void renderSafe(ItemDrainTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffer, + int light, int overlay) { + super.renderSafe(te, partialTicks, ms, buffer, light, overlay); + renderFluid(te, partialTicks, ms, buffer, light); + renderItem(te, partialTicks, ms, buffer, light, overlay); + } + + protected void renderItem(ItemDrainTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffer, + int light, int overlay) { + TransportedItemStack transported = te.heldItem; + if (transported == null) + return; + + MatrixStacker msr = MatrixStacker.of(ms); + Vec3d itemPosition = VecHelper.getCenterOf(te.getPos()); + + Direction insertedFrom = transported.insertedFrom; + if (!insertedFrom.getAxis() + .isHorizontal()) + return; + + ms.push(); + ms.translate(.5f, 15 / 16f, .5f); + msr.nudge(0); + float offset = MathHelper.lerp(partialTicks, transported.prevBeltPosition, transported.beltPosition); + float sideOffset = MathHelper.lerp(partialTicks, transported.prevSideOffset, transported.sideOffset); + + Vec3d offsetVec = new Vec3d(insertedFrom.getOpposite() + .getDirectionVec()).scale(.5f - offset); + ms.translate(offsetVec.x, offsetVec.y, offsetVec.z); + boolean alongX = insertedFrom.rotateY() + .getAxis() == Axis.X; + if (!alongX) + sideOffset *= -1; + ms.translate(alongX ? sideOffset : 0, 0, alongX ? 0 : sideOffset); + + ItemStack itemStack = transported.stack; + Random r = new Random(0); + ItemRenderer itemRenderer = Minecraft.getInstance() + .getItemRenderer(); + int count = (int) (MathHelper.log2((int) (itemStack.getCount()))) / 2; + boolean renderUpright = BeltHelper.isItemUpright(itemStack); + boolean blockItem = itemRenderer.getItemModelWithOverrides(itemStack, null, null) + .isGui3d(); + + if (renderUpright) + ms.translate(0, 3 / 32d, 0); + + int positive = insertedFrom.getAxisDirection() + .getOffset(); + float verticalAngle = positive * offset * 360; + if (insertedFrom.getAxis() != Axis.X) + msr.rotateX(verticalAngle); + if (insertedFrom.getAxis() != Axis.Z) + msr.rotateZ(-verticalAngle); + + if (renderUpright) { + Entity renderViewEntity = Minecraft.getInstance().renderViewEntity; + if (renderViewEntity != null) { + Vec3d positionVec = renderViewEntity.getPositionVec(); + Vec3d vectorForOffset = itemPosition.add(offsetVec); + Vec3d diff = vectorForOffset.subtract(positionVec); + + if (insertedFrom.getAxis() != Axis.X) + diff = VecHelper.rotate(diff, verticalAngle, Axis.X); + if (insertedFrom.getAxis() != Axis.Z) + diff = VecHelper.rotate(diff, -verticalAngle, Axis.Z); + + float yRot = (float) MathHelper.atan2(diff.z, -diff.x); + ms.multiply(Vector3f.POSITIVE_Y.getRadialQuaternion((float) (yRot - Math.PI / 2))); + } + ms.translate(0, 0, -1/16f); + } + + for (int i = 0; i <= count; i++) { + ms.push(); + if (blockItem) + ms.translate(r.nextFloat() * .0625f * i, 0, r.nextFloat() * .0625f * i); + ms.scale(.5f, .5f, .5f); + if (!blockItem && !renderUpright) + msr.rotateX(90); + itemRenderer.renderItem(itemStack, TransformType.FIXED, light, overlay, ms, buffer); + ms.pop(); + + if (!renderUpright) { + if (!blockItem) + msr.rotateY(10); + ms.translate(0, blockItem ? 1 / 64d : 1 / 16d, 0); + } else + ms.translate(0, 0, -1 / 16f); + } + + ms.pop(); + } + + protected void renderFluid(ItemDrainTileEntity te, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffer, + int light) { + SmartFluidTankBehaviour tank = te.internalTank; + if (tank == null) + return; + + TankSegment primaryTank = tank.getPrimaryTank(); + FluidStack fluidStack = primaryTank.getRenderedFluid(); + float level = primaryTank.getFluidLevel() + .getValue(partialTicks); + + if (!fluidStack.isEmpty() && level != 0) { + float yMin = 4f / 16f; + float min = 2f / 16f; + float max = min + (12 / 16f); + float yOffset = (8 / 16f) * level; + ms.push(); + ms.translate(0, yOffset, 0); + FluidRenderer.renderTiledFluidBB(fluidStack, min, yMin - yOffset, min, max, yMin, max, buffer, ms, light, + false); + ms.pop(); + } + + ItemStack heldItemStack = te.getHeldItemStack(); + if (heldItemStack.isEmpty()) + return; + FluidStack fluidStack2 = EmptyingByBasin.emptyItem(te.getWorld(), heldItemStack, true) + .getFirst(); + if (fluidStack2.isEmpty()) { + if (fluidStack.isEmpty()) + return; + fluidStack2 = fluidStack; + } + + int processingTicks = te.processingTicks; + float processingPT = te.processingTicks - partialTicks; + float processingProgress = 1 - (processingPT - 5) / 10; + processingProgress = MathHelper.clamp(processingProgress, 0, 1); + float radius = 0; + + if (processingTicks != -1) { + radius = (float) (Math.pow(((2 * processingProgress) - 1), 2) - 1); + AxisAlignedBB bb = new AxisAlignedBB(0.5, 1.0, 0.5, 0.5, 0.25, 0.5).grow(radius / 32f); + FluidRenderer.renderTiledFluidBB(fluidStack2, (float) bb.minX, (float) bb.minY, (float) bb.minZ, + (float) bb.maxX, (float) bb.maxY, (float) bb.maxZ, buffer, ms, light, true); + } + + } + +} diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainTileEntity.java new file mode 100644 index 000000000..341b36e25 --- /dev/null +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainTileEntity.java @@ -0,0 +1,257 @@ +package com.simibubi.create.content.contraptions.fluids.actors; + +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; + +import com.simibubi.create.content.contraptions.processing.EmptyingByBasin; +import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack; +import com.simibubi.create.foundation.tileEntity.SmartTileEntity; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.belt.DirectBeltInputBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.fluid.SmartFluidTankBehaviour; +import com.simibubi.create.foundation.utility.Iterate; +import com.simibubi.create.foundation.utility.Pair; +import com.simibubi.create.foundation.utility.VecHelper; + +import net.minecraft.block.Block; +import net.minecraft.entity.item.ItemEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundNBT; +import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Vec3d; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; + +public class ItemDrainTileEntity extends SmartTileEntity { + + public static final int FILLING_TIME = 20; + + SmartFluidTankBehaviour internalTank; + TransportedItemStack heldItem; + protected int processingTicks; + Map> itemHandlers; + + public ItemDrainTileEntity(TileEntityType tileEntityTypeIn) { + super(tileEntityTypeIn); + itemHandlers = new IdentityHashMap<>(); + for (Direction d : Iterate.horizontalDirections) { + ItemDrainItemHandler itemDrainItemHandler = new ItemDrainItemHandler(this, d); + itemHandlers.put(d, LazyOptional.of(() -> itemDrainItemHandler)); + } + } + + @Override + public void addBehaviours(List behaviours) { + behaviours.add(new DirectBeltInputBehaviour(this).setInsertionHandler(this::tryInsertingFromSide)); + behaviours.add(internalTank = SmartFluidTankBehaviour.single(this, 1500) + .allowExtraction() + .forbidInsertion()); + } + + private ItemStack tryInsertingFromSide(TransportedItemStack transportedStack, Direction side, boolean simulate) { + ItemStack inserted = transportedStack.stack; + ItemStack empty = ItemStack.EMPTY; + + if (!getHeldItemStack().isEmpty()) + return inserted; + if (simulate) + return empty; + + transportedStack = transportedStack.copy(); + transportedStack.beltPosition = side.getAxis() + .isVertical() ? .5f : 0; + transportedStack.prevSideOffset = transportedStack.sideOffset; + transportedStack.prevBeltPosition = transportedStack.beltPosition; + setHeldItem(transportedStack, side); + markDirty(); + sendData(); + + return empty; + } + + public ItemStack getHeldItemStack() { + return heldItem == null ? ItemStack.EMPTY : heldItem.stack; + } + + @Override + public void tick() { + super.tick(); + if (heldItem == null) { + processingTicks = 0; + return; + } + + if (processingTicks > 0) { + heldItem.prevBeltPosition = .5f; + boolean wasAtBeginning = processingTicks == FILLING_TIME; + if (!world.isRemote || processingTicks < FILLING_TIME) + processingTicks--; + if (!continueProcessing()) { + processingTicks = 0; + notifyUpdate(); + return; + } + if (wasAtBeginning != (processingTicks == FILLING_TIME)) + sendData(); + return; + } + + heldItem.prevBeltPosition = heldItem.beltPosition; + heldItem.prevSideOffset = heldItem.sideOffset; + + heldItem.beltPosition += itemMovementPerTick(); + if (heldItem.beltPosition > 1) { + heldItem.beltPosition = 1; + + if (world.isRemote) + return; + + Direction side = heldItem.insertedFrom; + BlockPos nextPosition = pos.offset(side); + DirectBeltInputBehaviour directBeltInputBehaviour = + TileEntityBehaviour.get(world, nextPosition, DirectBeltInputBehaviour.TYPE); + if (directBeltInputBehaviour == null) { + if (!Block.hasSolidSide(world.getBlockState(nextPosition), world, nextPosition, side.getOpposite())) { + ItemStack ejected = heldItem.stack; + Vec3d outPos = VecHelper.getCenterOf(pos) + .add(new Vec3d(side.getDirectionVec()).scale(.75)); + float movementSpeed = itemMovementPerTick(); + Vec3d outMotion = new Vec3d(side.getDirectionVec()).scale(movementSpeed) + .add(0, 1 / 8f, 0); + outPos.add(outMotion.normalize()); + ItemEntity entity = new ItemEntity(world, outPos.x, outPos.y + 6 / 16f, outPos.z, ejected); + entity.setMotion(outMotion); + entity.setDefaultPickupDelay(); + entity.velocityChanged = true; + world.addEntity(entity); + + heldItem = null; + notifyUpdate(); + } + return; + } + + if (!directBeltInputBehaviour.canInsertFromSide(side)) + return; + + ItemStack returned = directBeltInputBehaviour.handleInsertion(heldItem.copy(), side, false); + + if (returned.isEmpty()) { + heldItem = null; + notifyUpdate(); + return; + } + + if (returned.getCount() != heldItem.stack.getCount()) { + heldItem.stack = returned; + notifyUpdate(); + return; + } + + return; + } + + if (heldItem.prevBeltPosition < .5f && heldItem.beltPosition >= .5f) { + if (!EmptyingByBasin.canItemBeEmptied(world, heldItem.stack)) + return; + heldItem.beltPosition = .5f; + if (world.isRemote) + return; + processingTicks = FILLING_TIME; + sendData(); + } + + } + + protected boolean continueProcessing() { + if (world.isRemote) + return true; + if (processingTicks < 5) + return true; + if (!EmptyingByBasin.canItemBeEmptied(world, heldItem.stack)) + return false; + + Pair emptyItem = EmptyingByBasin.emptyItem(world, heldItem.stack, true); + FluidStack fluidFromItem = emptyItem.getFirst(); + + if (processingTicks > 5) { + internalTank.allowInsertion(); + if (internalTank.getPrimaryHandler() + .fill(fluidFromItem, FluidAction.SIMULATE) != fluidFromItem.getAmount()) { + internalTank.forbidInsertion(); + processingTicks = FILLING_TIME; + return true; + } + internalTank.forbidInsertion(); + return true; + } + + emptyItem = EmptyingByBasin.emptyItem(world, heldItem.stack.copy(), false); + + // Process finished + ItemStack out = emptyItem.getSecond(); + if (!out.isEmpty()) + heldItem.stack = out; + else + heldItem = null; + internalTank.allowInsertion(); + internalTank.getPrimaryHandler() + .fill(fluidFromItem, FluidAction.EXECUTE); + internalTank.forbidInsertion(); + notifyUpdate(); + return true; + } + + private float itemMovementPerTick() { + return 1 / 8f; + } + + @Override + public void remove() { + super.remove(); + for (LazyOptional lazyOptional : itemHandlers.values()) + lazyOptional.invalidate(); + } + + public void setHeldItem(TransportedItemStack heldItem, Direction insertedFrom) { + this.heldItem = heldItem; + this.heldItem.insertedFrom = insertedFrom; + } + + @Override + public void write(CompoundNBT compound, boolean clientPacket) { + compound.putInt("ProcessingTicks", processingTicks); + if (heldItem != null) + compound.put("HeldItem", heldItem.serializeNBT()); + super.write(compound, clientPacket); + } + + @Override + protected void read(CompoundNBT compound, boolean clientPacket) { + heldItem = null; + processingTicks = compound.getInt("ProcessingTicks"); + if (compound.contains("HeldItem")) + heldItem = TransportedItemStack.read(compound.getCompound("HeldItem")); + super.read(compound, clientPacket); + } + + @Override + public LazyOptional getCapability(Capability cap, Direction side) { + if (side != null && side.getAxis() + .isHorizontal() && isItemHandlerCap(cap)) + return itemHandlers.get(side) + .cast(); + + if (side != Direction.UP && isFluidHandlerCap(cap)) + return internalTank.getCapability() + .cast(); + + return super.getCapability(cap, side); + } + +} diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutTileEntity.java index 552858f1e..06ab3c4b8 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutTileEntity.java @@ -147,9 +147,9 @@ public class SpoutTileEntity extends SmartTileEntity { public void tick() { super.tick(); - if (processingTicks >= 0) - processingTicks--; if (processingTicks >= 8 && world.isRemote) + if (processingTicks >= 0) + processingTicks--; spawnProcessingParticles(tank.getPrimaryTank().getRenderedFluid()); } diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankModel.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankModel.java index 93fda0b22..0411e7edf 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankModel.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankModel.java @@ -6,6 +6,7 @@ import java.util.Collections; import java.util.List; import java.util.Random; +import com.simibubi.create.AllSpriteShifts; import com.simibubi.create.foundation.block.connected.CTModel; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; import com.simibubi.create.foundation.utility.Iterate; @@ -23,7 +24,15 @@ public class FluidTankModel extends CTModel { protected static ModelProperty CULL_PROPERTY = new ModelProperty<>(); - public FluidTankModel(IBakedModel originalModel, CTSpriteShiftEntry side, CTSpriteShiftEntry top) { + public static FluidTankModel standard(IBakedModel originalModel) { + return new FluidTankModel(originalModel, AllSpriteShifts.FLUID_TANK, AllSpriteShifts.COPPER_CASING); + } + + public static FluidTankModel creative(IBakedModel originalModel) { + return new FluidTankModel(originalModel, AllSpriteShifts.CREATIVE_FLUID_TANK, AllSpriteShifts.CREATIVE_CASING); + } + + private FluidTankModel(IBakedModel originalModel, CTSpriteShiftEntry side, CTSpriteShiftEntry top) { super(originalModel, new FluidTankCTBehaviour(side, top)); } diff --git a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java b/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java index afe7c9a87..5d85d663f 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java @@ -1,11 +1,15 @@ package com.simibubi.create.content.curiosities; +import java.util.List; +import java.util.Random; + import com.simibubi.create.AllItems; import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.config.CRecipes; import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.VecHelper; + import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.item.ItemEntity; @@ -17,15 +21,16 @@ import net.minecraft.particles.ParticleTypes; import net.minecraft.tileentity.BeaconTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; -import net.minecraft.util.math.*; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceContext; import net.minecraft.util.math.RayTraceContext.BlockMode; import net.minecraft.util.math.RayTraceContext.FluidMode; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.gen.Heightmap; -import java.util.List; -import java.util.Random; - public class ChromaticCompoundItem extends Item { public ChromaticCompoundItem(Properties properties) { diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlock.java index f16b10656..afbf8dab9 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotBlock.java @@ -101,10 +101,8 @@ public class DepotBlock extends Block implements ITE { @Override public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving) { - if (!state.hasTileEntity() || state.getBlock() == newState.getBlock()) { + if (!state.hasTileEntity() || state.getBlock() == newState.getBlock()) return; - } - withTileEntityDo(worldIn, pos, te -> { ItemHelper.dropContents(worldIn, pos, te.processingOutputBuffer); if (!te.getHeldItemStack() diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotRenderer.java b/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotRenderer.java index 63f2755a2..636f0c585 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/depot/DepotRenderer.java @@ -86,7 +86,7 @@ public class DepotRenderer extends SafeTileEntityRenderer { ms.pop(); } - protected void renderItem(MatrixStack ms, IRenderTypeBuffer buffer, int light, int overlay, ItemStack itemStack, + public static void renderItem(MatrixStack ms, IRenderTypeBuffer buffer, int light, int overlay, ItemStack itemStack, int angle, Random r, Vec3d itemPosition) { ItemRenderer itemRenderer = Minecraft.getInstance() .getItemRenderer(); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelBlock.java index b6f949a5a..16c0b33ea 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/BeltFunnelBlock.java @@ -6,6 +6,8 @@ import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock; import com.simibubi.create.content.logistics.block.depot.DepotBlock; +import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; +import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBehaviour; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.VoxelShaper; import com.tterrag.registrate.util.entry.BlockEntry; @@ -107,7 +109,7 @@ public abstract class BeltFunnelBlock extends HorizontalInteractionFunnelBlock { public static BlockState updateShape(BlockState state, IBlockReader world, BlockPos pos) { state = state.with(SHAPE, Shape.RETRACTED); Direction horizontalFacing = state.get(HORIZONTAL_FACING); - + BlockState below = world.getBlockState(pos.down()); if (below.getBlock() instanceof BeltBlock && below.get(BeltBlock.HORIZONTAL_FACING) .getAxis() != horizontalFacing.getAxis()) @@ -129,6 +131,17 @@ public abstract class BeltFunnelBlock extends HorizontalInteractionFunnelBlock { return false; } + @Override + public void onReplaced(BlockState p_196243_1_, World p_196243_2_, BlockPos p_196243_3_, BlockState p_196243_4_, + boolean p_196243_5_) { + if (p_196243_1_.hasTileEntity() + && (p_196243_1_.getBlock() != p_196243_4_.getBlock() && !FunnelBlock.isFunnel(p_196243_4_) + || !p_196243_4_.hasTileEntity())) { + TileEntityBehaviour.destroy(p_196243_2_, p_196243_3_, FilteringBehaviour.TYPE); + p_196243_2_.removeTileEntity(p_196243_3_); + } + } + @Override protected boolean canStillInteract(BlockState state, IWorldReader world, BlockPos pos) { return isOnValidBelt(state, world, pos); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java index ea72f1ccf..c95d6b41a 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/funnel/FunnelFilterSlotPositioning.java @@ -32,7 +32,7 @@ public class FunnelFilterSlotPositioning extends ValueBoxTransform.Sided { if (!funnelFacing.getAxis() .isHorizontal()) { - Vec3d southLocation = VecHelper.voxelSpace(8, 13, 15.5f); + Vec3d southLocation = VecHelper.voxelSpace(8, funnelFacing == Direction.DOWN ? 3 : 13, 15.5f); return VecHelper.rotateCentered(southLocation, horizontalAngle, Axis.Y); } @@ -48,7 +48,7 @@ public class FunnelFilterSlotPositioning extends ValueBoxTransform.Sided { float zRotLast = alongX ^ funnelFacing.getAxisDirection() == AxisDirection.POSITIVE ? 180 : 0; if (reverse) zRotLast += 180; - + Vec3d vec = VecHelper.voxelSpace(8, 13, .5f); vec = vec.subtract(.5, .5, .5); vec = VecHelper.rotate(vec, zRotLast, Axis.Z); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java index 5e139d946..75c75fde0 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPoint.java @@ -8,12 +8,12 @@ import com.google.common.collect.ImmutableMap; import com.mojang.blaze3d.matrix.MatrixStack; import com.simibubi.create.AllBlockPartials; import com.simibubi.create.AllBlocks; +import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterBlock; import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterTileEntity; import com.simibubi.create.content.contraptions.components.deployer.DeployerBlock; import com.simibubi.create.content.contraptions.components.saw.SawBlock; import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock; -import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock; import com.simibubi.create.content.logistics.block.funnel.FunnelBlock; import com.simibubi.create.content.logistics.block.funnel.FunnelTileEntity; diff --git a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmTileEntity.java b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmTileEntity.java index 3bc9e2901..26af2e2ad 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmTileEntity.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmTileEntity.java @@ -1,5 +1,10 @@ package com.simibubi.create.content.logistics.block.mechanicalArm; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.Nullable; + import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.logistics.block.mechanicalArm.ArmInteractionPoint.Jukebox; import com.simibubi.create.content.logistics.block.mechanicalArm.ArmInteractionPoint.Mode; @@ -15,6 +20,7 @@ import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.NBTHelper; import com.simibubi.create.foundation.utility.VecHelper; + import net.minecraft.block.BlockState; import net.minecraft.block.JukeboxBlock; import net.minecraft.item.ItemStack; @@ -30,10 +36,6 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.util.Constants.NBT; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; - public class ArmTileEntity extends KineticTileEntity { // Server diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchBlock.java index a701a2b07..23db2297e 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchBlock.java @@ -79,6 +79,8 @@ public class StockpileSwitchBlock extends HorizontalBlock implements ITE b.key('S', I.shaft()) - .key('A', I.andesite()) - .key('R', ItemTags.PLANKS) - .key('B', Items.IRON_BARS) + .key('A', I.andesiteCasing()) + .key('R', I.cog()) .key('P', AllItems.PROPELLER.get()) .patternLine(" S ") .patternLine("RAR") - .patternLine("BPB")), + .patternLine(" P ")), CUCKOO_CLOCK = create(AllBlocks.CUCKOO_CLOCK).unlockedBy(I::andesite) .viaShaped(b -> b.key('S', ItemTags.PLANKS) @@ -458,6 +457,13 @@ public class StandardRecipeGen extends CreateRecipeProvider { .patternLine("T") .patternLine("P") .patternLine("S")), + + ITEM_DRAIN = create(AllBlocks.ITEM_DRAIN).unlockedBy(I::copperCasing) + .viaShaped(b -> b + .key('P', Blocks.IRON_BARS) + .key('S', I.copperCasing()) + .patternLine("P") + .patternLine("S")), FLUID_TANK = create(AllBlocks.FLUID_TANK).returns(2) .unlockedBy(I::copperCasing) diff --git a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/fluid/SmartFluidTankBehaviour.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/fluid/SmartFluidTankBehaviour.java index 445ab0a91..44dadd97f 100644 --- a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/fluid/SmartFluidTankBehaviour.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/fluid/SmartFluidTankBehaviour.java @@ -226,7 +226,7 @@ public class SmartFluidTankBehaviour extends TileEntityBehaviour { protected FluidStack renderedFluid; public TankSegment(int capacity) { - tank = new SmartFluidTank(1000, f -> onFluidStackChanged()); + tank = new SmartFluidTank(capacity, f -> onFluidStackChanged()); fluidLevel = LerpedFloat.linear() .startWithValue(0) .chase(0, .25, Chaser.EXP); diff --git a/src/main/resources/assets/create/models/block/rope_pulley/rope_coil.json b/src/main/resources/assets/create/models/block/rope_pulley/rope_coil.json index bbb85e18b..f29424c95 100644 --- a/src/main/resources/assets/create/models/block/rope_pulley/rope_coil.json +++ b/src/main/resources/assets/create/models/block/rope_pulley/rope_coil.json @@ -2,8 +2,6 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "0": "create:block/axis", - "1": "create:block/axis_top", "5": "create:block/pulley_rope" }, "elements": [ @@ -37,7 +35,7 @@ "name": "coil", "from": [3.5, 3.5, 3], "to": [12.5, 12.5, 7], - "rotation": {"angle": 45, "axis": "z", "origin": [8, 8, -10]}, + "rotation": {"angle": -45, "axis": "z", "origin": [8, 8, -10]}, "faces": { "north": {"uv": [0, 0, 9, 9], "texture": "#5"}, "east": {"uv": [0, 0, 4, 9], "texture": "#5"}, @@ -46,21 +44,6 @@ "up": {"uv": [0, 0, 4, 9], "rotation": 90, "texture": "#5"}, "down": {"uv": [0, 0, 4, 9], "rotation": 90, "texture": "#5"} } - }, - { - "name": "Axis", - "from": [6, 6, 0], - "to": [10, 10, 16], - "shade": false, - "rotation": {"angle": 0, "axis": "x", "origin": [8, 1, 8]}, - "faces": { - "north": {"uv": [6, 6, 10, 10], "rotation": 180, "texture": "#1"}, - "east": {"uv": [6, 0, 10, 16], "rotation": 90, "texture": "#0"}, - "south": {"uv": [6, 6, 10, 10], "texture": "#1"}, - "west": {"uv": [6, 0, 10, 16], "rotation": 270, "texture": "#0"}, - "up": {"uv": [6, 0, 10, 16], "texture": "#0"}, - "down": {"uv": [6, 0, 10, 16], "rotation": 180, "texture": "#0"} - } } ] } \ No newline at end of file