Repo-Mirror/MoonriseMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix AcquirePoiMixin

Browse Source 
Just needed to update the method targets
This commit is contained in:
Spottedleaf
2024-12-03 11:28:23 -08:00
parent 6b4139a5ab
commit f6541b0d91
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/ca/spottedleaf/moonrise/common/util/JsonUtil.java
View File

@@ -1,6 +1,7 @@
package ca.spottedleaf.moonrise.common.util; package ca.spottedleaf.moonrise.common.util;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.Strictness;
import com.google.gson.internal.Streams; import com.google.gson.internal.Streams;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;
import java.io.File; import java.io.File;
@@ -16,7 +17,7 @@ public final class JsonUtil {
final StringWriter stringWriter = new StringWriter(); final StringWriter stringWriter = new StringWriter();
final JsonWriter jsonWriter = new JsonWriter(stringWriter); final JsonWriter jsonWriter = new JsonWriter(stringWriter);
jsonWriter.setIndent(" "); jsonWriter.setIndent(" ");
jsonWriter.setLenient(false); jsonWriter.setStrictness(Strictness.LENIENT);
Streams.write(element, jsonWriter); Streams.write(element, jsonWriter);
final String jsonString = stringWriter.toString(); final String jsonString = stringWriter.toString();

6
src/main/java/ca/spottedleaf/moonrise/mixin/poi_lookup/AcquirePoiMixin.java
View File

@@ -24,8 +24,8 @@ abstract class AcquirePoiMixin {
*/ */
@Redirect( @Redirect(
method = { method = {
"method_46885", "lambda$create$8",
"*(ZLorg/apache/commons/lang3/mutable/MutableLong;Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;Ljava/util/function/Predicate;Lnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;Ljava/util/Optional;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/PathfinderMob;J)Z" "method_46885"
}, },
at = @At( at = @At(
target = "Lnet/minecraft/world/entity/ai/village/poi/PoiManager;findAllClosestFirstWithType(Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/core/BlockPos;ILnet/minecraft/world/entity/ai/village/poi/PoiManager$Occupancy;)Ljava/util/stream/Stream;", target = "Lnet/minecraft/world/entity/ai/village/poi/PoiManager;findAllClosestFirstWithType(Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/core/BlockPos;ILnet/minecraft/world/entity/ai/village/poi/PoiManager$Occupancy;)Ljava/util/stream/Stream;",
@@ -33,7 +33,7 @@ abstract class AcquirePoiMixin {
ordinal = 0 ordinal = 0
) )
) )
private static Stream<Pair<Holder<PoiType>, BlockPos>> aaa(PoiManager poiManager, Predicate<Holder<PoiType>> predicate, private static Stream<Pair<Holder<PoiType>, BlockPos>> useLimitedSearch(PoiManager poiManager, Predicate<Holder<PoiType>> predicate,
Predicate<BlockPos> predicate2, BlockPos blockPos, int i, Predicate<BlockPos> predicate2, BlockPos blockPos, int i,
PoiManager.Occupancy occup) { PoiManager.Occupancy occup) {
final List<Pair<Holder<PoiType>, BlockPos>> ret = new ArrayList<>(); final List<Pair<Holder<PoiType>, BlockPos>> ret = new ArrayList<>();