Skip to content

Commit cfb44cc

Browse files
liansishenliansishen
committed
spotlessApply
1 parent 11f4948 commit cfb44cc

File tree

7 files changed

+43
-31
lines changed

7 files changed

+43
-31
lines changed

‎src/main/java/com/hepdd/easytech/api/metatileentity/implementations/ETHPrimitiveHatchOutput.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package com.hepdd.easytech.api.metatileentity.implementations;
22

3-
import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
4-
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
5-
import com.gtnewhorizons.modularui.common.widget.TextWidget;
6-
import gregtech.api.gui.modularui.GTUITextures;
73
import net.minecraft.entity.player.EntityPlayer;
84
import net.minecraft.init.Blocks;
95
import net.minecraft.item.ItemStack;
106
import net.minecraftforge.common.util.ForgeDirection;
117

128
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
139
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
10+
import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
11+
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
12+
import com.gtnewhorizons.modularui.common.widget.TextWidget;
1413

1514
import gregtech.api.enums.Textures;
15+
import gregtech.api.gui.modularui.GTUITextures;
1616
import gregtech.api.interfaces.ITexture;
1717
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
1818
import gregtech.api.metatileentity.MetaTileEntity;
@@ -85,9 +85,9 @@ public int getCapacity() {
8585
@Override
8686
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
8787
builder.widget(
88-
new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK)
89-
.setPos(7, 16)
90-
.setSize(71, 45))
88+
new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK)
89+
.setPos(7, 16)
90+
.setSize(71, 45))
9191
.widget(
9292
new DrawableWidget().setDrawable(GTUITextures.PICTURE_GAUGE)
9393
.setPos(79, 34)

‎src/main/java/com/hepdd/easytech/api/metatileentity/implementations/base/ETHFuelMultiBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ protected void setProcessingLogicPower(ProcessingLogic logic) {
8080
public abstract void construct(ItemStack stackSize, boolean hintsOnly);
8181

8282
@Override
83-
public abstract IStructureDefinition getStructureDefinition();
83+
public abstract IStructureDefinition<T> getStructureDefinition();
8484

8585
@Override
8686
protected abstract MultiblockTooltipBuilder createTooltip();

‎src/main/java/com/hepdd/easytech/api/metatileentity/implementations/base/ETHVoidMinerBase.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
1010
import static gregtech.api.util.GTStructureUtility.ofFrame;
1111

12-
import java.util.*;
12+
import java.util.HashMap;
13+
import java.util.List;
14+
import java.util.Map;
1315
import java.util.function.Predicate;
1416
import java.util.stream.Collectors;
1517

@@ -38,7 +40,11 @@
3840
import com.gtnewhorizons.modularui.api.math.Pos2d;
3941
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
4042
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
41-
import com.gtnewhorizons.modularui.common.widget.*;
43+
import com.gtnewhorizons.modularui.common.widget.ButtonWidget;
44+
import com.gtnewhorizons.modularui.common.widget.DynamicPositionedColumn;
45+
import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
46+
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
47+
import com.gtnewhorizons.modularui.common.widget.TextWidget;
4248

4349
import bwcrossmod.galacticgreg.VoidMinerUtility;
4450
import gregtech.api.GregTechAPI;
@@ -119,7 +125,7 @@ protected IStructureDefinition<ETHVoidMinerBase> computeValue(Class<?> type) {
119125
private VoidMinerUtility.DropMap extraDropMap = null;
120126
private float totalWeight;
121127
private int multiplier = 1;
122-
private int oreType = 0; // 0: rawOre 1: OreBlock
128+
private int oreType = 0; // 0: rawOre 1: OreBlock
123129

124130
private boolean mBlacklist = false;
125131

‎src/main/java/com/hepdd/easytech/common/tileentities/machines/multi/ETHElectricVoidMiners.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package com.hepdd.easytech.common.tileentities.machines.multi;
22

3+
import net.minecraft.item.ItemStack;
4+
35
import com.hepdd.easytech.api.metatileentity.implementations.base.ETHVoidMinerBase;
46

57
import gregtech.api.GregTechAPI;
6-
import gregtech.api.enums.GTValues;
78
import gregtech.api.enums.ItemList;
89
import gregtech.api.enums.Materials;
910
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
1011
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
1112
import gregtech.api.util.GTUtility;
12-
import net.minecraft.item.ItemStack;
1313

1414
public class ETHElectricVoidMiners {
1515

@@ -38,9 +38,9 @@ public void setElectricityStats() {
3838
this.mOutputItems = new ItemStack[0];
3939
this.mProgresstime = 0;
4040
this.mMaxProgresstime = 10; // 0.5s
41-
this.mEUt = -32; //32eu/t
41+
this.mEUt = -32; // 32eu/t
4242
setMultiplier(2);
43-
setOreType(1); // OreBlock
43+
setOreType(1); // OreBlock
4444
}
4545

4646
@Override
@@ -79,9 +79,9 @@ public void setElectricityStats() {
7979
this.mOutputItems = new ItemStack[0];
8080
this.mProgresstime = 0;
8181
this.mMaxProgresstime = 10; // 0.5s
82-
this.mEUt = -512; // 512eu/t
82+
this.mEUt = -512; // 512eu/t
8383
setMultiplier(4);
84-
setOreType(1); // OreBlock
84+
setOreType(1); // OreBlock
8585
}
8686

8787
@Override
@@ -120,9 +120,9 @@ public void setElectricityStats() {
120120
this.mOutputItems = new ItemStack[0];
121121
this.mProgresstime = 0;
122122
this.mMaxProgresstime = 10; // 0.5s
123-
this.mEUt = -8192; // 8192eu/t
123+
this.mEUt = -8192; // 8192eu/t
124124
setMultiplier(8);
125-
setOreType(1); // OreBlock
125+
setOreType(1); // OreBlock
126126
}
127127

128128
@Override

‎src/main/java/com/hepdd/easytech/common/tileentities/machines/multi/ETHPrimitiveVoidMiner.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import static com.hepdd.easytech.api.enums.ETHTextures.MACHINE_CASING_VOID_MINER_WOOD;
44

5-
import java.util.*;
5+
import java.util.ArrayList;
6+
import java.util.Arrays;
7+
import java.util.List;
68
import java.util.stream.Collectors;
79

810
import net.minecraft.item.ItemStack;

‎src/main/java/com/hepdd/easytech/common/tileentities/machines/multi/ETHSteamVoidMiner.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package com.hepdd.easytech.common.tileentities.machines.multi;
22

3+
import net.minecraft.item.ItemStack;
4+
35
import com.hepdd.easytech.api.metatileentity.implementations.base.ETHVoidMinerBase;
46

57
import gregtech.api.enums.ItemList;
68
import gregtech.api.enums.Materials;
79
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
810
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
911
import gregtech.api.util.GTUtility;
10-
import net.minecraft.item.ItemStack;
1112

1213
public class ETHSteamVoidMiner extends ETHVoidMinerBase {
1314

@@ -34,13 +35,13 @@ public void setElectricityStats() {
3435
this.mOutputItems = new ItemStack[0];
3536
this.mProgresstime = 0;
3637
this.mMaxProgresstime = 20; // 1s
37-
this.mEUt = -80; // 80mB Steam/t
38+
this.mEUt = -80; // 80mB Steam/t
3839
setMultiplier(4);
3940
}
4041

4142
@Override
4243
public int getCasingTextureIndex() {
43-
return GTUtility.getCasingTextureIndex(ItemList.Hull_Bronze.getBlock(),0);
44+
return GTUtility.getCasingTextureIndex(ItemList.Hull_Bronze.getBlock(), 0);
4445
}
4546

4647
@Override

‎src/main/java/com/hepdd/easytech/loaders/preload/ETHLoaderMetaTileEntities.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
import com.hepdd.easytech.api.metatileentity.implementations.ETHPrimitiveHatchInputBus;
66
import com.hepdd.easytech.api.metatileentity.implementations.ETHPrimitiveHatchOutput;
77
import com.hepdd.easytech.api.metatileentity.implementations.ETHPrimitiveHatchOutputBus;
8-
import com.hepdd.easytech.common.tileentities.machines.multi.*;
9-
import com.hepdd.easytech.common.tileentities.machines.multi.ETHElectricVoidMiners.*;
8+
import com.hepdd.easytech.common.tileentities.machines.multi.ETHElectricVoidMiners;
9+
import com.hepdd.easytech.common.tileentities.machines.multi.ETHLargeBlastFurnace;
10+
import com.hepdd.easytech.common.tileentities.machines.multi.ETHLargeCokeOven;
11+
import com.hepdd.easytech.common.tileentities.machines.multi.ETHPrimitiveVoidMiner;
12+
import com.hepdd.easytech.common.tileentities.machines.multi.ETHSteamVoidMiner;
1013

1114
import gregtech.api.enums.ItemList;
1215
import gregtech.api.enums.Textures;
@@ -68,14 +71,14 @@ private static void registerMultiblockControllers() {
6871
ETHItemList.Machine_Steam_Void_Miner
6972
.set(new ETHSteamVoidMiner(intMachineID++, "multimachine.steamvoidminer", "蒸汽虚空矿机").getStackForm(1L));
7073

71-
ETHItemList.Machine_LV_Void_Miner
72-
.set(new EVMLV(intMachineID++, "multimachine.lvvoidminer", "低压虚空矿机").getStackForm(1L));
74+
ETHItemList.Machine_LV_Void_Miner.set(
75+
new ETHElectricVoidMiners.EVMLV(intMachineID++, "multimachine.lvvoidminer", "低压虚空矿机").getStackForm(1L));
7376

74-
ETHItemList.Machine_HV_Void_Miner
75-
.set(new EVMHV(intMachineID++, "multimachine.hvvoidminer", "高压虚空矿机").getStackForm(1L));
77+
ETHItemList.Machine_HV_Void_Miner.set(
78+
new ETHElectricVoidMiners.EVMHV(intMachineID++, "multimachine.hvvoidminer", "高压虚空矿机").getStackForm(1L));
7679

77-
ETHItemList.Machine_IV_Void_Miner
78-
.set(new EVMIV(intMachineID++, "multimachine.ivvoidminer", "强导压虚空矿机").getStackForm(1L));
80+
ETHItemList.Machine_IV_Void_Miner.set(
81+
new ETHElectricVoidMiners.EVMIV(intMachineID++, "multimachine.ivvoidminer", "强导压虚空矿机").getStackForm(1L));
7982
}
8083

8184
private static void registerHatch() {

0 commit comments

Comments
 (0)