aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSHsuperCM <shsupercm@gmail.com>2023-06-21 12:59:48 +0300
committerSHsuperCM <shsupercm@gmail.com>2023-06-21 12:59:48 +0300
commit4c04ceb7ee4e9b532f3677c1424433e0e3955a08 (patch)
treedf8acc8bb9e54856caefcce00474302ce2514430
parentdaa0381b50753f8db9aff2e353872c8d673947b8 (diff)
downloadCITResewn-4c04ceb7ee4e9b532f3677c1424433e0e3955a08.tar.gz
CITResewn-4c04ceb7ee4e9b532f3677c1424433e0e3955a08.tar.bz2
CITResewn-4c04ceb7ee4e9b532f3677c1424433e0e3955a08.zip
Added 1.19.4 port
-rw-r--r--defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/mixin/types/enchantment/ItemRendererMixin.java8
-rw-r--r--defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/mixin/types/enchantment/RenderPhaseAccessor.java2
-rw-r--r--defaults/versions/1.19.4/gradle.properties6
-rw-r--r--settings.gradle4
-rw-r--r--versions/1.19.4/gradle.properties6
5 files changed, 19 insertions, 7 deletions
diff --git a/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/mixin/types/enchantment/ItemRendererMixin.java b/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/mixin/types/enchantment/ItemRendererMixin.java
index 909c2f4..f5cdc70 100644
--- a/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/mixin/types/enchantment/ItemRendererMixin.java
+++ b/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/mixin/types/enchantment/ItemRendererMixin.java
@@ -49,8 +49,8 @@ public class ItemRendererMixin {
cir.setReturnValue(vertexConsumer);
}
- @Inject(method = "getDynamicDisplayGlintConsumer", cancellable = true, at = @At("RETURN"))
- private static void citresewn$enchantment$getCompassGlintConsumer(VertexConsumerProvider provider, RenderLayer layer, MatrixStack.Entry entry, CallbackInfoReturnable<VertexConsumer> cir) {
+ @Inject(method = /*? <1.20 {?*//*"getCompassGlintConsumer"/*?} else {?*/"getDynamicDisplayGlintConsumer"/*?}?*/, cancellable = true, at = @At("RETURN"))
+ private static void citresewn$enchantment$getDynamicDisplayGlintConsumer(VertexConsumerProvider provider, RenderLayer layer, MatrixStack.Entry entry, CallbackInfoReturnable<VertexConsumer> cir) {
if (!CONTAINER.shouldApply())
return;
VertexConsumer vertexConsumer = TypeEnchantment.GlintRenderLayer.GLINT.tryApply(null, layer, provider);
@@ -58,8 +58,8 @@ public class ItemRendererMixin {
cir.setReturnValue(VertexConsumers.union(new OverlayVertexConsumer(vertexConsumer, entry.getPositionMatrix(), entry.getNormalMatrix(), 1f), cir.getReturnValue()));
}
- @Inject(method = "getDirectDynamicDisplayGlintConsumer", cancellable = true, at = @At("RETURN"))
- private static void citresewn$enchantment$getDirectCompassGlintConsumer(VertexConsumerProvider provider, RenderLayer layer, MatrixStack.Entry entry, CallbackInfoReturnable<VertexConsumer> cir) {
+ @Inject(method = /*? <1.20 {?*//*"getDirectCompassGlintConsumer"/*?} else {?*/"getDirectDynamicDisplayGlintConsumer"/*?}?*/, cancellable = true, at = @At("RETURN"))
+ private static void citresewn$enchantment$getDirectDynamicDisplayGlintConsumer(VertexConsumerProvider provider, RenderLayer layer, MatrixStack.Entry entry, CallbackInfoReturnable<VertexConsumer> cir) {
if (!CONTAINER.shouldApply())
return;
VertexConsumer vertexConsumer = TypeEnchantment.GlintRenderLayer.DIRECT_GLINT.tryApply(null, layer, provider);
diff --git a/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/mixin/types/enchantment/RenderPhaseAccessor.java b/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/mixin/types/enchantment/RenderPhaseAccessor.java
index 01b382f..c845309 100644
--- a/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/mixin/types/enchantment/RenderPhaseAccessor.java
+++ b/defaults/src/main/java/shcm/shsupercm/fabric/citresewn/defaults/mixin/types/enchantment/RenderPhaseAccessor.java
@@ -17,5 +17,5 @@ public interface RenderPhaseAccessor {
@Accessor("EQUAL_DEPTH_TEST") static RenderPhase.DepthTest EQUAL_DEPTH_TEST() { throw new RuntimeException(); }
@Accessor("COLOR_MASK") static RenderPhase.WriteMaskState COLOR_MASK() { throw new RuntimeException(); }
@Accessor("VIEW_OFFSET_Z_LAYERING") static RenderPhase.Layering VIEW_OFFSET_Z_LAYERING() { throw new RuntimeException(); }
- @Accessor("ITEM_ENTITY_TARGET") static RenderPhase.Target ITEM_ENTITY_TARGET() { throw new RuntimeException(); }
+ @Accessor(/*? <1.20 {?*//*"ITEM_TARGET"/*?} else {?*/"ITEM_ENTITY_TARGET"/*?}?*/) static RenderPhase.Target ITEM_ENTITY_TARGET() { throw new RuntimeException(); }
}
diff --git a/defaults/versions/1.19.4/gradle.properties b/defaults/versions/1.19.4/gradle.properties
new file mode 100644
index 0000000..771e603
--- /dev/null
+++ b/defaults/versions/1.19.4/gradle.properties
@@ -0,0 +1,6 @@
+mod.target-mc=~1.19.4
+publish.target-mc=1.19.4
+deps.yarn=1.19.4+build.2
+deps.fabric-api=0.83.0+1.19.4
+deps.modmenu=6.2.3
+deps.cloth-config=10.0.96 \ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 36513d1..88f75a8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -9,7 +9,7 @@ pluginManagement {
}
plugins {
- id 'io.shcm.shsupercm.fabric.stonecutter' version '1.1'
+ id 'io.shcm.shsupercm.fabric.stonecutter' version '1.2'
id 'fabric-loom' version '1.2-SNAPSHOT' apply false
id 'io.shcm.shsupercm.fabric.fletchingtable' version '1.6' apply false
@@ -19,7 +19,7 @@ plugins {
include 'defaults'
-String[] targetMCVersions = [ '1.20.1' ]
+String[] targetMCVersions = [ '1.20.1', '1.19.4' ]
stonecutter.create(rootProject) {
versions targetMCVersions
diff --git a/versions/1.19.4/gradle.properties b/versions/1.19.4/gradle.properties
new file mode 100644
index 0000000..771e603
--- /dev/null
+++ b/versions/1.19.4/gradle.properties
@@ -0,0 +1,6 @@
+mod.target-mc=~1.19.4
+publish.target-mc=1.19.4
+deps.yarn=1.19.4+build.2
+deps.fabric-api=0.83.0+1.19.4
+deps.modmenu=6.2.3
+deps.cloth-config=10.0.96 \ No newline at end of file