aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/goodgenerator/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/goodgenerator/util')
-rw-r--r--src/main/java/goodgenerator/util/MyRecipeAdder.java13
-rw-r--r--src/main/java/goodgenerator/util/StackUtils.java10
2 files changed, 16 insertions, 7 deletions
diff --git a/src/main/java/goodgenerator/util/MyRecipeAdder.java b/src/main/java/goodgenerator/util/MyRecipeAdder.java
index ce63af69ae..f5aad4cb00 100644
--- a/src/main/java/goodgenerator/util/MyRecipeAdder.java
+++ b/src/main/java/goodgenerator/util/MyRecipeAdder.java
@@ -515,7 +515,7 @@ public class MyRecipeAdder {
aNEISpecialValuePost,
aShowVoltageAmperageInNEI,
aNEIAllowed);
- setUsualFluidInputCount(8);
+ setUsualFluidInputCount(12);
setNEITransferRect(new Rectangle(70, 15, 18, 54));
setNEISpecialInfoFormatter(
(recipeInfo, applyPrefixAndSuffix) -> Collections.singletonList(
@@ -524,17 +524,18 @@ public class MyRecipeAdder {
@Override
public List<Pos2d> getItemInputPositions(int itemInputCount) {
- return UIHelper.getGridPositions(itemInputCount, 16, 15, 3);
+ return UIHelper.getGridPositions(itemInputCount, 16, 8, 3);
}
@Override
public List<Pos2d> getItemOutputPositions(int itemOutputCount) {
- return Collections.singletonList(new Pos2d(142, 15));
+ return Collections.singletonList(new Pos2d(142, 8));
}
@Override
public List<Pos2d> getFluidInputPositions(int fluidInputCount) {
- return UIHelper.getGridPositions(fluidInputCount, 88, 37, 4);
+
+ return UIHelper.getGridPositions(fluidInputCount, 88, 26, 4);
}
@Override
@@ -545,7 +546,7 @@ public class MyRecipeAdder {
Pos2d windowOffset) {
builder.widget(
new DrawableWidget().setDrawable(GG_UITextures.PICTURE_COMPONENT_ASSLINE)
- .setPos(new Pos2d(70, 22).add(windowOffset)).setSize(72, 40));
+ .setPos(new Pos2d(70, 11).add(windowOffset)).setSize(72, 40));
}
}
@@ -555,7 +556,7 @@ public class MyRecipeAdder {
"Component Assembly Line",
null,
"goodgenerator:textures/gui/ComponentAssline",
- 9,
+ 12,
1,
0,
0,
diff --git a/src/main/java/goodgenerator/util/StackUtils.java b/src/main/java/goodgenerator/util/StackUtils.java
index c4d8c4f9a1..3de85910cb 100644
--- a/src/main/java/goodgenerator/util/StackUtils.java
+++ b/src/main/java/goodgenerator/util/StackUtils.java
@@ -16,7 +16,7 @@ public class StackUtils {
/**
* Multiplies one ItemStack by a multiplier, and splits it into as many full stacks as it needs to.
- *
+ *
* @param stack The ItemStack you want to multiply
* @param multiplier The number the stack is multiplied by
* @return A List of stacks that, in total, are the same as the input ItemStack after it has been multiplied.
@@ -67,6 +67,10 @@ public class StackUtils {
return output;
}
+ /**
+ * Turns the {@code items} List into a {@code HashMap} containing each unique {@code ItemStack} as the key, and a
+ * value representing the total amount of the respective {@code ItemStack} in the List.
+ */
public static HashMap<ItemStack, Integer> getTotalItems(List<ItemStack> items) {
HashMap<ItemStack, Integer> totals = new HashMap<>();
itemLoop: for (ItemStack item : items) {
@@ -77,6 +81,10 @@ public class StackUtils {
return totals;
}
+ /**
+ * Turns the {@code items} Array into a {@code HashMap} containing each unique {@code ItemStack} as the key, and a
+ * value representing the total amount of the respective {@code ItemStack} in the Array.
+ */
public static HashMap<ItemStack, Integer> getTotalItems(ItemStack[] items) {
return getTotalItems(Arrays.asList(items));
}