From c1fcfd15b6efe8c78724998700253a9a5b6be671 Mon Sep 17 00:00:00 2001 From: Kosma Moczek Date: Thu, 24 Nov 2022 19:23:57 +0100 Subject: [PATCH] fabric-1.19.3: migrateMappings to 1.19.3-pre2+build.6 --- fabric-1.19.3/gradle.properties | 8 ++++---- .../main/java/org/dynmap/fabric_1_19_3/DynmapPlugin.java | 2 +- .../org/dynmap/fabric_1_19_3/FabricMapChunkCache.java | 1 - .../main/java/org/dynmap/fabric_1_19_3/FabricServer.java | 2 +- .../main/java/org/dynmap/fabric_1_19_3/FabricWorld.java | 2 +- .../mixin/ServerPlayNetworkHandlerMixin.java | 2 -- fabric-1.19.3/src/main/resources/fabric.mod.json | 6 +++--- 7 files changed, 10 insertions(+), 13 deletions(-) diff --git a/fabric-1.19.3/gradle.properties b/fabric-1.19.3/gradle.properties index cf9d1bea..532b94d9 100644 --- a/fabric-1.19.3/gradle.properties +++ b/fabric-1.19.3/gradle.properties @@ -1,4 +1,4 @@ -minecraft_version=1.19.1 -yarn_mappings=1.19.1+build.4 -loader_version=0.14.8 -fabric_version=0.58.5+1.19.1 +minecraft_version=1.19.3-pre2 +yarn_mappings=1.19.3-pre2+build.6 +loader_version=0.14.10 +fabric_version=0.67.2+1.19.3 diff --git a/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/DynmapPlugin.java b/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/DynmapPlugin.java index 81b8d844..7e949147 100644 --- a/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/DynmapPlugin.java +++ b/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/DynmapPlugin.java @@ -14,6 +14,7 @@ import net.minecraft.block.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.network.ClientConnection; +import net.minecraft.registry.Registry; import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayNetworkHandler; @@ -23,7 +24,6 @@ import net.minecraft.util.Identifier; import net.minecraft.util.collection.IdList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; -import net.minecraft.util.registry.Registry; import net.minecraft.world.EmptyBlockView; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; diff --git a/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricMapChunkCache.java b/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricMapChunkCache.java index dda75591..08aa2d70 100644 --- a/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricMapChunkCache.java +++ b/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricMapChunkCache.java @@ -8,7 +8,6 @@ import net.minecraft.util.collection.PackedIntegerArray; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.WordPackedArray; -import net.minecraft.util.registry.Registry; import net.minecraft.world.ChunkSerializer; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; diff --git a/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricServer.java b/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricServer.java index 3169e3da..f5957589 100644 --- a/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricServer.java +++ b/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricServer.java @@ -7,6 +7,7 @@ import net.minecraft.block.AbstractSignBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.network.message.MessageType; +import net.minecraft.registry.Registry; import net.minecraft.server.BannedIpList; import net.minecraft.server.BannedPlayerList; import net.minecraft.server.MinecraftServer; @@ -17,7 +18,6 @@ import net.minecraft.text.Text; import net.minecraft.util.UserCache; import net.minecraft.util.Util; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import net.minecraft.world.biome.Biome; import org.dynmap.DynmapChunk; diff --git a/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricWorld.java b/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricWorld.java index 746d4989..cc39790f 100644 --- a/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricWorld.java +++ b/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/FabricWorld.java @@ -1,8 +1,8 @@ package org.dynmap.fabric_1_19_3; +import net.minecraft.registry.RegistryKey; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.Heightmap; import net.minecraft.world.LightType; import net.minecraft.world.World; diff --git a/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/mixin/ServerPlayNetworkHandlerMixin.java b/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/mixin/ServerPlayNetworkHandlerMixin.java index 8bdb36e3..1e44112b 100644 --- a/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/mixin/ServerPlayNetworkHandlerMixin.java +++ b/fabric-1.19.3/src/main/java/org/dynmap/fabric_1_19_3/mixin/ServerPlayNetworkHandlerMixin.java @@ -15,8 +15,6 @@ import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; import java.util.List; - -import net.minecraft.util.registry.RegistryKey; import org.dynmap.fabric_1_19_3.event.BlockEvents; import org.dynmap.fabric_1_19_3.event.ServerChatEvents; import org.spongepowered.asm.mixin.Mixin; diff --git a/fabric-1.19.3/src/main/resources/fabric.mod.json b/fabric-1.19.3/src/main/resources/fabric.mod.json index 7290d283..451a9e90 100644 --- a/fabric-1.19.3/src/main/resources/fabric.mod.json +++ b/fabric-1.19.3/src/main/resources/fabric.mod.json @@ -26,8 +26,8 @@ ], "depends": { - "fabricloader": ">=0.14.8", - "fabric": ">=0.58.5", - "minecraft": ["1.19.1", "1.19.2"] + "fabricloader": ">=0.14.10", + "fabric": ">=0.67.2", + "minecraft": ["1.19.3-beta.2"] } }