MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'quiqueck:1.19' into 1.19

Browse source
This commit is contained in:
Paloo 2023-02-03 10:42:41 +09:00 • committed by GitHub
commit 63d9799765
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gradle.properties
View file

@ -13,7 +13,7 @@ modrinth_versions=["1.19", "1.19.1", "1.19.2"]
release_channel=release release_channel=release
modrinth_id=betterend modrinth_id=betterend
# Mod Properties # Mod Properties
mod_version=2.1.3 mod_version=2.1.4
maven_group=org.betterx.betterend maven_group=org.betterx.betterend
archives_base_name=better-end archives_base_name=better-end
# Dependencies # Dependencies
@ -22,6 +22,6 @@ patchouli_version=1.19-73-FABRIC
bclib_version=2.1.4 bclib_version=2.1.4
rei_version=9.1.500 rei_version=9.1.500
jei_version=11.1.0.235 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 trinkets_version=3.4.0
cca_version=5.0.0-beta.1 cca_version=5.0.0-beta.1

23
src/main/java/org/betterx/betterend/integration/emi/TransparentSlotWidget.java
View file

@ -7,7 +7,6 @@ import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.gui.GuiComponent;
import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.GameRenderer;
import dev.emi.emi.EmiClient;
import dev.emi.emi.EmiConfig; import dev.emi.emi.EmiConfig;
import dev.emi.emi.EmiRenderHelper; import dev.emi.emi.EmiRenderHelper;
import dev.emi.emi.api.render.EmiRender; import dev.emi.emi.api.render.EmiRender;
@ -42,17 +41,17 @@ public class TransparentSlotWidget extends SlotWidget {
} }
} }
if (this.getRecipe() == null // if (this.getRecipe() == null
&& EmiClient.availableForCrafting.containsKey(this.getStack()) // && EmiClient.availableForCrafting.containsKey(this.getStack())
&& !this.getStack().isEmpty() // && !this.getStack().isEmpty()
&& !(Boolean) EmiClient.availableForCrafting.get(this.getStack())) { // && !(Boolean) EmiClient.availableForCrafting.get(this.getStack())) {
GuiComponent.fill( // GuiComponent.fill(
matrices, // matrices,
bounds.x(), bounds.y(), // bounds.x(), bounds.y(),
bounds.x() + bounds.width(), bounds.y() + bounds.height(), // bounds.x() + bounds.width(), bounds.y() + bounds.height(),
0x44FF0000 // 0x44FF0000
); // );
} // }
int xOff = (width - 16) / 2; int xOff = (width - 16) / 2;
int yOff = (height - 16) / 2; int yOff = (height - 16) / 2;

9
src/main/java/org/betterx/betterend/rituals/EternalRitual.java
View file

@ -1,5 +1,6 @@
package org.betterx.betterend.rituals; package org.betterx.betterend.rituals;
import org.betterx.bclib.BCLib;
import org.betterx.bclib.blocks.BlockProperties; import org.betterx.bclib.blocks.BlockProperties;
import org.betterx.betterend.BetterEnd; import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.advancements.BECriteria; import org.betterx.betterend.advancements.BECriteria;
@ -722,6 +723,7 @@ public class EternalRitual {
Block searchBlock, Block searchBlock,
Predicate<BlockState> condition Predicate<BlockState> condition
) { ) {
BCLib.LOGGER.info("Checking " + checkPos + " for Portal");
if (world instanceof ServerLevel server) { if (world instanceof ServerLevel server) {
BlockPos.MutableBlockPos altCheckPos = new BlockPos.MutableBlockPos( BlockPos.MutableBlockPos altCheckPos = new BlockPos.MutableBlockPos(
checkPos.getX(), checkPos.getX(),
@ -731,6 +733,7 @@ public class EternalRitual {
var pos = findClosestPoi(server, altCheckPos); var pos = findClosestPoi(server, altCheckPos);
if (pos != null) { if (pos != null) {
checkPos = pos.mutable(); checkPos = pos.mutable();
BCLib.LOGGER.info("Moving to " + checkPos);
} }
} }
Direction moveDirection = Direction.EAST; Direction moveDirection = Direction.EAST;
@ -755,9 +758,10 @@ public class EternalRitual {
} }
} }
} }
System.out.print(checkPos + " -> " + moveDirection + " -> "); String s = checkPos + " -> " + moveDirection + " -> ";
checkPos.move(moveDirection, 16); checkPos.move(moveDirection, 16);
System.out.println(checkPos); s += checkPos;
BCLib.LOGGER.info(s);
} }
moveDirection = moveDirection.getClockWise(); moveDirection = moveDirection.getClockWise();
} }
@ -767,7 +771,6 @@ public class EternalRitual {
/** /**
* @param world World for search * @param world World for search
* @param checkPos Start search position * @param checkPos Start search position
* @param radius Search radius
* @return List of positions of the all found blocks or empty list. * @return List of positions of the all found blocks or empty list.
*/ */
public static BlockPos findClosestPoi( public static BlockPos findClosestPoi(