From 9aae18a623c9e0371f679fb289ab4197b6740313 Mon Sep 17 00:00:00 2001
From: SD <harrypotter.starwars.shrish@gmail.com>
Date: Fri, 12 Feb 2021 10:48:21 +0530
Subject: [PATCH] UPPER -> LOWER

---
 build.gradle                                                 | 2 +-
 .../java/org/dimdev/dimdoors/block/DimensionalDoorBlock.java | 2 +-
 .../org/dimdev/dimdoors/item/RiftConfigurationToolItem.java  | 4 ++--
 .../java/org/dimdev/dimdoors/pockets/PocketTemplate.java     | 5 ++---
 src/main/java/org/dimdev/dimdoors/world/level/Counter.java   | 4 ++++
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8fbc67e1..7d9a29ce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -88,7 +88,7 @@ dependencies {
 	includeCompile("com.flowpowered", "flow-math", "1.0.3")
 	includeCompile("org.jgrapht", "jgrapht-core", "1.1.0")
 	includeCompile("com.github.DimensionalDevelopment", "poly2tri.java", "0.1.1")
-	includeCompile("io.github.BoogieMonster1O1", "OpenWorlds", "d487eaa")
+	includeCompile("io.github.BoogieMonster1O1", "OpenWorlds", "c57e3ef")
 	includeCompile("io.github.cottonmc", "LibGui", "3.3.2+1.16.4")
 	includeCompile("me.shedaniel.cloth", "config-2", "5.0.0")
 	includeCompile("io.github.onyxstudios", "Cardinal-Components-API", "3.0.0-nightly.20w48a")
diff --git a/src/main/java/org/dimdev/dimdoors/block/DimensionalDoorBlock.java b/src/main/java/org/dimdev/dimdoors/block/DimensionalDoorBlock.java
index 4012f97e..f3ead3d0 100644
--- a/src/main/java/org/dimdev/dimdoors/block/DimensionalDoorBlock.java
+++ b/src/main/java/org/dimdev/dimdoors/block/DimensionalDoorBlock.java
@@ -58,7 +58,7 @@ public class DimensionalDoorBlock extends DoorBlock implements RiftProvider<Entr
 	@Nullable
 	@Override
 	public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
-		if (state.get(DoorBlock.HALF) == DoubleBlockHalf.LOWER) {
+		if (state.get(DoorBlock.HALF) == DoubleBlockHalf.UPPER) {
 			return null;
 		}
 		return new EntranceRiftBlockEntity(pos, state);
diff --git a/src/main/java/org/dimdev/dimdoors/item/RiftConfigurationToolItem.java b/src/main/java/org/dimdev/dimdoors/item/RiftConfigurationToolItem.java
index a1298901..ef005552 100644
--- a/src/main/java/org/dimdev/dimdoors/item/RiftConfigurationToolItem.java
+++ b/src/main/java/org/dimdev/dimdoors/item/RiftConfigurationToolItem.java
@@ -121,7 +121,7 @@ public class RiftConfigurationToolItem extends Item {
 					EntityUtils.chat(player, Text.of("Rift stripped of data and set to invalid id: -1"));
 				}
 			} else if (Counter.get(stack).count() != -1) {
-				Counter.get(stack).set(-1);
+//				Counter.get(stack).set(-1); TODO
 				((RiftConfigurationToolItem) stack.getItem()).sync(stack, player, hand);
 
 				EntityUtils.chat(player, Text.of("Counter has been reset."));
@@ -141,7 +141,7 @@ public class RiftConfigurationToolItem extends Item {
 	@Override
 	public ItemStack getDefaultStack() {
 		ItemStack defaultStack = super.getDefaultStack();
-		Counter.get(defaultStack).set(-1);
+//		Counter.get(defaultStack).set(-1); TODO
 		return defaultStack;
 	}
 
diff --git a/src/main/java/org/dimdev/dimdoors/pockets/PocketTemplate.java b/src/main/java/org/dimdev/dimdoors/pockets/PocketTemplate.java
index 70593c08..d8f234dd 100644
--- a/src/main/java/org/dimdev/dimdoors/pockets/PocketTemplate.java
+++ b/src/main/java/org/dimdev/dimdoors/pockets/PocketTemplate.java
@@ -90,16 +90,15 @@ public class PocketTemplate {
                 BlockState state = schematic.palette.get(schematic.blockData[x][y][z]);
 
                 CompoundTag newNBT = new CompoundTag();
-                EntranceRiftBlockEntity rift = ModBlockEntityTypes.ENTRANCE_RIFT.instantiate();
+                EntranceRiftBlockEntity rift = ModBlockEntityTypes.ENTRANCE_RIFT.instantiate(new BlockPos(x, y, z), state);
 
                 String placeholder = tileEntityNBT.getString("placeholder");
 
                 if(placeholderMap.containsKey(placeholder)) {
-                    rift.setPos(new BlockPos(x, y, z));
                     placeholderMap.get(placeholder).accept(rift);
                     newNBT = rift.toTag(newNBT);
                 } else
-                    throw new RuntimeException("Unknown tile entity placeholder: " + tileEntityNBT.getString("placeholder"));
+                    throw new RuntimeException("Unknown block entity placeholder: " + tileEntityNBT.getString("placeholder"));
 
                 // TODO: allow overriding some placeholder properties by copying other properties (not placeholder and x/y/z) to the new nbt
                 tileEntities.add(newNBT);
diff --git a/src/main/java/org/dimdev/dimdoors/world/level/Counter.java b/src/main/java/org/dimdev/dimdoors/world/level/Counter.java
index ccf2549d..fcf9056c 100644
--- a/src/main/java/org/dimdev/dimdoors/world/level/Counter.java
+++ b/src/main/java/org/dimdev/dimdoors/world/level/Counter.java
@@ -18,6 +18,10 @@ public class Counter implements Component {
 		return this.counter;
 	}
 
+	public int count() {
+		return this.counter;
+	}
+
 	public static <T> Counter get(T provider) {
 		return DimensionalDoorsComponents.COUNTER_COMPONENT_KEY.get(provider);
 	}