Skip to content

Commit 98cb5aa

Browse files
Circulate233Circulate233
committed
重构部分代码
1 parent c83e9c5 commit 98cb5aa

File tree

16 files changed

+87
-122
lines changed

16 files changed

+87
-122
lines changed

‎src/main/java/com/circulation/random_complement/RCConfig.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.minecraftforge.fml.common.Mod;
1010
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
1111
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
12+
import net.minecraftforge.fml.server.FMLServerHandler;
1213

1314
import static com.circulation.random_complement.RandomComplement.NET_CHANNEL;
1415

@@ -47,8 +48,8 @@ public class RCConfig {
4748
public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) {
4849
if (event.getModID().equals(RandomComplement.MOD_ID)) {
4950
ConfigManager.sync(RandomComplement.MOD_ID, Config.Type.INSTANCE);
50-
if (RandomComplement.server != null && FMLCommonHandler.instance().getSide().isServer()) {
51-
for (EntityPlayerMP player : RandomComplement.server.getPlayerList().getPlayers()) {
51+
if (FMLCommonHandler.instance().getSide().isServer()) {
52+
for (EntityPlayerMP player : FMLServerHandler.instance().getServer().getPlayerList().getPlayers()) {
5253
RandomComplement.NET_CHANNEL.sendTo(new SyncConfig(), player);
5354
}
5455
}

‎src/main/java/com/circulation/random_complement/RandomComplement.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
package com.circulation.random_complement;
22

33
import com.circulation.random_complement.common.CommonProxy;
4-
import net.minecraft.server.MinecraftServer;
54
import net.minecraftforge.fml.common.Mod;
65
import net.minecraftforge.fml.common.SidedProxy;
76
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
87
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
98
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
10-
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
11-
import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
129
import net.minecraftforge.fml.common.network.NetworkRegistry;
1310
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
1411
import org.apache.logging.log4j.LogManager;
@@ -31,7 +28,6 @@ public class RandomComplement {
3128
public static final SimpleNetworkWrapper NET_CHANNEL = NetworkRegistry.INSTANCE.newSimpleChannel(MOD_ID);
3229

3330
public static final Logger LOGGER = LogManager.getLogger(Tags.MOD_NAME);
34-
public static MinecraftServer server;
3531

3632
@SidedProxy(clientSide = CLIENT_PROXY, serverSide = COMMON_PROXY)
3733
public static CommonProxy proxy;
@@ -53,14 +49,4 @@ public void init(FMLInitializationEvent event) {
5349
public void postInit(FMLPostInitializationEvent event) {
5450
proxy.postInit();
5551
}
56-
57-
@Mod.EventHandler
58-
public void onServerStart(FMLServerStartingEvent event) {
59-
server = event.getServer();
60-
}
61-
62-
@Mod.EventHandler
63-
public void onServerStopping(FMLServerStoppingEvent event) {
64-
server = null;
65-
}
6652
}

‎src/main/java/com/circulation/random_complement/client/JEIRecipeCatalyst.java‎

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import net.minecraft.item.ItemStack;
1414
import net.minecraft.util.ResourceLocation;
1515
import net.minecraftforge.fml.common.Loader;
16+
import net.minecraftforge.fml.common.Optional;
1617
import net.minecraftforge.fml.common.registry.GameRegistry;
1718
import org.jetbrains.annotations.NotNull;
1819

@@ -35,45 +36,53 @@ public static ItemStack getOtherModsItemStack(String modId, String itemName) {
3536
@Override
3637
public void register(final @NotNull IModRegistry registry) {
3738
JEIRecipeCatalyst.registration = registry;
38-
if (Loader.isModLoaded("packagedexcrafting")) {
39-
registration.addRecipeCatalyst(getOtherModsItemStack("packagedexcrafting", "combination_crafter"), "extendedcrafting:combination_crafting");
40-
registration.addRecipeCatalyst(getOtherModsItemStack("packagedexcrafting", "marked_pedestal"), "extendedcrafting:combination_crafting");
41-
registration.addRecipeCatalyst(getOtherModsItemStack("packagedexcrafting", "ender_crafter"), "extendedcrafting:ender_crafting");
42-
registration.addRecipeCatalyst(getOtherModsItemStack("packagedexcrafting", "advanced_crafter"), "extendedcrafting:table_crafting_5x5");
43-
registration.addRecipeCatalyst(getOtherModsItemStack("packagedexcrafting", "elite_crafter"), "extendedcrafting:table_crafting_7x7");
44-
registration.addRecipeCatalyst(getOtherModsItemStack("packagedexcrafting", "ultimate_crafter"), "extendedcrafting:table_crafting_9x9");
39+
final var exc = "packagedexcrafting";
40+
if (Loader.isModLoaded(exc)) {
41+
addRecipeCatalyst(exc, "combination_crafter", "extendedcrafting:combination_crafting");
42+
addRecipeCatalyst(exc, "marked_pedestal", "extendedcrafting:combination_crafting");
43+
addRecipeCatalyst(exc, "ender_crafter", "extendedcrafting:ender_crafting");
44+
addRecipeCatalyst(exc, "advanced_crafter", "extendedcrafting:table_crafting_5x5");
45+
addRecipeCatalyst(exc, "elite_crafter", "extendedcrafting:table_crafting_7x7");
46+
addRecipeCatalyst(exc, "ultimate_crafter", "extendedcrafting:table_crafting_9x9");
4547
}
4648
if (Loader.isModLoaded("packagedavaritia")) {
47-
registration.addRecipeCatalyst(getOtherModsItemStack("packagedavaritia", "extreme_crafter"), "Avatitia.Extreme");
49+
addRecipeCatalyst("packagedavaritia", "extreme_crafter", "Avatitia.Extreme");
4850
}
49-
if (Loader.isModLoaded("packagedastral")) {
50-
registration.addRecipeCatalyst(getOtherModsItemStack("packagedastral", "trait_crafter"), "astralsorcery.altar.trait");
51-
registration.addRecipeCatalyst(getOtherModsItemStack("packagedastral", "constellation_crafter"), "astralsorcery.altar.constellation");
52-
registration.addRecipeCatalyst(getOtherModsItemStack("packagedastral", "attunement_crafter"), "astralsorcery.altar.attunement");
53-
registration.addRecipeCatalyst(getOtherModsItemStack("packagedastral", "discovery_crafter"), "astralsorcery.altar.discovery");
54-
}
55-
if (Loader.isModLoaded("packageddraconic")) {
56-
registration.addRecipeCatalyst(getOtherModsItemStack("packageddraconic", "fusion_crafter"), "DraconicEvolution.Fusion");
57-
}
58-
if (Loader.isModLoaded("ae2exttable")) {
59-
addExtended();
51+
final var a = "packagedastral";
52+
if (Loader.isModLoaded(a)) {
53+
addRecipeCatalyst(a, "trait_crafter", "astralsorcery.altar.trait");
54+
addRecipeCatalyst(a, "constellation_crafter", "astralsorcery.altar.constellation");
55+
addRecipeCatalyst(a, "attunement_crafter", "astralsorcery.altar.attunement");
56+
addRecipeCatalyst(a, "discovery_crafter", "astralsorcery.altar.discovery");
6057
}
58+
if (Loader.isModLoaded("packageddraconic"))
59+
addRecipeCatalyst("packageddraconic", "fusion_crafter", "DraconicEvolution.Fusion");
60+
if (Loader.isModLoaded("ae2exttable")) addExtended();
6161
}
6262

63+
@Optional.Method(modid = "ae2exttable")
6364
public void addExtended() {
64-
registration.addRecipeCatalyst(ItemRegistry.BASIC_TERMINAL.getDefaultInstance(), VanillaRecipeCategoryUid.CRAFTING);
65-
registration.addRecipeCatalyst(ItemRegistry.BASIC_TERMINAL.getDefaultInstance(), BasicTableCategory.UID);
66-
registration.addRecipeCatalyst(ItemRegistry.WIRELESS_BASIC_TERMINAL.getDefaultInstance(), VanillaRecipeCategoryUid.CRAFTING);
67-
registration.addRecipeCatalyst(ItemRegistry.WIRELESS_BASIC_TERMINAL.getDefaultInstance(), BasicTableCategory.UID);
65+
addRecipeCatalyst(ItemRegistry.BASIC_TERMINAL.getDefaultInstance(), VanillaRecipeCategoryUid.CRAFTING);
66+
addRecipeCatalyst(ItemRegistry.BASIC_TERMINAL.getDefaultInstance(), BasicTableCategory.UID);
67+
addRecipeCatalyst(ItemRegistry.WIRELESS_BASIC_TERMINAL.getDefaultInstance(), VanillaRecipeCategoryUid.CRAFTING);
68+
addRecipeCatalyst(ItemRegistry.WIRELESS_BASIC_TERMINAL.getDefaultInstance(), BasicTableCategory.UID);
69+
70+
addRecipeCatalyst(ItemRegistry.ADVANCED_TERMINAL.getDefaultInstance(), AdvancedTableCategory.UID);
71+
addRecipeCatalyst(ItemRegistry.WIRELESS_ADVANCED_TERMINAL.getDefaultInstance(), AdvancedTableCategory.UID);
6872

69-
registration.addRecipeCatalyst(ItemRegistry.ADVANCED_TERMINAL.getDefaultInstance(), AdvancedTableCategory.UID);
70-
registration.addRecipeCatalyst(ItemRegistry.WIRELESS_ADVANCED_TERMINAL.getDefaultInstance(), AdvancedTableCategory.UID);
73+
addRecipeCatalyst(ItemRegistry.ELITE_TERMINAL.getDefaultInstance(), EliteTableCategory.UID);
74+
addRecipeCatalyst(ItemRegistry.WIRELESS_ELITE_TERMINAL.getDefaultInstance(), EliteTableCategory.UID);
7175

72-
registration.addRecipeCatalyst(ItemRegistry.ELITE_TERMINAL.getDefaultInstance(), EliteTableCategory.UID);
73-
registration.addRecipeCatalyst(ItemRegistry.WIRELESS_ELITE_TERMINAL.getDefaultInstance(), EliteTableCategory.UID);
76+
addRecipeCatalyst(ItemRegistry.ULTIMATE_TERMINAL.getDefaultInstance(), UltimateTableCategory.UID);
77+
addRecipeCatalyst(ItemRegistry.WIRELESS_ULTIMATE_TERMINAL.getDefaultInstance(), UltimateTableCategory.UID);
78+
}
79+
80+
private void addRecipeCatalyst(String modid, String id, String... jei) {
81+
addRecipeCatalyst(getOtherModsItemStack(modid, id), jei);
82+
}
7483

75-
registration.addRecipeCatalyst(ItemRegistry.ULTIMATE_TERMINAL.getDefaultInstance(), UltimateTableCategory.UID);
76-
registration.addRecipeCatalyst(ItemRegistry.WIRELESS_ULTIMATE_TERMINAL.getDefaultInstance(), UltimateTableCategory.UID);
84+
private void addRecipeCatalyst(ItemStack stack, String... jei) {
85+
registration.addRecipeCatalyst(stack, jei);
7786
}
7887

79-
}
88+
}

‎src/main/java/com/circulation/random_complement/client/RCGuiCraftConfirm.java‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/main/java/com/circulation/random_complement/client/RCGuiScrollbar.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ public void setVisible(boolean visible) {
3232
}
3333

3434
public void drawBG() {
35-
if (drawBG != null) {
36-
drawBG.run();
35+
if (visible) {
36+
if (drawBG != null) {
37+
drawBG.run();
38+
}
3739
}
3840
}
3941

‎src/main/java/com/circulation/random_complement/common/CommonProxy.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.circulation.random_complement.common;
22

33
import com.circulation.random_complement.common.handler.CraftingUnitHandler;
4+
import com.circulation.random_complement.common.interfaces.Packet;
45
import com.circulation.random_complement.common.network.ContainerRollBACK;
56
import com.circulation.random_complement.common.network.KeyBindingHandler;
67
import com.circulation.random_complement.common.network.RCActionButton;
@@ -17,21 +18,22 @@
1718
@SuppressWarnings("MethodMayBeStatic")
1819
public class CommonProxy {
1920

21+
private int id = 0;
22+
2023
public void construction() {
2124
}
2225

2326
public void preInit() {
24-
int start = 0;
2527
if (Functions.modLoaded("appliedenergistics2")) {
26-
NET_CHANNEL.registerMessage(ContainerRollBACK.class, ContainerRollBACK.class, start++, Side.CLIENT);
27-
NET_CHANNEL.registerMessage(SyncConfig.class, SyncConfig.class, start++, Side.CLIENT);
28+
registerMessage(ContainerRollBACK.class, Side.CLIENT);
29+
registerMessage(SyncConfig.class, Side.CLIENT);
2830

29-
NET_CHANNEL.registerMessage(ContainerRollBACK.class, ContainerRollBACK.class, start++, Side.SERVER);
30-
NET_CHANNEL.registerMessage(WirelessPickBlock.class, WirelessPickBlock.class, start++, Side.SERVER);
31-
NET_CHANNEL.registerMessage(RCConfigButton.class, RCConfigButton.class, start++, Side.SERVER);
32-
NET_CHANNEL.registerMessage(RCActionButton.class, RCActionButton.class, start++, Side.SERVER);
31+
registerMessage(ContainerRollBACK.class, Side.SERVER);
32+
registerMessage(WirelessPickBlock.class, Side.SERVER);
33+
registerMessage(RCConfigButton.class, Side.SERVER);
34+
registerMessage(RCActionButton.class, Side.SERVER);
3335
if (Functions.modLoaded("jei")) {
34-
NET_CHANNEL.registerMessage(KeyBindingHandler.class, KeyBindingHandler.class, start++, Side.SERVER);
36+
registerMessage(KeyBindingHandler.class, Side.SERVER);
3537
}
3638
}
3739
}
@@ -48,4 +50,8 @@ public boolean isMouseHasItem() {
4850
return false;
4951
}
5052

53+
public <T extends Packet<T>> void registerMessage(Class<T> aClass, Side side) {
54+
NET_CHANNEL.registerMessage(aClass, aClass, id++, side);
55+
}
56+
5157
}

‎src/main/java/com/circulation/random_complement/common/handler/CraftingUnitHandler.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,13 @@ private static void registerNAE2() {
108108
*/
109109
@Optional.Method(modid = "extracpus")
110110
private static void registerEXCPU() {
111-
final var block16384k = Block.getBlockFromName("extracpus:crafting_storage_16384k");
112111
final Item item;
113112
if (Loader.isModLoaded("extracells")) {
114113
item = Item.getByNameOrId("extracells:storage.component");
115114
} else if (Loader.isModLoaded("aeadditions")) {
116115
item = Item.getByNameOrId("aeadditions:storage.component");
117-
} else {
118-
item = null;
119-
}
116+
} else return;
117+
final var block16384k = Block.getBlockFromName("extracpus:crafting_storage_16384k");
120118
if (item != null) {
121119
ModBlocks.CRAFTING_STORAGE_256K.maybeBlock()
122120
.ifPresent(b -> addMatch(new ItemStack(item, 1, 0), b));

‎src/main/java/com/circulation/random_complement/common/interfaces/SpecialInvTracker.java‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/main/java/com/circulation/random_complement/common/interfaces/SpecialMEPatternProvider.java‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/main/java/com/circulation/random_complement/common/network/ContainerRollBACK.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ public IMessage onMessage(ContainerRollBACK message, MessageContext ctx) {
4343
}
4444
RandomComplement.NET_CHANNEL.sendTo(message, entityPlayerMP);
4545
}
46-
case CLIENT -> ClientRun();
46+
case CLIENT -> clientRun();
4747
}
4848
return null;
4949
}
5050

5151
@SideOnly(Side.CLIENT)
52-
public void ClientRun() {
52+
public void clientRun() {
5353
if (RCInputHandler.getDelayMethod() != null) {
5454
RCInputHandler.getDelayMethod().run();
5555
RCInputHandler.setDelayMethod(null);

0 commit comments

Comments
 (0)