修复一些bug

Author: Circulate233

build.gradle.kts

@@ -176,7 +176,6 @@ repositories {
 //mixin {
 //    add sourceSets.main, "mixins.novaeng_core.refmap.json"
 //}
-
 dependencies {
     annotationProcessor("com.github.bsideup.jabel:jabel-javac-plugin:0.4.2")
     compileOnly("com.github.bsideup.jabel:jabel-javac-plugin:0.4.2")
@@ -208,6 +207,9 @@ dependencies {
     compileOnly("org.projectlombok:lombok:1.18.24")
     annotationProcessor("org.projectlombok:lombok:1.18.24")
 
+    //kt
+    implementation("io.github.chaosunity.forgelin:Forgelin-Continuous:2.2.20.0")
+
     // Performance Test Tool
 //    runtimeOnly(rfg.deobf("curse.maven:spark-361579:3542217"))
 
@@ -224,6 +226,7 @@ dependencies {
     implementation(rfg.deobf("curse.maven:tinkers-construct-74072:2902483"))
     implementation(rfg.deobf("curse.maven:not-enough-energistics-515565:5234732"))
     implementation(rfg.deobf("curse.maven:psi-241665:3085917"))
+    implementation(rfg.deobf("curse.maven:psio-339394:3077697"))
     implementation(rfg.deobf("curse.maven:RandomTweaker-514170:5528753"))
     implementation(rfg.deobf("curse.maven:jetif-303122:2919936"))
     implementation(rfg.deobf("curse.maven:ctm-267602:2915363"))
@@ -306,7 +309,6 @@ dependencies {
     implementation(rfg.deobf("curse.maven:random-complement-1198138:6995821"))
     implementation(rfg.deobf("curse.maven:modular-routers-250294:2954953"))
     implementation(rfg.deobf("curse.maven:actually-additions-228404:3117927"))
-    implementation(kotlin("stdlib-jdk8"))
 }
 
 // Publishing to a Maven repository

src/main/java/github/kasuminova/novaeng/client/gui/GuiHyperNetTerminal.java

@@ -1,5 +1,6 @@
 package github.kasuminova.novaeng.client.gui;
 
+import com.github.bsideup.jabel.Desugar;
 import github.kasuminova.novaeng.NovaEngineeringCore;
 import github.kasuminova.novaeng.client.gui.misc.TechLevelText;
 import github.kasuminova.novaeng.client.gui.widget.GuiScrollbarThin;
@@ -118,8 +119,7 @@ private static void updateResearchingData(Object2DoubleOpenHashMap<ResearchCogni
 
     public static boolean isMouseOver(final int startX, final int startY,
                                       final int endX, final int endY,
-                                      final int mouseX, final int mouseY)
-    {
+                                      final int mouseX, final int mouseY) {
         return mouseX >= startX && mouseX <= endX && mouseY >= startY && mouseY <= endY;
     }
 
@@ -131,8 +131,7 @@ public static void renderItemStackToGUI(final Minecraft mc,
                                             final RenderItem ri,
                                             final int x,
                                             final int y,
-                                            final ItemStack stack)
-    {
+                                            final ItemStack stack) {
         RenderHelper.enableGUIStandardItemLighting();
         ri.renderItemAndEffectIntoGUI(stack, x, y);
         ri.renderItemOverlays(mc.fontRenderer, stack, x, y);
@@ -230,7 +229,7 @@ protected void drawScreen(int mouseX, int mouseY) {
             GlStateManager.popMatrix();
 
             startResearch.drawButton(mc, mouseX, mouseY, Animation.getPartialTickTime());
-            if (!current.isLocked()) {
+            if (!current.locked()) {
                 toggleResearchDesc.drawButton(mc, mouseX, mouseY, Animation.getPartialTickTime());
                 drawToggleResearchDescBtnHoverText(mouseX, mouseY);
             }
@@ -251,7 +250,7 @@ protected void drawStartBtnOverlayAndHoveringText(final int mouseX, final int mo
         List<String> warnTip = new ArrayList<>();
         List<String> errorTip = new ArrayList<>();
 
-        ResearchCognitionData data = current.getData();
+        ResearchCognitionData data = current.data();
         ResearchStationType stationType = PktTerminalGuiData.getResearchStationType();
         double consumption = ComputationCenterCache.getComputationPointConsumption();
         double generation = ComputationCenterCache.getComputationPointGeneration();
@@ -278,12 +277,12 @@ protected void drawStartBtnOverlayAndHoveringText(final int mouseX, final int mo
             errorTip.add(I18n.format("gui.terminal_controller.screen.info.start.error.database_space"));
         }
 
-        if (!current.isLocked()) {
+        if (!current.locked()) {
             drawButtonOverlay(44, 22);
             hoveredTip.add(I18n.format("gui.terminal_controller.data.unlocked"));
         } else if (errorTip.isEmpty()) {
             hoveredTip.add(I18n.format("gui.terminal_controller.screen.info.start"));
-            long tickRequired = (long) ((data.getRequiredPoints() - current.getProgress()) / data.getMinComputationPointPerTick());
+            long tickRequired = (long) ((data.getRequiredPoints() - current.progress()) / data.getMinComputationPointPerTick());
 //                long tickRequired = (long) (data.getRequiredPoints() / Math.max(0.1F, (generation - consumption)));
             hoveredTip.add(TimeUtils.formatResearchRequiredTime(tickRequired * 50));
             hoveredTip.addAll(warnTip);
@@ -295,7 +294,7 @@ protected void drawStartBtnOverlayAndHoveringText(final int mouseX, final int mo
             hoveredTip.add(I18n.format("gui.terminal_controller.screen.info.reset"));
         }
         EntityPlayerSP player = Minecraft.getMinecraft().player;
-        if (current.isLocked() && player != null && player.isCreative()) {
+        if (current.locked() && player != null && player.isCreative()) {
             hoveredTip.add(I18n.format("gui.terminal_controller.screen.info.start.instant"));
         }
 
@@ -322,7 +321,7 @@ protected void drawButtonOverlay(int textureX, int textureY) {
     }
 
     protected void drawDataInfo() {
-        ResearchCognitionData data = current.getData();
+        ResearchCognitionData data = current.data();
 
         fontRenderer.drawStringWithShadow(data.getTranslatedName(), 115, 46, 0xFFFFFF);
 
@@ -332,12 +331,12 @@ protected void drawDataInfo() {
         float descDrawOffsetY = 60 / FONT_SCALE;
 
         List<String> lines;
-        if (current.isAvailable() && (current.isLocked() || showLockedResearchDesc)) {
+        if (current.available() && (current.locked() || showLockedResearchDesc)) {
             lines = data.getDescriptions()
                     .stream()
                     .flatMap(desc -> fontRenderer.listFormattedStringToWidth(desc, (int) (SCREEN_TEXT_MAX_WIDTH / FONT_SCALE)).stream())
                     .collect(Collectors.toList());
-        } else if (!current.isLocked()) {
+        } else if (!current.locked()) {
             lines = data.getUnlockedDescriptions()
                     .stream()
                     .flatMap(desc -> fontRenderer.listFormattedStringToWidth(desc, (int) (SCREEN_TEXT_MAX_WIDTH / FONT_SCALE)).stream())
@@ -505,7 +504,7 @@ protected void updateSearchTextField() {
             (o1, o2) -> {
                 float a = o1.getTechLevel();
                 float b = o2.getTechLevel();
-                if (a == b){
+                if (a == b) {
                     return 0;
                 } else {
                     return a > b ? 1 : -1;
@@ -593,14 +592,14 @@ protected void drawResearchData(final ResearchDataContext dataContext, final int
         if (darkMode) {
             GlStateManager.color(0.7F, 0.7F, 0.7F, 1.0F);
         }
-        if (dataContext.isLocked()) {
+        if (dataContext.locked()) {
             if (darkMode) {
                 GlStateManager.color(1.0F, 0.85F, 0.45F, 1.0F);
             } else {
                 GlStateManager.color(1.0F, 0.9F, 0.6F, 1.0F);
             }
         }
-        if (!dataContext.isAvailable()) {
+        if (!dataContext.available()) {
             GlStateManager.color(1.0F, 0.6F, 0.6F, 1.0F);
         }
         if (isMouseOver(8, offsetY,
@@ -615,8 +614,8 @@ protected void drawResearchData(final ResearchDataContext dataContext, final int
         this.mc.getTextureManager().bindTexture(TEXTURES_TERMINAL_ELEMENTS);
         drawTexturedModalRect(8, offsetY, 0, 0, TERMINAL_ELEMENT_WIDTH, TERMINAL_ELEMENT_HEIGHT);
 
-        ResearchCognitionData data = dataContext.getData();
-        double researchProgress = dataContext.getProgress();
+        ResearchCognitionData data = dataContext.data();
+        double researchProgress = dataContext.progress();
         if (researchProgress > 0) {
             GlStateManager.color(0.6F, 1.0F, 0.6F, 1.0F);
             double progress = researchProgress / data.getRequiredPoints();
@@ -632,7 +631,7 @@ protected void drawResearchData(final ResearchDataContext dataContext, final int
         float textRenderOffsetY = (48 + (offsetY - 44)) / FONT_SCALE;
         fontRenderer.drawString(data.getTranslatedName(), (int) textRenderOffsetX, (int) textRenderOffsetY, 0x404040);
 
-        if (dataContext.isLocked()) {
+        if (dataContext.locked()) {
             if (researchProgress >= 0) {
                 if (researchProgress == 0) {
                     fontRenderer.drawString(
@@ -645,7 +644,7 @@ protected void drawResearchData(final ResearchDataContext dataContext, final int
                             (int) textRenderOffsetX, (int) textRenderOffsetY + 12, 0x404040);
                 }
             } else {
-                if (dataContext.isAvailable()) {
+                if (dataContext.available()) {
                     fontRenderer.drawString(I18n.format("gui.terminal_controller.data.locked"),
                             (int) textRenderOffsetX, (int) textRenderOffsetY + 12, 0x404040);
                 } else {
@@ -694,17 +693,16 @@ protected void mouseClicked(final int mouseX, final int mouseY, final int mouseB
             if (isMouseOver(searchTextField.x, searchTextField.y,
                     searchTextField.x + searchTextField.width,
                     searchTextField.y + searchTextField.height,
-                    x, y))
-            {
+                    x, y)) {
                 searchTextField.setText("");
                 searchTextCache = "";
                 updateRenderingData();
             }
         }
 
         if (startResearch.mousePressed(mc, x, y)) {
-            if (mouseButton == 0 && current != null && current.isLocked() && canStartResearch(current.getData())) {
-                NovaEngineeringCore.NET_CHANNEL.sendToServer(new PktResearchTaskProvide(current.getData()));
+            if (mouseButton == 0 && current != null && current.locked() && canStartResearch(current.data())) {
+                NovaEngineeringCore.NET_CHANNEL.sendToServer(new PktResearchTaskProvide(current.data()));
                 startResearch.playPressSound(mc.getSoundHandler());
                 return;
             }
@@ -714,15 +712,15 @@ protected void mouseClicked(final int mouseX, final int mouseY, final int mouseB
                 return;
             }
             EntityPlayerSP player = Minecraft.getMinecraft().player;
-            if (mouseButton == 2 && current != null && current.isLocked() && player != null && player.isCreative()) {
-                NovaEngineeringCore.NET_CHANNEL.sendToServer(new PktResearchTaskProvideCreative(current.getData()));
+            if (mouseButton == 2 && current != null && current.locked() && player != null && player.isCreative()) {
+                NovaEngineeringCore.NET_CHANNEL.sendToServer(new PktResearchTaskProvideCreative(current.data()));
                 startResearch.playPressSound(mc.getSoundHandler());
                 return;
             }
         }
 
         if (toggleResearchDesc.mousePressed(mc, x, y)) {
-            if (mouseButton == 0 && current != null && !current.isLocked()) {
+            if (mouseButton == 0 && current != null && !current.locked()) {
                 showLockedResearchDesc = !showLockedResearchDesc;
                 toggleResearchDesc.playPressSound(mc.getSoundHandler());
                 return;
@@ -743,8 +741,7 @@ protected void mouseClicked(final int mouseX, final int mouseY, final int mouseB
             if (isMouseOver(
                     8, offsetY,
                     8 + TERMINAL_ELEMENT_WIDTH - 1, offsetY + TERMINAL_ELEMENT_HEIGHT - 1,
-                    x, y))
-            {
+                    x, y)) {
                 if (mouseButton == 0) {
                     setCurrent(data);
                 } else if (mouseButton == 1) {
@@ -877,39 +874,8 @@ protected void updateAndDrawScrollbar() {
         GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
     }
 
-    public static class ResearchDataContext {
-        private final ResearchCognitionData data;
-        private final boolean locked;
-        private final boolean available;
-        private final double progress;
-
-        public ResearchDataContext(final ResearchCognitionData data,
-                                   final boolean locked,
-                                   final boolean available,
-                                   final Double progress)
-        {
-            this.data = data;
-            this.locked = locked;
-            this.available = available;
-            this.progress = progress;
-        }
-
-        public ResearchCognitionData getData() {
-            return data;
-        }
-
-        public boolean isLocked() {
-            return locked;
-        }
-
-        public boolean isAvailable() {
-            return available;
-        }
-
-        public double getProgress() {
-            return progress;
-        }
-
+    @Desugar
+    public record ResearchDataContext(ResearchCognitionData data, boolean locked, boolean available, double progress) {
         @Override
         public int hashCode() {
             return data.hashCode();
@@ -923,4 +889,4 @@ public boolean equals(final Object obj) {
             return data.equals(other.data);
         }
     }
-}
+}

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

@@ -2,6 +2,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import lombok.Getter;
 import net.minecraft.util.JsonUtils;
 
 import java.io.BufferedReader;
@@ -15,16 +16,13 @@
 public class HitokotoAPI {
     public static final String API_URL = "https://v1.hitokoto.cn/";
 
+    @Getter
     public static String hitokotoCache = null;
 
     private static final Gson DESERIALIZER = new GsonBuilder()
             .registerTypeHierarchyAdapter(HitokotoResult.class, new HitokotoDeserializer())
             .create();
 
-    public static String getHitokotoCache() {
-        return hitokotoCache;
-    }
-
     public static String getRandomHitokoto() {
         if (hitokotoCache != null) {
             return hitokotoCache;

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

@@ -17,14 +17,14 @@
 import github.kasuminova.novaeng.common.container.ContainerSingularityCore;
 import github.kasuminova.novaeng.common.enchantment.MagicBreaking;
 import github.kasuminova.novaeng.common.estorage.EStorageCellHandler;
-import github.kasuminova.novaeng.common.handler.IEHandler;
 import github.kasuminova.novaeng.common.handler.ECalculatorEventHandler;
 import github.kasuminova.novaeng.common.handler.EFabricatorEventHandler;
 import github.kasuminova.novaeng.common.handler.EStorageEventHandler;
 import github.kasuminova.novaeng.common.handler.EnchantmentHandler;
 import github.kasuminova.novaeng.common.handler.FTBHandler;
 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.OreHandler;
 import github.kasuminova.novaeng.common.handler.WorldLoadedHandler;
 import github.kasuminova.novaeng.common.hypernet.old.HyperNetTerminal;
@@ -60,7 +60,6 @@
 import github.kasuminova.novaeng.common.tile.machine.GeocentricDrillController;
 import github.kasuminova.novaeng.common.trait.Register;
 import github.kasuminova.novaeng.common.util.MachineCoolants;
-import github.kasuminova.novaeng.mixin.NovaEngCoreEarlyMixinLoader;
 import github.kasuminova.novaeng.mixin.ae2.AccessorCellRegistry;
 import hellfirepvp.modularmachinery.ModularMachinery;
 import hellfirepvp.modularmachinery.common.base.Mods;
@@ -69,6 +68,7 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.text.translation.I18n;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Loader;
@@ -93,7 +93,7 @@ public boolean isClient(){
 
     public void construction() {
         if (Loader.isModLoaded("ecoaeextension")){
-            throw new RuntimeException(NovaEngCoreEarlyMixinLoader.getString("mod.ecoae.warning"));
+            throw new RuntimeException(I18n.translateToLocal("mod.ecoae.warning"));
         }
     }
 

src/main/java/github/kasuminova/novaeng/common/crafttweaker/expansion/RecipePrimerHyperNet.java

@@ -11,6 +11,7 @@
 import net.minecraft.client.resources.I18n;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fml.common.FMLCommonHandler;
+import stanhebben.zenscript.annotations.Optional;
 import stanhebben.zenscript.annotations.ZenExpansion;
 import stanhebben.zenscript.annotations.ZenMethod;
 
@@ -26,7 +27,6 @@ public class RecipePrimerHyperNet {
      * 为一个配方添加算力要求。
      * 用法：{@code requireComputationPoint(1.0F);}
      */
-    @ZenMethod
     public static RecipePrimer requireComputationPoint(final RecipePrimer primer,
                                                        final float required)
     {
@@ -36,7 +36,7 @@ public static RecipePrimer requireComputationPoint(final RecipePrimer primer,
     @ZenMethod
     public static RecipePrimer requireComputationPoint(final RecipePrimer primer,
                                                        final float required,
-                                                       final boolean triggerFailure)
+                                                       @Optional final boolean triggerFailure)
     {
         if (FMLCommonHandler.instance().getSide().isClient()) {
             primer.addRecipeTooltip(