1.19.3

YoungSoulluoS · Dec 13, 2022 · dc494c8 · dc494c8
1 parent 47b53f8
commit dc494c8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/main/java/net/dorianpb/cem/mixins/EntityModelLoaderMixin.java b/src/main/java/net/dorianpb/cem/mixins/EntityModelLoaderMixin.java
@@ -10,9 +10,10 @@
 import net.minecraft.client.render.entity.model.EntityModelLoader;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
+import net.minecraft.registry.Registries;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
+// import net.minecraft.util.registry.Registry;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -50,7 +51,7 @@ private void loadResourceFromId(ResourceManager manager, Identifier id, String n
 
 			String entityName = CemFairy.getEntityNameFromId(id);
 			Optional<EntityType<?>> entityTypeOptional = EntityType.get(entityName);
-			Optional<BlockEntityType<?>> blockEntityTypeOptional = Registry.BLOCK_ENTITY_TYPE.getOrEmpty(Identifier.tryParse(entityName));
+			Optional<BlockEntityType<?>> blockEntityTypeOptional = Registries.BLOCK_ENTITY_TYPE.getOrEmpty(Identifier.tryParse(entityName));
 
 			if(entityTypeOptional.isPresent()){
 				EntityType<? extends Entity> entityType = entityTypeOptional.get();

diff --git a/src/main/java/net/dorianpb/cem/mixins/ModelCuboidDataMixin.java b/src/main/java/net/dorianpb/cem/mixins/ModelCuboidDataMixin.java
@@ -5,7 +5,8 @@
 import net.minecraft.client.model.ModelCuboidData;
 import net.minecraft.client.model.ModelPart.Cuboid;
 import net.minecraft.client.util.math.Vector2f;
-import net.minecraft.util.math.Vec3f;
+// import net.minecraft.util.math.Vec3f;
+import org.joml.Vector3f;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -17,7 +18,7 @@
 public abstract class ModelCuboidDataMixin{
 	@Final
 	@Shadow
-	private Vec3f offset, dimensions;
+	private Vector3f offset, dimensions;
 
 	@Final
 	@Shadow
@@ -33,12 +34,12 @@ public abstract class ModelCuboidDataMixin{
 
 	@Inject(method = "createCuboid", at = @At("RETURN"), cancellable = true)
 	private void cem$injectCuboid(int textureWidth, int textureHeight, CallbackInfoReturnable<Cuboid> cir){
-		cir.setReturnValue(new CemCuboid(this.offset.getX(),
-		                                 this.offset.getY(),
-		                                 this.offset.getZ(),
-		                                 this.dimensions.getX(),
-		                                 this.dimensions.getY(),
-		                                 this.dimensions.getZ(),
+		cir.setReturnValue(new CemCuboid(this.offset.x(),
+		                                 this.offset.y(),
+		                                 this.offset.z(),
+		                                 this.dimensions.x(),
+		                                 this.dimensions.y(),
+		                                 this.dimensions.z(),
 		                                 ((DilationAccessor) this.extraSize).getRadiusX(),
 		                                 ((DilationAccessor) this.extraSize).getRadiusY(),
 		                                 ((DilationAccessor) this.extraSize).getRadiusZ(),