From a91d01817187f60dbf2a58c3b789376aa075c7ef Mon Sep 17 00:00:00 2001
From: WinExp <55543397+WinExp@users.noreply.github.com>
Date: Sat, 23 Dec 2023 16:52:08 +0800
Subject: [PATCH] Support Minecraft 1.20.4 (#25)

---
 build.gradle                                               | 2 ++
 gradle.properties                                          | 6 +++---
 settings.gradle                                            | 1 +
 .../carpet/mixin/rule/forceRestock/MixinSpectralArrow.java | 7 +++++++
 versions/1.20.4/gradle.properties                          | 3 +++
 versions/1.20.4/pca.accesswidener                          | 5 +++++
 6 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 versions/1.20.4/gradle.properties
 create mode 100644 versions/1.20.4/pca.accesswidener

diff --git a/build.gradle b/build.gradle
index 50b6f19..15f0185 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,6 +16,7 @@ preprocess {
     def mc1194 = createNode("1.19.4", 1_19_04, "mojang")
     def mc1201 = createNode("1.20.1", 1_20_01, "mojang")
     def mc1202 = createNode("1.20.2", 1_20_02, "mojang")
+    def mc1204 = createNode("1.20.4", 1_20_04, "mojang")
 
     mc1144.link(mc1152, null)
     mc1152.link(mc1165, null)
@@ -26,6 +27,7 @@ preprocess {
     mc1193.link(mc1194, null)
     mc1194.link(mc1201, null)
     mc1201.link(mc1202, file("versions/mapping-1.20.1-1.20.2.txt"))
+    mc1202.link(mc1204, null)
 }
 
 ext {
diff --git a/gradle.properties b/gradle.properties
index d3549ba..bffa6d7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,9 +15,9 @@ mod_sources=https://github.com/plusls/plusls-carpet-addition
 mod_version=0.3
 
 # Required Libraries
-# MagicLib - 0.7.387
-magiclib_dependency=0.7.387
-magiclib_version=0.7.387
+# MagicLib - 0.7.398
+magiclib_dependency=0.7.398
+magiclib_version=0.7.398
 
 # Annotation processor
 lombok_version=1.18.30
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 5d20f3f..35f39d6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -37,6 +37,7 @@ def versions = Arrays.asList(
         "1.19.4",
         "1.20.1",
         "1.20.2",
+        "1.20.4",
 )
 
 for (String version : versions) {
diff --git a/src/main/java/com/plusls/carpet/mixin/rule/forceRestock/MixinSpectralArrow.java b/src/main/java/com/plusls/carpet/mixin/rule/forceRestock/MixinSpectralArrow.java
index 779c449..d2154a3 100644
--- a/src/main/java/com/plusls/carpet/mixin/rule/forceRestock/MixinSpectralArrow.java
+++ b/src/main/java/com/plusls/carpet/mixin/rule/forceRestock/MixinSpectralArrow.java
@@ -6,6 +6,7 @@
 import net.minecraft.world.entity.npc.AbstractVillager;
 import net.minecraft.world.entity.projectile.AbstractArrow;
 import net.minecraft.world.entity.projectile.SpectralArrow;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.trading.MerchantOffer;
 import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Mixin;
@@ -15,9 +16,15 @@
 
 @Mixin(SpectralArrow.class)
 public abstract class MixinSpectralArrow extends AbstractArrow {
+    //#if MC <= 12002
     protected MixinSpectralArrow(EntityType<? extends AbstractArrow> entityType, Level world) {
         super(entityType, world);
     }
+    //#else
+    //$$ protected MixinSpectralArrow(EntityType<? extends AbstractArrow> entityType, Level world, ItemStack item) {
+    //$$     super(entityType, world, item);
+    //$$ }
+    //#endif
 
     @Inject(
             method = "doPostHurtEffects",
diff --git a/versions/1.20.4/gradle.properties b/versions/1.20.4/gradle.properties
new file mode 100644
index 0000000..6ddd275
--- /dev/null
+++ b/versions/1.20.4/gradle.properties
@@ -0,0 +1,3 @@
+# Development Environment
+minecraft_version=1.20.4
+minecraft_dependency=1.20.4
diff --git a/versions/1.20.4/pca.accesswidener b/versions/1.20.4/pca.accesswidener
new file mode 100644
index 0000000..e408bf4
--- /dev/null
+++ b/versions/1.20.4/pca.accesswidener
@@ -0,0 +1,5 @@
+accessWidener v2 named
+accessible class net/minecraft/world/level/block/entity/BeehiveBlockEntity$BeeData
+accessible field net/minecraft/world/entity/ExperienceOrb count I
+accessible field net/minecraft/world/level/block/DispenserBlock DISPENSER_REGISTRY Ljava/util/Map;
+accessible method net/minecraft/world/entity/player/Player destroyVanishingCursedItems ()V
\ No newline at end of file