Option to prevent accidental mapart rotation when using autoplace

Author: EvModder

src/main/java/net/evmodder/evmod/Configs.java

@@ -57,6 +57,7 @@ public static class Generic{
 		public static final ConfigBoolean PLACEMENT_HELPER_MAPART_FROM_BUNDLE = new ConfigBoolean("placementHelperMapArtFromBundle", true).apply(GENERIC_KEY);
 		public static final ConfigBooleanHotkeyed MAPART_AUTOPLACE = new ConfigBooleanHotkeyed("mapArtAutoPlace", true, "").apply(GENERIC_KEY);
 		public static final ConfigInteger MAPART_AUTOPLACE_INV_DELAY = new ConfigInteger("mapArtAutoPlaceInvDelay", 3, 0, 20).apply(GENERIC_KEY);
+		public static final ConfigBoolean MAPART_AUTOPLACE_ANTI_ROTATE = new ConfigBoolean("mapArtAutoPlaceAntiRotate", true).apply(GENERIC_KEY);
 
 		public static final ConfigBooleanHotkeyed MAPART_AUTOREMOVE = new ConfigBooleanHotkeyed("mapArtAutoRemove", true, "").apply(GENERIC_KEY);
 		public static final ConfigInteger MAPART_AUTOREMOVE_AFTER = new ConfigInteger("mapArtAutoRemoveThreshold", 2, 1, 20).apply(GENERIC_KEY);
@@ -111,7 +112,7 @@ public static final List<IConfigBase> getOptions(){
 							//PLACEMENT_HELPER_MAPART_REACH
 							PLACEMENT_HELPER_MAPART_USE_NAMES, PLACEMENT_HELPER_MAPART_USE_IMAGE,
 							PLACEMENT_HELPER_MAPART_FROM_BUNDLE));
-					if(main.placementHelperMapArtAuto) availableOptions.addAll(List.of(MAPART_AUTOPLACE, MAPART_AUTOPLACE_INV_DELAY));
+					if(main.placementHelperMapArtAuto) availableOptions.addAll(List.of(MAPART_AUTOPLACE, MAPART_AUTOPLACE_INV_DELAY, MAPART_AUTOPLACE_ANTI_ROTATE));
 				}
 				if(main.gameMessageListener) availableOptions.addAll(List.of(WHISPER_PLAY_SOUND, WHISPER_PEARL_PULL));
 				if(main.cmdMapArtGroup) availableOptions.add(MAPART_GROUP_INCLUDE_UNLOCKED);

src/main/java/net/evmodder/evmod/keybinds/KeybindMapCopy.java

