update to 20w17a

Author: LemmaEOF

gradle.properties

@@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=20w15a
-yarn_build=7
+minecraft_version=20w17a
+yarn_build=3
 loader_version=0.8.2+build.194
 
 # Mod Properties
@@ -14,5 +14,5 @@ archives_base_name = libcd
 
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.5.10+build.320-1.16
+fabric_version=0.6.2+build.327-1.16
 jankson_version=2.0.1+j1.2.0

src/main/java/io/github/cottonmc/libcd/command/HeldItemCommand.java

@@ -9,11 +9,7 @@
 import net.minecraft.network.MessageType;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.ClickEvent;
-import net.minecraft.text.HoverEvent;
-import net.minecraft.text.LiteralText;
-import net.minecraft.text.Style;
-import net.minecraft.text.Text;
+import net.minecraft.text.*;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 
@@ -28,16 +24,16 @@ public int run(CommandContext<ServerCommandSource> context) throws CommandSyntax
 		String idString = (id==null) ? "unknown" : id.toString();
 		description.append(idString);
 
-		Text feedback = new LiteralText(idString);
+		BaseText feedback = new LiteralText(idString);
 
 		CompoundTag tag = toDescribe.getTag();
 		if (tag!=null) {
 			description.append(tag.asString());
 			feedback.append(tag.toText());
 		}
 
-		Style clickableStyle = new Style()
-			.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new LiteralText("Click to copy to clipboard")))
+		Style clickableStyle = Style.field_24360
+			.setHoverEvent(new HoverEvent(HoverEvent.class_5247.field_24342, new LiteralText("Click to copy to clipboard")))
 			.setClickEvent(new ClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, description.toString()));
 
 		feedback.setStyle(clickableStyle);

src/main/java/io/github/cottonmc/libcd/mixin/MixinTagBuilder.java

@@ -27,7 +27,7 @@
 @Mixin(Tag.Builder.class)
 public class MixinTagBuilder implements TagBuilderWarningAccessor {
 
-    @Shadow @Final private List<Tag.class_5145> entries;
+    @Shadow @Final private List<Tag.TrackedEntry> entries;
     @Unique
     private final List<Object> libcdWarnings = new ArrayList<>();
 
@@ -48,7 +48,7 @@ private void onFromJson(JsonObject json, String string, CallbackInfoReturnable<T
                 }
 
                 result.getEntries().forEach((entry) -> {
-                    this.entries.add(class_5145Accessor.createClass_5145(entry, string));
+                    this.entries.add(TagEntryAccessor.createTrackedEntry(entry, string));
                 });
 
                 libcdWarnings.addAll(result.getWarnings());

…onmc/libcd/mixin/class_5145Accessor.java …ttonmc/libcd/mixin/TagEntryAccessor.javasrc/main/java/io/github/cottonmc/libcd/mixin/class_5145Accessor.java renamed to src/main/java/io/github/cottonmc/libcd/mixin/TagEntryAccessor.java src/main/java/io/github/cottonmc/libcd/mixin/class_5145Accessor.java renamed to src/main/java/io/github/cottonmc/libcd/mixin/TagEntryAccessor.java

@@ -4,10 +4,10 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
-@Mixin(Tag.class_5145.class)
-public interface class_5145Accessor {
+@Mixin(Tag.TrackedEntry.class)
+public interface TagEntryAccessor {
     @Invoker("<init>")
-    static Tag.class_5145 createClass_5145(Tag.Entry entry, String string) {
+    static Tag.TrackedEntry createTrackedEntry(Tag.Entry entry, String string) {
         throw new UnsupportedOperationException();
     }
 }

src/main/resources/mixins.libcd.json

@@ -3,8 +3,6 @@
   "package": "io.github.cottonmc.libcd.mixin",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
-
-    "class_5145Accessor",
     "ItemEntrySerializerAccessor",
     "MixinAdvancementRewards",
     "MixinAdvancementRewardsDeserializer",
@@ -17,6 +15,7 @@
     "MixinResourceManagerImpl",
     "MixinShapedRecipe",
     "MixinTagBuilder",
-    "MixinTagContainer"
+    "MixinTagContainer",
+    "TagEntryAccessor"
   ]
 }