fix SchematicGenerator offset

Author: CreepyCre

src/main/java/org/dimdev/dimdoors/pockets/SchematicV2Handler.java

@@ -67,7 +67,9 @@ public void load() {
     public Tag readNbtFromJson(String id) {
 		try {
 			Path path = Paths.get(SchematicV2Handler.class.getResource("/data/dimdoors/pockets/json/" + id + ".json").toURI());
-			if (!Files.isRegularFile(path)) return null;
+			if (!Files.isRegularFile(path)) {
+				return null;
+			}
 			try {
 				JsonElement json = GSON.fromJson(String.join("", Files.readAllLines(path)), JsonElement.class);
 				return JsonOps.INSTANCE.convertTo(NbtOps.INSTANCE, json);
@@ -123,7 +125,6 @@ private void loadPocketGenerator(String id, Tag tag) {
     		return;
 		}
 		PocketGenerator gen =  PocketGenerator.deserialize((CompoundTag) tag);
-    	LOGGER.info(id + ": "  + gen.toTag(new CompoundTag()));
 		if (gen != null) pocketGeneratorMap.put(id, gen);
 	}
 

src/main/java/org/dimdev/dimdoors/pockets/generator/PocketGenerator.java

@@ -21,22 +21,15 @@
 import org.dimdev.dimdoors.pockets.TemplateUtils;
 import org.dimdev.dimdoors.pockets.modifier.Modifier;
 import org.dimdev.dimdoors.pockets.modifier.RiftManager;
-import org.dimdev.dimdoors.rift.targets.IdMarker;
 import org.dimdev.dimdoors.util.Location;
 import org.dimdev.dimdoors.util.PocketGenerationParameters;
 import org.dimdev.dimdoors.util.Weighted;
 import org.dimdev.dimdoors.util.math.Equation;
 import org.dimdev.dimdoors.util.math.Equation.EquationParseException;
-import org.dimdev.dimdoors.world.level.DimensionalRegistry;
 import org.dimdev.dimdoors.world.pocket.Pocket;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 public abstract class PocketGenerator implements Weighted<PocketGenerationParameters> {
 	private static final Logger LOGGER = LogManager.getLogger();
@@ -170,9 +163,6 @@ public void setup(Pocket pocket, PocketGenerationParameters parameters, boolean
 		});
 		TemplateUtils.registerRifts(rifts, parameters.getLinkTo(), parameters.getLinkProperties(), pocket);
 
-		System.out.println("Printing Bullshit.");
-		DimensionalRegistry.getRiftRegistry().getPocketEntrances(pocket).forEach(System.out::println);
-
 		pocket.virtualLocation = parameters.getSourceVirtualLocation(); //TODO: this makes very little sense
 	}
 
@@ -217,6 +207,7 @@ public CompoundTag toTag(CompoundTag tag) {
 					return tag;
 				}
 			});
+
 		}
 	}
 }

src/main/java/org/dimdev/dimdoors/pockets/modifier/RiftDataModifier.java

@@ -27,7 +27,6 @@
 import org.dimdev.dimdoors.util.TagEquations;
 
 public class RiftDataModifier implements Modifier {
-	private static final Logger LOGGER = LogManager.getLogger();
 	public static final String KEY = "rift_data";
 
 	private CompoundTag doorData;
@@ -39,12 +38,10 @@ public Modifier fromTag(CompoundTag tag) {
 		if (tag.getType("rift_data") == NbtType.STRING) {
 			doorDataReference = tag.getString("rift_data");
 			doorData = (CompoundTag) SchematicV2Handler.getInstance().readNbtFromJson(doorDataReference);
-			LOGGER.info("Print Door bullshit: " + "\n" + doorData);
 		}
 		else if (tag.getType("rift_data") == NbtType.COMPOUND) doorData = tag.getCompound("rift_data");
 
 		ids = stream(tag.getByteArray("ids")).boxed().collect(Collectors.toList());
-		LOGGER.info("Checking bullshit 2 Electric Bugaloo: " + tag);
 		return this;
 	}
 
@@ -93,9 +90,6 @@ public void apply(PocketGenerationParameters parameters, RiftManager manager) {
 			CompoundTag solvedDoorData = TagEquations.solveCompoundTagEquations(doorData, variableMap);
 			RiftData data = RiftData.fromTag(solvedDoorData);
 
-			LOGGER.info("Dealing spefific bullshit.");
-			LOGGER.info(RiftData.toTag(data));
-			LOGGER.info(solvedDoorData);
 			riftBlockEntityConsumer = rift -> rift.setData(data);
 		}
 

src/main/java/org/dimdev/dimdoors/pockets/modifier/RiftManager.java

@@ -1,6 +1,8 @@
 package org.dimdev.dimdoors.pockets.modifier;
 
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.BiPredicate;
 import java.util.function.Function;
@@ -21,7 +23,7 @@ public RiftManager(Pocket pocket) {
 		map = pocket.getBlockEntities().values().stream()
 				.filter(RiftBlockEntity.class::isInstance).map(RiftBlockEntity.class::cast)
 				.filter(a -> a.getData().getDestination() instanceof IdMarker)
-				.filter(a -> ((IdMarker) a.getData().getDestination()).getId() < 0)
+				.filter(a -> ((IdMarker) a.getData().getDestination()).getId() >= 0)
 				.collect(Collectors.toMap(rift -> ((IdMarker) rift.getData().getDestination()).getId(), rift -> rift));
 		maxId = map.keySet().stream()
 				.mapToInt(a -> a)
@@ -67,7 +69,7 @@ public boolean available(int id) { // TODO: remove? method is likely redundant
 	}
 
 	public void foreachConsume(BiPredicate<Integer, RiftBlockEntity> consumer) {
-		for(int id : map.keySet()) {
+		for(int id : new HashSet<>(map.keySet())) {
 			if(consumer.test(id, map.get(id))) {
 				map.remove(id);
 			}