diff --git a/src/main/java/org/dimdev/dimdoors/DimensionalDoorsInitializer.java b/src/main/java/org/dimdev/dimdoors/DimensionalDoorsInitializer.java index 9e5940b0..4c5975bf 100644 --- a/src/main/java/org/dimdev/dimdoors/DimensionalDoorsInitializer.java +++ b/src/main/java/org/dimdev/dimdoors/DimensionalDoorsInitializer.java @@ -96,6 +96,15 @@ public class DimensionalDoorsInitializer implements ModInitializer { server = minecraftServer; }); + Targets.registerDefaultTargets(); + VirtualTarget.VirtualTargetType.register(); + VirtualSingularPocket.VirtualSingularPocketType.register(); + Modifier.ModifierType.register(); + PocketGenerator.PocketGeneratorType.register(); + AbstractPocket.AbstractPocketType.register(); + PocketAddon.PocketAddonType.register(); + Condition.ConditionType.register(); + ModBlocks.init(); ModItems.init(); ModFeatures.init(); @@ -109,17 +118,6 @@ public class DimensionalDoorsInitializer implements ModInitializer { ModSoundEvents.init(); ModParticleTypes.init(); - Targets.registerDefaultTargets(); - VirtualTarget.VirtualTargetType.register(); - VirtualSingularPocket.VirtualSingularPocketType.register(); - Modifier.ModifierType.register(); - PocketGenerator.PocketGeneratorType.register(); - AbstractPocket.AbstractPocketType.register(); - PocketAddon.PocketAddonType.register(); - Condition.ConditionType.register(); - - DoorDataReader.read(); - ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(PocketLoader.getInstance()); ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("dimdoors", "default_pockets"), dimDoorsMod, ResourcePackActivationType.DEFAULT_ENABLED); diff --git a/src/main/java/org/dimdev/dimdoors/block/DimensionalPortalBlock.java b/src/main/java/org/dimdev/dimdoors/block/DimensionalPortalBlock.java index 4cedb8ff..58291caa 100644 --- a/src/main/java/org/dimdev/dimdoors/block/DimensionalPortalBlock.java +++ b/src/main/java/org/dimdev/dimdoors/block/DimensionalPortalBlock.java @@ -75,4 +75,9 @@ public class DimensionalPortalBlock extends Block implements RiftProvider extends BlockEntityProvider { T getRift(World world, BlockPos pos, BlockState state); + + default boolean isTall(BlockState cachedState) { + return false; + } } diff --git a/src/main/java/org/dimdev/dimdoors/block/door/DimensionalDoorBlock.java b/src/main/java/org/dimdev/dimdoors/block/door/DimensionalDoorBlock.java index 5bc0e092..c98bead3 100644 --- a/src/main/java/org/dimdev/dimdoors/block/door/DimensionalDoorBlock.java +++ b/src/main/java/org/dimdev/dimdoors/block/door/DimensionalDoorBlock.java @@ -1,5 +1,6 @@ package org.dimdev.dimdoors.block.door; +import net.minecraft.block.BlockRenderType; import net.minecraft.util.math.Vec3d; import org.dimdev.dimdoors.DimensionalDoorsInitializer; @@ -141,4 +142,9 @@ public class DimensionalDoorBlock extends DoorBlock implements RiftProvider) this.getCachedState().getBlock()).isTall(this.getCachedState()); } @Override diff --git a/src/main/java/org/dimdev/dimdoors/client/EntranceRiftBlockEntityRenderer.java b/src/main/java/org/dimdev/dimdoors/client/EntranceRiftBlockEntityRenderer.java index e1191ec1..ea526d39 100644 --- a/src/main/java/org/dimdev/dimdoors/client/EntranceRiftBlockEntityRenderer.java +++ b/src/main/java/org/dimdev/dimdoors/client/EntranceRiftBlockEntityRenderer.java @@ -1,6 +1,7 @@ package org.dimdev.dimdoors.client; import java.util.Collections; +import java.util.Random; import org.dimdev.dimdoors.block.entity.EntranceRiftBlockEntity; @@ -15,6 +16,7 @@ import net.minecraft.client.render.block.entity.BlockEntityRenderer; import net.minecraft.client.render.block.entity.EndPortalBlockEntityRenderer; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; +import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Matrix4f; import net.fabricmc.api.EnvType; @@ -27,17 +29,22 @@ public class EntranceRiftBlockEntityRenderer implements BlockEntityRenderer