@@ -288,8 +288,6 @@ private void copyMapArtInBundles(final ArrayDeque<InvAction> clicks, final ItemS
 				if(USE_TEMP_BUNDLE) clicks.add(new InvAction(tempBundleSlot, 1, ActionType.CLICK)); // Take map from temp bundle
 				else{
 					final int innerBundleSlot = BUNDLE_SELECT_REVERSE ? content.size()-1 : 0;
-//					final int innerBundleSlot = BUNDLE_SELECT_REVERSE ? content.size()-(i+1) : i;
-//					final int innerBundleSlot = BUNDLE_SELECT_REVERSE ? i : content.size()-(i+1);
 					clicks.add(new InvAction(slotsWithBundles[entry.getKey()], innerBundleSlot, ActionType.BUNDLE_SELECT)); // Select 1st map in bundle
 					clicks.add(new InvAction(slotsWithBundles[entry.getKey()], 1, ActionType.CLICK)); // Take map from src bundle
 				}

src/main/java/net/evmodder/evmod/listeners/MapHandRestock.java

@@ -506,30 +506,37 @@ else if(isHotbarSlot){
 	private ItemFrameEntity lastIfe;
 	private ItemStack lastStack;
 	public MapHandRestock(final boolean allowAutoPlacer){
-		final AutoPlaceMapArt autoPlaceMapArt;
+		final AutoPlaceMapArt autoPlacer;
 		if(allowAutoPlacer){
-			autoPlaceMapArt = new AutoPlaceMapArt();
-			ClientTickEvents.END_CLIENT_TICK.register(client -> autoPlaceMapArt.placeNearestMap(client));
+			autoPlacer = new AutoPlaceMapArt();
+			ClientTickEvents.END_CLIENT_TICK.register(client -> autoPlacer.placeNearestMap(client));
 			AttackEntityCallback.EVENT.register((player, world, hand, entity, hitResult) -> {
 //				if(mapAutoPlacer.isActive() && entity instanceof ItemFrameEntity ife && ife.getHeldItemStack().getItem() == Items.FILLED_MAP){
-				if(autoPlaceMapArt.isActive()){
-					autoPlaceMapArt.disableAndReset();
+				if(autoPlacer.isActive()){
+					autoPlacer.disableAndReset();
 					Main.LOGGER.info("AutoPlaceMapArt: Disabling due to EntityAttackEvent");
 				}
 				return ActionResult.PASS;
 			});
 		}
-		else autoPlaceMapArt = null;
+		else autoPlacer = null;
 
 		UseEntityCallback.EVENT.register((player, _0, hand, entity, _1) -> {
 			if(!(entity instanceof ItemFrameEntity ife)) return ActionResult.PASS;
 			//Main.LOGGER.info("clicked item frame");
 			if(hand != Hand.MAIN_HAND){
-				Main.LOGGER.info("not main hand: "+hand.name());
+				Main.LOGGER.info("MapHandRestock: not main hand: "+hand.name());
 //				return ActionResult.FAIL;
 			}
-			//Main.LOGGER.info("placed item from offhand");
-			if(!ife.getHeldItemStack().isEmpty()) return ActionResult.PASS;
+			//Main.LOGGER.info("placed item from mainhand");
+			if(!ife.getHeldItemStack().isEmpty()){
+				if(allowAutoPlacer && Configs.Generic.MAPART_AUTOPLACE_ANTI_ROTATE.getBooleanValue() && autoPlacer.isActive()
+						&& ife.getHeldItemStack().getItem() == Items.FILLED_MAP){
+					Main.LOGGER.info("AutoPlaceMapArt: Ignoring a (likely accidental) map-rotation click");
+					return ActionResult.FAIL;
+				}
+				return ActionResult.PASS;
+			}
 			//Main.LOGGER.info("item frame is empty");
 			ItemStack stack = player.getMainHandStack();
 			if(waitingForRestock && (stack.isEmpty() || stack.getItem() == Items.FILLED_MAP)){
@@ -544,7 +551,7 @@ public MapHandRestock(final boolean allowAutoPlacer){
 
 			UpdateInventoryHighlights.setCurrentlyBeingPlacedMapArt(player, stack);
 
-			if(autoPlaceMapArt.recalcIsActive(player, lastIfe, lastStack, ife, stack)){
+			if(allowAutoPlacer && autoPlacer.recalcIsActive(player, lastIfe, lastStack, ife, stack)){
 				Main.LOGGER.info("MapRestock: AutoPlaceMapArt is active, no need to handle restock");
 			}
 			else{

src/main/resources/assets/evmod/lang/en_us.json

@@ -101,6 +101,7 @@
 	"evmod.config.generic.name.placementHelperMapArtFromBundle": "placementHelperMapArtFromBundle",
 	"evmod.config.generic.name.mapArtAutoPlace": "mapArtAutoPlace",
 	"evmod.config.generic.name.mapArtAutoPlaceInvDelay": "mapArtAutoPlaceInvDelay",
+	"evmod.config.generic.name.mapArtAutoPlaceAntiRotate": "mapArtAutoPlaceAntiRotate",
 	"evmod.config.generic.comment.placementHelperIFrame": "iFrame Helper - An item_frame auto placer",
 	"evmod.config.generic.comment.placementHelperIFrameMustConnect": "iFrame Helper - Only place connecting iFrames",
 	"evmod.config.generic.comment.placementHelperIFrameMustMatchBlock": "iFrame Helper - Only place on matching blocks",
@@ -109,6 +110,8 @@
 	"evmod.config.generic.comment.pla cementHelperMapArtUseImage": "Predict-next-map using map image",
 	"evmod.config.generic.comment.placementHelperMapArtFromBundle": "Allow mod to pull next-map prediction from bundles",
 	"evmod.config.generic.comment.mapArtAutoPlace": "Auto-place ids for a mapart from your inventory",
+	"evmod.config.generic.comment.mapArtAutoPlaceInvDelay": "How many ticks to wait between inventory actions",
+	"evmod.config.generic.comment.mapArtAutoPlaceAntiRotate": "Disable rotating maparts in frames when AutoPlace is active (helps prevent accidental rotating with misclicks)",
 
 	"evmod.config.generic.name.hotbarSlotItemTypeScrollOrder": "hotbarSlotItemTypeScrollOrder",
 	"evmod.config.generic.name.broadcastAccount": "broadcastAccount",

src/main/resources/assets/evmod/lang/es_ar.json

@@ -94,6 +94,7 @@
 	"evmod.config.generic.name.placementHelperMapArtFromBundle": "placementHelperMapArtFromBundle",
 	"evmod.config.generic.name.mapArtAutoPlace": "ayudante para mapart - AutoPlace",
 	"evmod.config.generic.name.mapArtAutoPlaceInvDelay": "mapArtAutoPlaceInvDelay",
+	"evmod.config.generic.name.mapArtAutoPlaceAntiRotate": "mapArtAutoPlaceAntiRotate",
 	"evmod.config.generic.comment.placementHelperIFrame": "ayudante para colocar marco de items",
 	"evmod.config.generic.comment.placementHelperIFrameMustConnect": "ayudante para marco de items - Solo coloca item frames conectados",
 	"evmod.config.generic.comment.placementHelperIFrameMustMatchBlock": "ayudante para marco de items - solo coloca en bloques que coinciden",
@@ -102,6 +103,8 @@
 	"evmod.config.generic.comment.placementHelperMapArtUseImage": "Precide el siguiente mapa usando la imagen",
 	"evmod.config.generic.comment.placementHelperMapArtFromBundle": "Allow mod to pull next-map prediction from bundles",
 	"evmod.config.generic.comment.mapArtAutoPlace": "coloca automaticamente mapas desde tu inventario",
+	"evmod.config.generic.comment.mapArtAutoPlaceInvDelay": "How many ticks to wait between inventory actions",
+	"evmod.config.generic.comment.mapArtAutoPlaceAntiRotate": "Disable rotating maparts in frames when AutoPlace is active (helps prevent accidental rotating with misclicks)",
 
 	"evmod.config.generic.name.hotbarSlotItemTypeScrollOrder": "hotbarSlotItemTypeScrollOrder",
 	"evmod.config.generic.name.broadcastAccount": "broadcastAccount",