From 2d365daae6e92d4edfe303f3d1ba5e77556a1351 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 28 Jan 2023 14:00:14 +0100 Subject: [PATCH 1/4] added import --- .../java/org/betterx/betterend/rituals/EternalRitual.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/betterx/betterend/rituals/EternalRitual.java b/src/main/java/org/betterx/betterend/rituals/EternalRitual.java index f809f2ed..51f81386 100644 --- a/src/main/java/org/betterx/betterend/rituals/EternalRitual.java +++ b/src/main/java/org/betterx/betterend/rituals/EternalRitual.java @@ -1,5 +1,6 @@ package org.betterx.betterend.rituals; +import org.betterx.bclib.BCLib; import org.betterx.bclib.blocks.BlockProperties; import org.betterx.betterend.BetterEnd; import org.betterx.betterend.advancements.BECriteria; @@ -722,6 +723,7 @@ public class EternalRitual { Block searchBlock, Predicate condition ) { + BCLib.LOGGER.info("Checking " + checkPos + " for Portal"); if (world instanceof ServerLevel server) { BlockPos.MutableBlockPos altCheckPos = new BlockPos.MutableBlockPos( checkPos.getX(), @@ -731,6 +733,7 @@ public class EternalRitual { var pos = findClosestPoi(server, altCheckPos); if (pos != null) { checkPos = pos.mutable(); + BCLib.LOGGER.info("Moving to " + checkPos); } } Direction moveDirection = Direction.EAST; @@ -755,9 +758,10 @@ public class EternalRitual { } } } - System.out.print(checkPos + " -> " + moveDirection + " -> "); + String s = checkPos + " -> " + moveDirection + " -> "; checkPos.move(moveDirection, 16); - System.out.println(checkPos); + s += checkPos; + BCLib.LOGGER.info(s); } moveDirection = moveDirection.getClockWise(); } From 533b269f3c850c68f6a5a107ef3ec5e904439c72 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 28 Jan 2023 14:04:18 +0100 Subject: [PATCH 2/4] [Change] Updated EMI dependency (#128) --- gradle.properties | 2 +- .../emi/TransparentSlotWidget.java | 23 +++++++++---------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/gradle.properties b/gradle.properties index bef3fbdc..b6b0e41f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,6 +22,6 @@ patchouli_version=1.19-73-FABRIC bclib_version=2.1.4 rei_version=9.1.500 jei_version=11.1.0.235 -emi_version=0.3.0+1.19 +emi_version=0.4.3+1.19 trinkets_version=3.4.0 cca_version=5.0.0-beta.1 diff --git a/src/main/java/org/betterx/betterend/integration/emi/TransparentSlotWidget.java b/src/main/java/org/betterx/betterend/integration/emi/TransparentSlotWidget.java index 1cc65591..edf3fea8 100644 --- a/src/main/java/org/betterx/betterend/integration/emi/TransparentSlotWidget.java +++ b/src/main/java/org/betterx/betterend/integration/emi/TransparentSlotWidget.java @@ -7,7 +7,6 @@ import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.renderer.GameRenderer; -import dev.emi.emi.EmiClient; import dev.emi.emi.EmiConfig; import dev.emi.emi.EmiRenderHelper; import dev.emi.emi.api.render.EmiRender; @@ -42,17 +41,17 @@ public class TransparentSlotWidget extends SlotWidget { } } - if (this.getRecipe() == null - && EmiClient.availableForCrafting.containsKey(this.getStack()) - && !this.getStack().isEmpty() - && !(Boolean) EmiClient.availableForCrafting.get(this.getStack())) { - GuiComponent.fill( - matrices, - bounds.x(), bounds.y(), - bounds.x() + bounds.width(), bounds.y() + bounds.height(), - 0x44FF0000 - ); - } +// if (this.getRecipe() == null +// && EmiClient.availableForCrafting.containsKey(this.getStack()) +// && !this.getStack().isEmpty() +// && !(Boolean) EmiClient.availableForCrafting.get(this.getStack())) { +// GuiComponent.fill( +// matrices, +// bounds.x(), bounds.y(), +// bounds.x() + bounds.width(), bounds.y() + bounds.height(), +// 0x44FF0000 +// ); +// } int xOff = (width - 16) / 2; int yOff = (height - 16) / 2; From 9cf3400a967df522c14d99785a625acd9af8715f Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 28 Jan 2023 14:10:37 +0100 Subject: [PATCH 3/4] Version Bump --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b6b0e41f..69e5eeac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ modrinth_versions=["1.19", "1.19.1", "1.19.2"] release_channel=release modrinth_id=betterend # Mod Properties -mod_version=2.1.3 +mod_version=2.1.4 maven_group=org.betterx.betterend archives_base_name=better-end # Dependencies From 2c873eea3f505dd74a8343498a69ee4dca924c5d Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 28 Jan 2023 14:10:50 +0100 Subject: [PATCH 4/4] Javadoc fixes --- src/main/java/org/betterx/betterend/rituals/EternalRitual.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/betterx/betterend/rituals/EternalRitual.java b/src/main/java/org/betterx/betterend/rituals/EternalRitual.java index 51f81386..177da6b7 100644 --- a/src/main/java/org/betterx/betterend/rituals/EternalRitual.java +++ b/src/main/java/org/betterx/betterend/rituals/EternalRitual.java @@ -771,7 +771,6 @@ public class EternalRitual { /** * @param world World for search * @param checkPos Start search position - * @param radius Search radius * @return List of positions of the all found blocks or empty list. */ public static BlockPos findClosestPoi(