Skip to content

Commit

Permalink
build: 24w37a
Browse files Browse the repository at this point in the history
  • Loading branch information
ishland committed Sep 12, 2024
1 parent 6f9d092 commit 43ab79b
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 43 deletions.
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx2G

# Fabric Properties
# check these on https://fabricmc.net/versions.html
minecraft_version=24w35a
yarn_mappings=24w35a+build.3
loader_version=0.16.3
minecraft_version=24w37a
yarn_mappings=24w37a+build.3
loader_version=0.16.5

# Mod Properties
mod_version = 0.2.0+beta.7
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ private static int execute(
@Nullable PosArgument rotation,
@Nullable TeleportCommand.LookTarget facingLocation
) throws CommandSyntaxException {
Vec3d vec3d = location.toAbsolutePos(source);
Vec2f vec2f = rotation == null ? null : rotation.toAbsoluteRotation(source);
Vec3d vec3d = location.getPos(source);
Vec2f vec2f = rotation == null ? null : rotation.getRotation(source);
Set<PositionFlag> set = EnumSet.noneOf(PositionFlag.class);
if (location.isXRelative()) {
set.add(PositionFlag.X);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
@Mixin(ServerWorld.class)
public abstract class MixinServerWorld extends World implements StructureWorldAccess {

protected MixinServerWorld(MutableWorldProperties properties, RegistryKey<World> registryRef, DynamicRegistryManager registryManager, RegistryEntry<DimensionType> dimensionEntry, Supplier<Profiler> profiler, boolean isClient, boolean debugWorld, long biomeAccess, int maxChainedNeighborUpdates) {
super(properties, registryRef, registryManager, dimensionEntry, profiler, isClient, debugWorld, biomeAccess, maxChainedNeighborUpdates);
protected MixinServerWorld(MutableWorldProperties properties, RegistryKey<World> registryRef, DynamicRegistryManager registryManager, RegistryEntry<DimensionType> dimensionEntry, boolean isClient, boolean debugWorld, long seed, int maxChainedNeighborUpdates) {
super(properties, registryRef, registryManager, dimensionEntry, isClient, debugWorld, seed, maxChainedNeighborUpdates);
}

@Shadow public abstract ServerChunkManager getChunkManager();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@
import it.unimi.dsi.fastutil.objects.ObjectArrayFIFOQueue;
import net.minecraft.server.world.ChunkHolder;
import net.minecraft.server.world.ChunkLevels;
import net.minecraft.server.world.ChunkTaskPrioritySystem;
import net.minecraft.server.world.ChunkTicket;
import net.minecraft.server.world.ChunkTicketManager;
import net.minecraft.server.world.ServerChunkLoadingManager;
import net.minecraft.util.collection.SortedArraySet;
import net.minecraft.util.thread.MessageListener;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
Expand Down Expand Up @@ -49,10 +47,6 @@ public abstract class MixinChunkTicketManager {

@Shadow protected abstract SortedArraySet<ChunkTicket<?>> getTicketSet(long position);

@Shadow @Final private MessageListener<ChunkTaskPrioritySystem.UnblockingMessage> playerTicketThrottlerUnblocker;
@Shadow private long age;
@Shadow @Final private Long2ObjectOpenHashMap<SortedArraySet<ChunkTicket<?>>> ticketsByPosition;

@Shadow
protected static int getLevel(SortedArraySet<ChunkTicket<?>> sortedArraySet) {
throw new AbstractMethodError();
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/vmp.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"access.ITrackedPosition",
"carpet.MixinEntityPlayerMPFake",
"chunk.loading.MixinPointOfInterestStorage",
"chunk.loading.MixinTeleportTarget",
"chunk.loading.commands.MixinCommandFunctionManager",
"chunk.loading.commands.MixinSpreadPlayersCommand",
"chunk.loading.commands.MixinTeleportCommand",
Expand Down

0 comments on commit 43ab79b

Please sign in to comment.