Skip to content

Commit b323f2f

Browse files
Circulate233Circulate233
committed
一些调整
1 parent dc38a6c commit b323f2f

File tree

57 files changed

+493
-159
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+493
-159
lines changed

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

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,37 @@
66
import github.kasuminova.novaeng.common.command.CommandSPacketProfiler;
77
import github.kasuminova.novaeng.common.config.NovaEngCoreConfig;
88
import github.kasuminova.novaeng.common.handler.WorldLoadedHandler;
9-
import github.kasuminova.novaeng.common.network.*;
9+
import github.kasuminova.novaeng.common.network.ParallelNetworkManager;
10+
import github.kasuminova.novaeng.common.network.PktCellDriveStatusUpdate;
11+
import github.kasuminova.novaeng.common.network.PktECalculatorGUIData;
12+
import github.kasuminova.novaeng.common.network.PktEFabricatorGUIAction;
13+
import github.kasuminova.novaeng.common.network.PktEFabricatorGUIData;
14+
import github.kasuminova.novaeng.common.network.PktEFabricatorPatternSearchGUIAction;
15+
import github.kasuminova.novaeng.common.network.PktEFabricatorPatternSearchGUIUpdate;
16+
import github.kasuminova.novaeng.common.network.PktEFabricatorWorkerStatusUpdate;
17+
import github.kasuminova.novaeng.common.network.PktEStorageGUIData;
18+
import github.kasuminova.novaeng.common.network.PktGeocentricDrillControl;
19+
import github.kasuminova.novaeng.common.network.PktHyperNetStatus;
20+
import github.kasuminova.novaeng.common.network.PktMouseItemUpdate;
21+
import github.kasuminova.novaeng.common.network.PktPatternTermUploadPattern;
22+
import github.kasuminova.novaeng.common.network.PktResearchTaskComplete;
23+
import github.kasuminova.novaeng.common.network.PktResearchTaskProvide;
24+
import github.kasuminova.novaeng.common.network.PktResearchTaskProvideCreative;
25+
import github.kasuminova.novaeng.common.network.PktResearchTaskReset;
26+
import github.kasuminova.novaeng.common.network.PktTerminalGuiData;
1027
import github.kasuminova.novaeng.common.network.packetprofiler.PktCProfilerReply;
1128
import github.kasuminova.novaeng.common.network.packetprofiler.PktCProfilerRequest;
1229
import github.kasuminova.novaeng.common.profiler.SPacketProfiler;
1330
import net.minecraft.util.text.TextFormatting;
1431
import net.minecraftforge.fml.common.Mod;
1532
import net.minecraftforge.fml.common.SidedProxy;
16-
import net.minecraftforge.fml.common.event.*;
33+
import net.minecraftforge.fml.common.event.FMLConstructionEvent;
34+
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
35+
import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent;
36+
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
37+
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
38+
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
39+
import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
1740
import net.minecraftforge.fml.common.network.NetworkRegistry;
1841
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
1942
import net.minecraftforge.fml.relauncher.Side;

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@
22

33
import github.kasuminova.mmce.client.renderer.MachineControllerRenderer;
44
import github.kasuminova.novaeng.client.book.BookTransformerAppendModifiers;
5-
import github.kasuminova.novaeng.client.gui.*;
5+
import github.kasuminova.novaeng.client.gui.GuiECalculatorController;
6+
import github.kasuminova.novaeng.client.gui.GuiEFabricatorController;
7+
import github.kasuminova.novaeng.client.gui.GuiEFabricatorPatternBus;
8+
import github.kasuminova.novaeng.client.gui.GuiEFabricatorPatternSearch;
9+
import github.kasuminova.novaeng.client.gui.GuiEStorageController;
10+
import github.kasuminova.novaeng.client.gui.GuiGeocentricDrill;
11+
import github.kasuminova.novaeng.client.gui.GuiHyperNetTerminal;
12+
import github.kasuminova.novaeng.client.gui.GuiModularServerAssembler;
13+
import github.kasuminova.novaeng.client.gui.GuiSingularityCore;
614
import github.kasuminova.novaeng.client.handler.BlockAngelRendererHandler;
715
import github.kasuminova.novaeng.client.handler.ClientEventHandler;
816
import github.kasuminova.novaeng.client.handler.HyperNetClientEventHandler;
@@ -41,7 +49,8 @@
4149
import javax.annotation.Nullable;
4250
import java.io.File;
4351

44-
import static github.kasuminova.novaeng.mixin.NovaEngCoreEarlyMixinLoader.*;
52+
import static github.kasuminova.novaeng.mixin.NovaEngCoreEarlyMixinLoader.checkJavaVersion;
53+
import static github.kasuminova.novaeng.mixin.NovaEngCoreEarlyMixinLoader.isCleanroomLoader;
4554

