From 9568f441c500c74f44fefa57b0852aa9b1acd77d Mon Sep 17 00:00:00 2001 From: OvermindDL1 Date: Fri, 14 Sep 2018 06:00:44 -0600 Subject: [PATCH 1/2] Fix FramezAPI usage Use the Framez for MC 1.7.10 API. Fixes https://github.com/ReikaKalseki/Reika_Mods_Issues/issues/1956 --- ModInteract/DeepInteract/FrameBlacklist.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ModInteract/DeepInteract/FrameBlacklist.java b/ModInteract/DeepInteract/FrameBlacklist.java index 757e9faa9..b46129467 100644 --- a/ModInteract/DeepInteract/FrameBlacklist.java +++ b/ModInteract/DeepInteract/FrameBlacklist.java @@ -18,8 +18,7 @@ import com.amadornes.framez.api.FramezApi; import com.amadornes.framez.api.movement.BlockMovementType; -import com.amadornes.framez.api.movement.HandlingPriority; -import com.amadornes.framez.api.movement.HandlingPriority.Priority; +import com.amadornes.framez.api.Priority; import com.amadornes.framez.api.movement.IMovementHandler; import com.amadornes.framez.api.movement.IMovingBlock; @@ -49,21 +48,21 @@ private FramezHandler() { @Override @SmartStrip - @HandlingPriority(Priority.HIGH) + @Priority(Priority.PriorityEnum.HIGH) public boolean handleStartMoving(IMovingBlock block) { return FrameBlacklist.this.isBlacklisted(block.getWorld(), block.getX(), block.getY(), block.getZ(), block.getBlock(), block.getMetadata(), block.getTileEntity()); } @Override @SmartStrip - @HandlingPriority(Priority.HIGH) + @Priority(Priority.PriorityEnum.HIGH) public boolean handleFinishMoving(IMovingBlock block) { return FrameBlacklist.this.isBlacklisted(block.getWorld(), block.getX(), block.getY(), block.getZ(), block.getBlock(), block.getMetadata(), block.getTileEntity()); } @Override @SmartStrip - @HandlingPriority(Priority.HIGH) + @Priority(Priority.PriorityEnum.HIGH) public BlockMovementType getMovementType(World world, Integer x, Integer y, Integer z) { return FrameBlacklist.this.isBlacklisted(world, x, y, z, world.getBlock(x, y, z), world.getBlockMetadata(x, y, z), world.getTileEntity(x, y, z)) ? BlockMovementType.UNMOVABLE : null; } From ebff77a8879aae2c911a55300f17f7c77cda5baa Mon Sep 17 00:00:00 2001 From: OvermindDL1 Date: Fri, 14 Sep 2018 06:12:33 -0600 Subject: [PATCH 2/2] Update FrameBlacklist.java Fixed naming to match the FramezAPI --- ModInteract/DeepInteract/FrameBlacklist.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/ModInteract/DeepInteract/FrameBlacklist.java b/ModInteract/DeepInteract/FrameBlacklist.java index b46129467..4163cc4f1 100644 --- a/ModInteract/DeepInteract/FrameBlacklist.java +++ b/ModInteract/DeepInteract/FrameBlacklist.java @@ -13,11 +13,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; import Reika.DragonAPI.ASM.APIStripper.Strippable; import Reika.DragonAPI.ASM.DependentMethodStripper.SmartStrip; import com.amadornes.framez.api.FramezApi; import com.amadornes.framez.api.movement.BlockMovementType; +import com.amadornes.framez.api.movement.IMovement; import com.amadornes.framez.api.Priority; import com.amadornes.framez.api.movement.IMovementHandler; import com.amadornes.framez.api.movement.IMovingBlock; @@ -32,7 +34,7 @@ public class FrameBlacklist { private FrameBlacklist() { if (Loader.isModLoaded("framez")) - FramezApi.inst().getMovementApi().registerMovementHandler(new FramezHandler()); + FramezApi.instance().movement().registerMovementHandler(new FramezHandler()); } private boolean isBlacklisted(World world, int x, int y, int z, Block b, int meta, TileEntity te) { @@ -49,24 +51,29 @@ private FramezHandler() { @Override @SmartStrip @Priority(Priority.PriorityEnum.HIGH) - public boolean handleStartMoving(IMovingBlock block) { + public boolean startMoving(IMovingBlock block) { return FrameBlacklist.this.isBlacklisted(block.getWorld(), block.getX(), block.getY(), block.getZ(), block.getBlock(), block.getMetadata(), block.getTileEntity()); } @Override @SmartStrip @Priority(Priority.PriorityEnum.HIGH) - public boolean handleFinishMoving(IMovingBlock block) { + public boolean finishMoving(IMovingBlock block) { return FrameBlacklist.this.isBlacklisted(block.getWorld(), block.getX(), block.getY(), block.getZ(), block.getBlock(), block.getMetadata(), block.getTileEntity()); } @Override - @SmartStrip - @Priority(Priority.PriorityEnum.HIGH) - public BlockMovementType getMovementType(World world, Integer x, Integer y, Integer z) { + public BlockMovementType getMovementType(World world, int x, int y, int z, ForgeDirection side, + IMovement movement) { return FrameBlacklist.this.isBlacklisted(world, x, y, z, world.getBlock(x, y, z), world.getBlockMetadata(x, y, z), world.getTileEntity(x, y, z)) ? BlockMovementType.UNMOVABLE : null; } + @Override + public boolean canHandle(World world, int x, int y, int z) { + // TODO Auto-generated method stub + return false; + } + } public boolean fireFrameEvent(World world, int x, int y, int z) {