mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Lava can no longer be used as a coolant for reactors

Browse Source
This commit is contained in:
TheBusyBiscuit 2020-06-01 14:02:49 +02:00
parent 2f09470b51
commit f65ac6b68c
2 changed files with 56 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -25,10 +25,14 @@
* Added Bone Blocks recipe to the Electric Press
* Added thai translations
#### Changes
* Fixed a few memory leaks
#### Fixes
* Fixed Ore Washer recipes showing up twice
* Fixed #1942
* Fixed #1943
* Fixed Nuclear Reactors accepting Lava as coolant
## Release Candidate 12 (27 May 2020)

85
src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java
View File

@ -11,6 +11,7 @@ import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import io.github.thebusybiscuit.cscorelib2.item.CustomItem;
@ -53,7 +54,7 @@ public abstract class AReactor extends AbstractEnergyGenerator {
public static Map<Location, MachineFuel> processing = new HashMap<>();
public static Map<Location, Integer> progress = new HashMap<>();
private static final BlockFace[] cooling = { BlockFace.NORTH, BlockFace.NORTH_EAST, BlockFace.EAST, BlockFace.SOUTH_EAST, BlockFace.SOUTH, BlockFace.SOUTH_WEST, BlockFace.WEST, BlockFace.NORTH_WEST };
private static final BlockFace[] coolantBlocks = { BlockFace.NORTH, BlockFace.NORTH_EAST, BlockFace.EAST, BlockFace.SOUTH_EAST, BlockFace.SOUTH, BlockFace.SOUTH_WEST, BlockFace.WEST, BlockFace.NORTH_WEST };
private static final int[] border = { 0, 1, 2, 3, 5, 6, 7, 8, 12, 13, 14, 21, 23 };
private static final int[] border_1 = { 9, 10, 11, 18, 20, 27, 29, 36, 38, 45, 46, 47 };
@ -276,44 +277,19 @@ public abstract class AReactor extends AbstractEnergyGenerator {
progress.put(l, timeleft - 1);
Slimefun.runSync(() -> {
if (!l.getBlock().getRelative(cooling[ThreadLocalRandom.current().nextInt(cooling.length)]).isLiquid()) {
// We will pick a surrounding block at random and see if this is water.
// If it isn't, then we will make it explode.
BlockFace randomNeighbour = coolantBlocks[ThreadLocalRandom.current().nextInt(coolantBlocks.length)];
if (l.getBlock().getRelative(randomNeighbour).getType() != Material.WATER) {
explode.add(l);
}
});
ChestMenuUtils.updateProgressbar(menu, 22, timeleft, processing.get(l).getTicks(), getProgressBar());
if (needsCooling()) {
boolean coolant = (processing.get(l).getTicks() - timeleft) % 25 == 0;
if (coolant) {
if (port != null) {
for (int slot : getCoolantSlots()) {
if (SlimefunUtils.isItemSimilar(port.getItemInSlot(slot), getCoolant(), true)) {
port.replaceExistingItem(slot, menu.pushItem(port.getItemInSlot(slot), getCoolantSlots()));
}
}
}
boolean explosion = true;
for (int slot : getCoolantSlots()) {
if (SlimefunUtils.isItemSimilar(menu.getItemInSlot(slot), getCoolant(), true)) {
menu.consumeItem(slot);
ReactorHologram.update(l, "&b\u2744 &7100%");
explosion = false;
break;
}
}
if (explosion) {
explode.add(l);
return 0;
}
}
else {
ReactorHologram.update(l, "&b\u2744 &7" + getPercentage(timeleft, processing.get(l).getTicks()) + "%");
}
if (needsCooling() && !isProperlyCooled(l, menu, port, timeleft)) {
explode.add(l);
return 0;
}
}
@ -385,6 +361,49 @@ public abstract class AReactor extends AbstractEnergyGenerator {
};
}
/**
* This method cools the given {@link AReactor}.
*
* @param reactor
* The {@link Location} of this {@link AReactor}
* @param menu
* The {@link Inventory} of this {@link AReactor}
* @param port
* The {@link ReactorAccessPort}, if available
* @param timeleft
* The time left
*
* @return Whether the {@link AReactor} was successfully cooled, if not it should explode
*/
private boolean isProperlyCooled(Location reactor, BlockMenu menu, BlockMenu port, int timeleft) {
boolean coolant = (processing.get(reactor).getTicks() - timeleft) % 25 == 0;
if (coolant) {
if (port != null) {
for (int slot : getCoolantSlots()) {
if (SlimefunUtils.isItemSimilar(port.getItemInSlot(slot), getCoolant(), true)) {
port.replaceExistingItem(slot, menu.pushItem(port.getItemInSlot(slot), getCoolantSlots()));
}
}
}
for (int slot : getCoolantSlots()) {
if (SlimefunUtils.isItemSimilar(menu.getItemInSlot(slot), getCoolant(), true)) {
menu.consumeItem(slot);
ReactorHologram.update(reactor, "&b\u2744 &7100%");
return true;
}
}
return false;
}
else {
ReactorHologram.update(reactor, "&b\u2744 &7" + getPercentage(timeleft, processing.get(reactor).getTicks()) + "%");
}
return true;
}
private float getPercentage(int time, int total) {
int passed = ((total - time) % 25);
return Math.round(((((25 - passed) * 100.0F) / 25) * 100.0F) / 100.0F);