Skip to content

Commit 5122020

Browse files
Circulate233Circulate233
committed
狂乱！
1 parent 591a93b commit 5122020

3 files changed

Lines changed: 29 additions & 27 deletions

File tree

‎src/main/java/github/kasuminova/novaeng/common/machine/GeocentricDrill.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,39 +100,39 @@ private static void addGeocentricQuartzCrystalOre(final Map<String, ItemStack> r
100100
private static void addOres(final Map<String, ItemStack> rawOres) {
101101
List<ItemStack> dustDraconium = OreDictionary.getOres("dustDraconium", false);
102102
if (!dustDraconium.isEmpty()) {
103-
rawOres.put("dustDraconium", ItemUtils.copyStackWithSize(dustDraconium.get(0), ORE_COUNT));
103+
rawOres.put("dustDraconium", ItemUtils.copyStackWithSize(dustDraconium.getFirst(), ORE_COUNT));
104104
}
105105
List<ItemStack> blockSkyStone = OreDictionary.getOres("blockSkyStone", false);
106106
if (!blockSkyStone.isEmpty()) {
107-
rawOres.put("blockSkyStone", ItemUtils.copyStackWithSize(blockSkyStone.get(0), 8));
107+
rawOres.put("blockSkyStone", ItemUtils.copyStackWithSize(blockSkyStone.getFirst(), 8));
108108
}
109109
List<ItemStack> crystalLitherite = OreDictionary.getOres("crystalLitherite", false);
110110
if (!crystalLitherite.isEmpty()) {
111-
rawOres.put("crystalLitherite", ItemUtils.copyStackWithSize(crystalLitherite.get(0), 8));
111+
rawOres.put("crystalLitherite", ItemUtils.copyStackWithSize(crystalLitherite.getFirst(), 8));
112112
}
113113
List<ItemStack> crystalErodium = OreDictionary.getOres("crystalErodium", false);
114114
if (!crystalErodium.isEmpty()) {
115-
rawOres.put("crystalErodium", ItemUtils.copyStackWithSize(crystalErodium.get(0), 6));
115+
rawOres.put("crystalErodium", ItemUtils.copyStackWithSize(crystalErodium.getFirst(), 6));
116116
}
117117
List<ItemStack> crystalLonsdaleite = OreDictionary.getOres("crystalLonsdaleite", false);
118118
if (!crystalLonsdaleite.isEmpty()) {
119-
rawOres.put("crystalLonsdaleite", ItemUtils.copyStackWithSize(crystalLonsdaleite.get(0), 4));
119+
rawOres.put("crystalLonsdaleite", ItemUtils.copyStackWithSize(crystalLonsdaleite.getFirst(), 4));
120120
}
121121
List<ItemStack> crystalKyronite = OreDictionary.getOres("crystalKyronite", false);
122122
if (!crystalKyronite.isEmpty()) {
123-
rawOres.put("crystalKyronite", ItemUtils.copyStackWithSize(crystalKyronite.get(0), 4));
123+
rawOres.put("crystalKyronite", ItemUtils.copyStackWithSize(crystalKyronite.getFirst(), 4));
124124
}
125125
List<ItemStack> crystalPladium = OreDictionary.getOres("crystalPladium", false);
126126
if (!crystalPladium.isEmpty()) {
127-
rawOres.put("crystalPladium", ItemUtils.copyStackWithSize(crystalPladium.get(0), 4));
127+
rawOres.put("crystalPladium", ItemUtils.copyStackWithSize(crystalPladium.getFirst(), 4));
128128
}
129129
List<ItemStack> crystalIonite = OreDictionary.getOres("crystalIonite", false);
130130
if (!crystalIonite.isEmpty()) {
131-
rawOres.put("crystalIonite", ItemUtils.copyStackWithSize(crystalIonite.get(0), 4));
131+
rawOres.put("crystalIonite", ItemUtils.copyStackWithSize(crystalIonite.getFirst(), 4));
132132
}
133133
List<ItemStack> crystalAethium = OreDictionary.getOres("crystalAethium", false);
134134
if (!crystalAethium.isEmpty()) {
135-
rawOres.put("crystalAethium", ItemUtils.copyStackWithSize(crystalAethium.get(0), 2));
135+
rawOres.put("crystalAethium", ItemUtils.copyStackWithSize(crystalAethium.getFirst(), 2));
136136
}
137137
rawOres.put("glowstone_dust", new ItemStack(Items.GLOWSTONE_DUST, 24));
138138
}
@@ -148,7 +148,7 @@ public void preInit(final DynamicMachine machine) {
148148
.forEach(oreName -> {
149149
NonNullList<ItemStack> ores = OreDictionary.getOres(oreName);
150150
if (!ores.isEmpty() && !oreName.equals("rawOreAluminium")) {
151-
ItemStack stack = ores.get(0).copy();
151+
ItemStack stack = ores.getFirst().copy();
152152
stack.setCount(ORE_COUNT);
153153
rawOres.put(oreName, stack);
154154
}

‎src/main/java/github/kasuminova/novaeng/common/machine/MMAltar.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -522,9 +522,7 @@ object MMAltar : MachineSpecial {
522522
t = this.world.getTileEntity(this.pos.offset(EnumFacing.DOWN, 4)) as? TileAltar
523523
} else return t
524524
if (t != null) {
525-
synchronized(MMAltar) {
526-
chace.put(this, t)
527-
}
525+
chace[this] = t
528526
}
529527
return t
530528
}

‎src/main/java/github/kasuminova/novaeng/common/tile/TileDreamEnergyPort.java‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,16 @@ public double getEnergyScopeSq() {
111111
@SuppressWarnings("ReturnOfInnerClass")
112112
public final class DreamenergyHandler implements IEnergyHandler {
113113

114-
private static final BigInteger max = BigDecimal.valueOf(1.0E256d).toBigInteger();
114+
private static final BigInteger max = BigDecimal.valueOf(Double.MAX_VALUE).toBigInteger();
115+
private static final byte SUCCEEDED = 1;
116+
private static final byte FAILED = 2;
115117
private final EnergyAmount receive = EnergyAmount.obtain(0);
116118
private final EnergyAmount send = EnergyAmount.obtain(0);
117119
private final EnergyAmount canSend = EnergyAmount.obtain(0);
118-
private boolean init = false;
120+
private byte init = 0;
119121

120122
@Override
121123
public IEnergyHandler init(TileEntity tileEntity, HubNode.HubMetadata hubMetadata) {
122-
if (getCtrlStructureFormed()) {
123-
canSend.init(DreamEnergyCore.getEnergyStoredString(getCtrl()));
124-
init = true;
125-
} else init = false;
126124
return this;
127125
}
128126

@@ -133,15 +131,15 @@ public IEnergyHandler init(ItemStack itemStack, HubNode.HubMetadata hubMetadata)
133131

134132
@Override
135133
public void clear() {
136-
if (init) {
134+
if (init == SUCCEEDED) {
137135
var ctrl = getCtrl();
138136
DreamEnergyCore.extractEnergy(ctrl, send.asBigInteger());
139137
DreamEnergyCore.receiveEnergy(ctrl, receive.asBigInteger());
140-
canSend.setZero();
141-
receive.setZero();
142-
send.setZero();
143-
init = false;
144138
}
139+
canSend.setZero();
140+
receive.setZero();
141+
send.setZero();
142+
init = 0;
145143
}
146144

147145
@Override
@@ -169,15 +167,15 @@ public EnergyAmount canReceiveValue(HubNode.HubMetadata hubMetadata) {
169167

170168
@Override
171169
public boolean canExtract(IEnergyHandler iEnergyHandler, HubNode.HubMetadata hubMetadata) {
172-
if (!init) {
170+
if (init != SUCCEEDED) {
173171
return false;
174172
}
175173
return canSend.compareTo(0) > 0;
176174
}
177175

178176
@Override
179177
public boolean canReceive(IEnergyHandler iEnergyHandler, HubNode.HubMetadata hubMetadata) {
180-
return init;
178+
return init == SUCCEEDED;
181179
}
182180

183181
@Override
@@ -187,7 +185,13 @@ public void recycle() {
187185

188186
@Override
189187
public EnergyType getType(HubNode.HubMetadata hubMetadata) {
190-
if (init) {
188+
if (init == 0) {
189+
if (getCtrlStructureFormed()) {
190+
canSend.init(DreamEnergyCore.getEnergyStoredString(getCtrl()));
191+
init = SUCCEEDED;
192+
} else init = FAILED;
193+
}
194+
if (init == SUCCEEDED) {
191195
return EnergyType.STORAGE;
192196
}
193197
return EnergyType.INVALID;

0 commit comments

Comments
 (0)