4655
@SuppressWarnings("MethodMayBeStatic")
4756
@Mod.EventBusSubscriber(Side.CLIENT)

‎src/main/java/github/kasuminova/novaeng/client/gui/GuiEFabricatorController.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
import github.kasuminova.mmce.client.gui.widget.base.WidgetController;
55
import github.kasuminova.mmce.client.gui.widget.base.WidgetGui;
66
import github.kasuminova.novaeng.NovaEngineeringCore;
7-
import github.kasuminova.novaeng.client.gui.widget.efabricator.*;
7+
import github.kasuminova.novaeng.client.gui.widget.efabricator.ControlPanel;
8+
import github.kasuminova.novaeng.client.gui.widget.efabricator.CraftingStatusPanel;
9+
import github.kasuminova.novaeng.client.gui.widget.efabricator.HeatStatisticPanel;
10+
import github.kasuminova.novaeng.client.gui.widget.efabricator.TitleButtonLine;
11+
import github.kasuminova.novaeng.client.gui.widget.efabricator.TotalCraftedLabel;
812
import github.kasuminova.novaeng.client.gui.widget.efabricator.event.EFGUIDataUpdateEvent;
913
import github.kasuminova.novaeng.common.container.ContainerEFabricatorController;
1014
import github.kasuminova.novaeng.common.container.data.EFabricatorData;

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

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
import hellfirepvp.modularmachinery.common.util.MiscUtils;
2727
import io.netty.util.internal.ThrowableUtil;
2828
import it.unimi.dsi.fastutil.objects.Object2DoubleOpenHashMap;
29+
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
30+
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
31+
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
2932
import net.minecraft.client.Minecraft;
3033
import net.minecraft.client.entity.EntityPlayerSP;
3134
import net.minecraft.client.gui.FontRenderer;
@@ -44,7 +47,13 @@
4447
import org.lwjgl.input.Mouse;
4548

4649
import java.io.IOException;
47-
import java.util.*;
50+
import java.util.ArrayList;
51+
import java.util.Arrays;
52+
import java.util.Collections;
53+
import java.util.Comparator;
54+
import java.util.List;
55+
import java.util.Map;
56+
import java.util.Set;
4857
import java.util.stream.Collectors;
4958

