diff --git a/src/main/java/org/dimdev/dimdoors/block/entity/EntranceRiftBlockEntity.java b/src/main/java/org/dimdev/dimdoors/block/entity/EntranceRiftBlockEntity.java index e94a1bcf..ba83f11d 100644 --- a/src/main/java/org/dimdev/dimdoors/block/entity/EntranceRiftBlockEntity.java +++ b/src/main/java/org/dimdev/dimdoors/block/entity/EntranceRiftBlockEntity.java @@ -2,32 +2,29 @@ package org.dimdev.dimdoors.block.entity; import java.util.Optional; -import net.minecraft.block.Block; -import net.minecraft.entity.LivingEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.TranslatableText; -import net.minecraft.util.JsonHelper; -import net.minecraft.util.math.EulerAngle; import org.dimdev.dimdoors.DimensionalDoorsInitializer; import org.dimdev.dimdoors.block.CoordinateTransformerBlock; import org.dimdev.dimdoors.item.RiftKeyItem; import org.dimdev.dimdoors.rift.registry.Rift; import org.dimdev.dimdoors.util.EntityUtils; import org.dimdev.dimdoors.util.TeleportUtil; +import org.dimdev.dimdoors.util.math.TransformationMatrix3d; +import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.DoorBlock; import net.minecraft.block.HorizontalFacingBlock; import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.text.TranslatableText; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.EulerAngle; import net.minecraft.util.math.Vec3d; -import org.dimdev.dimdoors.util.math.TransformationMatrix3d; -import org.dimdev.dimdoors.world.level.component.RiftKeyIdsComponent; -import org.lwjgl.system.CallbackI; public class EntranceRiftBlockEntity extends RiftBlockEntity { private boolean locked; diff --git a/src/main/java/org/dimdev/dimdoors/item/RiftKeyItem.java b/src/main/java/org/dimdev/dimdoors/item/RiftKeyItem.java index 64c38a11..d8b9e127 100644 --- a/src/main/java/org/dimdev/dimdoors/item/RiftKeyItem.java +++ b/src/main/java/org/dimdev/dimdoors/item/RiftKeyItem.java @@ -112,8 +112,9 @@ public class RiftKeyItem extends Item { } public static void add(ItemStack stack, UUID id) { - IntArrayTag arrayTag = new IntArrayTag(DynamicSerializableUuid.toIntArray(id)); - if (!has(stack, id)) stack.getOrCreateTag().getList("Ids", NbtType.LIST).add(arrayTag); + if (!has(stack, id)) { + stack.getOrCreateTag().getList("Ids", NbtType.LIST).add(new IntArrayTag(DynamicSerializableUuid.toIntArray(id))); + } } public static boolean has(ItemStack stack, UUID id) { diff --git a/src/main/resources/data/dimdoors/dimension/limbo.json b/src/main/resources/data/dimdoors/dimension/limbo.json index 49d9d364..5a9a41fe 100644 --- a/src/main/resources/data/dimdoors/dimension/limbo.json +++ b/src/main/resources/data/dimdoors/dimension/limbo.json @@ -10,6 +10,7 @@ "bedrock_floor_position": 0, "bedrock_roof_position": -2147483648, "noise_caves_enabled": true, + "deepslate_enabled": false, "aquifers_enabled": false, "disable_mob_generation": false, "sea_level": 32, diff --git a/src/main/resources/data/dimdoors/loot_tables/blocks/iron_dimensional_door.json b/src/main/resources/data/dimdoors/loot_tables/blocks/iron_dimensional_door.json index 79d984f2..be30ea2a 100644 --- a/src/main/resources/data/dimdoors/loot_tables/blocks/iron_dimensional_door.json +++ b/src/main/resources/data/dimdoors/loot_tables/blocks/iron_dimensional_door.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "dimdoors:unstable_dimensional_door" + "name": "dimdoors:iron_dimensional_door" } ], "conditions": [ @@ -17,4 +17,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/src/main/resources/data/dimdoors/recipes/unstable_dimensional_door.json b/src/main/resources/data/dimdoors/recipes/unstable_dimensional_door.json deleted file mode 100644 index 9d883395..00000000 --- a/src/main/resources/data/dimdoors/recipes/unstable_dimensional_door.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "#X#" - ], - "key": { - "#": { - "item": "minecraft:iron_door" - }, - "X": { - "item": "minecraft:ender_eye" - } - }, - "result": { - "item": "dimdoors:unstable_dimensional_door", - "count": 1 - } -}