Skip to content

Commit 21f3a07

Browse files
Circulate233Circulate233
committed
运行了一遍代码清理
1 parent 50538e6 commit 21f3a07

File tree

195 files changed

+1945
-1954
lines changed

Some content is hidden

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

195 files changed

+1945
-1954
lines changed

‎src/main/java/com/glodblock/github/FluidCraft.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@ public class FluidCraft {
3030
public static Logger log;
3131

3232
@Mod.EventHandler
33-
public void onPreInit(FMLPreInitializationEvent event) {
33+
public void onPreInit(final FMLPreInitializationEvent event) {
3434
log = event.getModLog();
3535
ModAndClassUtil.init();
3636
proxy.preInit(event);
3737
}
3838

3939
@Mod.EventHandler
40-
public void onInit(FMLInitializationEvent event) {
40+
public void onInit(final FMLInitializationEvent event) {
4141
proxy.init(event);
4242
}
4343

4444
@Mod.EventHandler
45-
public void onPostInit(FMLPostInitializationEvent event) {
45+
public void onPostInit(final FMLPostInitializationEvent event) {
4646
proxy.postInit(event);
4747
}
4848

49-
public static ResourceLocation resource(String path) {
49+
public static ResourceLocation resource(final String path) {
5050
return new ResourceLocation(MODID, path);
5151
}
5252

‎src/main/java/com/glodblock/github/client/GuiBurette.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class GuiBurette extends AEBaseGui {
3030
private GuiNumberBox amountField;
3131
private final MouseRegionManager mouseRegions = new MouseRegionManager(this);
3232

33-
public GuiBurette(InventoryPlayer ipl, TileBurette tile) {
33+
public GuiBurette(final InventoryPlayer ipl, final TileBurette tile) {
3434
super(new ContainerBurette(ipl, tile));
3535
this.cont = (ContainerBurette)inventorySlots;
3636

@@ -53,21 +53,21 @@ public void initGui() {
5353
amountField.setText("1000");
5454
}
5555

56-
private ButtonMouseHandler createTransposeButton(boolean into) {
56+
private ButtonMouseHandler createTransposeButton(final boolean into) {
5757
return new ButtonMouseHandler(into ? NameConst.TT_TRANSPOSE_IN : NameConst.TT_TRANSPOSE_OUT, () -> {
5858
try {
59-
int amount = Integer.parseInt(amountField.getText());
59+
final int amount = Integer.parseInt(amountField.getText());
6060
if (cont.canTranferFluid(into)) {
6161
FluidCraft.proxy.netHandler.sendToServer(new CPacketTransposeFluid(amount, into));
6262
}
63-
} catch (NumberFormatException e) {
63+
} catch (final NumberFormatException e) {
6464
// NO-OP
6565
}
6666
});
6767
}
6868

6969
@Override
70-
protected void mouseClicked(int xCoord, int yCoord, int btn) throws IOException {
70+
protected void mouseClicked(final int xCoord, final int yCoord, final int btn) throws IOException {
7171
if (mouseRegions.onClick(xCoord, yCoord, btn)) {
7272
amountField.mouseClicked(xCoord, yCoord, btn);
7373
super.mouseClicked(xCoord, yCoord, btn);
@@ -80,7 +80,7 @@ protected void keyTyped(final char character, final int key) throws IOException
8080
if ((key == 211 || key == 205 || key == 203 || key == 14 || Character.isDigit(character))
8181
&& amountField.textboxKeyTyped(character, key)) {
8282
try {
83-
int amount = Integer.parseInt(amountField.getText());
83+
final int amount = Integer.parseInt(amountField.getText());
8484
if (amount < 0) {
8585
amountField.setText("1");
8686
} else {
@@ -96,20 +96,20 @@ protected void keyTyped(final char character, final int key) throws IOException
9696
}
9797

9898
@Override
99-
public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) {
99+
public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
100100
mc.getTextureManager().bindTexture(TEX_BG);
101101
drawTexturedModalRect(offsetX, offsetY, 0, 0, 176, ySize);
102102
amountField.drawTextBox();
103103
GlStateManager.color(1F, 1F, 1F, 1F);
104104
}
105105

106106
@Override
107-
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
107+
public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
108108
fontRenderer.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_BURETTE)), 8, 6, 0x404040);
109109
fontRenderer.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040);
110110
GlStateManager.color(1F, 1F, 1F, 1F);
111111

112-
IAEFluidTank fluidInv = cont.getTile().getFluidInventory();
112+
final IAEFluidTank fluidInv = cont.getTile().getFluidInventory();
113113
FluidRenderUtils.renderFluidIntoGuiCleanly(TANK_X, TANK_Y, TANK_WIDTH, TANK_HEIGHT,
114114
fluidInv.getFluidInSlot(0), fluidInv.getTankProperties()[0].getCapacity());
115115

‎src/main/java/com/glodblock/github/client/GuiFCCraftAmount.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class GuiFCCraftAmount extends GuiCraftAmount {
2626
private GuiButton next;
2727
private GuiType originGui;
2828

29-
public GuiFCCraftAmount(InventoryPlayer inventoryPlayer, ITerminalHost te) {
29+
public GuiFCCraftAmount(final InventoryPlayer inventoryPlayer, final ITerminalHost te) {
3030
super(inventoryPlayer, te);
3131
}
3232

@@ -36,9 +36,9 @@ public void initGui() {
3636
this.originalGuiBtn = Ae2ReflectClient.getGuiCraftAmountBackButton(this);
3737
this.next = Ae2ReflectClient.getGuiCraftAmountNextButton(this);
3838
ItemStack icon = ItemStack.EMPTY;
39-
Object te = ((AEBaseContainer)this.inventorySlots).getTarget();
39+
final Object te = ((AEBaseContainer)this.inventorySlots).getTarget();
4040
if (te instanceof WirelessTerminalGuiObject) {
41-
ItemStack tool = ((WirelessTerminalGuiObject) te).getItemStack();
41+
final ItemStack tool = ((WirelessTerminalGuiObject) te).getItemStack();
4242
if (tool.getItem() == FCItems.WIRELESS_FLUID_PATTERN_TERMINAL) {
4343
icon = new ItemStack(FCItems.WIRELESS_FLUID_PATTERN_TERMINAL, 1);
4444
this.originGui = GuiType.WIRELESS_FLUID_PATTERN_TERMINAL;
@@ -59,13 +59,13 @@ public void initGui() {
5959
}
6060

6161
@Override
62-
protected void actionPerformed(GuiButton btn) throws IOException {
62+
protected void actionPerformed(final GuiButton btn) throws IOException {
6363
if (btn == this.originalGuiBtn && this.originGui != null) {
6464
InventoryHandler.switchGui(this.originGui);
6565
} else if (btn == this.next) {
66-
String text = Ae2ReflectClient.getGuiCraftAmountTextBox(this).getText();
67-
double resultD = MathExpressionParser.parse(text);
68-
int result;
66+
final String text = Ae2ReflectClient.getGuiCraftAmountTextBox(this).getText();
67+
final double resultD = MathExpressionParser.parse(text);
68+
final int result;
6969
if (resultD <= 0 || Double.isNaN(resultD)) {
7070
result = 1;
7171
} else {

‎src/main/java/com/glodblock/github/client/GuiFCCraftConfirm.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ public class GuiFCCraftConfirm extends GuiCraftConfirm {
2323
private GuiButton cancel;
2424
private GuiType originGui;
2525

26-
public GuiFCCraftConfirm(InventoryPlayer inventoryPlayer, ITerminalHost te) {
26+
public GuiFCCraftConfirm(final InventoryPlayer inventoryPlayer, final ITerminalHost te) {
2727
super(inventoryPlayer, te);
2828
this.inventorySlots = new ContainerFCCraftConfirm(inventoryPlayer, te);
29-
ContainerCraftConfirm ccc = (ContainerCraftConfirm) this.inventorySlots;
29+
final ContainerCraftConfirm ccc = (ContainerCraftConfirm) this.inventorySlots;
3030
ccc.setGui(this);
3131
Ae2ReflectClient.writeCraftConfirmContainer(this, ccc);
3232
}
@@ -35,9 +35,9 @@ public GuiFCCraftConfirm(InventoryPlayer inventoryPlayer, ITerminalHost te) {
3535
public void initGui() {
3636
super.initGui();
3737
this.cancel = Ae2ReflectClient.getCraftConfirmBackButton(this);
38-
Object te = ((AEBaseContainer)this.inventorySlots).getTarget();
38+
final Object te = ((AEBaseContainer)this.inventorySlots).getTarget();
3939
if (te instanceof WirelessTerminalGuiObject) {
40-
ItemStack tool = ((WirelessTerminalGuiObject) te).getItemStack();
40+
final ItemStack tool = ((WirelessTerminalGuiObject) te).getItemStack();
4141
if (tool.getItem() == FCItems.WIRELESS_FLUID_PATTERN_TERMINAL) {
4242
this.originGui = GuiType.WIRELESS_FLUID_PATTERN_TERMINAL;
4343
}
@@ -51,7 +51,7 @@ public void initGui() {
5151
}
5252

5353
@Override
54-
protected void actionPerformed(GuiButton btn) throws IOException {
54+
protected void actionPerformed(final GuiButton btn) throws IOException {
5555
if (btn == this.cancel && this.originGui != null) {
5656
InventoryHandler.switchGui(this.originGui);
5757
return;

‎src/main/java/com/glodblock/github/client/GuiFluidAssembler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class GuiFluidAssembler extends AEBaseGui {
2121
FluidCraft.resource("textures/gui/fluid_assembler4.png"),
2222
};
2323

24-
public GuiFluidAssembler(InventoryPlayer ipl, TileFluidAssembler tile) {
24+
public GuiFluidAssembler(final InventoryPlayer ipl, final TileFluidAssembler tile) {
2525
super(new ContainerFluidAssembler(ipl, tile));
2626
this.container = (ContainerFluidAssembler) inventorySlots;
2727
this.ySize = 249;
@@ -35,13 +35,13 @@ public void initGui() {
3535
}
3636

3737
@Override
38-
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
38+
public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
3939
fontRenderer.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_ASSEMBLER)), 8, 6, 0x404040);
4040
this.pb.setFullMsg((this.container.getCurrentProgress() * 100 / TileFluidAssembler.TIME) + "%");
4141
}
4242

4343
@Override
44-
public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) {
44+
public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
4545
mc.getTextureManager().bindTexture(TEX_BG[cap()]);
4646
this.pb.x = 148 + this.guiLeft;
4747
this.pb.y = 34 + this.guiTop;

‎src/main/java/com/glodblock/github/client/GuiFluidDualInterface.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public GuiFluidDualInterface(final InventoryPlayer ip, final IFluidInterfaceHost
2525
@Override
2626
public void initGui() {
2727
super.initGui();
28-
ItemStack icon = AEApi.instance().definitions().blocks().iface().maybeStack(1).orElse(ItemStack.EMPTY);
28+
final ItemStack icon = AEApi.instance().definitions().blocks().iface().maybeStack(1).orElse(ItemStack.EMPTY);
2929
switchInterface = new GuiTabButton(guiLeft + 133, guiTop, icon, icon.getDisplayName(), itemRender);
3030
buttonList.add(switchInterface);
3131
priorityBtn = Ae2ReflectClient.getPriorityButton(this);

‎src/main/java/com/glodblock/github/client/GuiFluidExportBus.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ public class GuiFluidExportBus extends GuiUpgradeable {
1414

1515
private final PartSharedFluidBus bus;
1616

17-
public GuiFluidExportBus(InventoryPlayer inventoryPlayer, PartSharedFluidBus te) {
17+
public GuiFluidExportBus(final InventoryPlayer inventoryPlayer, final PartSharedFluidBus te) {
1818
super(new ContainerFluidExportBus(inventoryPlayer, te));
1919
this.bus = te;
2020
}
2121

2222
public void initGui() {
2323
super.initGui();
24-
ContainerFluidIO container = (ContainerFluidIO)this.inventorySlots;
25-
IAEFluidTank inv = this.bus.getConfig();
24+
final ContainerFluidIO container = (ContainerFluidIO)this.inventorySlots;
25+
final IAEFluidTank inv = this.bus.getConfig();
2626
this.guiSlots.add(new GuiFluidSlot(inv, 0, 0, 80, 40));
2727
this.guiSlots.add(new GuiOptionalFluidSlot(inv, container, 1, 1, 1, 80, 40, -1, 0));
2828
this.guiSlots.add(new GuiOptionalFluidSlot(inv, container, 2, 2, 1, 80, 40, 1, 0));

‎src/main/java/com/glodblock/github/client/GuiFluidPacketDecoder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ public class GuiFluidPacketDecoder extends AEBaseGui {
1414

1515
private static final ResourceLocation TEX_BG = FluidCraft.resource("textures/gui/fluid_packet_decoder.png");
1616

17-
public GuiFluidPacketDecoder(InventoryPlayer ipl, TileFluidPacketDecoder tile) {
17+
public GuiFluidPacketDecoder(final InventoryPlayer ipl, final TileFluidPacketDecoder tile) {
1818
super(new ContainerFluidPacketDecoder(ipl, tile));
1919
}
2020

2121
@Override
22-
public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) {
22+
public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
2323
mc.getTextureManager().bindTexture(TEX_BG);
2424
drawTexturedModalRect(offsetX, offsetY, 0, 0, 176, ySize);
2525
}
2626

2727
@Override
28-
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
28+
public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
2929
fontRenderer.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_PACKET_DECODER)), 8, 6, 0x404040);
3030
fontRenderer.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040);
3131
}

‎src/main/java/com/glodblock/github/client/GuiFluidPatternEncoder.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class GuiFluidPatternEncoder extends AEBaseGui {
2323
private final ContainerFluidPatternEncoder cont;
2424
private final MouseRegionManager mouseRegions = new MouseRegionManager(this);
2525

26-
public GuiFluidPatternEncoder(InventoryPlayer ipl, TileFluidPatternEncoder tile) {
26+
public GuiFluidPatternEncoder(final InventoryPlayer ipl, final TileFluidPatternEncoder tile) {
2727
super(new ContainerFluidPatternEncoder(ipl, tile));
2828
this.cont = (ContainerFluidPatternEncoder)inventorySlots;
2929
mouseRegions.addRegion(141, 38, 10, 10, new MouseRegionManager.Handler() {
@@ -33,7 +33,7 @@ public List<String> getTooltip() {
3333
}
3434

3535
@Override
36-
public boolean onClick(int button) {
36+
public boolean onClick(final int button) {
3737
if (button == 0) {
3838
if (cont.canEncodePattern()) {
3939
FluidCraft.proxy.netHandler.sendToServer(new CPacketEncodePattern());
@@ -46,20 +46,20 @@ public boolean onClick(int button) {
4646
}
4747

4848
@Override
49-
protected void mouseClicked(int xCoord, int yCoord, int btn) throws IOException {
49+
protected void mouseClicked(final int xCoord, final int yCoord, final int btn) throws IOException {
5050
if (mouseRegions.onClick(xCoord, yCoord, btn)) {
5151
super.mouseClicked(xCoord, yCoord, btn);
5252
}
5353
}
5454

5555
@Override
56-
public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY) {
56+
public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
5757
mc.getTextureManager().bindTexture(TEX_BG);
5858
drawTexturedModalRect(offsetX, offsetY, 0, 0, 176, ySize);
5959
}
6060

6161
@Override
62-
public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) {
62+
public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
6363
fontRenderer.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_PATTERN_ENCODER)), 8, 6, 0x404040);
6464
fontRenderer.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040);
6565
mouseRegions.render(mouseX, mouseY);

‎src/main/java/com/glodblock/github/client/GuiFluidPatternTerminalCraftingStatus.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ public class GuiFluidPatternTerminalCraftingStatus extends GuiCraftingStatus {
2323
private GuiTabButton originalGuiBtn;
2424
private final ITerminalHost part;
2525

26-
public GuiFluidPatternTerminalCraftingStatus(InventoryPlayer inventoryPlayer, ITerminalHost te) {
26+
public GuiFluidPatternTerminalCraftingStatus(final InventoryPlayer inventoryPlayer, final ITerminalHost te) {
2727
super(inventoryPlayer, te);
2828
this.part = te;
2929
if (te instanceof WirelessTerminalGuiObject) {
30-
ItemStack tool = ((WirelessTerminalGuiObject) te).getItemStack();
30+
final ItemStack tool = ((WirelessTerminalGuiObject) te).getItemStack();
3131
if (tool.getItem() == FCItems.WIRELESS_FLUID_PATTERN_TERMINAL) {
3232
Ae2ReflectClient.setIconItem(this, new ItemStack(FCItems.WIRELESS_FLUID_PATTERN_TERMINAL));
3333
}
@@ -50,7 +50,7 @@ public void initGui() {
5050
protected void actionPerformed(final GuiButton btn) throws IOException {
5151
if (btn == originalGuiBtn) {
5252
if (part instanceof WirelessTerminalGuiObject) {
53-
ItemStack tool = ((WirelessTerminalGuiObject) part).getItemStack();
53+
final ItemStack tool = ((WirelessTerminalGuiObject) part).getItemStack();
5454
if (tool.getItem() == FCItems.WIRELESS_FLUID_PATTERN_TERMINAL) {
5555
InventoryHandler.switchGui(GuiType.WIRELESS_FLUID_PATTERN_TERMINAL);
5656
} else super.actionPerformed(btn);

0 commit comments

Comments
 (0)