Port new Changes

src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa

@@ -1,4 +1,4 @@
-// 1.20.1	2023-06-29T19:16:25.7368047	Create's Sequenced Assembly Recipes
+// 1.20.1	2023-07-04T18:31:12.3951444	Create's Sequenced Assembly Recipes
 dbaca5a5aa312f3bc7b826e51e665d32e798a5d7 data/create/recipes/sequenced_assembly/precision_mechanism.json
 0cdbd4f583aa0a2aa8f3ca2827199bede1732722 data/create/recipes/sequenced_assembly/sturdy_sheet.json
 1274315b5c570722d6f5b2ed7f5e53fe01b6288a data/create/recipes/sequenced_assembly/track.json

src/generated/resources/.cache/1cb0872ba1a6c752326d93c76b4dff08eb2dcb71

@@ -1,4 +1,4 @@
-// 1.20.1	2023-06-29T19:16:25.7447829	Create's Worldgen Data
+// 1.20.1	2023-07-04T18:31:12.4140931	Create's Worldgen Data
 f650826db97d0562230ae0bd965ccbad4c696eff data/create/forge/biome_modifier/striated_ores_nether.json
 d401f270f1ba0e5d6940aeb8f72ebb3a02dd055e data/create/forge/biome_modifier/striated_ores_overworld.json
 ed82e4fd3dba36cf2fd81a196cc6670ae0c6da9f data/create/forge/biome_modifier/zinc_ore.json

src/generated/resources/.cache/1e7ae3781bc686bd8d35b4cded279de7954d4a3d

@@ -1,4 +1,4 @@
-// 1.20.1	2023-06-29T19:16:25.6732481	Create's Damage Type Data
+// 1.20.1	2023-07-04T18:31:12.3273263	Create's Damage Type Data
 030ede1044384c4117ac1e491bf5c78bbd2842f5 data/create/damage_type/crush.json
 92b0416950ffeb3ba68811e587177c2f8811c2c5 data/create/damage_type/cuckoo_surprise.json
 d2a4fdb64f4ba817e13a7b20c73fd1ca34b825fc data/create/damage_type/fan_fire.json

src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba

@@ -1,4 +1,4 @@
-// 1.20.1	2023-06-29T19:16:25.6752424	Create's Advancements
+// 1.20.1	2023-07-04T18:31:12.3303171	Create's Advancements
 2661a689fdcf729494f46e3c719f71c62e31582e data/create/advancements/andesite_alloy.json
 fa16c4afe0496edc3f157858a6e0ff177a1622ff data/create/advancements/andesite_casing.json
 5a694002d0a663bc869b09d15924a10c43dc522f data/create/advancements/anvil_plough.json

src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9

@@ -1,4 +1,4 @@
-// 1.20.1	2023-06-29T19:16:25.7437852	Create's Mechanical Crafting Recipes
+// 1.20.1	2023-07-04T18:31:12.4130959	Create's Mechanical Crafting Recipes
 f076d64d9f30709bed34775136c9241097b28aa9 data/create/recipes/mechanical_crafting/crushing_wheel.json
 694dca9dcff246bb7f560b3304fcc244c53217d5 data/create/recipes/mechanical_crafting/extendo_grip.json
 3b2837b08607c1ca466fa3eb418209b2e55da6ba data/create/recipes/mechanical_crafting/potato_cannon.json

src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9

@@ -1,4 +1,4 @@
-// 1.20.1	2023-06-29T19:16:25.7378011	Create's Standard Recipes
+// 1.20.1	2023-07-04T18:31:12.4081093	Create's Standard Recipes
 a8cc4af26f6c7c45a9eef12e92af1452fe042454 data/create/advancements/recipes/combat/crafting/appliances/netherite_backtank.json
 2c2639c7b307ee7c7a4e97e5efebf496788998ad data/create/advancements/recipes/combat/crafting/appliances/netherite_backtank_from_netherite.json
 81dcf0cb1aa99e39bc7d1a386e07cad4cee7d8b9 data/create/advancements/recipes/combat/crafting/appliances/netherite_diving_boots.json

src/generated/resources/.cache/84f9c7ad2eb0c05bbc6dce996bf102df34b68360

