From b4a30ea837ccf359af46d2e13ecc2295997da49a Mon Sep 17 00:00:00 2001 From: CursedFlames <18627001+CursedFlames@users.noreply.github.com> Date: Mon, 22 Jan 2024 06:32:33 +1300 Subject: [PATCH] missed some params all remaining unmapped params should be things that are unmapped in parchment, excluding commented out code --- .../common/server/level/MixinTickingTracker.java | 2 +- .../world/level/chunklike/CloAccess.java | 2 +- .../cubicchunks/world/level/cube/CubeAccess.java | 14 +++++++------- .../cubicchunks/world/level/cube/LevelCube.java | 10 +++++----- .../level/CubicDistanceManagerTestAccess.java | 4 ++-- .../server/level/TestCubicDistanceManager.java | 12 ++++++------ .../test/world/level/cube/TestCubeAccess.java | 2 +- .../server/level/CubeTaskPriorityQueueSorter.java | 2 +- .../level/clo/CloTaskPriorityQueueSorter.java | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinTickingTracker.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinTickingTracker.java index 891991ec..5d7afc96 100644 --- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinTickingTracker.java +++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinTickingTracker.java @@ -71,7 +71,7 @@ private TicketType cc_replaceTicketType(Operation> origi public abstract void addTicket(TicketType type, CloPos cloPos, int ticketLevel, T key); @TransformFrom("removeTicket(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;ILjava/lang/Object;)V") - public abstract void removeTicket(TicketType type, CloPos p_184170_, int ticketLevel, T key); + public abstract void removeTicket(TicketType type, CloPos cloPos, int ticketLevel, T key); @TransformFrom("getLevel(Lnet/minecraft/world/level/ChunkPos;)I") public abstract int getLevel(CloPos cloPos); diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/CloAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/CloAccess.java index 13a76c30..34676782 100644 --- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/CloAccess.java +++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/CloAccess.java @@ -40,7 +40,7 @@ import net.minecraft.world.ticks.TickContainerAccess; public interface CloAccess extends BlockGetter, BiomeManager.NoiseBiomeSource, LightChunk, StructureAccess { - GameEventListenerRegistry getListenerRegistry(int p_251437_); + GameEventListenerRegistry getListenerRegistry(int sectionY); @Nullable BlockState setBlockState(BlockPos pos, BlockState state, boolean isMoving); diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java index 5fe01f77..b3d2808c 100644 --- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java +++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java @@ -164,11 +164,11 @@ private static void replaceMissingSections(Registry biomeRegistry, LevelC @TransformFrom(copyFrom = @CopyFrom(clazz = ChunkAccess.class), value = "getStartForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;)" + "Lnet/minecraft/world/level/levelgen/structure/StructureStart;") - @Override @Nullable public native StructureStart getStartForStructure(Structure p_223005_); + @Override @Nullable public native StructureStart getStartForStructure(Structure structure); @TransformFrom(copyFrom = @CopyFrom(clazz = ChunkAccess.class), value = "setStartForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;" + "Lnet/minecraft/world/level/levelgen/structure/StructureStart;)V") - @Override public native void setStartForStructure(Structure p_223010_, StructureStart p_223011_); + @Override public native void setStartForStructure(Structure structure, StructureStart structureStart); @TransformFrom(copyFrom = @CopyFrom(clazz = ChunkAccess.class), value = "getAllStarts()Ljava/util/Map;") @Override public native Map getAllStarts(); @@ -178,16 +178,16 @@ private static void replaceMissingSections(Registry biomeRegistry, LevelC @TransformFrom(copyFrom = @CopyFrom(clazz = ChunkAccess.class), value = "getReferencesForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;)" + "Lit/unimi/dsi/fastutil/longs/LongSet;") - @Override public native LongSet getReferencesForStructure(Structure p_223017_); + @Override public native LongSet getReferencesForStructure(Structure structure); @TransformFrom(copyFrom = @CopyFrom(clazz = ChunkAccess.class), value = "addReferenceForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;J)V") - @Override public native void addReferenceForStructure(Structure p_223007_, long p_223008_); + @Override public native void addReferenceForStructure(Structure structure, long reference); @TransformFrom(copyFrom = @CopyFrom(clazz = ChunkAccess.class), value = "getAllReferences()Ljava/util/Map;") @Override public native Map getAllReferences(); @TransformFrom(copyFrom = @CopyFrom(clazz = ChunkAccess.class), value = "setAllReferences(Ljava/util/Map;)V") - @Override public native void setAllReferences(Map p_187663_); + @Override public native void setAllReferences(Map structureReferencesMap); @Override public boolean isYSpaceEmpty(int startY, int endY) { // TODO @@ -228,7 +228,7 @@ private static void replaceMissingSections(Registry biomeRegistry, LevelC @Override @Nullable public native CompoundTag getBlockEntityNbtForSaving(BlockPos pos); @TransformFrom(copyFrom = @CopyFrom(clazz = ChunkAccess.class), value = "findBlockLightSources(Ljava/util/function/BiConsumer;)V") - @Override public native void findBlockLightSources(BiConsumer p_285269_); + @Override public native void findBlockLightSources(BiConsumer output); @TransformFrom(copyFrom = @CopyFrom(clazz = ChunkAccess.class), value = "findBlocks(Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V") @Override public native void findBlocks(Predicate predicate, BiConsumer output); @@ -307,7 +307,7 @@ private static void replaceMissingSections(Registry biomeRegistry, LevelC throw new UnsupportedOperationException(); // TODO P3 } - @Override public Holder getNoiseBiome(int p_204347_, int p_204348_, int p_204349_) { + @Override public Holder getNoiseBiome(int x, int y, int z) { throw new UnsupportedOperationException(); // TODO P3 } diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java index 175b1db2..0398e348 100644 --- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java +++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java @@ -158,14 +158,14 @@ public LevelCube(ServerLevel level, ProtoCube cube, @Nullable PostLoadProcessor // TODO should this actually be dasm'd? @TransformFrom(copyFrom = @CopyFrom(clazz = LevelChunk.class), value = "getListenerRegistry(I)Lnet/minecraft/world/level/gameevent/GameEventListenerRegistry;") - @Override public native GameEventListenerRegistry getListenerRegistry(int p_251193_); + @Override public native GameEventListenerRegistry getListenerRegistry(int sectionY); // dasm + mixin @TransformFrom(copyFrom = @CopyFrom(clazz = LevelChunk.class), value = "getBlockState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState;") - @Override public native @NotNull BlockState getBlockState(BlockPos p_62923_); + @Override public native @NotNull BlockState getBlockState(BlockPos pos); @TransformFrom(copyFrom = @CopyFrom(clazz = LevelChunk.class), value = "getFluidState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/material/FluidState;") - @Override public native @NotNull FluidState getFluidState(BlockPos p_62895_); + @Override public native @NotNull FluidState getFluidState(BlockPos pos); // dasm + mixin @TransformFrom(copyFrom = @CopyFrom(clazz = LevelChunk.class), value = "getFluidState(III)Lnet/minecraft/world/level/material/FluidState;") @@ -321,7 +321,7 @@ public void postProcessGeneration() { @TransformFrom(copyFrom = @CopyFrom(clazz = LevelChunk.class), value = "promotePendingBlockEntity(Lnet/minecraft/core/BlockPos;Lnet/minecraft/nbt/CompoundTag;)" + "Lnet/minecraft/world/level/block/entity/BlockEntity;") - @Nullable private native BlockEntity promotePendingBlockEntity(BlockPos p_62871_, CompoundTag p_62872_); + @Nullable private native BlockEntity promotePendingBlockEntity(BlockPos pos, CompoundTag tag); @TransformFrom(copyFrom = @CopyFrom(clazz = LevelChunk.class), value = "unpackTicks(J)V") public native void unpackTicks(long pos); @@ -419,7 +419,7 @@ public class RebindableTickingBlockEntityWrapper implements TickingBlockEntity { throw new IllegalStateException("DASM failed to apply"); } - native void rebind(TickingBlockEntity p_156450_); + native void rebind(TickingBlockEntity ticker); @Override public native void tick(); diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/CubicDistanceManagerTestAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/CubicDistanceManagerTestAccess.java index 302677e6..a726462f 100644 --- a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/CubicDistanceManagerTestAccess.java +++ b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/CubicDistanceManagerTestAccess.java @@ -11,11 +11,11 @@ @Mixin(DistanceManager.class) public interface CubicDistanceManagerTestAccess { @Invoker(value = "updateChunkForced") - void invoke_updateChunkForced(ChunkPos p_140800_, boolean p_140801_); + void invoke_updateChunkForced(ChunkPos pos, boolean add); @Dynamic @Invoker(value = "updateCubeForced", remap = false) - void invoke_updateCubeForced(CloPos p_140800_, boolean p_140801_); + void invoke_updateCubeForced(CloPos pos, boolean add); @Accessor(value = "playerTicketManager") DistanceManager.PlayerTicketTracker get_playerTicketManager(); diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicDistanceManager.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicDistanceManager.java index 50b86f45..20c70884 100644 --- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicDistanceManager.java +++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicDistanceManager.java @@ -47,16 +47,16 @@ public TestDistanceManager(Executor executor, Executor executor2) { } @Override - protected boolean isChunkToRemove(long p_140462_) { + protected boolean isChunkToRemove(long chunkPos) { return false; } @Nullable @Override - protected ChunkHolder getChunk(long p_140469_) { return null; } + protected ChunkHolder getChunk(long chunkPos) { return null; } @Nullable @Override - protected ChunkHolder updateChunkScheduling(long p_140464_, int p_140465_, @Nullable ChunkHolder p_140466_, int p_140467_) { return null; } + protected ChunkHolder updateChunkScheduling(long chunkPos, int newLevel, @Nullable ChunkHolder holder, int oldLevel) { return null; } } static class ServerPlayerAndPosition { @@ -75,12 +75,12 @@ private DistanceManager setupDistanceManager() { var mainThreadExecutor = // Based on ServerChunkCache.MainThreadExecutor new BlockableEventLoop<>("test_event_loop") { @Override - protected Runnable wrapRunnable(Runnable p_8506_) { - return p_8506_; + protected Runnable wrapRunnable(Runnable runnable) { + return runnable; } @Override - protected boolean shouldRun(Runnable p_8504_) { + protected boolean shouldRun(Runnable runnable) { return true; } diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestCubeAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestCubeAccess.java index daef389f..e291aebd 100644 --- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestCubeAccess.java +++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestCubeAccess.java @@ -50,7 +50,7 @@ public CubeAccessTestImpl(CloPos cloPos, UpgradeData upgradeData, super(cloPos, upgradeData, levelHeightAccessor, biomeRegistry, inhabitedTime, chunkSections, blendingData); } - @Override public GameEventListenerRegistry getListenerRegistry(int p_251437_) { + @Override public GameEventListenerRegistry getListenerRegistry(int sectionY) { return null; } diff --git a/src_old/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeTaskPriorityQueueSorter.java b/src_old/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeTaskPriorityQueueSorter.java index 945c9af1..56a68209 100644 --- a/src_old/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeTaskPriorityQueueSorter.java +++ b/src_old/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeTaskPriorityQueueSorter.java @@ -13,7 +13,7 @@ public class CubeTaskPriorityQueueSorter implements AutoCloseable, CubeHolderLevelChangeListener { - public CubeTaskPriorityQueueSorter(List> taskExecutors, Executor executor, int p_i50713_3_) { + public CubeTaskPriorityQueueSorter(List> taskExecutors, Executor executor, int maxTasks) { throw new Error("ASM didn't apply"); } diff --git a/src_old/main/java/io/github/opencubicchunks/cubicchunks/server/level/clo/CloTaskPriorityQueueSorter.java b/src_old/main/java/io/github/opencubicchunks/cubicchunks/server/level/clo/CloTaskPriorityQueueSorter.java index bedd6f23..e2b67650 100644 --- a/src_old/main/java/io/github/opencubicchunks/cubicchunks/server/level/clo/CloTaskPriorityQueueSorter.java +++ b/src_old/main/java/io/github/opencubicchunks/cubicchunks/server/level/clo/CloTaskPriorityQueueSorter.java @@ -14,7 +14,7 @@ public class CloTaskPriorityQueueSorter implements AutoCloseable, CubeHolderLevelChangeListener { - public CloTaskPriorityQueueSorter(List> taskExecutors, Executor executor, int p_i50713_3_) { + public CloTaskPriorityQueueSorter(List> taskExecutors, Executor executor, int maxTasks) { throw new Error("ASM didn't apply"); }