xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Boblet 2024-07-11 16:05:25 +02:00
parent 6951c73aa4
commit 28e1fdd7f5
9 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/hbm/inventory/container/ContainerAutocrafter.java
View File

@ -5,7 +5,6 @@ import com.hbm.tileentity.machine.TileEntityMachineAutocrafter;
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;

127
src/main/java/com/hbm/inventory/container/ContainerBase.java
View File

@ -7,75 +7,84 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
/**For now, only used for stuff with filters and crates as a reference implementation,
* because I really needed to get the te from a container
* But you should very much use this to kill the giant amount of boilerplate in container classes
* @author 70k **/
/**
* For now, only used for stuff with filters and crates as a reference
* implementation, because I really needed to get the te from a container But
* you should very much use this to kill the giant amount of boilerplate in
* container classes
*
* @author 70k
**/
public class ContainerBase extends Container {
public IInventory te;
public IInventory tile;
public ContainerBase (InventoryPlayer invPlayer, IInventory tedf){
te = tedf;
}
@Override
public boolean canInteractWith(EntityPlayer player) {
return te.isUseableByPlayer(player);
}
public ContainerBase(InventoryPlayer invPlayer, IInventory tedf) {
tile = tedf;
}
@Override
public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
ItemStack var3 = null;
Slot var4 = (Slot) this.inventorySlots.get(par2);
@Override
public boolean canInteractWith(EntityPlayer player) {
return tile.isUseableByPlayer(player);
}
if(var4 != null && var4.getHasStack()) {
ItemStack var5 = var4.getStack();
var3 = var5.copy();
@Override
public ItemStack transferStackInSlot(EntityPlayer player, int index) {
ItemStack slotOriginal = null;
Slot slot = (Slot) this.inventorySlots.get(index);
if(par2 <= te.getSizeInventory() - 1) {
if(!this.mergeItemStack(var5, te.getSizeInventory(), this.inventorySlots.size(), true)) {
return null;
}
} else if(!this.mergeItemStack(var5, 0, te.getSizeInventory(), false)) {
return null;
}
if(slot != null && slot.getHasStack()) {
ItemStack slotStack = slot.getStack();
slotOriginal = slotStack.copy();
if(var5.stackSize == 0) {
var4.putStack(null);
} else {
var4.onSlotChanged();
}
if(index <= tile.getSizeInventory() - 1) {
if(!this.mergeItemStack(slotStack, tile.getSizeInventory(), this.inventorySlots.size(), true)) {
return null;
}
} else if(!this.mergeItemStack(slotStack, 0, tile.getSizeInventory(), false)) {
return null;
}
var4.onPickupFromSlot(p_82846_1_, var5);
}
if(slotStack.stackSize == 0) {
slot.putStack(null);
} else {
slot.onSlotChanged();
}
return var3;
}
slot.onPickupFromSlot(player, slotStack);
}
/**Used to quickly set up the player inventory*/
public void playerInv(InventoryPlayer invPlayer, int playerInvX, int playerInvY, int playerHotbarY){
for(int i = 0; i < 3; i++) {
for(int j = 0; j < 9; j++) {
this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, playerInvX + j * 18, playerInvY + i * 18));
}
}
return slotOriginal;
}
for(int i = 0; i < 9; i++) {
this.addSlotToContainer(new Slot(invPlayer, i, playerInvX + i * 18, playerHotbarY));
}
}
/** Used to quickly set up the player inventory */
public void playerInv(InventoryPlayer invPlayer, int playerInvX, int playerInvY, int playerHotbarY) {
for(int i = 0; i < 3; i++) {
for(int j = 0; j < 9; j++) {
this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, playerInvX + j * 18, playerInvY + i * 18));
}
}
// I'm gonna make a farken helper function for this shit, why was it done the old way for 9 whole ass years?
//- Mellow, 1884
/**Used to add several conventional inventory slots at a time
* @param inv the inventory to add the slots to
* @param from the slot index to start from*/
public void addSlots(IInventory inv, int from, int x, int y, int rows, int cols) {
int slotSize = 18;
for(int row = 0; row < rows; row++) {
for(int col = 0; col < cols; col++) {
this.addSlotToContainer(new Slot(inv, col + row * cols + from, x + col * slotSize, y + row * slotSize));
}
}
}
for(int i = 0; i < 9; i++) {
this.addSlotToContainer(new Slot(invPlayer, i, playerInvX + i * 18, playerHotbarY));
}
}
// I'm gonna make a farken helper function for this shit, why was it done
// the old way for 9 whole ass years?
// - Mellow, 1884
/**
* Used to add several conventional inventory slots at a time
*
* @param inv the inventory to add the slots to
* @param from the slot index to start from
*/
public void addSlots(IInventory inv, int from, int x, int y, int rows, int cols) {
int slotSize = 18;
for(int row = 0; row < rows; row++) {
for(int col = 0; col < cols; col++) {
this.addSlotToContainer(new Slot(inv, col + row * cols + from, x + col * slotSize, y + row * slotSize));
}
}
}
}

1
src/main/java/com/hbm/inventory/container/ContainerCounterTorch.java
View File

@ -5,7 +5,6 @@ import com.hbm.tileentity.network.TileEntityRadioTorchCounter;
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;

1
src/main/java/com/hbm/inventory/container/ContainerCraneExtractor.java
View File

@ -7,7 +7,6 @@ import com.hbm.tileentity.network.TileEntityCraneExtractor;
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;

1
src/main/java/com/hbm/inventory/container/ContainerCraneGrabber.java
View File

@ -7,7 +7,6 @@ import com.hbm.tileentity.network.TileEntityCraneGrabber;
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;

1
src/main/java/com/hbm/inventory/container/ContainerCraneRouter.java
View File

@ -5,7 +5,6 @@ import com.hbm.tileentity.network.TileEntityCraneRouter;
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;

9
src/main/java/com/hbm/inventory/container/ContainerCrateBase.java
View File

@ -2,24 +2,21 @@ package com.hbm.inventory.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
public class ContainerCrateBase extends ContainerBase {
//just there so prev stuff doesnt break
protected IInventory crate = te;
protected IInventory crate = tile;
public ContainerCrateBase(InventoryPlayer invPlayer, IInventory tedf) {
super(invPlayer, tedf);
te.openInventory();
tile.openInventory();
}
@Override
public void onContainerClosed(EntityPlayer p_75134_1_) {
super.onContainerClosed(p_75134_1_);
te.closeInventory();
tile.closeInventory();
}
}

1
src/main/java/com/hbm/inventory/container/ContainerMassStorage.java
View File

@ -6,7 +6,6 @@ import com.hbm.tileentity.machine.storage.TileEntityMassStorage;
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;

2
src/main/java/com/hbm/inventory/gui/GuiInfoContainer.java
View File

@ -306,7 +306,7 @@ public abstract class GuiInfoContainer extends GuiContainer implements INEIGuiHa
tag.setInteger("id", Item.getIdFromItem(stack.getItem()));
tag.setInteger("meta", stack.getItemDamage());
TileEntity te = (TileEntity) ((ContainerBase) inventorySlots).te;
TileEntity te = (TileEntity) ((ContainerBase) inventorySlots).tile;
PacketDispatcher.wrapper.sendToServer(new NBTControlPacket(tag, te.xCoord, te.yCoord, te.zCoord));
return true;
}