Skip to content

Commit

Permalink
missed some params
Browse files Browse the repository at this point in the history
all remaining unmapped params should be things that are unmapped in parchment, excluding commented out code
  • Loading branch information
CursedFlames authored and NotStirred committed Jan 21, 2024
1 parent e6d3fec commit b4a30ea
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ private TicketType<?> cc_replaceTicketType(Operation<TicketType<ChunkPos>> origi
public abstract <T> void addTicket(TicketType<T> 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 <T> void removeTicket(TicketType<T> type, CloPos p_184170_, int ticketLevel, T key);
public abstract <T> void removeTicket(TicketType<T> type, CloPos cloPos, int ticketLevel, T key);

@TransformFrom("getLevel(Lnet/minecraft/world/level/ChunkPos;)I")
public abstract int getLevel(CloPos cloPos);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,11 @@ private static void replaceMissingSections(Registry<Biome> 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<Structure, StructureStart> getAllStarts();
Expand All @@ -178,16 +178,16 @@ private static void replaceMissingSections(Registry<Biome> 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<Structure, LongSet> getAllReferences();

@TransformFrom(copyFrom = @CopyFrom(clazz = ChunkAccess.class), value = "setAllReferences(Ljava/util/Map;)V")
@Override public native void setAllReferences(Map<Structure, LongSet> p_187663_);
@Override public native void setAllReferences(Map<Structure, LongSet> structureReferencesMap);

@Override public boolean isYSpaceEmpty(int startY, int endY) {
// TODO
Expand Down Expand Up @@ -228,7 +228,7 @@ private static void replaceMissingSections(Registry<Biome> 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<BlockPos, BlockState> p_285269_);
@Override public native void findBlockLightSources(BiConsumer<BlockPos, BlockState> output);

@TransformFrom(copyFrom = @CopyFrom(clazz = ChunkAccess.class), value = "findBlocks(Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V")
@Override public native void findBlocks(Predicate<BlockState> predicate, BiConsumer<BlockPos, BlockState> output);
Expand Down Expand Up @@ -307,7 +307,7 @@ private static void replaceMissingSections(Registry<Biome> biomeRegistry, LevelC
throw new UnsupportedOperationException(); // TODO P3
}

@Override public Holder<Biome> getNoiseBiome(int p_204347_, int p_204348_, int p_204349_) {
@Override public Holder<Biome> getNoiseBiome(int x, int y, int z) {
throw new UnsupportedOperationException(); // TODO P3
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;")
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

public class CubeTaskPriorityQueueSorter implements AutoCloseable, CubeHolderLevelChangeListener {

public CubeTaskPriorityQueueSorter(List<ProcessorHandle<?>> taskExecutors, Executor executor, int p_i50713_3_) {
public CubeTaskPriorityQueueSorter(List<ProcessorHandle<?>> taskExecutors, Executor executor, int maxTasks) {
throw new Error("ASM didn't apply");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

public class CloTaskPriorityQueueSorter implements AutoCloseable, CubeHolderLevelChangeListener {

public CloTaskPriorityQueueSorter(List<ProcessorHandle<?>> taskExecutors, Executor executor, int p_i50713_3_) {
public CloTaskPriorityQueueSorter(List<ProcessorHandle<?>> taskExecutors, Executor executor, int maxTasks) {
throw new Error("ASM didn't apply");
}

Expand Down

0 comments on commit b4a30ea

Please sign in to comment.