5059
public class GuiHyperNetTerminal extends GuiContainerBase<ContainerHyperNetTerminal> {
@@ -73,11 +82,11 @@ public class GuiHyperNetTerminal extends GuiContainerBase<ContainerHyperNetTermi
7382
private static ResearchDataContext currentCache = null;
7483

7584
protected final TileHyperNetTerminal terminal;
76-
protected final Set<ResearchCognitionData> unlockedData = new HashSet<>();
77-
protected final List<ResearchCognitionData> lockedData = new ArrayList<>();
78-
protected final List<ResearchCognitionData> unavailableData = new ArrayList<>();
85+
protected final Set<ResearchCognitionData> unlockedData = new ObjectOpenHashSet<>();
86+
protected final List<ResearchCognitionData> lockedData = new ObjectArrayList<>();
87+
protected final List<ResearchCognitionData> unavailableData = new ObjectArrayList<>();
7988
protected final Object2DoubleOpenHashMap<ResearchCognitionData> researchingData = new Object2DoubleOpenHashMap<>();
80-
protected final List<ResearchDataContext> renderingData = new ArrayList<>();
89+
protected final List<ResearchDataContext> renderingData = new ObjectArrayList<>();
8190

8291
protected boolean darkMode = true;
8392
protected boolean showLockedResearchDesc = false;
@@ -506,7 +515,7 @@ protected void updateSearchTextField() {
506515
protected void updateRenderingData() {
507516
renderingData.clear();
508517

509-
Map<String, ResearchDataContext> tmp = new LinkedHashMap<>();
518+
Map<String, ResearchDataContext> tmp = new Object2ObjectLinkedOpenHashMap<>();
510519

511520
lockedData.sort(comparator);
512521
unavailableData.sort(comparator);

‎src/main/java/github/kasuminova/novaeng/client/gui/GuiModularServerAssembler.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,12 @@
55
import github.kasuminova.mmce.client.gui.widget.base.WidgetController;
66
import github.kasuminova.mmce.client.gui.widget.base.WidgetGui;
77
import github.kasuminova.novaeng.NovaEngineeringCore;
8-
import github.kasuminova.novaeng.client.gui.widget.msa.*;
8+
import github.kasuminova.novaeng.client.gui.widget.msa.AssemblyInvCPU;
9+
import github.kasuminova.novaeng.client.gui.widget.msa.AssemblyInvCalculateCard;
10+
import github.kasuminova.novaeng.client.gui.widget.msa.AssemblyInvExtension;
11+
import github.kasuminova.novaeng.client.gui.widget.msa.AssemblyInvManager;
12+
import github.kasuminova.novaeng.client.gui.widget.msa.AssemblyInvPower;
13+
import github.kasuminova.novaeng.client.gui.widget.msa.ServerInfoColumn;
914
import github.kasuminova.novaeng.client.gui.widget.msa.event.AssemblerInvUpdateEvent;
1015
import github.kasuminova.novaeng.common.container.ContainerModularServerAssembler;
1116
import github.kasuminova.novaeng.common.tile.TileModularServerAssembler;

‎src/main/java/github/kasuminova/novaeng/client/gui/widget/ProgressBar.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package github.kasuminova.novaeng.client.gui.widget;
22

3-
import github.kasuminova.mmce.client.gui.util.*;
3+
import github.kasuminova.mmce.client.gui.util.AnimationValue;
4+
import github.kasuminova.mmce.client.gui.util.MousePos;
5+
import github.kasuminova.mmce.client.gui.util.RenderPos;
6+
import github.kasuminova.mmce.client.gui.util.RenderSize;
7+
import github.kasuminova.mmce.client.gui.util.TextureProperties;
48
import github.kasuminova.mmce.client.gui.widget.base.DynamicWidget;
59
import github.kasuminova.mmce.client.gui.widget.base.WidgetGui;
610
import net.minecraft.client.gui.GuiScreen;

‎src/main/java/github/kasuminova/novaeng/client/gui/widget/efabricator/PatternPanel.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22

33
import appeng.api.networking.crafting.ICraftingPatternDetails;
44
import appeng.api.storage.data.IAEItemStack;
5-
import github.kasuminova.mmce.client.gui.util.*;
5+
import github.kasuminova.mmce.client.gui.util.MousePos;
6+
import github.kasuminova.mmce.client.gui.util.RenderFunction;
7+
import github.kasuminova.mmce.client.gui.util.RenderPos;
8+
import github.kasuminova.mmce.client.gui.util.RenderSize;
9+
import github.kasuminova.mmce.client.gui.util.TextureProperties;
610
import github.kasuminova.mmce.client.gui.widget.base.DynamicWidget;
711
import github.kasuminova.mmce.client.gui.widget.base.WidgetGui;
812
import github.kasuminova.mmce.client.gui.widget.container.Row;
@@ -27,7 +31,11 @@
2731
import net.minecraft.item.ItemStack;
2832
import net.minecraft.util.math.BlockPos;
2933

30-
import java.util.*;
34+
import java.util.Collection;
35+
import java.util.Collections;
36+
import java.util.List;
37+
import java.util.Map;
38+
import java.util.Set;
3139
import java.util.concurrent.atomic.AtomicBoolean;
3240
import java.util.regex.Pattern;
3341

‎src/main/java/github/kasuminova/novaeng/client/gui/widget/efabricator/SlotItemVirtualJEISmall.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import net.minecraft.client.renderer.GlStateManager;
1010
import net.minecraft.item.ItemStack;
1111

12-
import java.awt.*;
12+
import java.awt.Color;
1313

1414
public class SlotItemVirtualJEISmall extends SlotItemVirtualJEI {
1515

‎src/main/java/github/kasuminova/novaeng/client/gui/widget/estorage/EStorageGraphBar.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import net.minecraft.client.renderer.GlStateManager;
1414
import net.minecraft.util.ResourceLocation;
1515

16-
import java.awt.*;
16+
import java.awt.Color;
1717

1818
public class EStorageGraphBar extends DynamicWidget {
1919
public static final ResourceLocation TEX_RES = new ResourceLocation(NovaEngineeringCore.MOD_ID, "textures/gui/estorage_controller_elements.png");

‎src/main/java/github/kasuminova/novaeng/client/gui/widget/geocentricdrill/SlotOreControl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
import net.minecraft.client.resources.I18n;
1717
import net.minecraft.item.ItemStack;
1818

19-
import java.awt.*;
19+
import java.awt.Color;
2020
import java.util.List;
2121

2222
public class SlotOreControl extends SlotItemVirtualJEI {
2323

2424
private final String oreName;
25-
private float chance;
26-
private boolean accelerated;
25+
private final float chance;
26+
private final boolean accelerated;
2727

2828
public SlotOreControl(final String oreName, final ItemStack stackInSlot, float chance, boolean accelerated) {
2929
super(stackInSlot);

0 commit comments

Comments
 (0)