Added NotPlace and dump version to 1.3

1. Added NotPlace
2. Dump version to v1.3
3. Modified DeathScreenMixin, from directly invoking requestRespawn to using native onConfirmQuit

Author: Taskeren

build.gradle

@@ -15,11 +15,14 @@ repositories {
 	maven {
 		url "https://maven.shedaniel.me"
 	}
+//	maven {
+//		url "https://maven.terraformersmc.com/releases"
+//	}
 	maven {
-		url "https://maven.terraformersmc.com/releases"
+		url "https://jitpack.io"
 	}
 	maven {
-		url "https://jitpack.io"
+		url "https://raw.githubusercontent.com/TerraformersMC/Archive/main/releases/"
 	}
 }
 
@@ -38,7 +41,7 @@ dependencies {
 		exclude(group: "net.fabricmc.fabric-api");
 	}
 
-	modApi("com.terraformersmc:modmenu:2.0.1")
+	modApi("com.terraformersmc:modmenu:2.0.2")
 
 	// Calculator-lib by Octocynth from Jitpack
 	def calcLib = "com.github.octocynth:calculator-lib:8c69c67b0e"

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx4G
 	loader_version=0.11.6
 
 # Mod Properties
-	mod_version = 1.2.0
+	mod_version = 1.3.0
 	maven_group = cn.taskeren.minequery
 	archives_base_name = minequery
 

src/main/java/cn/taskeren/minequery/MineQueryMod.java

@@ -2,15 +2,19 @@
 
 import cn.taskeren.minequery.callback.HarvestCheck;
 import cn.taskeren.minequery.callback.NotHit;
+import cn.taskeren.minequery.callback.NotPlace;
 import cn.taskeren.minequery.command.CmdCalculator;
 import cn.taskeren.minequery.command.CmdLocationCalc;
 import cn.taskeren.minequery.config.MineQueryConfig;
 import cn.taskeren.minequery.key.KeyToCommand;
 import me.shedaniel.autoconfig.AutoConfig;
 import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer;
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
 import net.fabricmc.fabric.api.event.player.AttackBlockCallback;
 import net.fabricmc.fabric.api.event.player.AttackEntityCallback;