@@ -1,4 +1,4 @@
-// 1.20.1	2023-06-29T22:04:50.9792131	Tags for minecraft:damage_type mod id create
+// 1.20.1	2023-07-04T18:31:12.3293201	Tags for minecraft:damage_type mod id create
-55371872b65f63a4b7508599d18a9a5e029ed353 data/minecraft/tags/damage_type/bypasses_armor.json
+035f94f328fba0594df1a6bd7c374b8b99b8d7d1 data/minecraft/tags/damage_type/bypasses_armor.json
 62231dbbc4e6a21bafe1b3cdb3c86d06ff647ec7 data/minecraft/tags/damage_type/is_explosion.json
-25913dd7c9ec6de04eac0f77ff764e1c48ca651d data/minecraft/tags/damage_type/is_fire.json
+ad45c55a9cc7883cfcd8b208f735c739f599e1d0 data/minecraft/tags/damage_type/is_fire.json

src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139

@@ -1,2 +1,2 @@
-// 1.20.1	2023-06-29T19:16:25.6862141	Create's Custom Sounds
+// 1.20.1	2023-07-04T18:31:12.3492665	Create's Custom Sounds
 043955db25ffe58e7debb9a4f11e41a9571376e6 assets/create/sounds.json

src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json

@@ -5,7 +5,7 @@
       "required": false
     },
     {
-      "id": "create:fan_fire",
+      "id": "create:mechanical_saw",
       "required": false
     },
     {
@@ -13,11 +13,11 @@
       "required": false
     },
     {
-      "id": "create:mechanical_drill",
+      "id": "create:fan_fire",
       "required": false
     },
     {
-      "id": "create:mechanical_saw",
+      "id": "create:mechanical_drill",
       "required": false
     }
   ]

src/generated/resources/data/minecraft/tags/damage_type/is_fire.json

@@ -1,11 +1,11 @@
 {
   "values": [
     {
-      "id": "create:fan_lava",
+      "id": "create:fan_fire",
       "required": false
     },
     {
-      "id": "create:fan_fire",
+      "id": "create:fan_lava",
       "required": false
     }
   ]

src/main/java/com/simibubi/create/AllFluids.java

@@ -8,10 +8,10 @@ import java.util.function.Supplier;
 import javax.annotation.Nullable;
 
 import org.jetbrains.annotations.NotNull;
+import org.joml.Vector3f;
 
 import com.mojang.blaze3d.shaders.FogShape;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.math.Vector3f;
 import com.simibubi.create.AllTags.AllFluidTags;
 import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes;
 import com.simibubi.create.content.fluids.VirtualFluid;

src/main/java/com/simibubi/create/AllTags.java

@@ -9,7 +9,7 @@ import java.util.Collections;
 
 import com.simibubi.create.foundation.utility.Lang;
 
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.FluidTags;
@@ -303,7 +303,7 @@ public class AllTags {
 			if (optional) {
 				tag = optionalTag(ForgeRegistries.ENTITY_TYPES, id);
 			} else {
-				tag = TagKey.create(Registry.ENTITY_TYPE_REGISTRY, id);
+				tag = TagKey.create(Registries.ENTITY_TYPE, id);
 			}
 			this.alwaysDatagen = alwaysDatagen;
 		}

src/main/java/com/simibubi/create/content/trains/bogey/BogeyRenderer.java

@@ -6,12 +6,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.IntStream;
 
-import com.mojang.math.Matrix3f;
-import com.mojang.math.Matrix4f;
-import com.mojang.math.Quaternion;
-import com.simibubi.create.content.trains.entity.CarriageBogey;
-
 import org.jetbrains.annotations.Nullable;
+import org.joml.Matrix3f;
+import org.joml.Matrix4f;
+import org.joml.Quaternionf;
 
 import com.jozufozu.flywheel.api.MaterialManager;
 import com.jozufozu.flywheel.core.Materials;
@@ -20,6 +18,7 @@ import com.jozufozu.flywheel.core.materials.model.ModelData;
 import com.jozufozu.flywheel.util.transform.Transform;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.simibubi.create.content.trains.entity.CarriageBogey;
 import com.simibubi.create.foundation.render.CachedBufferer;
 import com.simibubi.create.foundation.render.SuperByteBuffer;
 
@@ -375,7 +374,7 @@ public abstract class BogeyRenderer {
 		}
 
 		@Override
-		public BogeyModelData multiply(Quaternion quaternion) {
+		public BogeyModelData multiply(Quaternionf quaternion) {
 			this.transform.multiply(quaternion);
 			return this;
 		}