调整网络终端的研究显示顺序从 正在研究中 - 已研究 - 未研究 - 不可研究 改为 正在研究中 - 未研究 - 已研究 - 不可研究

Author: Circulate233

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

@@ -504,15 +504,15 @@ protected void updateRenderingData() {
                 setCurrent(context);
             }
         });
-        unlockedData.forEach(data -> {
-            ResearchDataContext context = new ResearchDataContext(data, false, true, -1D);
+        lockedData.forEach(data -> {
+            ResearchDataContext context = new ResearchDataContext(data, true, true, -1D);
             tmp.put(data.getTranslatedName(), context);
             if (context.equals(current)) {
                 setCurrent(context);
             }
         });
-        lockedData.forEach(data -> {
-            ResearchDataContext context = new ResearchDataContext(data, true, true, -1D);
+        unlockedData.forEach(data -> {
+            ResearchDataContext context = new ResearchDataContext(data, false, true, -1D);
             tmp.put(data.getTranslatedName(), context);
             if (context.equals(current)) {
                 setCurrent(context);

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

@@ -58,14 +58,12 @@ public CommonProxy() {
     }
 
     public void construction() {
-
-    }
-
-    public void preInit() {
         if (Loader.isModLoaded("ecoaeextension")){
             throw new RuntimeException(NovaEngCoreEarlyMixinLoader.getString("mod.ecoae.warning"));
         }
+    }
 
+    public void preInit() {
         NetworkRegistry.INSTANCE.registerGuiHandler(NovaEngineeringCore.MOD_ID, this);
 
         MinecraftForge.EVENT_BUS.register(IntegrationCRT.INSTANCE);

src/main/java/github/kasuminova/novaeng/common/container/ContainerHyperNetTerminal.java

@@ -8,6 +8,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.SlotItemHandler;
+import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nonnull;
 
@@ -23,6 +24,7 @@ public ContainerHyperNetTerminal(final TileHyperNetTerminal owner, final EntityP
     }
 
     @Override
+    @NotNull
     public ItemStack transferStackInSlot(@Nonnull EntityPlayer playerIn, int index) {
         ItemStack itemstack = ItemStack.EMPTY;
         Slot slot = this.inventorySlots.get(index);