Compare commits

...
3 changed files with 67 additions and 18 deletions

No files matched your search

+2 -2
View File
@@ -1,4 +1,4 @@
//version: 1705357285
//version: 1706545953
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -651,7 +651,7 @@ repositories {
def mixinProviderGroup = "io.github.legacymoddingmc"
def mixinProviderModule = "unimixins"
def mixinProviderVersion = "0.1.13"
def mixinProviderVersion = "0.1.15"
def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
ext.mixinProviderSpec = mixinProviderSpec
@@ -144,6 +144,7 @@ public class BookmarkCraftingChain {
for (int index = 0; index < items.size(); index++) {
CraftingChainItem item = new CraftingChainItem(items.get(index), metadata.get(index));
item.guid = item.ingredient ? "i" + item.guid : "r" + item.guid;
this.items.add(item);
if (this.multiplier.get(item.recipeIndex) == null) {
@@ -274,7 +275,7 @@ public class BookmarkCraftingChain {
for (CraftingChainItem item : request.outputs.get(stackIndex)) {
if (!request.initialItems.contains(item.recipeIndex) && item.factor > 0) {
long ingrCount = calculateCount(request, request.inputs.get(item.stackIndex));
long ingrCount = calculateCount(request, request.inputs.get(item.stackIndex), item.recipeIndex);
long outputCount = calculateCount(request, request.outputs.get(item.stackIndex));
long shift = (long) Math.ceil((ingrCount - outputCount) / (double) item.factor);
@@ -294,11 +295,17 @@ public class BookmarkCraftingChain {
}
private long calculateCount(CraftingChainRequest request, HashSet<CraftingChainItem> items) {
return calculateCount(request, items, -1);
}
private long calculateCount(CraftingChainRequest request, HashSet<CraftingChainItem> items, int recipeIndex) {
long count = 0L;
if (items != null) {
for (CraftingChainItem item : items) {
count += request.counts.get(item.guid) + item.factor * request.multiplier.get(item.recipeIndex);
if (item.recipeIndex != recipeIndex || recipeIndex == -1) {
count += request.counts.get(item.guid) + item.factor * request.multiplier.get(item.recipeIndex);
}
}
}
@@ -91,6 +91,44 @@ public class BookmarkPanel extends PanelWidget {
this.ungroup = ungroup;
this.rowIndexA = rowIndexA;
}
public int getTopRowIndex(BookmarkGrid BGrid) {
int topRowIndex = Math.min(this.rowIndexA, this.rowIndexB);
int topItemIndex = BGrid.getRowItemIndex(topRowIndex, true);
ItemStackMetadata meta = topItemIndex >= 0 ? BGrid.metadata.get(topItemIndex) : null;
if (meta != null && meta.recipeId != null) {
while (topItemIndex > 0 && meta.groupId == BGrid.metadata.get(topItemIndex - 1).groupId
&& meta.recipeId.equals(BGrid.metadata.get(topItemIndex - 1).recipeId)) {
topItemIndex--;
}
int index = BGrid.getMask().indexOf(topItemIndex);
topRowIndex = index == -1 ? 0 : index / BGrid.columns;
}
return topRowIndex;
}
public int getBottomRowIndex(BookmarkGrid BGrid) {
int bottomRowIndex = Math.max(this.rowIndexA, this.rowIndexB);
int bottomItemIndex = BGrid.getRowItemIndex(bottomRowIndex, false);
ItemStackMetadata meta = bottomItemIndex >= 0 ? BGrid.metadata.get(bottomItemIndex) : null;
if (meta != null && meta.recipeId != null) {
int size = BGrid.size();
while (bottomItemIndex < size - 1 && meta.groupId == BGrid.metadata.get(bottomItemIndex + 1).groupId
&& meta.recipeId.equals(BGrid.metadata.get(bottomItemIndex + 1).recipeId)) {
bottomItemIndex++;
}
int index = BGrid.getMask().indexOf(bottomItemIndex);
bottomRowIndex = index == -1 ? BGrid.getLastRowIndex() : index / BGrid.columns;
}
return bottomRowIndex;
}
}
protected static class ItemStackMetadata {
@@ -179,7 +217,9 @@ public class BookmarkPanel extends PanelWidget {
private static class RecipeTooltipRenderer {
public int slotIndex = 0;
public ItemStack stack = null;
public BookmarkRecipeId recipeId = null;
public GuiRecipe<?> gui = null;
public Runnable createRecipeGui = null;
}
@@ -281,6 +321,7 @@ public class BookmarkPanel extends PanelWidget {
if (c == 0 && (meta.recipeId == null || meta.ingredient == false
|| index + 1 < rows * columns && isInvalidSlot(index + 1)
|| previousMeta.groupId != meta.groupId
|| meta.ingredient && !meta.recipeId.equals(previousMeta.recipeId))) {
// In first column must be an item without recipe, a recipe result, or an ingredient
// if the second column is occupied
@@ -402,8 +443,8 @@ public class BookmarkPanel extends PanelWidget {
int previoudGroupId = DEFAULT_GROUP_ID;
if (groupingItem != null && groupingItem.rowIndexB != -1) {
int topRowIndex = Math.min(groupingItem.rowIndexA, groupingItem.rowIndexB);
int bottomRowIndex = Math.max(groupingItem.rowIndexA, groupingItem.rowIndexB);
int topRowIndex = groupingItem.getTopRowIndex(this);
int bottomRowIndex = groupingItem.getBottomRowIndex(this);
int groupIdA = groupMask.get(groupingItem.rowIndexA);
int groupId = groupingItem.ungroup ? DEFAULT_GROUP_ID : (groupIdA == DEFAULT_GROUP_ID ? -1 : groupIdA);
groupMask = new ArrayList<>(groupMask);
@@ -414,12 +455,12 @@ public class BookmarkPanel extends PanelWidget {
if (groupIdA != DEFAULT_GROUP_ID && !groupingItem.ungroup
&& groupingItem.rowIndexA != groupingItem.rowIndexB) {
if (groupingItem.rowIndexB == topRowIndex) {
if (groupingItem.rowIndexB < groupingItem.rowIndexA) {
for (int rowIndex = topRowIndex - 1; rowIndex >= 0
&& groupMask.get(rowIndex) == groupIdA; rowIndex--) {
groupMask.set(rowIndex, DEFAULT_GROUP_ID);
}
} else if (groupingItem.rowIndexB == bottomRowIndex) {
} else if (groupingItem.rowIndexB > groupingItem.rowIndexA) {
for (int rowIndex = bottomRowIndex + 1; rowIndex < groupMask.size()
&& groupMask.get(rowIndex) == groupIdA; rowIndex++) {
groupMask.set(rowIndex, DEFAULT_GROUP_ID);
@@ -633,8 +674,8 @@ public class BookmarkPanel extends PanelWidget {
protected void createGroup(GroupingItem groupingItem) {
final List<Integer> mask = getMask();
final int topRowIndex = Math.min(groupingItem.rowIndexA, groupingItem.rowIndexB);
final int bottomRowIndex = Math.max(groupingItem.rowIndexA, groupingItem.rowIndexB);
final int topRowIndex = groupingItem.getTopRowIndex(this);
final int bottomRowIndex = groupingItem.getBottomRowIndex(this);
final int groupIdA = getRowGroupId(groupingItem.rowIndexA);
final int startMaskIndex = topRowIndex * columns;
final int endMaskIntex = Math.min((bottomRowIndex + 1) * columns, mask.size());
@@ -1032,16 +1073,17 @@ public class BookmarkPanel extends PanelWidget {
return;
}
if (this.recipeTooltipRenderer == null || this.recipeTooltipRenderer.slotIndex != focused.slotIndex) {
if (this.recipeTooltipRenderer == null || this.recipeTooltipRenderer.recipeId != meta.recipeId) {
this.recipeTooltipRenderer = new RecipeTooltipRenderer();
this.recipeTooltipRenderer.slotIndex = focused.slotIndex;
this.recipeTooltipRenderer.stack = this.realItems.get(focused.slotIndex);
this.recipeTooltipRenderer.recipeId = meta.recipeId;
this.recipeTooltipRenderer.createRecipeGui = () -> {
final int slotIndex = this.recipeTooltipRenderer.slotIndex;
final BookmarkRecipeId recipeId = this.metadata.get(slotIndex).recipeId;
GuiRecipe<?> gui = GuiCraftingRecipe
.createRecipeGui("recipeId", false, this.realItems.get(slotIndex), recipeId);
GuiRecipe<?> gui = GuiCraftingRecipe.createRecipeGui(
"recipeId",
false,
this.recipeTooltipRenderer.stack,
this.recipeTooltipRenderer.recipeId);
if (gui != null) {
gui.initGui();