3.5.0

MORIMORI0317 · MORIMORI0317 · commit 955357066044 · 2023-03-19T23:30:15.000+09:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,10 +8,11 @@ Please write according to [Keep a Changelog](https://keepachangelog.com/en/1.0.0
 
 ### Added
 
-- Add cross block state provider
-
 ### Changed
 
+- Update CrossDataGenerator
+- Changes to rendering processing
+
 ### Deprecated
 
 ### Removed
diff --git a/common/src/main/java/dev/felnull/otyacraftengine/client/util/OERenderUtils.java b/common/src/main/java/dev/felnull/otyacraftengine/client/util/OERenderUtils.java
@@ -33,7 +33,9 @@
  */
 public final class OERenderUtils {
     private static final Minecraft mc = Minecraft.getInstance();
-    public static ThreadLocal<Boolean> SKIP_TRANSANDROT_MODELPART = ThreadLocal.withInitial(() -> false);
+    @Deprecated(forRemoval = true)
+    public static boolean SKIP_TRANSANDROT_MODELPART;
+    public static ThreadLocal<Boolean> SKIP_TRANSANDROT_MODELPART_V2 = ThreadLocal.withInitial(() -> false);
     public static final float MIN_BREADTH = 1.0E-3F;
 
     /**
@@ -841,9 +843,9 @@ public static float getPartialTicks() {
     }
 
     public static void noTransAndRotModelPart(Runnable runnable) {
-        SKIP_TRANSANDROT_MODELPART.set(true);
+        SKIP_TRANSANDROT_MODELPART_V2.set(true);
         runnable.run();
-        SKIP_TRANSANDROT_MODELPART.set(false);
+        SKIP_TRANSANDROT_MODELPART_V2.set(false);
     }
 
     public static void renderPlayerArmNoTransAndRot(PoseStack poseStack, MultiBufferSource multiBufferSource, HumanoidArm arm, int light) {
diff --git a/common/src/main/java/dev/felnull/otyacraftengine/mixin/client/ModelPartMixin.java b/common/src/main/java/dev/felnull/otyacraftengine/mixin/client/ModelPartMixin.java
@@ -12,7 +12,7 @@
 public class ModelPartMixin {
     @Inject(method = "translateAndRotate", at = @At("HEAD"), cancellable = true)
     private void translateAndRotate(PoseStack poseStack, CallbackInfo ci) {
-        if (OERenderUtils.SKIP_TRANSANDROT_MODELPART.get())
+        if (OERenderUtils.SKIP_TRANSANDROT_MODELPART_V2.get())
             ci.cancel();
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ enabled_platforms=fabric,forge
 #Mod
 archives_base_name=otyacraftengine
 mod_display_name=OtyacraftEngine
-mod_version=3.5.0-pre.26
+mod_version=3.5.0
 #Dependencies
 architectury_version=7.0.65
 fabric_loader_version=0.14.11
diff --git a/testmod-fabric/src/main/generated/.cache/0d50bffddf75e22e52fc02f1ad4a51e0aed4f3e3 b/testmod-fabric/src/main/generated/.cache/0d50bffddf75e22e52fc02f1ad4a51e0aed4f3e3
@@ -1 +1 @@
-// 1.19.3	2023-03-11T09:26:59.9141576	Otyacraft Engine Test/Tags for minecraft:block
+// 1.19.3	2023-03-19T23:09:33.8921084	Otyacraft Engine Test/Tags for minecraft:block
diff --git a/testmod-fabric/src/main/generated/.cache/1296ab1d9634d8ba1426c262f45d7e2bb0947054 b/testmod-fabric/src/main/generated/.cache/1296ab1d9634d8ba1426c262f45d7e2bb0947054
@@ -1,2 +1,2 @@
-// 1.19.3	2023-03-11T09:26:59.9141576	Otyacraft Engine Test/Model Definitions (Item)
+// 1.19.3	2023-03-19T23:09:33.8931113	Otyacraft Engine Test/Model Definitions (Item)
 b7d779d050cc4bf6037cd6dc75978d12806faa94 assets\otyacraftenginetest\models\item\test_item.json
diff --git a/testmod-fabric/src/main/generated/.cache/2636d2641d3f41320bfd9ff9339fa0989fd866b0 b/testmod-fabric/src/main/generated/.cache/2636d2641d3f41320bfd9ff9339fa0989fd866b0
@@ -1,4 +1,4 @@
-// 1.19.3	2023-03-11T09:26:59.9141576	Otyacraft Engine Test/Model Definitions (Block)
+// 1.19.3	2023-03-19T23:09:33.8931113	Otyacraft Engine Test/Model Definitions (Block)
 8485bbaffe8521f1d4e573a63caf7a75a92427d8 assets\otyacraftenginetest\blockstates\test_block.json
 cce7745f829730f141cc14861e138712b1106e6a assets\otyacraftenginetest\models\block\test_block_2.json
 81905599f38d704f38663494d077917837c90e91 assets\otyacraftenginetest\models\item\test_block.json
diff --git a/testmod-fabric/src/main/generated/.cache/7269ebe677acbe1feb3724b3502c670f1ddec5a1 b/testmod-fabric/src/main/generated/.cache/7269ebe677acbe1feb3724b3502c670f1ddec5a1
@@ -1,4 +1,4 @@
-// 1.19.3	2023-03-11T09:26:59.9141576	Otyacraft Engine Test/Registries
+// 1.19.3	2023-03-19T23:09:33.8921084	Otyacraft Engine Test/Registries
 fc89b9746a3ac1cb43cf716a6b9cbd90374b8c55 data\otyacraftenginetest\worldgen\noise_settings\ikisugi_level_stem_noise_generator_settings.json
 89ee89b16446035e3ece83b0f64d57b85dc2dd21 data\otyacraftenginetest\dimension_type\ikisugi_dimension.json
 ce951452ffc72395960111df81159292a00fc7cd data\otyacraftenginetest\dimension\ikisugi_dimension.json
diff --git a/testmod-fabric/src/main/generated/.cache/7ef7386eba12df43ed28295f8b18d4d73adaecc3 b/testmod-fabric/src/main/generated/.cache/7ef7386eba12df43ed28295f8b18d4d73adaecc3
@@ -1,2 +1,2 @@
-// 1.19.3	2023-03-11T09:26:59.9141576	Otyacraft Engine Test/Advancements
+// 1.19.3	2023-03-19T23:09:33.8921084	Otyacraft Engine Test/Advancements
 24ed8addd22a4702b7c77f0cd605fc53795f19e4 data\otyacraftenginetest\advancements\otyacraftenginetest\root.json
diff --git a/testmod-fabric/src/main/generated/.cache/82fd91efd4f0f9bed8483c2564da5617cbe89e10 b/testmod-fabric/src/main/generated/.cache/82fd91efd4f0f9bed8483c2564da5617cbe89e10
@@ -1,3 +1,3 @@
-// 1.19.3	2023-03-11T09:26:59.9141576	Otyacraft Engine Test/Input copy
+// 1.19.3	2023-03-19T23:09:33.8911092	Otyacraft Engine Test/Input copy
 183e554347c694dd0d75591721b58459636bd6f2 assets\otyacraftenginetest\copy_test\test.json
 183e554347c694dd0d75591721b58459636bd6f2 assets\otyacraftenginetest\copy_test\fcoh\ikisugi.json
diff --git a/testmod-fabric/src/main/generated/.cache/8a0e335825c442d2d05946d5f5bfc9cff6867414 b/testmod-fabric/src/main/generated/.cache/8a0e335825c442d2d05946d5f5bfc9cff6867414
@@ -1,3 +1,3 @@
-// 1.19.3	2023-03-11T09:26:59.9141576	Otyacraft Engine Test/Recipes
+// 1.19.3	2023-03-19T23:09:33.8911092	Otyacraft Engine Test/Recipes
 afe1da46e75b1ff0ac6ea63110f2748c8aa84b96 data\otyacraftenginetest\recipes\test.json
 d1ccb28bcc88e720665ccb40ab3bc54348a05587 data\otyacraftenginetest\advancements\recipes\food\test.json
diff --git a/testmod-fabric/src/main/generated/.cache/ce80034259a34f1a7f73e142406aa3e0d228839b b/testmod-fabric/src/main/generated/.cache/ce80034259a34f1a7f73e142406aa3e0d228839b
@@ -1,2 +1,2 @@
-// 1.19.3	2023-03-11T09:26:59.9141576	Otyacraft Engine Test/Tags for minecraft:item
+// 1.19.3	2023-03-19T23:09:33.8901105	Otyacraft Engine Test/Tags for minecraft:item
 7eb508a49db08b3875db67cd0383ae0d7494beb6 data\minecraft\tags\items\boats.json
diff --git a/testmod-fabric/src/main/generated/.cache/f61dec5b33b2b836451587dc0ec0b3cbe6b0bd80 b/testmod-fabric/src/main/generated/.cache/f61dec5b33b2b836451587dc0ec0b3cbe6b0bd80
@@ -1,4 +1,4 @@
-// 1.19.3	2023-03-11T09:26:59.9141576	Otyacraft Engine Test/Model Process
+// 1.19.3	2023-03-19T23:09:33.8911092	Otyacraft Engine Test/Model Process
 d949ee0f371db9fc9b8bceb58f7d74284b47ade3 assets\otyacraftenginetest\models\item\slide.json
 8cb44dd96d67f1401394f517ced825ebc2b7728e assets\otyacraftenginetest\models\item\glock_17.json
 b2c02147d1dbbc14042fc6c1a40e7f1072660b5b assets\otyacraftenginetest\models\item\magazine.json

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`public class ModelPartMixin {`
`13`	`13`	`@Inject(method = "translateAndRotate", at = @At("HEAD"), cancellable = true)`
`14`	`14`	`private void translateAndRotate(PoseStack poseStack, CallbackInfo ci) {`
`15`		`- if (OERenderUtils.SKIP_TRANSANDROT_MODELPART.get())`
	`15`	`+ if (OERenderUtils.SKIP_TRANSANDROT_MODELPART_V2.get())`
`16`	`16`	`ci.cancel();`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-// 1.19.3 2023-03-11T09:26:59.9141576 Otyacraft Engine Test/Tags for minecraft:block`
	`1`	`+// 1.19.3 2023-03-19T23:09:33.8921084 Otyacraft Engine Test/Tags for minecraft:block`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-// 1.19.3 2023-03-11T09:26:59.9141576 Otyacraft Engine Test/Model Definitions (Item)`
	`1`	`+// 1.19.3 2023-03-19T23:09:33.8931113 Otyacraft Engine Test/Model Definitions (Item)`
`2`	`2`	`b7d779d050cc4bf6037cd6dc75978d12806faa94 assets\otyacraftenginetest\models\item\test_item.json`