Small changes for 7.3

Author: UselessBullets

src/main/java/useless/moonsteel/ContainerStarBackpack.java

@@ -1,19 +1,19 @@
 package useless.moonsteel;
 
 import net.minecraft.core.InventoryAction;
-import net.minecraft.core.entity.player.EntityPlayer;
-import net.minecraft.core.player.inventory.Container;
+import net.minecraft.core.entity.player.Player;
+import net.minecraft.core.player.inventory.menu.MenuAbstract;
 import net.minecraft.core.player.inventory.slot.Slot;
 import useless.moonsteel.interfaces.IStarBackpack;
 
 import java.util.List;
 
-public class ContainerStarBackpack extends Container {
+public class ContainerStarBackpack extends MenuAbstract {
 	public StarBackpackInventory backpackInventory;
-	public ContainerStarBackpack(EntityPlayer player) {
-		backpackInventory = ((IStarBackpack)player).moonsteel$getStarBackpackInventory();
-		int slotsNum = this.backpackInventory.getSizeInventory();
-		int rows = (int)Math.ceil((double)slotsNum / 9.0);
+	public ContainerStarBackpack(final Player player) {
+		this.backpackInventory = ((IStarBackpack)player).moonsteel$getStarBackpackInventory();
+		final int slotsNum = this.backpackInventory.getContainerSize();
+		final int rows = (int)Math.ceil((double)slotsNum / 9.0);
 
 		for(int i = 0; i < rows; ++i) {
 			int width = 9;
@@ -37,34 +37,37 @@ public ContainerStarBackpack(EntityPlayer player) {
 		}
 	}
 
-	public List<Integer> getMoveSlots(InventoryAction inventoryAction, Slot slot, int i, EntityPlayer entityPlayer) {
-		int chestSize = this.backpackInventory.getSizeInventory();
-		if (slot.id >= 0 && slot.id < chestSize) {
+	@Override
+	public List<Integer> getMoveSlots(final InventoryAction inventoryAction, final Slot slot, final int i, final Player entityPlayer) {
+		final int chestSize = this.backpackInventory.getContainerSize();
+		if (slot.index >= 0 && slot.index < chestSize) {
 			return this.getSlots(0, chestSize, false);
 		} else {
 			if (inventoryAction == InventoryAction.MOVE_ALL) {
-				if (slot.id >= chestSize && slot.id < chestSize + 27) {
+				if (slot.index >= chestSize && slot.index < chestSize + 27) {
 					return this.getSlots(chestSize, 27, false);
 				}
 
-				if (slot.id >= chestSize + 27 && slot.id < chestSize + 36) {
+				if (slot.index >= chestSize + 27 && slot.index < chestSize + 36) {
 					return this.getSlots(chestSize + 27, 9, false);
 				}
-			} else if (slot.id >= chestSize && slot.id < chestSize + 36) {
+			} else if (slot.index >= chestSize && slot.index < chestSize + 36) {
 				return this.getSlots(chestSize, 36, false);
 			}
 
 			return null;
 		}
 	}
 
-	public List<Integer> getTargetSlots(InventoryAction inventoryAction, Slot slot, int i, EntityPlayer entityPlayer) {
-		int chestSize = this.backpackInventory.getSizeInventory();
-		return slot.id < chestSize ? this.getSlots(chestSize, 36, true) : this.getSlots(0, chestSize, false);
+	@Override
+	public List<Integer> getTargetSlots(final InventoryAction inventoryAction, final Slot slot, final int i, final Player entityPlayer) {
+		final int chestSize = this.backpackInventory.getContainerSize();
+		return slot.index < chestSize ? this.getSlots(chestSize, 36, true) : this.getSlots(0, chestSize, false);
 	}
 
-	public boolean isUsableByPlayer(EntityPlayer entityPlayer) {
-		return this.backpackInventory.canInteractWith(entityPlayer);
+	@Override
+	public boolean stillValid(final Player entityPlayer) {
+		return this.backpackInventory.stillValid(entityPlayer);
 	}
 
 }

src/main/java/useless/moonsteel/GuiStarBackpack.java

@@ -1,37 +1,38 @@
 package useless.moonsteel;
 
-import net.minecraft.client.gui.GuiContainer;
-import net.minecraft.core.entity.player.EntityPlayer;
+import net.minecraft.client.gui.container.ScreenContainerAbstract;
+import net.minecraft.core.entity.player.Player;
+import net.minecraft.core.lang.I18n;
 import org.lwjgl.opengl.GL11;
 import tosutosu.betterwithbackpacks.BetterWithBackpacks;
 
-public class GuiStarBackpack extends GuiContainer {
+public class GuiStarBackpack extends ScreenContainerAbstract {
 	private int GUIx;
 	private int GUIy;
 	private int rows;
 	private int slotsNum;
 	private final ContainerStarBackpack backpack;
-	public GuiStarBackpack(EntityPlayer player) {
+	public GuiStarBackpack(Player player) {
 		super(new ContainerStarBackpack(player));
 		backpack = (ContainerStarBackpack) inventorySlots;
 	}
 
 	public void init() {
 		this.GUIx = (this.width - this.xSize) / 2;
 		this.GUIy = (this.height - this.ySize) / 2;
-		this.slotsNum = this.backpack.backpackInventory.getSizeInventory();
+		this.slotsNum = this.backpack.backpackInventory.getContainerSize();
 		this.rows = (int)Math.ceil((double)this.slotsNum / 9.0);
 		super.init();
 	}
 
 	protected void drawGuiContainerForegroundLayer() {
-		this.fontRenderer.drawString(this.backpack.backpackInventory.getInvName(), 8, 6, BetterWithBackpacks.GUI_LABEL_COLOR);
-		this.fontRenderer.drawString("Inventory", 8, this.ySize - 96 + 2, BetterWithBackpacks.GUI_LABEL_COLOR);
+		this.font.drawString(I18n.getInstance().translateKey(this.backpack.backpackInventory.getNameTranslationKey()), 8, 6, BetterWithBackpacks.GUI_LABEL_COLOR);
+		this.font.drawString("Inventory", 8, this.ySize - 96 + 2, BetterWithBackpacks.GUI_LABEL_COLOR);
 	}
 
 	protected void drawGuiContainerBackgroundLayer(float f) {
 		GL11.glColor3d(1.0, 1.0, 1.0);
-		this.mc.renderEngine.bindTexture(this.mc.renderEngine.getTexture("/assets/betterwithbackpacks/gui/backpack.png"));
+		this.mc.textureManager.loadTexture("/assets/betterwithbackpacks/gui/backpack.png").bind();
 		this.drawTexturedModalRect(this.GUIx, this.GUIy, 0, 0, this.xSize, this.ySize);
 
 		for(int i = 0; i < this.rows; ++i) {