使用kt重实现Config类

允许通过按键将物品分享至聊天栏

Author: Circulate233

build.gradle.kts

@@ -231,7 +231,7 @@ dependencies {
     implementation(rfg.deobf("curse.maven:jetif-303122:2919936"))
     implementation(rfg.deobf("curse.maven:ctm-267602:2915363"))
 //    implementation(rfg.deobf("curse.maven:component-model-hider-940949:4885858"))
-    implementation(rfg.deobf("curse.maven:had-enough-items-557549:6930666"))
+    implementation(rfg.deobf("curse.maven:had-enough-items-557549:7057606"))
     implementation(rfg.deobf("curse.maven:the-one-probe-245211:2667280"))
     implementation(rfg.deobf("curse.maven:FTB-Library-237167:2985811"))
     implementation(rfg.deobf("curse.maven:FTBU-237102:3157548"))
@@ -306,7 +306,7 @@ dependencies {
     implementation(rfg.deobf("curse.maven:packagedauto-308380:6312996"))
     compileOnly(rfg.deobf("curse.maven:libvulpes-236541:3801015"))
     compileOnly(rfg.deobf("curse.maven:advanced-rocketry-236542:4671856"))
-    implementation(rfg.deobf("curse.maven:random-complement-1198138:6995821"))
+    implementation(rfg.deobf("curse.maven:random-complement-1198138:7133485"))
     implementation(rfg.deobf("curse.maven:modular-routers-250294:2954953"))
     implementation(rfg.deobf("curse.maven:actually-additions-228404:3117927"))
 }

src/main/java/github/kasuminova/novaeng/NovaEngineeringCore.java

@@ -6,6 +6,7 @@
 import github.kasuminova.novaeng.common.command.CommandSPacketProfiler;
 import github.kasuminova.novaeng.common.config.NovaEngCoreConfig;
 import github.kasuminova.novaeng.common.handler.WorldLoadedHandler;
+import github.kasuminova.novaeng.common.network.ItemDisplayPkt;
 import github.kasuminova.novaeng.common.network.ParallelNetworkManager;
 import github.kasuminova.novaeng.common.network.PktCellDriveStatusUpdate;
 import github.kasuminova.novaeng.common.network.PktECalculatorGUIData;
@@ -123,6 +124,7 @@ public void preInit(FMLPreInitializationEvent event) {
         NET_CHANNEL.registerMessage(PktCProfilerRequest.class, PktCProfilerRequest.class, start++, Side.CLIENT);
         NET_CHANNEL.registerMessage(PktECalculatorGUIData.class, PktECalculatorGUIData.class, start++, Side.CLIENT);
         NET_CHANNEL.registerMessage(PktMouseItemUpdate.class, PktMouseItemUpdate.class, start++, Side.CLIENT);
+        NET_CHANNEL.registerMessage(ItemDisplayPkt.class, ItemDisplayPkt.class, start++, Side.CLIENT);
 
         start = 64;
 
@@ -134,6 +136,7 @@ public void preInit(FMLPreInitializationEvent event) {
         NET_CHANNEL.registerMessage(PktEFabricatorPatternSearchGUIAction.class, PktEFabricatorPatternSearchGUIAction.class, start++, Side.SERVER);
         NET_CHANNEL.registerMessage(PktCProfilerReply.class, PktCProfilerReply.class, start++, Side.SERVER);
         NET_CHANNEL.registerMessage(PktGeocentricDrillControl.class, PktGeocentricDrillControl.class, start++, Side.SERVER);
+        NET_CHANNEL.registerMessage(ItemDisplayPkt.class, ItemDisplayPkt.class, start++, Side.SERVER);
 
         proxy.preInit();
     }

src/main/java/github/kasuminova/novaeng/client/ClientProxy.java

@@ -39,13 +39,16 @@
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import it.unimi.dsi.fastutil.objects.ObjectLists;
+import lombok.Getter;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.color.BlockColors;
 import net.minecraft.client.renderer.color.ItemColors;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
@@ -82,6 +85,8 @@
 @Mod.EventBusSubscriber(Side.CLIENT)
 public class ClientProxy extends CommonProxy {
 
+    @Getter
+    private static List<String> itemDisplayTooltip;
     private static final Object2IntMap<String> colorCache = new Object2IntOpenHashMap<>();
     public static List<Item> items = new ObjectArrayList<>();
     public static List<Block> blocks = new ObjectArrayList<>();
@@ -168,6 +173,8 @@ public void preInit() {
         MinecraftForge.EVENT_BUS.register(ClientEventHandler.INSTANCE);
         MinecraftForge.EVENT_BUS.register(BlockAngelRendererHandler.INSTANCE);
 
+        itemDisplayTooltip = ObjectLists.singleton(I18n.format("key.novaeng.item_display.tooltip", "Ctrl + L"));
+
         if (Mods.GECKOLIB.isPresent()) {
             ClientRegistry.bindTileEntitySpecialRenderer(SingularityCore.class, MachineControllerRenderer.INSTANCE);
         }

src/main/java/github/kasuminova/novaeng/client/gui/misc/TechLevelText.java

@@ -1,9 +1,11 @@
 package github.kasuminova.novaeng.client.gui.misc;
 
+import lombok.Getter;
 import net.minecraft.client.resources.I18n;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
+@Getter
 @SideOnly(Side.CLIENT)
 public class TechLevelText {
     private final String levelText;
@@ -34,11 +36,4 @@ public static String[] splitSubLevel(float level) {
         return new String[]{levelText, subLevelText.replace(".", "")};
     }
 
-    public String getLevelText() {
-        return levelText;
-    }
-
-    public String getSubLevelText() {
-        return subLevelText;
-    }
 }

src/main/java/github/kasuminova/novaeng/client/handler/ClientEventHandler.java

@@ -6,6 +6,7 @@
 import github.kasuminova.novaeng.common.profiler.CPacketProfiler;
 import github.kasuminova.novaeng.common.profiler.TEUpdatePacketProfiler;
 import github.kasuminova.novaeng.mixin.minecraft.AccessorParticleManager;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.particle.ParticleManager;
 import net.minecraft.util.text.TextFormatting;
@@ -15,7 +16,6 @@
 import net.minecraftforge.fml.common.network.FMLNetworkEvent;
 
 import java.util.ArrayDeque;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -25,7 +25,7 @@ public class ClientEventHandler {
 
     public static int debugPacketProfilerMessageLimit = 5;
     public static int debugTEPacketProfilerMessageLimit = 5;
-    private final List<String> debugMessageCache = new ArrayList<>();
+    private final List<String> debugMessageCache = new ObjectArrayList<>();
     private long clientTick = 0;
     private boolean debugMessageUpdateRequired = true;
 

src/main/java/github/kasuminova/novaeng/client/handler/ItemDisplayHandler.java

@@ -0,0 +1,23 @@
+package github.kasuminova.novaeng.client.handler;
+
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class ItemDisplayHandler {
+
+//    @SubscribeEvent(priority = EventPriority.HIGHEST)
+//    public void onInputEvent(GuiScreenEvent.KeyboardInputEvent.Pre event) {
+//        var mc = Minecraft.getMinecraft();
+//        if (mc.currentScreen instanceof GuiContainer gui) {
+//            int eventKey = Keyboard.getEventKey();
+//            if (GuiScreen.isCtrlKeyDown() && Keyboard.KEY_L == eventKey && Keyboard.isKeyDown(eventKey)) {
+//                var slot = gui.getSlotUnderMouse();
+//                if (slot != null) {
+//                    NovaEngineeringCore.NET_CHANNEL.sendToServer(new ItemDisplayPkt(slot.getStack(), mc.player));
+//                }
+//            }
+//        }
+//    }
+
+}

src/main/java/github/kasuminova/novaeng/client/hitokoto/HitokotoResult.java

@@ -1,9 +1,15 @@
 package github.kasuminova.novaeng.client.hitokoto;
 
-@SuppressWarnings("unused")
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.Accessors;
+
+@Getter
+@Setter
+@Accessors(chain = true)
 public class HitokotoResult {
     private int id;
-    private String uuid;
+    private String UUID;
     private String hitokoto;
     private String type;
     private String from;
@@ -14,113 +20,4 @@ public class HitokotoResult {
     private String commitFrom;
     private String createdAt;
     private int length;
-
-    public int getId() {
-        return id;
-    }
-
-    public HitokotoResult setId(final int id) {
-        this.id = id;
-        return this;
-    }
-
-    public String getUuid() {
-        return uuid;
-    }
-
-    public HitokotoResult setUUID(final String uuid) {
-        this.uuid = uuid;
-        return this;
-    }
-
-    public String getHitokoto() {
-        return hitokoto;
-    }
-
-    @SuppressWarnings("UnusedReturnValue")
-    public HitokotoResult setHitokoto(final String hitokoto) {
-        this.hitokoto = hitokoto;
-        return this;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public HitokotoResult setType(final String type) {
-        this.type = type;
-        return this;
-    }
-
-    public String getFrom() {
-        return from;
-    }
-
-    public HitokotoResult setFrom(final String from) {
-        this.from = from;
-        return this;
-    }
-
-    public String getFromWho() {
-        return fromWho;
-    }
-
-    public HitokotoResult setFromWho(final String fromWho) {
-        this.fromWho = fromWho;
-        return this;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public HitokotoResult setCreator(final String creator) {
-        this.creator = creator;
-        return this;
-    }
-
-    public int getCreatorUid() {
-        return creatorUid;
-    }
-
-    public HitokotoResult setCreatorUid(final int creatorUid) {
-        this.creatorUid = creatorUid;
-        return this;
-    }
-
-    public int getReviewer() {
-        return reviewer;
-    }
-
-    public HitokotoResult setReviewer(final int reviewer) {
-        this.reviewer = reviewer;
-        return this;
-    }
-
-    public String getCommitFrom() {
-        return commitFrom;
-    }
-
-    public HitokotoResult setCommitFrom(final String commitFrom) {
-        this.commitFrom = commitFrom;
-        return this;
-    }
-
-    public String getCreatedAt() {
-        return createdAt;
-    }
-
-    public HitokotoResult setCreatedAt(final String createdAt) {
-        this.createdAt = createdAt;
-        return this;
-    }
-
-    public int getLength() {
-        return length;
-    }
-
-    public HitokotoResult setLength(final int length) {
-        this.length = length;
-        return this;
-    }
 }

src/main/java/github/kasuminova/novaeng/common/CommonProxy.java

@@ -25,6 +25,7 @@
 import github.kasuminova.novaeng.common.handler.HyperNetEventHandler;
 import github.kasuminova.novaeng.common.handler.HyperNetMachineEventHandler;
 import github.kasuminova.novaeng.common.handler.IEHandler;
+import github.kasuminova.novaeng.common.handler.MachineAssemblyHandler;
 import github.kasuminova.novaeng.common.handler.OreHandler;
 import github.kasuminova.novaeng.common.handler.WorldLoadedHandler;
 import github.kasuminova.novaeng.common.hypernet.old.HyperNetTerminal;
@@ -111,11 +112,12 @@ public void preInit() {
         MinecraftForge.EVENT_BUS.register(WorldLoadedHandler.INSTANCE);
         MinecraftForge.EVENT_BUS.register(EnchantmentHandler.INSTANCE);
         MinecraftForge.EVENT_BUS.register(OreHandler.INSTANCE);
+        MinecraftForge.EVENT_BUS.register(MachineAssemblyHandler.INSTANCE);
 
         if (Loader.isModLoaded("ftbquests"))
             MinecraftForge.EVENT_BUS.register(FTBHandler.INSTANCE);
 
-        if (NovaEngCoreConfig.SERVER.SpecialMachine)
+        if (NovaEngCoreConfig.SERVER.specialMachine)
             MinecraftForge.EVENT_BUS.register(IEHandler.INSTANCE);
 
         if (Loader.isModLoaded("ic2")) {
@@ -134,7 +136,7 @@ public void init() {
         RecipeAdapterExtended.registerAdapter();
         AssemblyLine.registerNetNode();
         HyperNetRecipeManager.registerRecipes();
-        if (NovaEngCoreConfig.SERVER.SpecialMachine) {
+        if (NovaEngCoreConfig.SERVER.specialMachine) {
             if (Mods.ASTRAL_SORCERY.isPresent() && Mods.BOTANIA.isPresent()) {
                 RegistryMachineSpecial.registrySpecialMachine(IllumPool.INSTANCE);
             }