fix: fix Bio-Forge GUI crashing the game when clicking next page button

Elenterius · Apr 25, 2023 · 4046464 · 4046464
1 parent 6a752a7
commit 4046464
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/com/github/elenterius/biomancy/client/gui/BioForgeScreen.java b/src/main/java/com/github/elenterius/biomancy/client/gui/BioForgeScreen.java
@@ -220,6 +220,7 @@ private void drawTabs(PoseStack poseStack) {
 	private void drawRecipes(PoseStack poseStack) {
 		if (!recipeBook.hasRecipesOnPage()) return;
 
+		//TODO: refactor - move into the loop below
 		if (recipeBook.hasSelectedRecipe() && recipeBook.isSelectedRecipeVisible()) {
 			int gridIndex = recipeBook.getGridIndexOfSelectedRecipe();
 			BioForgeRecipe recipe = recipeBook.getRecipeByGrid(gridIndex);
@@ -228,10 +229,10 @@ private void drawRecipes(PoseStack poseStack) {
 		}
 
 		int maxRecipes = recipeBook.getMaxRecipesOnGrid();
-		for (int i = 0; i < maxRecipes; i++) {
-			BioForgeRecipe recipe = recipeBook.getRecipeByGrid(i);
-			boolean isCraftable = recipeBook.getRecipeCollectionByGrid(i).isCraftable(recipe);
-			drawRecipeTile(poseStack, i, isCraftable, recipe.getResultItem());
+		for (int gridIndex = 0; gridIndex < maxRecipes; gridIndex++) {
+			BioForgeRecipe recipe = recipeBook.getRecipeByGrid(gridIndex);
+			boolean isCraftable = recipeBook.getRecipeCollectionByGrid(gridIndex).isCraftable(recipe);
+			drawRecipeTile(poseStack, gridIndex, isCraftable, recipe.getResultItem());
 		}
 
 		drawPagination(poseStack);

diff --git a/src/main/java/com/github/elenterius/biomancy/client/gui/BioForgeScreenController.java b/src/main/java/com/github/elenterius/biomancy/client/gui/BioForgeScreenController.java
@@ -151,18 +151,18 @@ public int getMaxRecipesOnGrid() {
 		return Math.min(GRID_SIZE, shownRecipes.size() - startIndex);
 	}
 
+	//TODO: refactor
 	public boolean isSelectedRecipeVisible() {
 		int maxIndex = startIndex + GRID_SIZE;
 		if (recipeSelection.tab == activeTab) {
 			return recipeSelection.index >= startIndex && recipeSelection.index < maxIndex && getGridIndexOfSelectedRecipe() < getMaxRecipesOnGrid();
 		}
 
 		if (recipeSelection.recipe != null && (activeTab == 0 || getCurrentCategory() == recipeSelection.recipe.getTab())) {
-			//find gridIndex recipeSelection in foreign tab
 			int maxRecipes = getMaxRecipesOnGrid();
-			for (int i = 0; i < maxRecipes; i++) {
-				if (getRecipe(startIndex + i).isRecipeEqual(recipeSelection.recipe)) {
-					crossoverGridIndex = startIndex + i;
+			for (int gridIndex = 0; gridIndex < maxRecipes; gridIndex++) {
+				if (getRecipe(startIndex + gridIndex).isRecipeEqual(recipeSelection.recipe)) {
+					crossoverGridIndex = startIndex + gridIndex;
 					return true;
 				}
 			}
@@ -178,7 +178,7 @@ public int getGridIndexOfSelectedRecipe() {
 		}
 
 		if (recipeSelection.recipe != null && (activeTab == 0 || getCurrentCategory() == recipeSelection.recipe.getTab())) {
-			return crossoverGridIndex;
+			return crossoverGridIndex - startIndex;
 		}
 
 		return 0;