Skip to content

Commit ffd44c7

Browse files
committed
格式调整
修改一些东西从而适应fork的ae2fc
1 parent da1fe73 commit ffd44c7

File tree

13 files changed

+221
-103
lines changed

13 files changed

+221
-103
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
import org.apache.logging.log4j.Logger;
3636

3737
@Mod(modid = "ae2wut", name = Tags.MOD_NAME, version = Tags.VERSION,
38-
dependencies = "required-after:mixinbooter@[8.0,);" +
39-
"required-after:appliedenergistics2@[v0.56.7,);" +
40-
"after:ae2exttable@[v1.0.8,);"
38+
dependencies = "required-after:mixinbooter@[8.0,);" +
39+
"required-after:appliedenergistics2@[v0.56.7,);" +
40+
"after:ae2exttable@[v1.0.8,);"
4141
)
4242
public class AE2UELWirelessUniversalTerminal {
4343

src/main/java/com/circulation/ae2wut/client/model/WUTModelLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class WUTModelLoader implements ICustomModelLoader {
1313
@Override
1414
public boolean accepts(ResourceLocation modelLocation) {
1515
return modelLocation.getNamespace().equals(AE2UELWirelessUniversalTerminal.MOD_ID)
16-
&& !modelLocation.getPath().startsWith("models");
16+
&& !modelLocation.getPath().startsWith("models");
1717
}
1818

1919
@Override

src/main/java/com/circulation/ae2wut/handler/WutRegisterHandler.java

Lines changed: 179 additions & 69 deletions
Large diffs are not rendered by default.

src/main/java/com/circulation/ae2wut/mixin/ae2/gui/MixinGuiMEMonitorable.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ public void onInit(InventoryPlayer inventoryPlayer, ITerminalHost te, ContainerM
5959
public void initGui(CallbackInfo ci) {
6060
if (wut$isWut) {
6161
this.wut$Map = GuiHandler.initGui(
62-
this.guiTop, this.guiLeft, this.buttonList,
63-
WutRegisterHandler.Client.getGuiType(this.getClass()),
64-
this.wut$guiItem
62+
this.guiTop, this.guiLeft, this.buttonList,
63+
WutRegisterHandler.Client.getGuiType(this),
64+
this.wut$guiItem
6565
);
6666
this.wut$enableSwitching = false;
6767
this.wut$t = this.wut$Map.get((byte) -1);

src/main/java/com/circulation/ae2wut/mixin/ae2/gui/MixinGuiWirelessFluidTerminal.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ public void initGui() {
6161
super.initGui();
6262
if (wut$isWut) {
6363
this.wut$Map = GuiHandler.initGui(
64-
this.guiTop, this.guiLeft, this.buttonList,
65-
WutRegisterHandler.Client.getGuiType(this.getClass()),
66-
this.wut$guiItem
64+
this.guiTop, this.guiLeft, this.buttonList,
65+
WutRegisterHandler.Client.getGuiType(this),
66+
this.wut$guiItem
6767
);
6868
this.wut$enableSwitching = false;
6969
this.wut$t = this.wut$Map.get((byte) -1);

src/main/java/com/circulation/ae2wut/mixin/ae2/gui/MixinGuiWirelessInterfaceTerminal.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ public void drawScreen(int mouseX, int mouseY, float partialTicks) {
7171
if (wut$isWut) {
7272
if (wut$t == null) {
7373
this.wut$Map = GuiHandler.initGui(
74-
this.guiTop, this.guiLeft, this.buttonList,
75-
WutRegisterHandler.Client.getGuiType(this.getClass()),
76-
this.wut$guiItem
74+
this.guiTop, this.guiLeft, this.buttonList,
75+
WutRegisterHandler.Client.getGuiType(this),
76+
this.wut$guiItem
7777
);
7878
this.wut$enableSwitching = false;
7979
for (TooltipButton value : this.wut$Map.values()) {

src/main/java/com/circulation/ae2wut/mixin/ae2exttable/MixinGuiCraftConfirm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public MixinGuiCraftConfirm(Container container) {
3838

3939
@SuppressWarnings("InjectIntoConstructor")
4040
@Inject(method = "<init>(Lnet/minecraft/entity/player/InventoryPlayer;Lappeng/api/storage/ITerminalHost;)V",
41-
at = @At(value = "INVOKE", target = "Lappeng/container/implementations/ContainerCraftConfirm;setGui(Lappeng/client/gui/implementations/GuiCraftConfirm;)V", shift = At.Shift.AFTER))
41+
at = @At(value = "INVOKE", target = "Lappeng/container/implementations/ContainerCraftConfirm;setGui(Lappeng/client/gui/implementations/GuiCraftConfirm;)V", shift = At.Shift.AFTER))
4242
private void onInit(final InventoryPlayer inventoryPlayer, final ITerminalHost te, CallbackInfo ci) {
4343
if (te instanceof WirelessTerminalGuiObject term) {
4444
if (term.getItemStack().getItem() instanceof ItemWirelessUniversalTerminal t) {

src/main/java/com/circulation/ae2wut/mixin/ae2exttable/MixinGuiCraftingTerm.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ public void onInit(InventoryPlayer inventoryPlayer, ITerminalHost te, ContainerM
5959
public void initGui(CallbackInfo ci) {
6060
if (wut$isWut) {
6161
this.wut$Map = GuiHandler.initGui(
62-
this.guiTop, this.guiLeft, this.buttonList,
63-
WutRegisterHandler.Client.getGuiType(this.getClass()),
64-
this.wut$guiItem
62+
this.guiTop, this.guiLeft, this.buttonList,
63+
WutRegisterHandler.Client.getGuiType(this.getClass()),
64+
this.wut$guiItem
6565
);
6666
this.wut$enableSwitching = false;
6767
this.wut$t = this.wut$Map.get((byte) -1);

src/main/java/com/circulation/ae2wut/mixin/mekeng/MixinGuiWirelessGasTerminal.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ public void initGui() {
6060
super.initGui();
6161
if (wut$isWut) {
6262
this.wut$Map = GuiHandler.initGui(
63-
this.guiTop, this.guiLeft, this.buttonList,
64-
WutRegisterHandler.Client.getGuiType(this.getClass()),
65-
this.wut$guiItem
63+
this.guiTop, this.guiLeft, this.buttonList,
64+
WutRegisterHandler.Client.getGuiType(this.getClass()),
65+
this.wut$guiItem
6666
);
6767
this.wut$enableSwitching = false;
6868
this.wut$t = this.wut$Map.get((byte) -1);

src/main/java/com/circulation/ae2wut/network/OpenWUTGui.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ public IMessage onMessage(OpenWUTGui message, MessageContext ctx) {
5555
}
5656
if (terminal.getItem() == ItemWirelessUniversalTerminal.INSTANCE) {
5757
AE2UELWirelessUniversalTerminal
58-
.openWirelessTerminalGui(
59-
terminal, player, message.mode, message.slot, message.isBauble
60-
);
58+
.openWirelessTerminalGui(
59+
terminal, player, message.mode, message.slot, message.isBauble
60+
);
6161
}
6262
return null;
6363
}

0 commit comments

Comments
 (0)