mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-20 12:19:48 +00:00
Fix JABBA-related issues with crafting station slots (#54)
* Fix shift-merging tools voiding items fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/11392> * Change 0-sized ItemStacks into null stacks in crafting station attached slots Fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/10425> * Update buildscript * spotlessApply
This commit is contained in:
1 parent
18bfeaff32
commit
39be06c23b
571 files changed
+25959
-28223
No files matched your search
@@ -5,164 +5,122 @@ import net.minecraft.nbt.*;
|
||||
import net.minecraftforge.fluids.*;
|
||||
import tconstruct.library.crafting.Smeltery;
|
||||
|
||||
public class MultiFluidTank extends LogicComponent implements IFluidTank
|
||||
{
|
||||
public class MultiFluidTank extends LogicComponent implements IFluidTank {
|
||||
public ArrayList<FluidStack> fluidlist = new ArrayList<FluidStack>();
|
||||
protected int maxLiquid;
|
||||
protected int currentLiquid;
|
||||
|
||||
public MultiFluidTank()
|
||||
{
|
||||
}
|
||||
public MultiFluidTank() {}
|
||||
|
||||
public MultiFluidTank(int max)
|
||||
{
|
||||
public MultiFluidTank(int max) {
|
||||
maxLiquid = max;
|
||||
}
|
||||
|
||||
public void setCapacity (int i)
|
||||
{
|
||||
public void setCapacity(int i) {
|
||||
maxLiquid = i;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getCapacity ()
|
||||
{
|
||||
public int getCapacity() {
|
||||
return maxLiquid;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getFluidAmount ()
|
||||
{
|
||||
public int getFluidAmount() {
|
||||
return currentLiquid;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack drain (int maxDrain, boolean doDrain)
|
||||
{
|
||||
if (fluidlist.size() == 0)
|
||||
return null;
|
||||
public FluidStack drain(int maxDrain, boolean doDrain) {
|
||||
if (fluidlist.size() == 0) return null;
|
||||
|
||||
FluidStack liquid = fluidlist.get(0);
|
||||
if (liquid != null)
|
||||
{
|
||||
if (liquid.amount - maxDrain <= 0)
|
||||
{
|
||||
if (liquid != null) {
|
||||
if (liquid.amount - maxDrain <= 0) {
|
||||
FluidStack liq = liquid.copy();
|
||||
if (doDrain)
|
||||
{
|
||||
if (doDrain) {
|
||||
fluidlist.remove(liquid);
|
||||
currentLiquid = 0;
|
||||
}
|
||||
return liq;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (doDrain)
|
||||
{
|
||||
} else {
|
||||
if (doDrain) {
|
||||
liquid.amount -= maxDrain;
|
||||
currentLiquid -= maxDrain;
|
||||
}
|
||||
return new FluidStack(liquid.getFluid(), maxDrain, liquid.tag);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
return new FluidStack(0, 0);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int fill (FluidStack resource, boolean doFill)
|
||||
{
|
||||
if (resource != null && currentLiquid < maxLiquid)
|
||||
{
|
||||
if (resource.amount + currentLiquid > maxLiquid)
|
||||
resource.amount = maxLiquid - currentLiquid;
|
||||
public int fill(FluidStack resource, boolean doFill) {
|
||||
if (resource != null && currentLiquid < maxLiquid) {
|
||||
if (resource.amount + currentLiquid > maxLiquid) resource.amount = maxLiquid - currentLiquid;
|
||||
int amount = resource.amount;
|
||||
|
||||
if (doFill)
|
||||
{
|
||||
if (addFluidToTank(resource, false))
|
||||
{
|
||||
if (doFill) {
|
||||
if (addFluidToTank(resource, false)) {
|
||||
ArrayList alloys = Smeltery.mixMetals(fluidlist);
|
||||
for (int al = 0; al < alloys.size(); al++)
|
||||
{
|
||||
for (int al = 0; al < alloys.size(); al++) {
|
||||
FluidStack liquid = (FluidStack) alloys.get(al);
|
||||
addFluidToTank(liquid, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
return amount;
|
||||
}
|
||||
else
|
||||
return 0;
|
||||
} else return 0;
|
||||
}
|
||||
|
||||
public boolean addFluidToTank (FluidStack liquid, boolean first)
|
||||
{
|
||||
if (fluidlist.size() == 0)
|
||||
{
|
||||
public boolean addFluidToTank(FluidStack liquid, boolean first) {
|
||||
if (fluidlist.size() == 0) {
|
||||
fluidlist.add(liquid.copy());
|
||||
currentLiquid += liquid.amount;
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (liquid.amount + currentLiquid > maxLiquid)
|
||||
return false;
|
||||
} else {
|
||||
if (liquid.amount + currentLiquid > maxLiquid) return false;
|
||||
|
||||
currentLiquid += liquid.amount;
|
||||
boolean added = false;
|
||||
for (int i = 0; i < fluidlist.size(); i++)
|
||||
{
|
||||
for (int i = 0; i < fluidlist.size(); i++) {
|
||||
FluidStack l = fluidlist.get(i);
|
||||
if (l.isFluidEqual(liquid))
|
||||
{
|
||||
if (l.isFluidEqual(liquid)) {
|
||||
l.amount += liquid.amount;
|
||||
added = true;
|
||||
}
|
||||
if (l.amount <= 0)
|
||||
{
|
||||
if (l.amount <= 0) {
|
||||
fluidlist.remove(l);
|
||||
i--;
|
||||
}
|
||||
}
|
||||
if (!added)
|
||||
{
|
||||
if (first)
|
||||
fluidlist.add(0, liquid.copy());
|
||||
else
|
||||
fluidlist.add(liquid.copy());
|
||||
if (!added) {
|
||||
if (first) fluidlist.add(0, liquid.copy());
|
||||
else fluidlist.add(liquid.copy());
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack getFluid ()
|
||||
{
|
||||
if (fluidlist.size() == 0)
|
||||
return null;
|
||||
public FluidStack getFluid() {
|
||||
if (fluidlist.size() == 0) return null;
|
||||
return fluidlist.get(0);
|
||||
}
|
||||
|
||||
public List<FluidStack> getAllFluids ()
|
||||
{
|
||||
public List<FluidStack> getAllFluids() {
|
||||
return fluidlist;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidTankInfo getInfo ()
|
||||
{
|
||||
public FluidTankInfo getInfo() {
|
||||
return new FluidTankInfo(this);
|
||||
}
|
||||
|
||||
public FluidTankInfo[] getMultiTankInfo ()
|
||||
{
|
||||
public FluidTankInfo[] getMultiTankInfo() {
|
||||
FluidTankInfo[] info = new FluidTankInfo[fluidlist.size() + 1];
|
||||
for (int i = 0; i < fluidlist.size(); i++)
|
||||
{
|
||||
for (int i = 0; i < fluidlist.size(); i++) {
|
||||
FluidStack fluid = fluidlist.get(i);
|
||||
info[i] = new FluidTankInfo(fluid.copy(), fluid.amount);
|
||||
}
|
||||
@@ -173,26 +131,21 @@ public class MultiFluidTank extends LogicComponent implements IFluidTank
|
||||
/* Sync liquids */
|
||||
|
||||
@Override
|
||||
public void readNetworkNBT (NBTTagCompound tags)
|
||||
{
|
||||
public void readNetworkNBT(NBTTagCompound tags) {
|
||||
NBTTagList liquidTag = tags.getTagList("Liquids", 10);
|
||||
fluidlist.clear();
|
||||
|
||||
for (int iter = 0; iter < liquidTag.tagCount(); iter++)
|
||||
{
|
||||
for (int iter = 0; iter < liquidTag.tagCount(); iter++) {
|
||||
NBTTagCompound nbt = (NBTTagCompound) liquidTag.getCompoundTagAt(iter);
|
||||
FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbt);
|
||||
if (fluid != null)
|
||||
fluidlist.add(fluid);
|
||||
if (fluid != null) fluidlist.add(fluid);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeNetworkNBT (NBTTagCompound tags)
|
||||
{
|
||||
public void writeNetworkNBT(NBTTagCompound tags) {
|
||||
NBTTagList taglist = new NBTTagList();
|
||||
for (FluidStack liquid : fluidlist)
|
||||
{
|
||||
for (FluidStack liquid : fluidlist) {
|
||||
NBTTagCompound nbt = new NBTTagCompound();
|
||||
liquid.writeToNBT(nbt);
|
||||
taglist.appendTag(nbt);
|
||||
@@ -200,4 +153,4 @@ public class MultiFluidTank extends LogicComponent implements IFluidTank
|
||||
|
||||
tags.setTag("Liquids", taglist);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user