Merge branch 'master' into 1.20

VazkiiMods · Aug 7, 2024 · 17d12f1 · 17d12f1
2 parents f58cc8c + 95b89b2
commit 17d12f1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/build.properties b/build.properties
@@ -3,7 +3,7 @@ mapping_channel=parchment
 forge_version=47.1.3
 mod_id=morphtool
 dir_repo=./
-build_number=37
+build_number=38
 dir_output=../Build Output/Morphtool/
 mapping_version=2023.09.03-1.20.1
 version=1.7

diff --git a/changelog.txt b/changelog.txt
@@ -1,2 +1,2 @@
-- Updated several lang files
-- Added a several mod items to the default config
+- Fixed: Rotation feature not working
+- Fixed: Removing an Item from the Tool changes its title to the raw name
diff --git a/src/main/java/vazkii/morphtool/MorphToolItem.java b/src/main/java/vazkii/morphtool/MorphToolItem.java
@@ -31,7 +31,6 @@ public InteractionResult useOn(UseOnContext context) {
 		if (level.setBlock(pos, block.rotate(level, pos, Rotation.CLOCKWISE_90), Block.UPDATE_ALL)) {
 			return InteractionResult.sidedSuccess(level.isClientSide);
 		}
-
 		return super.useOn(context);
 	}
 

diff --git a/src/main/java/vazkii/morphtool/MorphingHandler.java b/src/main/java/vazkii/morphtool/MorphingHandler.java
@@ -73,6 +73,7 @@ public static void removeItemFromTool(Entity e, ItemStack stack, boolean itemBro
 				}
 
 				copyCmp.remove("display");
+
 				copyCmp.remove(TAG_MORPHING_TOOL);
 				copyCmp.remove(TAG_MORPH_TOOL_DISPLAY_NAME);
 				copyCmp.remove(TAG_MORPH_TOOL_DATA);