Skip to content

Commit b11331a

Browse files
Circulate233Circulate233
committed
修复bug
1 parent 5c3ab1b commit b11331a

33 files changed

+177
-179
lines changed

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,9 @@ dependencies {
203203
compileOnly("org.projectlombok:lombok:1.18.24")
204204
annotationProcessor("org.projectlombok:lombok:1.18.24")
205205

206+
implementation(rfg.deobf("curse.maven:had-enough-items-557549:6963093"))
206207
implementation(rfg.deobf("curse.maven:baubles-227083:2518667"))
207208
implementation(rfg.deobf("curse.maven:ae2-extended-life-570458:6302098"))
208-
implementation(rfg.deobf("curse.maven:had-enough-items-557549:6963093"))
209209
implementation(rfg.deobf("curse.maven:mek-268560:2835175"))
210210
implementation(rfg.deobf("curse.maven:MekanismEnergistics-1027681:5775101"))
211211
implementation(rfg.deobf("curse.maven:extended-crafting-nomifactory-edition-398267:5778512"))

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ show_testing_output = false
1515

1616
# Mod Information
1717
# HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
18-
mod_version = 1.2.4
18+
mod_version = 1.2.5
1919
root_package = com.circulation
2020
mod_id = ae2wut
2121
mod_name = AE2UELWirelessUniversalTerminal

‎src/main/java/com/circulation/ae2wut/AE2UELWirelessUniversalTerminal.java‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -56,44 +56,6 @@ public class AE2UELWirelessUniversalTerminal {
5656
public static AE2UELWirelessUniversalTerminal instance = null;
5757
public static LogWrapper logger;
5858

59-
@Mod.EventHandler
60-
public void preInit(FMLPreInitializationEvent event) {
61-
62-
int start = 0;
63-
64-
NET_CHANNEL.registerMessage(UpdateItemModeMessage.class, UpdateItemModeMessage.class, start++, Side.SERVER);
65-
NET_CHANNEL.registerMessage(WirelessTerminalRefresh.class, WirelessTerminalRefresh.class, start++, Side.SERVER);
66-
NET_CHANNEL.registerMessage(OpenWUTGui.class, OpenWUTGui.class, start++, Side.SERVER);
67-
68-
NET_CHANNEL.registerMessage(UpdateItemModeMessage.class, UpdateItemModeMessage.class, start++, Side.CLIENT);
69-
70-
proxy.preInit();
71-
}
72-
73-
@Mod.EventHandler
74-
public void init(FMLInitializationEvent event) {
75-
proxy.init();
76-
}
77-
78-
@Mod.EventHandler
79-
public void postInit(FMLPostInitializationEvent event) {
80-
proxy.postInit();
81-
}
82-
83-
public void registryContainer(byte id, GetGui<? extends AEBaseContainer> targetContainer) {
84-
proxy.registryContainer(id, targetContainer);
85-
}
86-
87-
@SideOnly(Side.CLIENT)
88-
public void registryGui(byte id, GetGui<? extends AEBaseGui> targetGui) {
89-
((ClientProxy) proxy).registryGui(id, targetGui);
90-
}
91-
92-
@FunctionalInterface
93-
public interface GetGui<T> {
94-
T get(ItemStack item, EntityPlayer player, int slot, int isBauble);
95-
}
96-
9759
@SideOnly(Side.CLIENT)
9860
public static void openWirelessTerminalGui(WirelessTerminalGuiObject obj, byte mode) {
9961
ItemStack stack = ItemStack.EMPTY;
@@ -103,6 +65,7 @@ public static void openWirelessTerminalGui(WirelessTerminalGuiObject obj, byte m
10365
stack = getBaubleItem(Minecraft.getMinecraft().player, obj.getInventorySlot());
10466
}
10567
if (!stack.isEmpty()) {
68+
Minecraft.getMinecraft().player.closeScreen();
10669
ItemWirelessUniversalTerminal.INSTANCE.nbtChangeB(stack);
10770
ItemWirelessUniversalTerminal.INSTANCE.nbtChange(stack, mode);
10871
NET_CHANNEL.sendToServer(new OpenWUTGui(obj, mode));
@@ -144,4 +107,42 @@ public static void openWirelessTerminalGui(ItemStack terminal, EntityPlayer play
144107
}
145108
}
146109
}
110+
111+
@Mod.EventHandler
112+
public void preInit(FMLPreInitializationEvent event) {
113+
114+
int start = 0;
115+
116+
NET_CHANNEL.registerMessage(UpdateItemModeMessage.class, UpdateItemModeMessage.class, start++, Side.SERVER);
117+
NET_CHANNEL.registerMessage(WirelessTerminalRefresh.class, WirelessTerminalRefresh.class, start++, Side.SERVER);
118+
NET_CHANNEL.registerMessage(OpenWUTGui.class, OpenWUTGui.class, start++, Side.SERVER);
119+
120+
NET_CHANNEL.registerMessage(UpdateItemModeMessage.class, UpdateItemModeMessage.class, start++, Side.CLIENT);
121+
122+
proxy.preInit();
123+
}
124+
125+
@Mod.EventHandler
126+
public void init(FMLInitializationEvent event) {
127+
proxy.init();
128+
}
129+
130+
@Mod.EventHandler
131+
public void postInit(FMLPostInitializationEvent event) {
132+
proxy.postInit();
133+
}
134+
135+
public void registryContainer(byte id, GetGui<? extends AEBaseContainer> targetContainer) {
136+
proxy.registryContainer(id, targetContainer);
137+
}
138+
139+
@SideOnly(Side.CLIENT)
140+
public void registryGui(byte id, GetGui<? extends AEBaseGui> targetGui) {
141+
((ClientProxy) proxy).registryGui(id, targetGui);
142+
}
143+
144+
@FunctionalInterface
145+
public interface GetGui<T> {
146+
T get(ItemStack item, EntityPlayer player, int slot, int isBauble);
147+
}
147148
}

‎src/main/java/com/circulation/ae2wut/client/TooltipButton.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public final class TooltipButton extends GuiButton implements ITooltip {
1717
private final byte t;
1818
private byte nowGui;
1919

20-
public TooltipButton(int x, int y,byte t) {
20+
public TooltipButton(int x, int y, byte t) {
2121
super(0, x, y, "");
2222
if (t < 0) {
2323
this.width = 18;
@@ -29,7 +29,7 @@ public TooltipButton(int x, int y,byte t) {
2929
this.t = t;
3030
}
3131

32-
public TooltipButton(int x, int y,byte t,byte nowGui) {
32+
public TooltipButton(int x, int y, byte t, byte nowGui) {
3333
this(x, y, t);
3434
if (t < 0) {
3535
this.nowGui = nowGui;

‎src/main/java/com/circulation/ae2wut/client/handler/WirelessUniversalTerminalHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
@SideOnly(Side.CLIENT)
2929
public class WirelessUniversalTerminalHandler {
30-
private GuiScreen gui;
3130
private final Minecraft mc = FMLClientHandler.instance().getClient();
31+
private GuiScreen gui;
3232

3333
@SubscribeEvent
3434
public void onGuiOpen(GuiOpenEvent event) {

‎src/main/java/com/circulation/ae2wut/client/model/ItemWUTBakedModel.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,22 @@ public class ItemWUTBakedModel implements IBakedModel {
3131
iconMap.defaultReturnValue(ItemStack.EMPTY);
3232
}
3333

34-
public static ItemStack getIconItem(byte key){
35-
return iconMap.get(key);
36-
}
37-
3834
private final IBakedModel baseModel;
3935
private final WutOverrideList overrides;
4036

41-
public static void regIcon(byte id,ItemStack icon){
42-
iconMap.put(id,icon);
43-
}
44-
4537
ItemWUTBakedModel(@NotNull IBakedModel baseModel) {
4638
this.baseModel = baseModel;
4739
this.overrides = new WutOverrideList();
4840
}
4941

42+
public static ItemStack getIconItem(byte key) {
43+
return iconMap.get(key);
44+
}
45+
46+
public static void regIcon(byte id, ItemStack icon) {
47+
iconMap.put(id, icon);
48+
}
49+
5050
@Override
5151
public List<BakedQuad> getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) {
5252
return this.baseModel.getQuads(state, side, rand);

‎src/main/java/com/circulation/ae2wut/handler/GuiHandler.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
public class GuiHandler {
1919
public static final ResourceLocation wut$guiRl = new ResourceLocation(AE2UELWirelessUniversalTerminal.MOD_ID, "textures/gui/control.png");
20+
private static Pair<Map<?, ?>, List<Rectangle>> rectanglePair;
2021

2122
public static Byte2ObjectMap<TooltipButton> initGui(int guiTop, int guiLeft, List<GuiButton> buttonList, byte nowGui, ItemStack terminal) {
2223
final Byte2ObjectMap<TooltipButton> map = new Byte2ObjectOpenHashMap<>();
@@ -52,10 +53,8 @@ public static int getTop(int guiTop, int guiLeft, List<GuiButton> buttonList) {
5253
return top;
5354
}
5455

55-
private static Pair<Map<?, ?>, List<Rectangle>> rectanglePair;
56-
57-
public static void clearCache(){
58-
if (rectanglePair != null){
56+
public static void clearCache() {
57+
if (rectanglePair != null) {
5958
rectanglePair.second().clear();
6059
rectanglePair.first().clear();
6160
rectanglePair = null;

‎src/main/java/com/circulation/ae2wut/item/ItemWirelessUniversalTerminal.java‎

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,47 @@ public ItemStack createIcon() {
6464
if (stack.hasTagCompound()) {
6565
if (stack.getTagCompound().hasKey("Nova")) {
6666
return 114514;
67-
} else {
68-
return stack.getTagCompound().getByte("mode");
6967
}
7068
}
7169
return 0;
7270
});
7371
}
7472

73+
@SideOnly(Side.CLIENT)
74+
public static String getWirelessName(int value) {
75+
return "§6(" + ItemWUTBakedModel.getIconItem((byte) value).getDisplayName() + ")";
76+
}
77+
78+
@Optional.Method(modid = "ae2exttable")
79+
public static AE2ExtendedGUIs getGuiType(ItemStack item) {
80+
if (item.hasTagCompound()) {
81+
byte mode = item.getTagCompound().getByte("mode");
82+
return getGui(mode);
83+
}
84+
return null;
85+
}
86+
87+
@Optional.Method(modid = "ae2exttable")
88+
public static AE2ExtendedGUIs getGui(byte value) {
89+
return switch (value) {
90+
case 7 -> AE2ExtendedGUIs.WIRELESS_ADVANCED_CRAFTING_TERMINAL;
91+
case 8 -> AE2ExtendedGUIs.WIRELESS_ELITE_CRAFTING_TERMINAL;
92+
case 9 -> AE2ExtendedGUIs.WIRELESS_ULTIMATE_CRAFTING_TERMINAL;
93+
default -> AE2ExtendedGUIs.WIRELESS_BASIC_CRAFTING_TERMINAL;
94+
};
95+
}
96+
97+
@Optional.Method(modid = "ae2exttable")
98+
public static byte getAE2EMode(AE2ExtendedGUIs value) {
99+
return switch (value) {
100+
case WIRELESS_BASIC_CRAFTING_TERMINAL -> 6;
101+
case WIRELESS_ADVANCED_CRAFTING_TERMINAL -> 7;
102+
case WIRELESS_ELITE_CRAFTING_TERMINAL -> 8;
103+
case WIRELESS_ULTIMATE_CRAFTING_TERMINAL -> 9;
104+
default -> 0;
105+
};
106+
}
107+
75108
@Override
76109
@SuppressWarnings("NullableProblems")
77110
public ActionResult<ItemStack> onItemRightClick(World w, EntityPlayer player, EnumHand hand) {
@@ -198,18 +231,13 @@ public void nbtChangeB(ItemStack item) {
198231
if (!tag.hasKey("cache")) {
199232
tag.setTag("cache", new NBTTagCompound());
200233
}
201-
tag.getCompoundTag("cache").setTag(String.valueOf(mode), items);
234+
tag.getCompoundTag("cache").setTag(Byte.toString(mode), items);
202235
}
203236
tag.getCompoundTag("craftingGrid").removeTag("Items");
204237
tag.removeTag("crafting");
205238
}
206239
}
207240

208-
@SideOnly(Side.CLIENT)
209-
public static String getWirelessName(int value) {
210-
return "§6(" + ItemWUTBakedModel.getIconItem((byte) value).getDisplayName() + ")";
211-
}
212-
213241
@Override
214242
public boolean willAutoSync(ItemStack stack, EntityLivingBase player) {
215243
return true;
@@ -265,37 +293,6 @@ protected void getCheckedSubItems(CreativeTabs creativeTab, NonNullList<ItemStac
265293
itemStacks.add(charged);
266294
}
267295

268-
@Optional.Method(modid = "ae2exttable")
269-
public static AE2ExtendedGUIs getGuiType(ItemStack item) {
270-
if (item.hasTagCompound()) {
271-
byte mode = item.getTagCompound().getByte("mode");
272-
return getGui(mode);
273-
}
274-
return null;
275-
}
276-
277-
@Optional.Method(modid = "ae2exttable")
278-
public static AE2ExtendedGUIs getGui(byte value) {
279-
return switch (value) {
280-
case 6 -> AE2ExtendedGUIs.WIRELESS_BASIC_CRAFTING_TERMINAL;
281-
case 7 -> AE2ExtendedGUIs.WIRELESS_ADVANCED_CRAFTING_TERMINAL;
282-
case 8 -> AE2ExtendedGUIs.WIRELESS_ELITE_CRAFTING_TERMINAL;
283-
case 9 -> AE2ExtendedGUIs.WIRELESS_ULTIMATE_CRAFTING_TERMINAL;
284-
default -> null;
285-
};
286-
}
287-
288-
@Optional.Method(modid = "ae2exttable")
289-
public static byte getAE2EMode(AE2ExtendedGUIs value) {
290-
return switch (value) {
291-
case WIRELESS_BASIC_CRAFTING_TERMINAL -> 6;
292-
case WIRELESS_ADVANCED_CRAFTING_TERMINAL -> 7;
293-
case WIRELESS_ELITE_CRAFTING_TERMINAL -> 8;
294-
case WIRELESS_ULTIMATE_CRAFTING_TERMINAL -> 9;
295-
default -> 0;
296-
};
297-
}
298-
299296
public boolean hasMode(ItemStack t, byte mode) {
300297
if (!AE2UELWirelessUniversalTerminal.proxy.getAllModeSet().contains(mode) || !t.hasTagCompound()) return false;
301298
for (int m : t.getTagCompound().getIntArray("modes")) {

‎src/main/java/com/circulation/ae2wut/mixin/WUTLateMixinLoader.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,6 @@ public class WUTLateMixinLoader implements ILateMixinLoader {
2626
addModdedMixinCFG("mixins.ae2wut.mekeng.json", "mekeng");
2727
}
2828

29-
@Override
30-
public List<String> getMixinConfigs() {
31-
return new ArrayList<>(MIXIN_CONFIGS.keySet());
32-
}
33-
34-
@Override
35-
public boolean shouldMixinConfigQueue(final String mixinConfig) {
36-
BooleanSupplier supplier = MIXIN_CONFIGS.get(mixinConfig);
37-
if (supplier == null) {
38-
LOG.warn(LOG_PREFIX + "Mixin config {} is not found in config map! It will never be loaded.", mixinConfig);
39-
return false;
40-
}
41-
return supplier.getAsBoolean();
42-
}
43-
4429
private static boolean modLoaded(final String modID) {
4530
return Loader.isModLoaded(modID);
4631
}
@@ -60,4 +45,19 @@ private static void addMixinCFG(final String mixinConfig) {
6045
private static void addMixinCFG(final String mixinConfig, final BooleanSupplier conditions) {
6146
MIXIN_CONFIGS.put(mixinConfig, conditions);
6247
}
48+
49+
@Override
50+
public List<String> getMixinConfigs() {
51+
return new ArrayList<>(MIXIN_CONFIGS.keySet());
52+
}
53+
54+
@Override
55+
public boolean shouldMixinConfigQueue(final String mixinConfig) {
56+
BooleanSupplier supplier = MIXIN_CONFIGS.get(mixinConfig);
57+
if (supplier == null) {
58+
LOG.warn(LOG_PREFIX + "Mixin config {} is not found in config map! It will never be loaded.", mixinConfig);
59+
return false;
60+
}
61+
return supplier.getAsBoolean();
62+
}
6363
}

‎src/main/java/com/circulation/ae2wut/mixin/ae2/MixinPacketTerminalUse.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import java.util.List;
2525

26-
@Mixin(value = PacketTerminalUse.class,remap = false)
26+
@Mixin(value = PacketTerminalUse.class, remap = false)
2727
public abstract class MixinPacketTerminalUse extends AppEngPacket {
2828

2929
@Shadow
@@ -36,7 +36,7 @@ void openGui(ItemStack itemStack, int slotIdx, EntityPlayer player, boolean isBa
3636
@Inject(method = "serverPacketData", at = @At(value = "HEAD"), cancellable = true)
3737
public void serverPacketDataMixin(INetworkInfo manager, AppEngPacket packet, EntityPlayer player, CallbackInfo ci) {
3838
int mode = ae2WirelessUniversalTerminal$determineMode();
39-
if (mode == -1)return;
39+
if (mode == -1) return;
4040
NonNullList<ItemStack> mainInventory = player.inventory.mainInventory;
4141
for (int i = 0; i < mainInventory.size(); ++i) {
4242
ItemStack is = mainInventory.get(i);

0 commit comments

Comments
 (0)