lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1553 from Phil-M-H/gate-of-the-fold

Browse source 
Gate of the fold Fixes and minor clean up
closes #1512
This commit is contained in:
Tobias 2020-12-30 20:40:24 +01:00 committed by GitHub
parent f98887b05b 4248d04263
commit d4d71864cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java
View file

@ -76,27 +76,22 @@ public class BlockDimensionalPortal extends BlockInteger {
if (!world.isRemote && world.getTileEntity(pos) instanceof TileDimensionalPortal) { if (!world.isRemote && world.getTileEntity(pos) instanceof TileDimensionalPortal) {
TileDimensionalPortal tile = (TileDimensionalPortal) world.getTileEntity(pos); TileDimensionalPortal tile = (TileDimensionalPortal) world.getTileEntity(pos);
if (LocationsHandler.getLocationsHandler() != null) { ArrayList<PortalLocation> linkedLocations = LocationsHandler.getLinkedLocations(tile.portalID);
ArrayList<PortalLocation> linkedLocations = LocationsHandler.getLocationsHandler().getLinkedLocations(tile.portalID);
if (linkedLocations != null && !linkedLocations.isEmpty() && linkedLocations.size() > 1) { if (linkedLocations != null && linkedLocations.size() > 1) {
if (world.getTileEntity(tile.getMasterStonePos()) != null && world.getTileEntity(tile.getMasterStonePos()) instanceof IMasterRitualStone) { TileEntity tileEntity = world.getTileEntity(tile.getMasterStonePos());
IMasterRitualStone masterRitualStone = (IMasterRitualStone) world.getTileEntity(tile.getMasterStonePos()); if (tileEntity instanceof IMasterRitualStone) {
if (linkedLocations.get(0).equals(new PortalLocation(masterRitualStone.getBlockPos().up(), world.provider.getDimension()))) { IMasterRitualStone masterRitualStone = (IMasterRitualStone) tileEntity;
PortalLocation portal = linkedLocations.get(1); PortalLocation portal;
if (portal.getDimension() == world.provider.getDimension()) { int index = linkedLocations.size() - 1; //index of most recent PortalLocation
TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), false)); if (linkedLocations.get(index).equals(new PortalLocation(masterRitualStone.getBlockPos().up(), world.provider.getDimension())))
} else { index--; // if most recent PortalLocation = this, get the 2nd most recent
TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), world, portal.getDimension(), false)); portal = linkedLocations.get(index);
}
} else if (linkedLocations.get(1).equals(new PortalLocation(masterRitualStone.getBlockPos().up(), world.provider.getDimension()))) { if (portal.getDimension() == world.provider.getDimension()) {
PortalLocation portal = linkedLocations.get(0); TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), false));
if (portal.getDimension() == world.provider.getDimension()) { } else {
TeleportQueue.getInstance().addITeleport(new Teleports.TeleportSameDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), false)); TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), world, portal.getDimension(), false));
} else {
TeleportQueue.getInstance().addITeleport(new Teleports.TeleportToDim(portal.getX(), portal.getY(), portal.getZ(), entity, masterRitualStone.getOwner(), world, portal.getDimension(), false));
}
}
} }
} }
} }

47
src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java
View file

