refactor: move DataComponentTypesInvoker to Accessor

OKTW-Network · Apr 26, 2024 · 0267fcf · 0267fcf
1 parent b11de54
commit 0267fcf
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 18 deletions.
diff --git a/...in/invoker/DataComponentTypesInvoker.java → .../accessor/DataComponentTypesAccessor.java b/...in/invoker/DataComponentTypesInvoker.java → .../accessor/DataComponentTypesAccessor.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package one.oktw.galaxy.mixin.invoker;
+package one.oktw.galaxy.mixin.accessor;
 
 import net.minecraft.component.DataComponentType;
 import net.minecraft.component.DataComponentTypes;
@@ -26,7 +26,7 @@
 import java.util.function.UnaryOperator;
 
 @Mixin(DataComponentTypes.class)
-public interface DataComponentTypesInvoker {
+public interface DataComponentTypesAccessor {
     @Invoker("register")
     static <T> DataComponentType<T> invokeRegister(String id, UnaryOperator<DataComponentType.Builder<T>> builderOperator) {
         throw new AssertionError();

diff --git a/src/main/kotlin/one/oktw/galaxy/item/CustomItem.kt b/src/main/kotlin/one/oktw/galaxy/item/CustomItem.kt
@@ -18,6 +18,7 @@
 
 package one.oktw.galaxy.item
 
+import net.minecraft.component.DataComponentType
 import net.minecraft.component.DataComponentTypes
 import net.minecraft.component.type.AttributeModifiersComponent
 import net.minecraft.component.type.CustomModelDataComponent
@@ -28,15 +29,15 @@ import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NbtCompound
 import net.minecraft.text.Text
 import net.minecraft.util.Identifier
-import one.oktw.galaxy.mixin.invoker.DataComponentTypesInvoker
+import one.oktw.galaxy.mixin.accessor.DataComponentTypesAccessor
 import one.oktw.galaxy.util.CustomRegistry
 import one.oktw.galaxy.util.Registrable
 
 abstract class CustomItem(override val identifier: Identifier, private val baseItem: Item, private val modelData: Int) : Registrable {
     companion object {
         val registry = CustomRegistry<CustomItem>()
 
-        val galaxyDataComponent = DataComponentTypesInvoker.invokeRegister("galaxy_data") { builder ->
+        val galaxyDataComponent: DataComponentType<NbtComponent> = DataComponentTypesAccessor.invokeRegister("galaxy_data") { builder ->
             builder.codec(NbtComponent.CODEC)
         }
 

diff --git a/src/main/resources/accessor.mixin.json b/src/main/resources/accessor.mixin.json
@@ -4,6 +4,7 @@
   "compatibilityLevel": "JAVA_16",
   "mixins": [
     "BeaconLevelAccessor",
+    "DataComponentTypesAccessor",
     "PlayerAbilitiesAccessor",
     "SerializingRegionBasedStorageAccessor",
     "ServerPlayerEntityFunctionAccessor",

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -24,8 +24,7 @@
     "tweak.mixin.json",
     "sponge.realtime.mixin.json",
     "accessor.mixin.json",
-    "recipe.mixin.json",
-    "invoker.mixin.json"
+    "recipe.mixin.json"
   ],
   "depends": {
     "minecraft": "1.20.x",

diff --git a/src/main/resources/invoker.mixin.json b/src/main/resources/invoker.mixin.json