diff --git a/build.gradle b/build.gradle index 82649c87..0dd3b51a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.10-SNAPSHOT' + id 'fabric-loom' version '0.11-SNAPSHOT' id 'maven-publish' } diff --git a/src/main/java/carpet/mixins/PerfCommand_permissionMixin.java b/src/main/java/carpet/mixins/PerfCommand_permissionMixin.java index ce8ba9a8..fb69816a 100644 --- a/src/main/java/carpet/mixins/PerfCommand_permissionMixin.java +++ b/src/main/java/carpet/mixins/PerfCommand_permissionMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; public class PerfCommand_permissionMixin { @SuppressWarnings("UnresolvedMixinReference") - @Inject(method = "lambda$register$0(Lnet/minecraft/commands/CommandSourceStack;)Z", at = @At("HEAD"), cancellable = true) + @Inject(method = "method_37340", at = @At("HEAD"), cancellable = true) private static void canRun(CommandSourceStack source, CallbackInfoReturnable cir) { cir.setReturnValue(source.hasPermission(CarpetSettings.perfPermissionLevel)); diff --git a/src/main/java/carpet/mixins/ReloadCommand_reloadAppsMixin.java b/src/main/java/carpet/mixins/ReloadCommand_reloadAppsMixin.java index 8123732b..35d8be92 100644 --- a/src/main/java/carpet/mixins/ReloadCommand_reloadAppsMixin.java +++ b/src/main/java/carpet/mixins/ReloadCommand_reloadAppsMixin.java @@ -14,7 +14,7 @@ public class ReloadCommand_reloadAppsMixin { //method_13530(Lcom/mojang/brigadier/context/CommandContext;)I // internal of register. @SuppressWarnings("UnresolvedMixinReference") - @Inject(method = "lambda$register$2", at = @At("TAIL")) + @Inject(method = "method_13530", at = @At("TAIL")) private static void onReload(CommandContext context, CallbackInfoReturnable cir) { // can't fetch here the reference to the server diff --git a/src/main/java/carpet/mixins/StructureGeneratorFactory_plopMixin.java b/src/main/java/carpet/mixins/StructureGeneratorFactory_plopMixin.java index 1e450b92..fb7595e3 100644 --- a/src/main/java/carpet/mixins/StructureGeneratorFactory_plopMixin.java +++ b/src/main/java/carpet/mixins/StructureGeneratorFactory_plopMixin.java @@ -12,7 +12,7 @@ import net.minecraft.world.level.levelgen.structure.pieces.PieceGeneratorSupplie public interface StructureGeneratorFactory_plopMixin { @SuppressWarnings("UnresolvedMixinReference") - @Redirect(method = "lambda$simple$0(Ljava/util/function/Predicate;Ljava/util/Optional;Lnet/minecraft/world/level/levelgen/structure/pieces/PieceGeneratorSupplier$Context;)Ljava/util/Optional;", at = @At( + @Redirect(method = "method_39845", at = @At( value = "INVOKE", target = "java/util/function/Predicate.test(Ljava/lang/Object;)Z" )) diff --git a/src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java b/src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java index 98fbc687..bd8d2475 100644 --- a/src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java +++ b/src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java @@ -108,10 +108,10 @@ public abstract class ThreadedAnvilChunkStorage_scarpetChunkCreationMixin implem ThreadLocal generated = ThreadLocal.withInitial(() -> null); - // in convertToFullChunk + // in protoChunkToFullChunk // fancier version of the one below, ensuring that the event is triggered when the chunk is actually loaded. @SuppressWarnings("UnresolvedMixinReference") - @Inject(method = "lambda$protoChunkToFullChunk$28", at = @At("HEAD")) + @Inject(method = "method_20460", at = @At("HEAD")) private void onChunkGeneratedStart(ChunkHolder chunkHolder, Either chunk, CallbackInfoReturnable>> cir) { if (CHUNK_GENERATED.isNeeded() || CHUNK_LOADED.isNeeded()) @@ -125,7 +125,7 @@ public abstract class ThreadedAnvilChunkStorage_scarpetChunkCreationMixin implem } @SuppressWarnings("UnresolvedMixinReference") - @Inject(method = "lambda$protoChunkToFullChunk$28", at = @At("RETURN")) + @Inject(method = "method_20460", at = @At("RETURN")) private void onChunkGeneratedEnd(ChunkHolder chunkHolder, Either chunk, CallbackInfoReturnable>> cir) { Boolean localGenerated= generated.get();