@ -9,39 +9,30 @@ import java.io.*;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
public class LocationsHandler implements Serializable { public final class LocationsHandler implements Serializable {
public static final long serialVersionUID = 10102001; public static final long serialVersionUID = 10102001;
private static final String fileName = String.valueOf(DimensionManager.getCurrentSaveRootDirectory()) + "/" + BloodMagic.MODID + "/PortalLocations.dat"; private static final String fileName = String.valueOf(DimensionManager.getCurrentSaveRootDirectory()) + "/" + BloodMagic.MODID + "/PortalLocations.dat";
private static HashMap<String, ArrayList<PortalLocation>> portals; private static HashMap<String, ArrayList<PortalLocation>> portals;
private static LocationsHandler locationsHandler; private static boolean initialized = false;
private LocationsHandler() {}
private LocationsHandler() { public static boolean addLocation(String name, PortalLocation location) {
portals = new HashMap<>();
}
public boolean addLocation(String name, PortalLocation location) {
ArrayList<PortalLocation> portalLocations = portals.get(name); ArrayList<PortalLocation> portalLocations = portals.get(name);
if (portalLocations == null) { if (portalLocations == null) {
portals.put(name, new ArrayList<>()); portals.put(name, new ArrayList<>());
updateFile(fileName, portals); updateFile(fileName, portals);
} }
if (!portals.get(name).isEmpty() && portals.get(name).size() >= 2) { portals.get(name).add(location);
BMLog.DEBUG.info("Location {} already exists.", name); BMLog.DEBUG.info("Adding {}", name);
updateFile(fileName, portals); updateFile(fileName, portals);
return false; return true;
} else {
portals.get(name).add(location);
BMLog.DEBUG.info("Adding {}", name);
updateFile(fileName, portals);
return true;
}
} }
public boolean removeLocation(String name, PortalLocation location) { public static boolean removeLocation(String name, PortalLocation location) {
if (portals.get(name) != null && !portals.get(name).isEmpty()) { if (portals.get(name) != null && !portals.get(name).isEmpty()) {
if (portals.get(name).contains(location)) { if (portals.get(name).remove(location)) {
portals.get(name).remove(location);
BMLog.DEBUG.info("Removing {}", name); BMLog.DEBUG.info("Removing {}", name);
updateFile(fileName, portals); updateFile(fileName, portals);
return true; return true;
@ -54,17 +45,17 @@ public class LocationsHandler implements Serializable {
return false; return false;
} }
public ArrayList<PortalLocation> getLinkedLocations(String name) { public static ArrayList<PortalLocation> getLinkedLocations(String name) {
return portals.get(name); return portals.get(name);
} }
public static LocationsHandler getLocationsHandler() { public static void verifyIsInitialized() {
if (locationsHandler == null || loadFile() == null) { if (!initialized) {
locationsHandler = new LocationsHandler(); HashMap<String, ArrayList<PortalLocation>> map = loadFile();
return locationsHandler; if(map == null) {
} else { portals = new HashMap<>();
portals = loadFile(); }
return locationsHandler; initialized = true;
} }
} }

12
src/main/java/WayofTime/bloodmagic/ritual/types/RitualPortal.java
View file

@ -86,11 +86,9 @@ public class RitualPortal extends Ritual {
} }
} }
} }
LocationsHandler.addLocation(name, new PortalLocation(x, y + 1, z, world.provider.getDimension()));
if (LocationsHandler.getLocationsHandler().addLocation(name, new PortalLocation(x, y + 1, z, world.provider.getDimension()))) { portalRitualTag.setString(PORTAL_ID_TAG, name);
portalRitualTag.setString(PORTAL_ID_TAG, name); return true;
return true;
}
} }
return false; return false;
} }
@ -152,7 +150,7 @@ public class RitualPortal extends Ritual {
int z = masterRitualStone.getBlockPos().getZ(); int z = masterRitualStone.getBlockPos().getZ();
EnumFacing direction = masterRitualStone.getDirection(); EnumFacing direction = masterRitualStone.getDirection();
LocationsHandler.getLocationsHandler().removeLocation(portalRitualTag.getString(PORTAL_ID_TAG), new PortalLocation(x, y + 1, z, world.provider.getDimension())); LocationsHandler.removeLocation(portalRitualTag.getString(PORTAL_ID_TAG), new PortalLocation(x, y + 1, z, world.provider.getDimension()));
if (direction == EnumFacing.NORTH || direction == EnumFacing.SOUTH) { if (direction == EnumFacing.NORTH || direction == EnumFacing.SOUTH) {
for (int i = x - 2; i <= x + 2; i++) { for (int i = x - 2; i <= x + 2; i++) {
@ -172,7 +170,7 @@ public class RitualPortal extends Ritual {
} }
} }
portalRitualTag.removeTag(PORTAL_ID_TAG); portalRitualTag.removeTag(portalRitualTag.getString(PORTAL_ID_TAG));
} }
@Override @Override

3
src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java
View file

@ -33,6 +33,7 @@ import WayofTime.bloodmagic.potion.PotionEventHandlers;
import WayofTime.bloodmagic.ritual.AreaDescriptor; import WayofTime.bloodmagic.ritual.AreaDescriptor;
import WayofTime.bloodmagic.ritual.IMasterRitualStone; import WayofTime.bloodmagic.ritual.IMasterRitualStone;
import WayofTime.bloodmagic.ritual.RitualManager; import WayofTime.bloodmagic.ritual.RitualManager;
import WayofTime.bloodmagic.ritual.portal.LocationsHandler;
import WayofTime.bloodmagic.ritual.types.RitualVeilOfEvil; import WayofTime.bloodmagic.ritual.types.RitualVeilOfEvil;
import WayofTime.bloodmagic.ritual.types.RitualWardOfSacrosanctity; import WayofTime.bloodmagic.ritual.types.RitualWardOfSacrosanctity;
import WayofTime.bloodmagic.soul.DemonWillHolder; import WayofTime.bloodmagic.soul.DemonWillHolder;
@ -552,6 +553,7 @@ public class GenericHandler {
preventSpawnMap.computeIfAbsent(world, k -> new HashMap<>()); preventSpawnMap.computeIfAbsent(world, k -> new HashMap<>());
PotionEventHandlers.flightListMap.computeIfAbsent(world, k -> new ArrayList<>()); PotionEventHandlers.flightListMap.computeIfAbsent(world, k -> new ArrayList<>());
PotionEventHandlers.noGravityListMap.computeIfAbsent(world, k -> new ArrayList<>()); PotionEventHandlers.noGravityListMap.computeIfAbsent(world, k -> new ArrayList<>());
LocationsHandler.verifyIsInitialized();
} }
@SubscribeEvent @SubscribeEvent
@ -566,4 +568,5 @@ public class GenericHandler {
PotionEventHandlers.flightListMap.remove(world); PotionEventHandlers.flightListMap.remove(world);
PotionEventHandlers.noGravityListMap.remove(world); PotionEventHandlers.noGravityListMap.remove(world);
} }
} }