diff --git a/src/main/java/techreborn/client/container/builder/BuiltContainer.java b/src/main/java/techreborn/client/container/builder/BuiltContainer.java index ce65c54b8..d470499cf 100644 --- a/src/main/java/techreborn/client/container/builder/BuiltContainer.java +++ b/src/main/java/techreborn/client/container/builder/BuiltContainer.java @@ -32,7 +32,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.lang3.Range; import org.apache.commons.lang3.tuple.MutableTriple; import org.apache.commons.lang3.tuple.Pair; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; import reborncore.common.util.ItemUtils; import techreborn.client.container.IRightClickHandler; @@ -56,11 +56,11 @@ public class BuiltContainer extends Container { private List> craftEvents; private Integer[] integerParts; - private final TileLegacyMachineBase tile; + private final TileMachineBase tile; public BuiltContainer(final String name, final Predicate canInteract, final List> playerSlotRange, - final List> tileSlotRange, TileLegacyMachineBase tile) { + final List> tileSlotRange, TileMachineBase tile) { this.name = name; this.canInteract = canInteract; diff --git a/src/main/java/techreborn/client/container/builder/ContainerBuilder.java b/src/main/java/techreborn/client/container/builder/ContainerBuilder.java index d9bf06b08..5445b8169 100644 --- a/src/main/java/techreborn/client/container/builder/ContainerBuilder.java +++ b/src/main/java/techreborn/client/container/builder/ContainerBuilder.java @@ -30,7 +30,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.Slot; import org.apache.commons.lang3.Range; import org.apache.commons.lang3.tuple.Pair; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; import java.util.ArrayList; import java.util.List; @@ -76,7 +76,7 @@ public class ContainerBuilder { return new ContainerPlayerInventoryBuilder(this, player); } - public ContainerTileInventoryBuilder tile(final TileLegacyMachineBase tile) { + public ContainerTileInventoryBuilder tile(final TileMachineBase tile) { return new ContainerTileInventoryBuilder(this, tile); } @@ -88,7 +88,7 @@ public class ContainerBuilder { this.tileInventoryRanges.add(range); } - public BuiltContainer create(final TileLegacyMachineBase tile) { + public BuiltContainer create(final TileMachineBase tile) { final BuiltContainer built = new BuiltContainer(this.name, this.canInteract, this.playerInventoryRanges, this.tileInventoryRanges, tile); diff --git a/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java b/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java index a2c1d19e7..7ee948350 100644 --- a/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java +++ b/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java @@ -38,7 +38,7 @@ import reborncore.client.gui.slots.BaseSlot; import reborncore.client.gui.slots.SlotFake; import reborncore.client.gui.slots.SlotOutput; import reborncore.common.powerSystem.TilePowerAcceptor; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; import techreborn.TechReborn; import techreborn.client.container.builder.slot.FilteredSlot; import techreborn.client.container.builder.slot.FurnaceFuelSlot; @@ -51,11 +51,11 @@ import java.util.function.Predicate; public class ContainerTileInventoryBuilder { - private final TileLegacyMachineBase tile; + private final TileMachineBase tile; private final ContainerBuilder parent; private final int rangeStart; - ContainerTileInventoryBuilder(final ContainerBuilder parent, final TileLegacyMachineBase tile) { + ContainerTileInventoryBuilder(final ContainerBuilder parent, final TileMachineBase tile) { this.tile = tile; this.parent = parent; this.rangeStart = parent.slots.size(); diff --git a/src/main/java/techreborn/client/gui/GuiBase.java b/src/main/java/techreborn/client/gui/GuiBase.java index 318ba5e67..6ac5f5c2d 100644 --- a/src/main/java/techreborn/client/gui/GuiBase.java +++ b/src/main/java/techreborn/client/gui/GuiBase.java @@ -36,7 +36,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; import reborncore.api.tile.IUpgradeable; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.gui.slot.GuiFluidConfiguration; import techreborn.client.gui.slot.GuiSlotConfiguration; @@ -318,8 +318,8 @@ public class GuiBase extends GuiContainer { return super.isPointInRegion(rectX, rectY, rectWidth, rectHeight, pointX, pointY); } - public TileLegacyMachineBase getMachine(){ - return (TileLegacyMachineBase) tile; + public TileMachineBase getMachine(){ + return (TileMachineBase) tile; } diff --git a/src/main/java/techreborn/client/gui/slot/GuiFluidConfiguration.java b/src/main/java/techreborn/client/gui/slot/GuiFluidConfiguration.java index 5204e44e2..3c9bab45f 100644 --- a/src/main/java/techreborn/client/gui/slot/GuiFluidConfiguration.java +++ b/src/main/java/techreborn/client/gui/slot/GuiFluidConfiguration.java @@ -29,7 +29,7 @@ import net.minecraft.client.Minecraft; import net.minecraftforge.client.event.GuiScreenEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.input.Keyboard; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; import techreborn.client.gui.GuiBase; import techreborn.client.gui.slot.elements.ConfigFluidElement; import techreborn.client.gui.slot.elements.ElementBase; @@ -138,15 +138,15 @@ public class GuiFluidConfiguration { } @Nullable - private static TileLegacyMachineBase getMachine() { + private static TileMachineBase getMachine() { if (!(Minecraft.getMinecraft().currentScreen instanceof GuiBase)) { return null; } GuiBase base = (GuiBase) Minecraft.getMinecraft().currentScreen; - if (!(base.tile instanceof TileLegacyMachineBase)) { + if (!(base.tile instanceof TileMachineBase)) { return null; } - TileLegacyMachineBase machineBase = (TileLegacyMachineBase) base.tile; + TileMachineBase machineBase = (TileMachineBase) base.tile; return machineBase; } diff --git a/src/main/java/techreborn/client/gui/slot/GuiSlotConfiguration.java b/src/main/java/techreborn/client/gui/slot/GuiSlotConfiguration.java index 43f8bed94..284a0f60a 100644 --- a/src/main/java/techreborn/client/gui/slot/GuiSlotConfiguration.java +++ b/src/main/java/techreborn/client/gui/slot/GuiSlotConfiguration.java @@ -32,14 +32,13 @@ import net.minecraft.inventory.Slot; import net.minecraft.util.text.TextComponentString; import net.minecraftforge.client.event.GuiScreenEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.SlotItemHandler; import org.lwjgl.input.Keyboard; import reborncore.client.gui.GuiUtil; import reborncore.common.network.NetworkManager; import reborncore.common.network.packet.PacketConfigSave; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.gui.GuiBase; import techreborn.client.gui.slot.elements.ConfigSlotElement; @@ -127,7 +126,7 @@ public class GuiSlotConfiguration { } public static void copyToClipboard(){ - TileLegacyMachineBase machine = getMachine(); + TileMachineBase machine = getMachine(); if(machine == null || machine.slotConfiguration == null){ return; } @@ -137,7 +136,7 @@ public class GuiSlotConfiguration { } public static void pasteFromClipboard(){ - TileLegacyMachineBase machine = getMachine(); + TileMachineBase machine = getMachine(); if(machine == null || machine.slotConfiguration == null){ return; } @@ -152,15 +151,15 @@ public class GuiSlotConfiguration { } @Nullable - private static TileLegacyMachineBase getMachine(){ + private static TileMachineBase getMachine(){ if(!(Minecraft.getMinecraft().currentScreen instanceof GuiBase)){ return null; } GuiBase base = (GuiBase) Minecraft.getMinecraft().currentScreen; - if(!(base.tile instanceof TileLegacyMachineBase)){ + if(!(base.tile instanceof TileMachineBase)){ return null; } - TileLegacyMachineBase machineBase = (TileLegacyMachineBase) base.tile; + TileMachineBase machineBase = (TileMachineBase) base.tile; return machineBase; } diff --git a/src/main/java/techreborn/client/gui/slot/elements/CheckBoxElement.java b/src/main/java/techreborn/client/gui/slot/elements/CheckBoxElement.java index 6f2b4dddc..3fc3e96c1 100644 --- a/src/main/java/techreborn/client/gui/slot/elements/CheckBoxElement.java +++ b/src/main/java/techreborn/client/gui/slot/elements/CheckBoxElement.java @@ -24,7 +24,7 @@ package techreborn.client.gui.slot.elements; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; import techreborn.client.gui.GuiBase; import java.util.function.Predicate; @@ -32,12 +32,12 @@ import java.util.function.Predicate; public class CheckBoxElement extends ElementBase { public String label, type; public int labelColor, slotID; - public TileLegacyMachineBase machineBase; + public TileMachineBase machineBase; Predicate ticked; private Sprite.CheckBox checkBoxSprite; - public CheckBoxElement(String label, int labelColor, int x, int y, String type, int slotID, Sprite.CheckBox checkBoxSprite, TileLegacyMachineBase machineBase, Predicate ticked) { + public CheckBoxElement(String label, int labelColor, int x, int y, String type, int slotID, Sprite.CheckBox checkBoxSprite, TileMachineBase machineBase, Predicate ticked) { super(x, y, checkBoxSprite.getNormal()); this.checkBoxSprite = checkBoxSprite; this.type = type; diff --git a/src/main/java/techreborn/client/gui/slot/elements/ElementBase.java b/src/main/java/techreborn/client/gui/slot/elements/ElementBase.java index 54b4827d3..e1b68fa57 100644 --- a/src/main/java/techreborn/client/gui/slot/elements/ElementBase.java +++ b/src/main/java/techreborn/client/gui/slot/elements/ElementBase.java @@ -31,7 +31,7 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.TextFormatting; import reborncore.client.gui.guibuilder.GuiBuilder; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; import techreborn.TechReborn; import techreborn.client.gui.GuiBase; @@ -110,7 +110,7 @@ public class ElementBase { return container; } - public void adjustDimensions(TileLegacyMachineBase provider) { + public void adjustDimensions(TileMachineBase provider) { if (container.offsetSprites != null) { for (OffsetSprite offsetSprite : container.offsetSprites) { if (offsetSprite.getSprite().getSprite(provider).width + offsetSprite.getOffsetX(provider) > this.width) { @@ -175,12 +175,12 @@ public class ElementBase { return this; } - public int getWidth(TileLegacyMachineBase provider) { + public int getWidth(TileMachineBase provider) { adjustDimensions(provider); return width; } - public int getHeight(TileLegacyMachineBase provider) { + public int getHeight(TileMachineBase provider) { adjustDimensions(provider); return height; } @@ -218,28 +218,28 @@ public class ElementBase { return this; } - public boolean onHover(TileLegacyMachineBase provider, GuiBase gui, int mouseX, int mouseY) { + public boolean onHover(TileMachineBase provider, GuiBase gui, int mouseX, int mouseY) { for (ElementBase.Action action : hoverActions) { action.execute(this, gui, provider, mouseX, mouseY); } return !hoverActions.isEmpty(); } - public boolean onDrag(TileLegacyMachineBase provider, GuiBase gui, int mouseX, int mouseY) { + public boolean onDrag(TileMachineBase provider, GuiBase gui, int mouseX, int mouseY) { for (ElementBase.Action action : dragActions) { action.execute(this, gui, provider, mouseX, mouseY); } return !dragActions.isEmpty(); } - public boolean onStartPress(TileLegacyMachineBase provider, GuiBase gui, int mouseX, int mouseY) { + public boolean onStartPress(TileMachineBase provider, GuiBase gui, int mouseX, int mouseY) { for (ElementBase.Action action : startPressActions) { action.execute(this, gui, provider, mouseX, mouseY); } return !startPressActions.isEmpty(); } - public boolean onRelease(TileLegacyMachineBase provider, GuiBase gui, int mouseX, int mouseY) { + public boolean onRelease(TileMachineBase provider, GuiBase gui, int mouseX, int mouseY) { for (ElementBase.Action action : releaseActions) { if(action.execute(this, gui, provider, mouseX, mouseY)){ return true; @@ -254,7 +254,7 @@ public class ElementBase { } public interface Action { - boolean execute(ElementBase element, GuiBase gui, TileLegacyMachineBase provider, int mouseX, int mouseY); + boolean execute(ElementBase element, GuiBase gui, TileMachineBase provider, int mouseX, int mouseY); } public interface UpdateAction { diff --git a/src/main/java/techreborn/client/gui/slot/elements/FluidConfigPopupElement.java b/src/main/java/techreborn/client/gui/slot/elements/FluidConfigPopupElement.java index 1525a3f9a..d85081905 100644 --- a/src/main/java/techreborn/client/gui/slot/elements/FluidConfigPopupElement.java +++ b/src/main/java/techreborn/client/gui/slot/elements/FluidConfigPopupElement.java @@ -39,7 +39,7 @@ import reborncore.common.network.NetworkManager; import reborncore.common.network.packet.PacketFluidConfigSave; import reborncore.common.network.packet.PacketFluidIOSave; import reborncore.common.tile.FluidConfiguration; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; import reborncore.common.util.MachineFacing; import techreborn.client.gui.GuiBase; @@ -61,7 +61,7 @@ public class FluidConfigPopupElement extends ElementBase { drawDefaultBackground(gui, adjustX(gui, getX() - 8), adjustY(gui, getY() - 7), 84, 105 + (filter ? 15 : 0)); super.draw(gui); - TileLegacyMachineBase machine = ((TileLegacyMachineBase) gui.tile); + TileMachineBase machine = ((TileMachineBase) gui.tile); IBlockAccess blockAccess = machine.getWorld(); BlockPos pos = machine.getPos(); IBlockState state = blockAccess.getBlockState(pos); @@ -85,7 +85,7 @@ public class FluidConfigPopupElement extends ElementBase { } @Override - public boolean onRelease(TileLegacyMachineBase provider, GuiBase gui, int mouseX, int mouseY) { + public boolean onRelease(TileMachineBase provider, GuiBase gui, int mouseX, int mouseY) { if (isInBox(23, 4, 16, 16, mouseX, mouseY, gui)) { cyleConfig(MachineFacing.UP.getFacing(provider), gui); } else if (isInBox(23, 23, 16, 16, mouseX, mouseY, gui)) { @@ -130,13 +130,13 @@ public class FluidConfigPopupElement extends ElementBase { } @Override - public boolean onHover(TileLegacyMachineBase provider, GuiBase gui, int mouseX, int mouseY) { + public boolean onHover(TileMachineBase provider, GuiBase gui, int mouseX, int mouseY) { lastMousex = mouseX; lastMousey = mouseY; return super.onHover(provider, gui, mouseX, mouseY); } - private void drawSateColor(TileLegacyMachineBase machineBase, EnumFacing side, int inx, int iny, GuiBase gui) { + private void drawSateColor(TileMachineBase machineBase, EnumFacing side, int inx, int iny, GuiBase gui) { iny += 4; int sx = inx + getX() + gui.guiLeft; int sy = iny + getY() + gui.guiTop; diff --git a/src/main/java/techreborn/client/gui/slot/elements/ISprite.java b/src/main/java/techreborn/client/gui/slot/elements/ISprite.java index 9e6b1531e..a84d05a97 100644 --- a/src/main/java/techreborn/client/gui/slot/elements/ISprite.java +++ b/src/main/java/techreborn/client/gui/slot/elements/ISprite.java @@ -24,8 +24,8 @@ package techreborn.client.gui.slot.elements; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; public interface ISprite { - Sprite getSprite(TileLegacyMachineBase provider); + Sprite getSprite(TileMachineBase provider); } diff --git a/src/main/java/techreborn/client/gui/slot/elements/OffsetSprite.java b/src/main/java/techreborn/client/gui/slot/elements/OffsetSprite.java index 27131904c..eedeb5335 100644 --- a/src/main/java/techreborn/client/gui/slot/elements/OffsetSprite.java +++ b/src/main/java/techreborn/client/gui/slot/elements/OffsetSprite.java @@ -24,7 +24,7 @@ package techreborn.client.gui.slot.elements; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; public class OffsetSprite { public ISprite sprite; @@ -41,7 +41,7 @@ public class OffsetSprite { this.sprite = sprite; } - public OffsetSprite(Sprite sprite, TileLegacyMachineBase provider) { + public OffsetSprite(Sprite sprite, TileMachineBase provider) { this.sprite = sprite; } @@ -49,7 +49,7 @@ public class OffsetSprite { return sprite; } - public int getOffsetX(TileLegacyMachineBase provider) { + public int getOffsetX(TileMachineBase provider) { return offsetX + sprite.getSprite(provider).offsetX; } @@ -58,7 +58,7 @@ public class OffsetSprite { return this; } - public int getOffsetY(TileLegacyMachineBase provider) { + public int getOffsetY(TileMachineBase provider) { return offsetY + sprite.getSprite(provider).offsetY; } diff --git a/src/main/java/techreborn/client/gui/slot/elements/SlotConfigPopupElement.java b/src/main/java/techreborn/client/gui/slot/elements/SlotConfigPopupElement.java index 7280554fb..8ad4badba 100644 --- a/src/main/java/techreborn/client/gui/slot/elements/SlotConfigPopupElement.java +++ b/src/main/java/techreborn/client/gui/slot/elements/SlotConfigPopupElement.java @@ -39,7 +39,7 @@ import reborncore.common.network.NetworkManager; import reborncore.common.network.packet.PacketIOSave; import reborncore.common.network.packet.PacketSlotSave; import reborncore.common.tile.SlotConfiguration; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; import reborncore.common.util.MachineFacing; import techreborn.client.gui.GuiBase; @@ -63,7 +63,7 @@ public class SlotConfigPopupElement extends ElementBase { drawDefaultBackground(gui, adjustX(gui, getX() -8), adjustY(gui, getY() - 7), 84, 105 + (filter ? 15 : 0)); super.draw(gui); - TileLegacyMachineBase machine = ((TileLegacyMachineBase) gui.tile); + TileMachineBase machine = ((TileMachineBase) gui.tile); IBlockAccess blockAccess = machine.getWorld(); BlockPos pos = machine.getPos(); IBlockState state = blockAccess.getBlockState(pos); @@ -88,7 +88,7 @@ public class SlotConfigPopupElement extends ElementBase { } @Override - public boolean onRelease(TileLegacyMachineBase provider, GuiBase gui, int mouseX, int mouseY) { + public boolean onRelease(TileMachineBase provider, GuiBase gui, int mouseX, int mouseY) { if(isInBox(23 , 4, 16, 16, mouseX, mouseY, gui)){ cyleSlotConfig(MachineFacing.UP.getFacing(provider), gui); } else if(isInBox(23 , 23, 16, 16, mouseX, mouseY, gui)){ @@ -135,7 +135,7 @@ public class SlotConfigPopupElement extends ElementBase { NetworkManager.sendToServer(packetSlotSave); } - private void drawSlotSateColor(TileLegacyMachineBase machineBase, EnumFacing side, int slotID, int inx, int iny, GuiBase gui){ + private void drawSlotSateColor(TileMachineBase machineBase, EnumFacing side, int slotID, int inx, int iny, GuiBase gui){ iny += 4; int sx = inx + getX() + gui.guiLeft; int sy = iny + getY() + gui.guiTop; diff --git a/src/main/java/techreborn/client/gui/slot/elements/Sprite.java b/src/main/java/techreborn/client/gui/slot/elements/Sprite.java index 57c833ac2..dc27f054b 100644 --- a/src/main/java/techreborn/client/gui/slot/elements/Sprite.java +++ b/src/main/java/techreborn/client/gui/slot/elements/Sprite.java @@ -28,7 +28,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; public class Sprite implements ISprite { public static final Sprite EMPTY = new Sprite(ElementBase.MECH_ELEMENTS, 0, 0, 0, 0); @@ -103,7 +103,7 @@ public class Sprite implements ISprite { } @Override - public Sprite getSprite(TileLegacyMachineBase provider) { + public Sprite getSprite(TileMachineBase provider) { return this; } diff --git a/src/main/java/techreborn/init/ModTileEntities.java b/src/main/java/techreborn/init/ModTileEntities.java index 0c4e4e7c3..32f6fddf0 100644 --- a/src/main/java/techreborn/init/ModTileEntities.java +++ b/src/main/java/techreborn/init/ModTileEntities.java @@ -27,7 +27,7 @@ package techreborn.init; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; import techreborn.TechReborn; import techreborn.tiles.*; import techreborn.tiles.cable.TileCable; @@ -101,7 +101,7 @@ public enum ModTileEntities { CREATIVE_QUANTUM_CHEST(TileCreativeQuantumChest.class, "creative_quantum_chest"), WATER_MILL(TileWaterMill.class, "water_mill"), WIND_MILL(TileWindMill.class, "wind_mill"), - MACHINE_BASE(TileLegacyMachineBase.class, "machine_base"), + MACHINE_BASE(TileMachineBase.class, "machine_base"), RECYCLER(TileRecycler.class, "recycler"), LOW_VOLTAGE_SU(TileLowVoltageSU.class, "low_voltage_su"), MEDIUM_VOLTAGE_SU(TileMediumVoltageSU.class, "medium_voltage_su"), diff --git a/src/main/java/techreborn/items/ItemUpgrade.java b/src/main/java/techreborn/items/ItemUpgrade.java index 86401173b..8ddd7abed 100644 --- a/src/main/java/techreborn/items/ItemUpgrade.java +++ b/src/main/java/techreborn/items/ItemUpgrade.java @@ -28,8 +28,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import reborncore.api.tile.IUpgrade; import reborncore.common.recipes.IUpgradeHandler; -import reborncore.common.tile.TileLegacyMachineBase; -import techreborn.utils.InitUtils; +import reborncore.common.tile.TileMachineBase; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -48,7 +47,7 @@ public class ItemUpgrade extends Item implements IUpgrade { @Override public void process( @Nonnull - TileLegacyMachineBase tile, + TileMachineBase tile, @Nullable IUpgradeHandler handler, @Nonnull diff --git a/src/main/java/techreborn/tiles/TileChargeOMat.java b/src/main/java/techreborn/tiles/TileChargeOMat.java index 1f7e6f53e..a20c6bb3e 100644 --- a/src/main/java/techreborn/tiles/TileChargeOMat.java +++ b/src/main/java/techreborn/tiles/TileChargeOMat.java @@ -105,7 +105,7 @@ public class TileChargeOMat extends TilePowerAcceptor return maxInput; } - // TileLegacyMachineBase + // TileMachineBase @Override public boolean canBeUpgraded() { return false; diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 9d9dcaaaa..992dd4234 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -189,7 +189,7 @@ public class TileMatterFabricator extends TilePowerAcceptor return maxInput; } - // TileLegacyMachineBase + // TileMachineBase @Override public boolean canBeUpgraded() { return false; diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index d1ff4e08c..bd877d997 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -34,7 +34,7 @@ import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.impl.ConfigRegistry; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; import reborncore.common.util.FluidUtils; import reborncore.common.util.Inventory; import reborncore.common.util.Tank; @@ -48,7 +48,7 @@ import javax.annotation.Nullable; import java.util.List; @RebornRegister(modID = TechReborn.MOD_ID) -public class TileQuantumTank extends TileLegacyMachineBase +public class TileQuantumTank extends TileMachineBase implements ItemHandlerProvider, IToolDrop, IListInfoProvider, IContainerProvider { @ConfigRegistry(config = "machines", category = "quantum_tank", key = "QuantumTankMaxStorage", comment = "Maximum amount of millibuckets a Quantum Tank can store") @@ -75,7 +75,7 @@ public class TileQuantumTank extends TileLegacyMachineBase return dropStack; } - // TileLegacyMachineBase + // TileMachineBase @Override public void update() { super.update(); diff --git a/src/main/java/techreborn/tiles/TileTechStorageBase.java b/src/main/java/techreborn/tiles/TileTechStorageBase.java index f3cf2a443..bc21df67f 100644 --- a/src/main/java/techreborn/tiles/TileTechStorageBase.java +++ b/src/main/java/techreborn/tiles/TileTechStorageBase.java @@ -35,7 +35,7 @@ import net.minecraftforge.items.CapabilityItemHandler; import reborncore.api.IListInfoProvider; import reborncore.api.IToolDrop; import reborncore.api.tile.ItemHandlerProvider; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; @@ -43,7 +43,7 @@ import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; -public class TileTechStorageBase extends TileLegacyMachineBase +public class TileTechStorageBase extends TileMachineBase implements ItemHandlerProvider, IToolDrop, IListInfoProvider { public final int maxCapacity; @@ -126,7 +126,7 @@ public class TileTechStorageBase extends TileLegacyMachineBase return stacks; } - // TileLegacyMachineBase + // TileMachineBase @Override public void update() { super.update(); diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java index 4b33037de..81d52af9c 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java @@ -344,7 +344,7 @@ public class TileFusionControlComputer extends TilePowerAcceptor return tagCompound; } - // TileLegacyMachineBase + // TileMachineBase @Override public void onLoad() { super.onLoad(); diff --git a/src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java b/src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java index 4255a7e76..88fe79885 100644 --- a/src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/machine/iron/TileIronAlloyFurnace.java @@ -37,7 +37,7 @@ import reborncore.api.recipe.RecipeHandler; import reborncore.api.tile.ItemHandlerProvider; import reborncore.common.recipes.RecipeTranslator; import reborncore.common.registration.RebornRegister; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; import techreborn.TechReborn; @@ -49,7 +49,7 @@ import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; @RebornRegister(modID = TechReborn.MOD_ID) -public class TileIronAlloyFurnace extends TileLegacyMachineBase +public class TileIronAlloyFurnace extends TileMachineBase implements IToolDrop, ItemHandlerProvider, IContainerProvider { public int tickTime; diff --git a/src/main/java/techreborn/tiles/machine/iron/TileIronFurnace.java b/src/main/java/techreborn/tiles/machine/iron/TileIronFurnace.java index 47dc79bf1..d8437a1b3 100644 --- a/src/main/java/techreborn/tiles/machine/iron/TileIronFurnace.java +++ b/src/main/java/techreborn/tiles/machine/iron/TileIronFurnace.java @@ -31,7 +31,7 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntityFurnace; import reborncore.api.tile.ItemHandlerProvider; import reborncore.common.blocks.BlockMachineBase; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; import reborncore.common.util.IInventoryAccess; import reborncore.common.util.Inventory; import reborncore.common.util.ItemUtils; @@ -39,7 +39,7 @@ import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; -public class TileIronFurnace extends TileLegacyMachineBase +public class TileIronFurnace extends TileMachineBase implements ItemHandlerProvider, IContainerProvider { public int tickTime; diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java b/src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java index 51eaf4d6c..c34f19aee 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileFluidReplicator.java @@ -132,7 +132,7 @@ public class TileFluidReplicator extends TileGenericMachine implements IContaine }; } - // TileLegacyMachineBase + // TileMachineBase @Nullable @Override public Tank getTank() { diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java index 6e598f2a7..9594e36b0 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialBlastFurnace.java @@ -139,7 +139,7 @@ public class TileIndustrialBlastFurnace extends TileGenericMachine implements IC } } - // TileLegacyMachineBase + // TileMachineBase @Override public void onDataPacket(final NetworkManager net, final SPacketUpdateTileEntity packet) { world.markBlockRangeForRenderUpdate(pos.getX(), pos.getY(), pos.getZ(), pos.getX(), pos.getY(), pos.getZ()); diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java index 436709ca1..36a689758 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialGrinder.java @@ -137,7 +137,7 @@ public class TileIndustrialGrinder extends TileGenericMachine implements IContai return tagCompound; } - // TileLegacyMachineBase + // TileMachineBase @Nullable @Override public Tank getTank() { diff --git a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java index 2263b7878..deee231e1 100644 --- a/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/machine/multiblock/TileIndustrialSawmill.java @@ -128,7 +128,7 @@ public class TileIndustrialSawmill extends TileGenericMachine implements IContai return tagCompound; } - // TileLegacyMachineBase + // TileMachineBase @Nullable @Override public Tank getTank() { diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java b/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java index 69569e618..4049d5755 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileAutoCraftingTable.java @@ -391,7 +391,7 @@ public class TileAutoCraftingTable extends TilePowerAcceptor super.readFromNBT(tag); } - // TileLegacyMachineBase + // TileMachineBase @Override public boolean canBeUpgraded() { return false; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java b/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java index d6eccc65d..8e2e3699e 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileRecycler.java @@ -179,7 +179,7 @@ public class TileRecycler extends TilePowerAcceptor return maxInput; } - // TileLegacyMachineBase + // TileMachineBase @Override public boolean canBeUpgraded() { return true; diff --git a/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java b/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java index 1deece16a..92053cf2e 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TileScrapboxinator.java @@ -53,7 +53,7 @@ public class TileScrapboxinator extends TileGenericMachine implements IContainer this.crafter = new ScrapboxRecipeCrafter(this, this.inventory, inputs, outputs); } - // TileLegacyMachineBase + // TileMachineBase @Override public boolean canBeUpgraded() { return false; diff --git a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java index fa9919439..f83a926dd 100644 --- a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java +++ b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java @@ -113,7 +113,7 @@ public class TileEnergyStorage extends TilePowerAcceptor return tier; } - // TileLegacyMachineBase + // TileMachineBase @Override public void setFacing(EnumFacing enumFacing) { world.setBlockState(pos, world.getBlockState(pos).withProperty(BlockEnergyStorage.FACING, enumFacing)); diff --git a/src/main/java/techreborn/tiles/storage/lesu/TileLSUStorage.java b/src/main/java/techreborn/tiles/storage/lesu/TileLSUStorage.java index 8e25da334..7e14a91d0 100644 --- a/src/main/java/techreborn/tiles/storage/lesu/TileLSUStorage.java +++ b/src/main/java/techreborn/tiles/storage/lesu/TileLSUStorage.java @@ -30,10 +30,10 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import reborncore.api.IToolDrop; -import reborncore.common.tile.TileLegacyMachineBase; +import reborncore.common.tile.TileMachineBase; import techreborn.init.ModBlocks; -public class TileLSUStorage extends TileLegacyMachineBase +public class TileLSUStorage extends TileMachineBase implements IToolDrop { public LesuNetwork network; @@ -77,7 +77,7 @@ public class TileLSUStorage extends TileLegacyMachineBase findAndJoinNetwork(world, pos.getX(), pos.getY(), pos.getZ()); } - // TileLegacyMachineBase + // TileMachineBase @Override public void update() { super.update(); diff --git a/src/main/java/techreborn/tiles/transformers/TileTransformer.java b/src/main/java/techreborn/tiles/transformers/TileTransformer.java index 01d9c2fac..eac49be0c 100644 --- a/src/main/java/techreborn/tiles/transformers/TileTransformer.java +++ b/src/main/java/techreborn/tiles/transformers/TileTransformer.java @@ -122,7 +122,7 @@ public class TileTransformer extends TilePowerAcceptor //Nope } - // TileLegacyMachineBase + // TileMachineBase @Override public EnumFacing getFacingEnum() { Block block = world.getBlockState(pos).getBlock();