4 Commits

Author SHA1 Message Date
techno-sam 4e36e54d64 version bump for translation 2025-10-19 23:40:21 +02:00
techno-sam 9c358dc19a Merge pull request #1 from StarmanMine142/patch-1
Create uk_ua.json
2025-10-19 23:39:07 +02:00
Starman(StarmanMine142) 07f42c7c58 Create uk_ua.json 2025-09-03 09:38:36 +03:00
techno-sam 11fbc3cd05 axiom compat
fix crash with ChunkRenderOverrider
2025-09-03 00:46:07 +02:00
9 changed files with 76 additions and 3 deletions
+15 -1
View File
@@ -49,6 +49,9 @@ repositories {
includeGroup "com.github.Chocohead" includeGroup "com.github.Chocohead"
} }
} }
flatDir {
dir("libs")
}
} }
dependencies { dependencies {
@@ -74,7 +77,18 @@ dependencies {
modCompileOnly libs.sodium modCompileOnly libs.sodium
if (!inCI && enable_sodium.toBoolean()) { if (!inCI && enable_sodium.toBoolean()) {
modRuntimeOnly libs.sodium modLocalRuntime libs.sodium
}
modCompileOnly libs.axiom
if (!inCI && enable_axiom.toBoolean()) {
modLocalRuntime(
libs.axiom,
libs.axiom.axiomclientapi,
libs.axiom.lattice,
libs.axiom.mixinconstraints
)
} }
include(implementation(annotationProcessor(libs.mixinextras.get()))) include(implementation(annotationProcessor(libs.mixinextras.get())))
+6
View File
@@ -1,4 +1,10 @@
tiny 2 0 official intermediary named tiny 2 0 official intermediary named
c uh net/minecraft/class_2483 net/minecraft/nbt/AbstractNbtList
m (I)Lvi; c method_10534 get
m (I)Lvi; d method_10536 remove
c uo net/minecraft/class_2499 net/minecraft/nbt/NbtList
m (I)Lvi; method_10534 method_10534 get
m (I)Lvi; method_10536 method_10536 remove
c fac net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvider c fac net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvider
f I a field_44729 MAX_LEVEL f I a field_44729 MAX_LEVEL
f I b field_44730 MIN_OPACITY f I b field_44730 MIN_OPACITY
+2 -1
View File
@@ -16,7 +16,7 @@ authors=Slimeist
contributors= contributors=
license=EUPL 1.2 or later license=EUPL 1.2 or later
# Mod Version # Mod Version
modVersion=0.1.0 modVersion=0.1.2
# Branch Metadata # Branch Metadata
branchName=fabric-1.21.8 branchName=fabric-1.21.8
compatibleVersions=1.21.8 compatibleVersions=1.21.8
@@ -24,3 +24,4 @@ compatibleLoaders=fabric
# mod compat # mod compat
enable_sodium=false enable_sodium=false
enable_axiom=false
+9
View File
@@ -10,6 +10,11 @@ mixinextras = "0.5.0"
mm = "15.0.0-beta.3" mm = "15.0.0-beta.3"
manningham = "v2.3" manningham = "v2.3"
sodium = "mc1.21.6-0.6.13-fabric" sodium = "mc1.21.6-0.6.13-fabric"
axiom = "qsljLO3K"
# these have to be manually extracted from the jar and put in the flatDir libs folder (only if the enable_axiom property is true)
axiom-axiomclientapi = "1.0.0"
axiom-lattice = "1.2.12"
axiom-mixinconstraints = "1.0.9"
[plugins] [plugins]
loom = { id = "fabric-loom", version.ref = "loom" } loom = { id = "fabric-loom", version.ref = "loom" }
@@ -24,3 +29,7 @@ mixinextras = { group = "io.github.llamalad7", name = "mixinextras-fabric", vers
mm = { group = "com.terraformersmc", name = "modmenu", version.ref = "mm" } mm = { group = "com.terraformersmc", name = "modmenu", version.ref = "mm" }
manningham = { group = "com.github.Chocohead", name = "Fabric-ASM", version.ref = "manningham" } manningham = { group = "com.github.Chocohead", name = "Fabric-ASM", version.ref = "manningham" }
sodium = { group = "maven.modrinth", name = "sodium", version.ref = "sodium" } sodium = { group = "maven.modrinth", name = "sodium", version.ref = "sodium" }
axiom = { group = "maven.modrinth", name = "axiom", version.ref = "axiom" }
axiom-axiomclientapi = { group = "local", name = "axiomclientapi", version.ref = "axiom-axiomclientapi" }
axiom-lattice = { group = "local", name = "lattice", version.ref = "axiom-lattice" }
axiom-mixinconstraints = { group = "local", name = "mixinconstraints", version.ref = "axiom-mixinconstraints" }
+1
View File
@@ -0,0 +1 @@
*
@@ -6,7 +6,8 @@ import java.util.Optional;
import java.util.function.Supplier; import java.util.function.Supplier;
public enum Mods { public enum Mods {
SODIUM("sodium"); SODIUM("sodium"),
AXIOM("axiom");
public final String id; public final String id;
public final boolean isLoaded; public final boolean isLoaded;
@@ -0,0 +1,22 @@
package io.github.slimeistdev.crystalline_sky.mixin.client.compat.axiom;
import com.moulberry.axiom.render.ChunkRenderOverrider;
import io.github.slimeistdev.crystalline_sky.annotation.mixin.ConditionalMixin;
import io.github.slimeistdev.crystalline_sky.compat.Mods;
import io.github.slimeistdev.crystalline_sky.extenders_cove.BlockRenderLayerExt;
import net.minecraft.client.render.BlockRenderLayer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@ConditionalMixin(mods = Mods.AXIOM)
@Mixin(ChunkRenderOverrider.AxiomChunkOverrideLayer.class)
public class ChunkRenderOverrider_AxiomChunkOverrideLayerMixin {
@Inject(method = "fromVanilla", at = @At(value = "NEW", target = "()Ljava/lang/IncompatibleClassChangeError;"), cancellable = true)
private static void unexplodeSky(BlockRenderLayer layer, CallbackInfoReturnable<ChunkRenderOverrider.AxiomChunkOverrideLayer> cir) {
if (layer == BlockRenderLayerExt.CRYSTALLINE_SKY_SKY) {
cir.setReturnValue(ChunkRenderOverrider.AxiomChunkOverrideLayer.CUTOUT_MIPPED);
}
}
}
@@ -0,0 +1,18 @@
{
"block.crystalline_sky.sky": "Небеса",
"block.crystalline_sky.weeping_sky": "Плакучі небеса",
"block.crystalline_sky.sky_light": "Небесне світло",
"block.crystalline_sky.weeping_sky_light": "Плакуче небесне світло",
"crystalline_sky.key.toggle_weeping_sky_debug": "Перемкнути налагод. плакучих небес",
"crystalline_sky.category.crystalline_sky": "Crystalline Sky",
"message.crystalline_sky.weeping_sky_debug.column.cleared": "Очищено стовпець налагодження плакучих небес.",
"message.crystalline_sky.weeping_sky_debug.column.set": "Установлено стовпець налагодження плакучих небес на [%s, %s].",
"message.crystalline_sky.weeping_sky_debug.0": "Налагодження плакучих небес: ВИМК.",
"message.crystalline_sky.weeping_sky_debug.1": "Налагодження плакучих небес: Освітлено",
"message.crystalline_sky.weeping_sky_debug.2": "Налагодження плакучих небес: Не освітлено",
"modmenu.descriptionTranslation.crystalline_sky": "Кристалізує небеса у формі блока. Для всіх ваших потреб у печері"
}
@@ -23,6 +23,7 @@
"client.WorldRenderer_NoSodium_Mixin", "client.WorldRenderer_NoSodium_Mixin",
"client.WorldRendererAccessor", "client.WorldRendererAccessor",
"client.WorldRendererMixin", "client.WorldRendererMixin",
"client.compat.axiom.ChunkRenderOverrider_AxiomChunkOverrideLayerMixin",
"client.compat.sodium.DefaultMaterialsMixin", "client.compat.sodium.DefaultMaterialsMixin",
"client.compat.sodium.DefaultTerrainRenderPassesMixin", "client.compat.sodium.DefaultTerrainRenderPassesMixin",
"client.compat.sodium.ShaderChunkRendererMixin", "client.compat.sodium.ShaderChunkRendererMixin",