mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-08-10 17:55:44 +00:00
Merge branch 'HbmMods:master' into rulang121
This commit is contained in:
commit
1e036e6aee
@ -342,23 +342,8 @@ public abstract class GuiInfoContainer extends GuiContainer implements INEIGuiHa
|
||||
@Optional.Method(modid = "NotEnoughItems")
|
||||
public boolean handleDragNDrop(GuiContainer gui, int x, int y, ItemStack stack, int button) {
|
||||
// BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD!
|
||||
// BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD!
|
||||
// BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD!
|
||||
// BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD!
|
||||
// BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD!
|
||||
// BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD!
|
||||
// BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD!
|
||||
// BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD!
|
||||
// BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD!
|
||||
// BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD!
|
||||
// BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD!
|
||||
// BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD!
|
||||
// BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD!
|
||||
// BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD!
|
||||
// BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD!
|
||||
// BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD! BALD!
|
||||
|
||||
/*if(gui instanceof GuiInfoContainer && stack != null){
|
||||
if(gui instanceof GuiInfoContainer && stack != null){
|
||||
Slot slot = getSlotAtPosition(x,y);
|
||||
if(slot instanceof SlotPattern){
|
||||
if(inventorySlots instanceof ContainerBase) {
|
||||
@ -374,7 +359,7 @@ public abstract class GuiInfoContainer extends GuiContainer implements INEIGuiHa
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
return false;
|
||||
}
|
||||
//all credits for impl to GTNH's EnderCore fork
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
package com.hbm.tileentity.network.pneumatic;
|
||||
|
||||
|
||||
import com.hbm.interfaces.IControlReceiver;
|
||||
import com.hbm.inventory.container.ContainerPneumoStorageExporter;
|
||||
import com.hbm.inventory.gui.GUIPneumoStorageExporter;
|
||||
@ -318,6 +317,15 @@ public class TileEntityPneumoStorageExporter extends TileEntityPneumaticMachineB
|
||||
@Override
|
||||
public void nextMode(int i) { }
|
||||
|
||||
@Override
|
||||
public void setFilterContents(NBTTagCompound nbt) {
|
||||
int slot = nbt.getInteger("slot");
|
||||
NBTTagCompound stack = nbt.getCompoundTag("stack");
|
||||
ItemStack item = ItemStack.loadItemStackFromNBT(stack);
|
||||
this.setInventorySlotContents(slot, item);
|
||||
this.markChanged();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getFunctionInfo() {
|
||||
return new String[] {
|
||||
|
||||
@ -69,6 +69,15 @@ public class TileEntityPneumoStorageMono extends TileEntityPneumaticStorageBase
|
||||
@Override public long getAmountAt(int index) { return amounts[index]; }
|
||||
@Override public boolean allowTypeSetting() { return false; }
|
||||
|
||||
@Override
|
||||
public void receiveControl(NBTTagCompound data) {
|
||||
super.receiveControl(data);
|
||||
|
||||
if(data.hasKey("slot")){
|
||||
setFilterContents(data);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public long useUpItem(int index, long amount) {
|
||||
if(amounts[index] <= 0) return amount;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user