重构文件结构

src/main/java/com/hexdragon/enchrebirth/block/GrindstoneContainerRe.java → src/main/java/com/hexdragon/enchrebirth/block/grindstone/GrindstoneContainerRe.java

@@ -1,4 +1,4 @@
-package com.hexdragon.enchrebirth.block;
+package com.hexdragon.enchrebirth.block.grindstone;
 
 import com.hexdragon.core.item.CraftResultInventoryRe;
 import com.hexdragon.core.item.EnchantmentHelperRe;

src/main/java/com/hexdragon/enchrebirth/block/GrindstoneScreenRe.java → src/main/java/com/hexdragon/enchrebirth/block/grindstone/GrindstoneScreenRe.java

@@ -1,4 +1,4 @@
-package com.hexdragon.enchrebirth.block;
+package com.hexdragon.enchrebirth.block.grindstone;
 
 import com.hexdragon.enchrebirth.Main;
 import com.mojang.blaze3d.matrix.MatrixStack;

src/main/java/com/hexdragon/enchrebirth/item/name_tag/NameTagScreen.java

@@ -0,0 +1,11 @@
+package com.hexdragon.enchrebirth.item.name_tag;
+
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.util.text.ITextComponent;
+
+public class NameTagScreen extends Screen {
+    protected NameTagScreen(ITextComponent titleIn) {
+        super(titleIn);
+    }
+
+}

src/main/java/com/hexdragon/enchrebirth/mixin/YggdrasilMixin.java

@@ -1,27 +0,0 @@
-package com.hexdragon.enchrebirth.mixin;
-
-import com.hexdragon.enchrebirth.Main;
-import com.mojang.authlib.GameProfile;
-import com.mojang.authlib.HttpAuthenticationService;
-import com.mojang.authlib.minecraft.HttpMinecraftSessionService;
-import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
-
-@Mixin(YggdrasilMinecraftSessionService.class)
-public abstract class YggdrasilMixin extends HttpMinecraftSessionService {
-    protected YggdrasilMixin(HttpAuthenticationService authenticationService) { super(authenticationService); }
-
-    // 强制结束 MC 的玩家档案获取，以避免进入存档时卡死
-    @Inject(method = "fillGameProfile", at = @At(value = "HEAD"), cancellable = true, locals = LocalCapture.CAPTURE_FAILEXCEPTION)
-    private void fillGameProfile(GameProfile profile, boolean requireSecure, CallbackInfoReturnable<GameProfile> cir) {
-        Main.LOGGER.warn("Canceled game profile filling.");
-        cir.setReturnValue(profile);
-        cir.cancel();
-    }
-
-}
-

src/main/java/com/hexdragon/enchrebirth/mixin/block/GrindstoneBlockMixin.java

@@ -1,6 +1,6 @@
 package com.hexdragon.enchrebirth.mixin.block;
 
-import com.hexdragon.enchrebirth.block.GrindstoneContainerRe;
+import com.hexdragon.enchrebirth.block.grindstone.GrindstoneContainerRe;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.GrindstoneBlock;
 import net.minecraft.block.HorizontalFaceBlock;

src/main/java/com/hexdragon/enchrebirth/registry/RegClient.java

@@ -1,9 +1,9 @@
 package com.hexdragon.enchrebirth.registry;
 
 import com.hexdragon.enchrebirth.Main;
-import com.hexdragon.enchrebirth.block.GrindstoneScreenRe;
 import com.hexdragon.enchrebirth.block.anvil.AnvilRenderer;
 import com.hexdragon.enchrebirth.block.anvil.AnvilScreenRe;
+import com.hexdragon.enchrebirth.block.grindstone.GrindstoneScreenRe;
 import net.minecraft.client.gui.ScreenManager;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;

src/main/java/com/hexdragon/enchrebirth/registry/RegMain.java

@@ -1,10 +1,10 @@
 package com.hexdragon.enchrebirth.registry;
 
 import com.hexdragon.enchrebirth.Main;
-import com.hexdragon.enchrebirth.block.GrindstoneContainerRe;
 import com.hexdragon.enchrebirth.block.anvil.AnvilContainerRe;
 import com.hexdragon.enchrebirth.block.anvil.AnvilTileEntity;
 import com.hexdragon.enchrebirth.block.anvil.NetheriteAnvil;
+import com.hexdragon.enchrebirth.block.grindstone.GrindstoneContainerRe;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.entity.player.PlayerInventory;

src/main/resources/mixins.enchrebirth.json

@@ -5,7 +5,6 @@
   "mixins": [
     "RepairItemRecipeMixin",
     "block/GrindstoneBlockMixin",
-    "block/AnvilBlockMixin",
-    "YggdrasilMixin"
+    "block/AnvilBlockMixin"
   ]
 }