diff --git a/idea/appearance/Cao_awa_colorful.icls b/idea/appearance/Cao_awa_colorful.icls new file mode 100644 index 0000000..6fe4d19 --- /dev/null +++ b/idea/appearance/Cao_awa_colorful.icls @@ -0,0 +1,1012 @@ + + + 2024-05-09T23:42:22 + idea + 2023.3.4.0.0 + 2024-05-09T23:42:34 + Cao awa colorful + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 index 4b8dbf4..737dfef 100644 --- 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 index fb74217..823f0b7 100644 --- 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 index d92711d..98db8c0 100644 --- 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 index 8a1dcbc..5be3244 100644 --- 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() \ No newline at end of file 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 index 58cca39..23a2943 100644 --- 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 index a138ee2..479e264 100644 --- 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/src/main/java/com/github/cao/awa/conium/extend/ConiumDynamicIdList.java b/src/main/java/com/github/cao/awa/conium/registry/extend/ConiumDynamicIdList.java similarity index 83% rename from src/main/java/com/github/cao/awa/conium/extend/ConiumDynamicIdList.java rename to src/main/java/com/github/cao/awa/conium/registry/extend/ConiumDynamicIdList.java index 4fa85f0..daa3352 100644 --- a/src/main/java/com/github/cao/awa/conium/extend/ConiumDynamicIdList.java +++ b/src/main/java/com/github/cao/awa/conium/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 { default void clearDynamic() { diff --git a/src/main/java/com/github/cao/awa/conium/extend/ConiumDynamicRegistry.java b/src/main/java/com/github/cao/awa/conium/registry/extend/ConiumDynamicRegistry.java similarity index 74% rename from src/main/java/com/github/cao/awa/conium/extend/ConiumDynamicRegistry.java rename to src/main/java/com/github/cao/awa/conium/registry/extend/ConiumDynamicRegistry.java index 4731a8d..46abae8 100644 --- a/src/main/java/com/github/cao/awa/conium/extend/ConiumDynamicRegistry.java +++ b/src/main/java/com/github/cao/awa/conium/registry/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/src/main/resources/META-INF/jars/fluxia-1.1.0-fix2.jar b/src/main/resources/META-INF/jars/fluxia-1.1.0-fix3.jar similarity index 99% rename from src/main/resources/META-INF/jars/fluxia-1.1.0-fix2.jar rename to src/main/resources/META-INF/jars/fluxia-1.1.0-fix3.jar index 87df602..0084f69 100644 Binary files a/src/main/resources/META-INF/jars/fluxia-1.1.0-fix2.jar and b/src/main/resources/META-INF/jars/fluxia-1.1.0-fix3.jar differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 7a4f1dc..428d4db 100644 --- 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,7 +45,7 @@ "recommends": { "fabric": "*", "lithium": "*", - "sepals": ">=1.0.5", + "sepals": ">=1.0.9", "sodium": "*" }, "breaks": { @@ -53,7 +53,7 @@ }, "jars": [ { - "file": "META-INF/jars/fluxia-1.1.0-fix2.jar" + "file": "META-INF/jars/fluxia-1.1.0-fix3.jar" } ] }