diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java index 118542aa..c71269bd 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GUIDislocatorInhibitor.java @@ -1,5 +1,17 @@ package com.brandon3055.draconicevolution.client.gui; +import java.util.ArrayList; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; + +import org.lwjgl.opengl.GL11; + import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; import com.brandon3055.draconicevolution.common.inventory.SlotFakeItem; @@ -7,20 +19,9 @@ import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.network.DislocatorInhibitorButtonPacket; import com.brandon3055.draconicevolution.common.network.SlotFakeClickPacket; import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import net.minecraftforge.client.event.GuiScreenEvent; -import net.minecraftforge.common.MinecraftForge; -import org.lwjgl.opengl.GL11; - -import java.util.ArrayList; @SideOnly(Side.CLIENT) public class GUIDislocatorInhibitor extends GuiContainer { @@ -81,10 +82,14 @@ public class GUIDislocatorInhibitor extends GuiContainer { lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.range.decrease.txt")); } else if ((x - guiLeft > 151 && x - guiLeft < 169) && (y - guiTop > 11 && y - guiTop < 29)) { switch (activityControlType) { - case ALWAYS_ACTIVE -> lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.always.txt")); - case WITH_REDSTONE -> lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.with.txt")); - case WITHOUT_REDSTONE -> lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.without.txt")); - case NEVER_ACTIVE -> lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.never.txt")); + case ALWAYS_ACTIVE -> lines + .add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.always.txt")); + case WITH_REDSTONE -> lines + .add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.with.txt")); + case WITHOUT_REDSTONE -> lines + .add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.without.txt")); + case NEVER_ACTIVE -> lines + .add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.never.txt")); } lines.add(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.tooltip.activity.cycle.txt")); } else if ((x - guiLeft > 151 && x - guiLeft < 169) && (y - guiTop > 33 && y - guiTop < 51)) { @@ -133,8 +138,12 @@ public class GUIDislocatorInhibitor extends GuiContainer { } private void drawGuiText() { - fontRendererObj.drawString(StatCollector.translateToLocal("gui.de.dislocatorInhibitor.range.txt"), - 40, 17, 0x000000, false); + fontRendererObj.drawString( + StatCollector.translateToLocal("gui.de.dislocatorInhibitor.range.txt"), + 40, + 17, + 0x000000, + false); fontRendererObj.drawString(String.valueOf(range), range < 10 ? 78 : 75, 17, 0x000000, false); } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java index a999be0c..a0fb4961 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java @@ -1,7 +1,5 @@ package com.brandon3055.draconicevolution.client.gui; -import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; -import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -11,6 +9,7 @@ import com.brandon3055.draconicevolution.client.gui.componentguis.GUIManual; import com.brandon3055.draconicevolution.client.gui.componentguis.GUIReactor; import com.brandon3055.draconicevolution.client.gui.componentguis.GUIToolConfig; import com.brandon3055.draconicevolution.common.container.ContainerAdvTool; +import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; import com.brandon3055.draconicevolution.common.container.ContainerDissEnchanter; import com.brandon3055.draconicevolution.common.container.ContainerDraconiumChest; import com.brandon3055.draconicevolution.common.container.ContainerEnergyInfuser; @@ -22,6 +21,7 @@ import com.brandon3055.draconicevolution.common.container.ContainerSunDial; import com.brandon3055.draconicevolution.common.container.ContainerUpgradeModifier; import com.brandon3055.draconicevolution.common.container.ContainerWeatherController; import com.brandon3055.draconicevolution.common.inventory.InventoryTool; +import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; import com.brandon3055.draconicevolution.common.tileentities.TileDissEnchanter; import com.brandon3055.draconicevolution.common.tileentities.TileDraconiumChest; import com.brandon3055.draconicevolution.common.tileentities.TileEnergyInfuser; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java index 73e6386a..589a153f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java @@ -1,7 +1,5 @@ package com.brandon3055.draconicevolution.common; -import com.brandon3055.draconicevolution.common.network.DislocatorInhibitorButtonPacket; -import com.brandon3055.draconicevolution.common.network.SlotFakeClickPacket; import net.minecraft.client.audio.ISound; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -40,6 +38,7 @@ import com.brandon3055.draconicevolution.common.magic.PotionHandler; import com.brandon3055.draconicevolution.common.network.BlockUpdatePacket; import com.brandon3055.draconicevolution.common.network.ButtonPacket; import com.brandon3055.draconicevolution.common.network.ContributorPacket; +import com.brandon3055.draconicevolution.common.network.DislocatorInhibitorButtonPacket; import com.brandon3055.draconicevolution.common.network.GenericParticlePacket; import com.brandon3055.draconicevolution.common.network.ItemConfigPacket; import com.brandon3055.draconicevolution.common.network.MagnetToggleAckPacket; @@ -50,6 +49,7 @@ import com.brandon3055.draconicevolution.common.network.PlacedItemPacket; import com.brandon3055.draconicevolution.common.network.PlayerDetectorButtonPacket; import com.brandon3055.draconicevolution.common.network.PlayerDetectorStringPacket; import com.brandon3055.draconicevolution.common.network.ShieldHitPacket; +import com.brandon3055.draconicevolution.common.network.SlotFakeClickPacket; import com.brandon3055.draconicevolution.common.network.SpeedRequestPacket; import com.brandon3055.draconicevolution.common.network.TeleporterPacket; import com.brandon3055.draconicevolution.common.network.TileObjectPacket; @@ -213,8 +213,11 @@ public class CommonProxy { .registerMessage(MagnetTogglePacket.Handler.class, MagnetTogglePacket.class, 19, Side.SERVER); DraconicEvolution.network .registerMessage(MagnetToggleAckPacket.Handler.class, MagnetToggleAckPacket.class, 20, Side.CLIENT); - DraconicEvolution.network - .registerMessage(DislocatorInhibitorButtonPacket.Handler.class, DislocatorInhibitorButtonPacket.class, 21, Side.SERVER); + DraconicEvolution.network.registerMessage( + DislocatorInhibitorButtonPacket.Handler.class, + DislocatorInhibitorButtonPacket.class, + 21, + Side.SERVER); DraconicEvolution.network .registerMessage(SlotFakeClickPacket.Handler.class, SlotFakeClickPacket.class, 22, Side.SERVER); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DislocatorInhibitor.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DislocatorInhibitor.java index 1d5490f9..92fddf0d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DislocatorInhibitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/DislocatorInhibitor.java @@ -1,16 +1,14 @@ package com.brandon3055.draconicevolution.common.blocks.machine; -import com.brandon3055.draconicevolution.client.gui.GuiHandler; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraft.world.IBlockAccess; @@ -18,17 +16,17 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.client.gui.GuiHandler; import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.blocks.BlockDE; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import java.util.List; - public class DislocatorInhibitor extends BlockDE implements ITileEntityProvider { public DislocatorInhibitor() { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDislocatorInhibitor.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDislocatorInhibitor.java index ac77ef22..3fb10133 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDislocatorInhibitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDislocatorInhibitor.java @@ -1,13 +1,14 @@ package com.brandon3055.draconicevolution.common.container; -import com.brandon3055.draconicevolution.common.inventory.SlotFakeItem; -import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import com.brandon3055.draconicevolution.common.inventory.SlotFakeItem; +import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; + public class ContainerDislocatorInhibitor extends Container { private TileDislocatorInhibitor inhibitor; @@ -42,7 +43,6 @@ public class ContainerDislocatorInhibitor extends Container { return inhibitor.isUseableByPlayer(player); } - @Override public boolean canDragIntoSlot(Slot p_94531_1_) { return false; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/inventory/SlotFakeItem.java b/src/main/java/com/brandon3055/draconicevolution/common/inventory/SlotFakeItem.java index c1fa7fc8..1d990be1 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/inventory/SlotFakeItem.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/inventory/SlotFakeItem.java @@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack; public class SlotFakeItem extends Slot { - public SlotFakeItem(IInventory inventory, int id, int x, int y) { super(inventory, id, x, y); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/DislocatorInhibitorButtonPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/DislocatorInhibitorButtonPacket.java index 013b2f3d..5f5a20e6 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/network/DislocatorInhibitorButtonPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/DislocatorInhibitorButtonPacket.java @@ -2,6 +2,7 @@ package com.brandon3055.draconicevolution.common.network; import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -35,7 +36,8 @@ public class DislocatorInhibitorButtonPacket implements IMessage { @Override public IMessage onMessage(DislocatorInhibitorButtonPacket message, MessageContext ctx) { - if (!(ctx.getServerHandler().playerEntity.openContainer instanceof ContainerDislocatorInhibitor container)) { + if (!(ctx + .getServerHandler().playerEntity.openContainer instanceof ContainerDislocatorInhibitor container)) { return null; } TileDislocatorInhibitor tile = container.getTileEntity(); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/SlotFakeClickPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/SlotFakeClickPacket.java index d2162652..aedfbfc8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/network/SlotFakeClickPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/SlotFakeClickPacket.java @@ -1,12 +1,14 @@ package com.brandon3055.draconicevolution.common.network; +import net.minecraft.item.ItemStack; + import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; import com.brandon3055.draconicevolution.common.tileentities.TileDislocatorInhibitor; + import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; -import net.minecraft.item.ItemStack; public class SlotFakeClickPacket implements IMessage { @@ -32,7 +34,8 @@ public class SlotFakeClickPacket implements IMessage { @Override public IMessage onMessage(SlotFakeClickPacket message, MessageContext ctx) { - if (!(ctx.getServerHandler().playerEntity.openContainer instanceof ContainerDislocatorInhibitor container)) { + if (!(ctx + .getServerHandler().playerEntity.openContainer instanceof ContainerDislocatorInhibitor container)) { return null; } TileDislocatorInhibitor tile = container.getTileEntity(); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDislocatorInhibitor.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDislocatorInhibitor.java index f80a3fbc..04dc9b43 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDislocatorInhibitor.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDislocatorInhibitor.java @@ -3,7 +3,6 @@ package com.brandon3055.draconicevolution.common.tileentities; import java.util.HashMap; import java.util.HashSet; -import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -18,6 +17,8 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import com.brandon3055.draconicevolution.common.container.ContainerDislocatorInhibitor; + public class TileDislocatorInhibitor extends TileEntity implements IInventory { public static final int MAXIMUM_RANGE = 16; @@ -306,8 +307,7 @@ public class TileDislocatorInhibitor extends TileEntity implements IInventory { ALWAYS_ACTIVE, WITH_REDSTONE, WITHOUT_REDSTONE, - NEVER_ACTIVE - ; + NEVER_ACTIVE; public ActivityControlType getNext() { return switch (this) { @@ -320,5 +320,4 @@ public class TileDislocatorInhibitor extends TileEntity implements IInventory { } - }