1.21

Lance5057 · Aug 14, 2024 · e7538ab · e7538ab
1 parent d50c7f5
commit e7538ab
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 17 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -34,7 +34,7 @@ mod_name=Butchercraft
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT
 # The mod version. See https://semver.org/
-mod_version=2.4.0
+mod_version=2.6.0
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

diff --git a/src/main/java/com/lance5057/butchercraft/Butchercraft.java b/src/main/java/com/lance5057/butchercraft/Butchercraft.java
@@ -1,10 +1,11 @@
 package com.lance5057.butchercraft;
 
-import com.lance5057.butchercraft.armor.BCArmorMaterial;
-import com.lance5057.butchercraft.entity.ButchercraftVillagers;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import com.lance5057.butchercraft.armor.BCArmorMaterial;
+import com.lance5057.butchercraft.entity.ButchercraftVillagers;
+
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.common.Mod;

diff --git a/src/main/java/com/lance5057/butchercraft/armor/models/ApronModel.java b/src/main/java/com/lance5057/butchercraft/armor/models/ApronModel.java
@@ -28,7 +28,7 @@ public ApronModel(ModelPart root) {
 	}
 
 	public static MeshDefinition createLayer(CubeDeformation deformation) {
-		MeshDefinition meshdefinition = HumanoidModel.createMesh(deformation, 0);
+		MeshDefinition meshdefinition = HumanoidModel.createMesh(deformation, 0.5f);
 		PartDefinition partdefinition = meshdefinition.getRoot();
 
 		partdefinition.addOrReplaceChild("body", CubeListBuilder.create().texOffs(0, 0).addBox(-4.0F, 0.0F, -2.0F, 8.0F,

diff --git a/src/main/java/com/lance5057/butchercraft/armor/models/BootsModel.java b/src/main/java/com/lance5057/butchercraft/armor/models/BootsModel.java
@@ -28,14 +28,14 @@ public BootsModel(ModelPart root) {
 	}
 
 	public static MeshDefinition createLayer(CubeDeformation deformation) {
-		MeshDefinition meshdefinition = HumanoidModel.createMesh(deformation, 0);
+		MeshDefinition meshdefinition = HumanoidModel.createMesh(deformation, 0.5f);
 		PartDefinition partdefinition = meshdefinition.getRoot();
 
 		//partdefinition.addOrReplaceChild("body", CubeListBuilder.create(), PartPose.ZERO);
 		partdefinition.addOrReplaceChild("left_leg", CubeListBuilder.create().texOffs(0, 0).addBox(-2.0F, 0.0F, -2.0F,
-				4.0F, 12.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F));
+				4.0F, 12.0F, 4.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 0.0F, 0.0F));
 		partdefinition.addOrReplaceChild("right_leg", CubeListBuilder.create().mirror().texOffs(0, 0).addBox(-2.0F,
-				0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F));
+				0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 0.0F, 0.0F));
 
 		return meshdefinition;
 	}

diff --git a/src/main/java/com/lance5057/butchercraft/armor/models/CowHoodModel.java b/src/main/java/com/lance5057/butchercraft/armor/models/CowHoodModel.java
@@ -28,14 +28,14 @@ public CowHoodModel(ModelPart root) {
 	}
 
 	public static MeshDefinition createLayer(CubeDeformation deformation) {
-		MeshDefinition meshdefinition = HumanoidModel.createMesh(deformation, 0);
+		MeshDefinition meshdefinition = HumanoidModel.createMesh(deformation, 0.5f);
 		PartDefinition partdefinition = meshdefinition.getRoot();
 
 		PartDefinition head = partdefinition.addOrReplaceChild("head",
 				CubeListBuilder.create().texOffs(0, 0)
 						.addBox(-4.0F, -8.0F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.35F)).texOffs(24, 2)
-						.addBox(-6.0F, -10.0F, -0.6F, 1.0F, 3.0F, 1.0F, new CubeDeformation(0.0F)).texOffs(24, 2)
-						.addBox(5.0F, -10.0F, -0.6F, 1.0F, 3.0F, 1.0F, new CubeDeformation(0.0F)),
+						.addBox(-5.25F, -10.0F, -0.6F, 1.0F, 3.0F, 1.0F, new CubeDeformation(0.0F)).texOffs(24, 2)
+						.addBox(4.25F, -10.0F, -0.6F, 1.0F, 3.0F, 1.0F, new CubeDeformation(0.0F)),
 				PartPose.offsetAndRotation(0.0F, -5.0F, 0.6F, -0.2618F, 0.0F, 0.0F));
 
 //		head.addOrReplaceChild("head",

diff --git a/src/main/java/com/lance5057/butchercraft/armor/models/GlovesModel.java b/src/main/java/com/lance5057/butchercraft/armor/models/GlovesModel.java
@@ -28,14 +28,14 @@ public GlovesModel(ModelPart root) {
 	}
 
 	public static MeshDefinition createLayer(CubeDeformation deformation) {
-		MeshDefinition meshdefinition = HumanoidModel.createMesh(deformation, 0);
+		MeshDefinition meshdefinition = HumanoidModel.createMesh(deformation, 0.5f);
 		PartDefinition partdefinition = meshdefinition.getRoot();
 
 		partdefinition.addOrReplaceChild("body", CubeListBuilder.create(), PartPose.ZERO);
-		partdefinition.addOrReplaceChild("left_arm", CubeListBuilder.create().texOffs(16, 0).addBox(-1.0F, 0.0F, -2.0F,
-				4.0F, 12.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F));
-		partdefinition.addOrReplaceChild("right_arm", CubeListBuilder.create().mirror().texOffs(16, 0).addBox(-3.0F,
-				0.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F));
+		partdefinition.addOrReplaceChild("left_arm", CubeListBuilder.create().texOffs(16, 0).addBox(-1.5F, -2.0F, -2.0F,
+				4.0F, 12.0F, 4.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 0.0F, 0.0F));
+		partdefinition.addOrReplaceChild("right_arm", CubeListBuilder.create().mirror().texOffs(16, 0).addBox(-2.5F,
+				-2.0F, -2.0F, 4.0F, 12.0F, 4.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 0.0F, 0.0F));
 
 		return meshdefinition;
 	}

diff --git a/src/main/java/com/lance5057/butchercraft/armor/models/MaskModel.java b/src/main/java/com/lance5057/butchercraft/armor/models/MaskModel.java
@@ -34,7 +34,7 @@ public static MeshDefinition createLayer(CubeDeformation deformation) {
 
 		partdefinition.addOrReplaceChild("hat", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F));
 		partdefinition.addOrReplaceChild("head", CubeListBuilder.create().texOffs(0, 16).addBox(
-				-4F, -8.0F, -4F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 24.0F, 0.0F));
+				-4F, -8.0F, -4F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.25F)), PartPose.offset(0.0F, 24.0F, 0.0F));
 
 		return meshdefinition;
 	}

diff --git a/src/main/java/com/lance5057/butchercraft/workstations/grinder/GrinderBlockEntity.java b/src/main/java/com/lance5057/butchercraft/workstations/grinder/GrinderBlockEntity.java
@@ -160,7 +160,7 @@ public ItemStack insertItem(ItemStack heldItem) {
 		for (int i = 0; i < 3; i++) {
 			if (inventory.isItemValid(i, heldItem)) {
 
-				if (!ItemStack.isSameItemSameComponents(inventory.insertItem(i, heldItem, true), heldItem)) {
+				if (!ItemStack.matches(inventory.insertItem(i, heldItem, true), heldItem)) {
 
 					heldItem = inventory.insertItem(i, heldItem.copy(), false);