Update fluxia version to '1.1.0-fix3'.

cao-awa · Dec 29, 2024 · f5fe604 · f5fe604
1 parent 62bff6a
commit f5fe604
Show file tree

Hide file tree

Showing 11 changed files with 1,025 additions and 12 deletions.
diff --git a/idea/appearance/Cao_awa_colorful.icls b/idea/appearance/Cao_awa_colorful.icls
diff --git a/src/main/java/com/github/cao/awa/conium/datapack/block/ConiumBlockManager.kt b/src/main/java/com/github/cao/awa/conium/datapack/block/ConiumBlockManager.kt
@@ -9,8 +9,8 @@ import com.github.cao.awa.conium.block.builder.bedrock.BedrockSchemaBlockBuilder
 import com.github.cao.awa.conium.block.builder.conium.ConiumSchemaBlockBuilder
 import com.github.cao.awa.conium.datapack.ConiumJsonDataLoader
 import com.github.cao.awa.conium.event.ConiumEvent
-import com.github.cao.awa.conium.extend.ConiumDynamicIdList
-import com.github.cao.awa.conium.extend.ConiumDynamicRegistry
+import com.github.cao.awa.conium.registry.extend.ConiumDynamicIdList
+import com.github.cao.awa.conium.registry.extend.ConiumDynamicRegistry
 import com.github.cao.awa.conium.kotlin.extent.block.register
 import com.github.cao.awa.conium.kotlin.extent.item.registerBlockItem
 import com.github.cao.awa.conium.registry.ConiumRegistryKeys

diff --git a/src/main/java/com/github/cao/awa/conium/datapack/entity/ConiumEntityManager.kt b/src/main/java/com/github/cao/awa/conium/datapack/entity/ConiumEntityManager.kt
@@ -9,7 +9,7 @@ import com.github.cao.awa.conium.entity.builder.bedrock.BedrockSchemaEntityBuild
 import com.github.cao.awa.conium.entity.builder.conium.ConiumSchemaEntityBuilder
 import com.github.cao.awa.conium.entity.metadata.ConiumEntityMetadata
 import com.github.cao.awa.conium.event.ConiumEvent
-import com.github.cao.awa.conium.extend.ConiumDynamicRegistry
+import com.github.cao.awa.conium.registry.extend.ConiumDynamicRegistry
 import com.github.cao.awa.conium.kotlin.extent.entity.register
 import com.github.cao.awa.conium.registry.ConiumRegistryKeys
 import com.github.cao.awa.sinuatum.util.collection.CollectionFactor

diff --git a/src/main/java/com/github/cao/awa/conium/datapack/item/ConiumItemManager.kt b/src/main/java/com/github/cao/awa/conium/datapack/item/ConiumItemManager.kt
@@ -4,7 +4,7 @@ import com.github.cao.awa.conium.Conium
 import com.github.cao.awa.conium.datapack.ConiumJsonDataLoader
 import com.github.cao.awa.conium.datapack.item.fuel.ConiumFuelRegistry
 import com.github.cao.awa.conium.event.ConiumEvent
-import com.github.cao.awa.conium.extend.ConiumDynamicRegistry
+import com.github.cao.awa.conium.registry.extend.ConiumDynamicRegistry
 import com.github.cao.awa.conium.item.builder.bedrock.BedrockSchemaItemBuilder
 import com.github.cao.awa.conium.item.builder.conium.ConiumSchemaItemBuilder
 import com.github.cao.awa.conium.kotlin.extent.item.register

diff --git a/src/main/java/com/github/cao/awa/conium/kotlin/extent/innate/ConiumInnate.kt b/src/main/java/com/github/cao/awa/conium/kotlin/extent/innate/ConiumInnate.kt
@@ -17,4 +17,5 @@ inline val Number.int: Int get() = toInt()
 inline val Number.long: Long get() = toLong()
 inline val Number.float: Float get() = toFloat()
 inline val Number.double: Double get() = toDouble()
-
+inline val Number.char: Char get() = this.int.toChar()
+inline val Number.byte: Byte get() = toByte()
diff --git a/src/main/java/com/github/cao/awa/conium/mixin/collection/IdListMixin.java b/src/main/java/com/github/cao/awa/conium/mixin/collection/IdListMixin.java
@@ -1,6 +1,6 @@
 package com.github.cao.awa.conium.mixin.collection;
 
-import com.github.cao.awa.conium.extend.ConiumDynamicIdList;
+import com.github.cao.awa.conium.registry.extend.ConiumDynamicIdList;
 import com.github.cao.awa.sinuatum.util.collection.CollectionFactor;
 import it.unimi.dsi.fastutil.objects.Reference2IntMap;
 import net.minecraft.util.collection.IdList;

diff --git a/src/main/java/com/github/cao/awa/conium/mixin/registry/SimpleRegistryMixin.java b/src/main/java/com/github/cao/awa/conium/mixin/registry/SimpleRegistryMixin.java
@@ -1,6 +1,6 @@
 package com.github.cao.awa.conium.mixin.registry;
 
-import com.github.cao.awa.conium.extend.ConiumDynamicRegistry;
+import com.github.cao.awa.conium.registry.extend.ConiumDynamicRegistry;
 import com.github.cao.awa.sinuatum.manipulate.QuickManipulate;
 import com.github.cao.awa.sinuatum.util.collection.CollectionFactor;
 import com.google.common.collect.Iterators;

diff --git a/...wa/conium/extend/ConiumDynamicIdList.java → .../registry/extend/ConiumDynamicIdList.java b/...wa/conium/extend/ConiumDynamicIdList.java → .../registry/extend/ConiumDynamicIdList.java
@@ -1,4 +1,4 @@
-package com.github.cao.awa.conium.extend;
+package com.github.cao.awa.conium.registry.extend;
 
 public interface ConiumDynamicIdList<T> {
     default void clearDynamic() {

diff --git a/.../conium/extend/ConiumDynamicRegistry.java → ...egistry/extend/ConiumDynamicRegistry.java b/.../conium/extend/ConiumDynamicRegistry.java → ...egistry/extend/ConiumDynamicRegistry.java
@@ -1,4 +1,4 @@
-package com.github.cao.awa.conium.extend;
+package com.github.cao.awa.conium.registry.extend;
 
 public interface ConiumDynamicRegistry {
     default void clearDynamic() {

diff --git a/...urces/META-INF/jars/fluxia-1.1.0-fix2.jar → ...urces/META-INF/jars/fluxia-1.1.0-fix3.jar b/...urces/META-INF/jars/fluxia-1.1.0-fix2.jar → ...urces/META-INF/jars/fluxia-1.1.0-fix3.jar
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -36,7 +36,7 @@
     "conium.mixins.json"
   ],
   "depends": {
-    "fluxia": "1.1.0-fix2",
+    "fluxia": "1.1.0-fix3",
     "fabricloader": "*",
     "fabric-language-kotlin": "1.13.0+kotlin.2.1.0",
     "minecraft": "1.21.4",
@@ -45,15 +45,15 @@
   "recommends": {
     "fabric": "*",
     "lithium": "*",
-    "sepals": ">=1.0.5",
+    "sepals": ">=1.0.9",
     "sodium": "*"
   },
   "breaks": {
     "optifabric": "*"
   },
   "jars": [
     {
-      "file": "META-INF/jars/fluxia-1.1.0-fix2.jar"
+      "file": "META-INF/jars/fluxia-1.1.0-fix3.jar"
     }
   ]
 }