+import net.fabricmc.fabric.api.event.player.UseBlockCallback;
+import net.fabricmc.loader.api.FabricLoader;
 
 public class MineQueryMod implements ClientModInitializer {
 
@@ -24,12 +28,19 @@ public static MineQueryConfig config() {
 	public void onInitializeClient() {
 		System.out.println("MineQuery!");
 
+		if(FabricLoader.getInstance().isDevelopmentEnvironment()) {
+			System.out.println("Hopeless");
+		}
+
 		AutoConfig.register(MineQueryConfig.class, JanksonConfigSerializer::new);
 
 		AttackBlockCallback.EVENT.register(HarvestCheck.INSTANCE);
 		AttackEntityCallback.EVENT.register(NotHit.IronGolem.INSTANCE);
 		AttackEntityCallback.EVENT.register(NotHit.Villager.INSTANCE);
 
+		UseBlockCallback.EVENT.register(NotPlace.INSTANCE);
+		ItemTooltipCallback.EVENT.register(NotPlace.INSTANCE);
+
 		CmdCalculator.register();
 		CmdLocationCalc.register();
 

src/main/java/cn/taskeren/minequery/callback/NotPlace.java

@@ -0,0 +1,67 @@
+package cn.taskeren.minequery.callback;
+
+import cn.taskeren.minequery.config.MineQueryConfig;
+import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
+import net.fabricmc.fabric.api.event.player.UseBlockCallback;
+import net.minecraft.client.item.TooltipContext;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.World;
+
+import java.util.List;
+
+import static cn.taskeren.minequery.MineQueryMod.config;
+
+public class NotPlace implements UseBlockCallback, ItemTooltipCallback {
+
+	public static final NotPlace INSTANCE = new NotPlace();
+
+	private NotPlace() {}
+
+	private static boolean validateItemStack(ItemStack stack) {
+		return stack.isOf(Items.STICK) && stack.getName().getString().equalsIgnoreCase("NotPlace");
+	}
+
+	@Override
+	public ActionResult interact(PlayerEntity player, World world, Hand hand, BlockHitResult hitResult) {
+		if(hand != Hand.MAIN_HAND || world.isClient) {
+			return ActionResult.PASS;
+		}
+
+		MineQueryConfig.NotPlaceConfig opt = config().notPlaceConfig;
+
+		ItemStack is = player.getStackInHand(hand);
+		Direction direction = hitResult.getSide();
+		if(validateItemStack(is) && player.isSneaking()) {
+			var flag = opt.toggle(direction);
+			player.sendMessage(new TranslatableText("text.minequery.notplace.toggle."+(flag ? "prevented" : "allowed"), direction), false);
+			return ActionResult.SUCCESS;
+		}
+		else if(is.getItem() instanceof BlockItem) {
+			if(opt.isPrevented(direction)) {
+				return ActionResult.FAIL;
+			}
+		}
+		return ActionResult.PASS;
+	}
+
+	@Override
+	public void getTooltip(ItemStack stack, TooltipContext context, List<Text> lines) {
+		if(validateItemStack(stack)) {
+			MineQueryConfig.NotPlaceConfig opt = config().notPlaceConfig;
+			for(var direction : Direction.values()) {
+				var prv = opt.isPrevented(direction);
+				lines.add(new TranslatableText("text.minequery.notplace.tooltip."+(prv ? "prevented" : "allowed"),
+						direction.getName()));
+			}
+		}
+	}
+}

src/main/java/cn/taskeren/minequery/config/MineQueryConfig.java

@@ -5,8 +5,10 @@
 import me.shedaniel.autoconfig.ConfigData;
 import me.shedaniel.autoconfig.annotation.Config;
 import me.shedaniel.autoconfig.annotation.ConfigEntry;
+import net.minecraft.util.math.Direction;
 
 import java.util.ArrayList;
+import java.util.EnumMap;
 
 import static cn.taskeren.minequery.key.KeyToCommand.KEY_BINDING_SIZE;
 
@@ -22,6 +24,9 @@ public class MineQueryConfig implements ConfigData {
 	@ConfigEntry.Gui.CollapsibleObject
 	public NotHitConfig notHitConfig = new NotHitConfig();
 
+	@ConfigEntry.Gui.Excluded
+	public NotPlaceConfig notPlaceConfig = new NotPlaceConfig();
+
 	@ConfigEntry.BoundedDiscrete(max = KEY_BINDING_SIZE)
 	public ArrayList<String> key2Cmd = new ArrayList<>();
 
@@ -43,4 +48,25 @@ public static class NotHitConfig {
 		public boolean villager = true;
 	}
 
+	/**
+	 * Use NotPlacingConfig#isPrevented to check. True to prevent.
+	 */
+	public static class NotPlaceConfig {
+		public EnumMap<Direction, Boolean> map = new EnumMap<>(Direction.class);
+
+		public boolean isPrevented(Direction direction) {
+			return map.getOrDefault(direction, false);
+		}
+
+		public void setPrevented(Direction direction, boolean value) {
+			map.put(direction, value);
+		}
+
+		public boolean toggle(Direction direction) {
+			boolean flag = !isPrevented(direction);
+			setPrevented(direction, flag);
+			return flag;
+		}
+	}
+
 }

src/main/java/cn/taskeren/minequery/mixin/DeathScreenMixin.java

@@ -2,7 +2,6 @@
 
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.DeathScreen;
-import net.minecraft.client.gui.screen.TitleScreen;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.text.TranslatableText;
 import org.spongepowered.asm.mixin.Mixin;
@@ -24,7 +23,7 @@ private void init(CallbackInfo info) {
 		if(config().autoRevive) {
 			ClientPlayerEntity cp = MinecraftClient.getInstance().player;
 			if(cp != null) {
-				cp.requestRespawn();
+				onConfirmQuit(false);
 				cp.sendMessage(new TranslatableText("text.minequery.autorevive"), true);
 			}
 		}

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

@@ -19,6 +19,11 @@
   "keybinding.minequery.key2cmd.8": "Key2Cmd #8",
   "keybinding.minequery.key2cmd.9": "Key2Cmd #9",
 
+  "text.minequery.notplace.toggle.allowed": "Allowed to place on %s",
+  "text.minequery.notplace.toggle.prevented": "Prevented to place on %s",
+  "text.minequery.notplace.tooltip.allowed": "%S: allowed",
+  "text.minequery.notplace.tooltip.prevented": "%s: prevented",
+
   "text.autoconfig.minequery.title": "MineQuery Configuration",
   "text.autoconfig.minequery.option.reseeding": "ReSeeding",
   "text.autoconfig.minequery.option.autoRevive": "Auto Revive",

src/main/resources/assets/minequery/lang/zh_cn.json

@@ -19,6 +19,11 @@
   "keybinding.minequery.key2cmd.8": "键对令 #8",
   "keybinding.minequery.key2cmd.9": "键对令 #9",
 
+  "text.minequery.notplace.toggle.allowed": "解禁%s面的放置",
+  "text.minequery.notplace.toggle.prevented": "禁止%s面的放置",
+  "text.minequery.notplace.tooltip.allowed": "%s面: 允许",
+  "text.minequery.notplace.tooltip.prevented": "%s面: 禁止",
+
   "text.autoconfig.minequery.title": "MC宝设置",
   "text.autoconfig.minequery.option.reseeding": "重新播种",
   "text.autoconfig.minequery.option.autoRevive": "自动复活",
@@ -34,4 +39,4 @@
   "text.autoconfig.minequery.option.notHitConfig.ironGolem": "不打铁傀儡",
   "text.autoconfig.minequery.option.notHitConfig.villager": "不打村民",
   "text.autoconfig.minequery.option.key2Cmd": "键对令指令设置"
-}
+}