mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 19:59:55 +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
@@ -3,13 +3,11 @@ package tconstruct.library.crafting;
|
||||
import java.util.*;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
public class AlloyMix
|
||||
{
|
||||
public class AlloyMix {
|
||||
public final FluidStack result;
|
||||
public final List<FluidStack> mixers;
|
||||
|
||||
public AlloyMix(FluidStack output, List<FluidStack> inputs)
|
||||
{
|
||||
public AlloyMix(FluidStack output, List<FluidStack> inputs) {
|
||||
result = output;
|
||||
mixers = inputs;
|
||||
}
|
||||
@@ -19,23 +17,18 @@ public class AlloyMix
|
||||
* ArrayList(mixers); return false; }
|
||||
*/
|
||||
|
||||
public FluidStack mix (ArrayList<FluidStack> liquids)
|
||||
{
|
||||
public FluidStack mix(ArrayList<FluidStack> liquids) {
|
||||
ArrayList<FluidStack> copyMix = new ArrayList(mixers);
|
||||
ArrayList effectiveAmount = new ArrayList();
|
||||
|
||||
for (int i = 0; i < liquids.size(); i++)
|
||||
{
|
||||
for (int i = 0; i < liquids.size(); i++) {
|
||||
FluidStack liquid = liquids.get(i);
|
||||
Iterator iter = copyMix.iterator();
|
||||
while (iter.hasNext())
|
||||
{
|
||||
while (iter.hasNext()) {
|
||||
FluidStack mixer = (FluidStack) iter.next();
|
||||
if (mixer.isFluidEqual(liquid))
|
||||
{
|
||||
if (mixer.isFluidEqual(liquid)) {
|
||||
// do we actually have enough of that liquid?
|
||||
if(liquid.amount < mixer.amount)
|
||||
break;
|
||||
if (liquid.amount < mixer.amount) break;
|
||||
|
||||
int eAmt = liquid.amount / mixer.amount;
|
||||
effectiveAmount.add(eAmt);
|
||||
@@ -45,28 +38,23 @@ public class AlloyMix
|
||||
}
|
||||
}
|
||||
|
||||
if (copyMix.size() > 0)
|
||||
return null;
|
||||
if (copyMix.size() > 0) return null;
|
||||
|
||||
// Remove old liquids
|
||||
int low = getLowestAmount(effectiveAmount);
|
||||
ArrayList<FluidStack> copyMix2 = new ArrayList(mixers);
|
||||
|
||||
for (int i = 0; i < liquids.size(); i++)
|
||||
{
|
||||
for (int i = 0; i < liquids.size(); i++) {
|
||||
FluidStack liquid = liquids.get(i);
|
||||
Iterator iter = copyMix2.iterator();
|
||||
while (iter.hasNext())
|
||||
{
|
||||
while (iter.hasNext()) {
|
||||
FluidStack mixer = (FluidStack) iter.next();
|
||||
// if (mixer.itemID == liquid.itemID && mixer.itemMeta ==
|
||||
// liquid.itemMeta)
|
||||
if (mixer.isFluidEqual(liquid))
|
||||
{
|
||||
if (mixer.isFluidEqual(liquid)) {
|
||||
int eAmt = low * mixer.amount;
|
||||
liquid.amount -= eAmt;
|
||||
if (liquid.amount <= 0)
|
||||
{
|
||||
if (liquid.amount <= 0) {
|
||||
liquids.remove(liquid);
|
||||
i--;
|
||||
}
|
||||
@@ -81,14 +69,11 @@ public class AlloyMix
|
||||
return ret;
|
||||
}
|
||||
|
||||
int getLowestAmount (ArrayList list)
|
||||
{
|
||||
int getLowestAmount(ArrayList list) {
|
||||
int frist = (Integer) list.get(0); // FRIST!!!
|
||||
for (int i = 1; i < list.size(); i++)
|
||||
{
|
||||
for (int i = 1; i < list.size(); i++) {
|
||||
int compare = (Integer) list.get(i);
|
||||
if (frist > compare)
|
||||
frist = compare;
|
||||
if (frist > compare) frist = compare;
|
||||
}
|
||||
return frist;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user