Merge from 1.20.2 into 1.20.1

build.gradle

@@ -13,7 +13,7 @@ buildscript {
 
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.10+" apply false
+    id "dev.architectury.loom" version "1.13+" apply false
     id "me.shedaniel.unified-publishing" version "0.1.+"
     id "com.github.breadmoirai.github-release" version "2.4.1"
 }

changelog.md

@@ -38,3 +38,10 @@
 - Bug fix: TARDIS removes forceloading when taking off and landing.
 - Bug fix: TARDIS takeoff sound plays from the interior door instead of the console.
 - Bug fix: Immersive Portals compatibility crashing the game on Forge.
+- Bug fix: Vortex not rendering in GUIs when Journeymap or Kilt is installed.
+- Bug fix: TARDIS cannot reach edges when moving in the vortex view on Forge.
+- Bug fix: Players can take damage or die while in shell view.
+- Bug fix: Players can receive new potion effects while in shell view.
+- Bug fix: Create TARDIS Summary does not display all lines correctly.
+- Bug fix: Crash when closing the game near a TARDIS Create display while Valkyrien Skies is installed.
+- Bug fix: Recently created TARDIS keeps printing "Preparing spawn area: 100%" every time a chunk loads until the server is restarted.

common/build.gradle

@@ -32,6 +32,7 @@ dependencies {
         transitive(false)
     }
 
+    modCompileOnly("com.simibubi.create:create-fabric-${minecraft_version}:${create_version_fabric}")
     modCompileOnly("maven.modrinth:valkyrien-skies:${minecraft_version}-fabric-${valkyrienskies_version}")
 
 }

common/src/main/java/whocraft/tardis_refined/TRConfig.java

@@ -39,13 +39,15 @@ public static class Client {
         public final ForgeConfigSpec.BooleanValue PLAY_CONSOLE_IDLE_ANIMATIONS;
         public final ForgeConfigSpec.BooleanValue RENDER_VORTEX_IN_DOOR;
         public final ForgeConfigSpec.BooleanValue USE_INTERNAL_SHADERS;
+        public final ForgeConfigSpec.DoubleValue SCREEN_SHAKE_MULTIPLIER;
 
         public Client(ForgeConfigSpec.Builder builder) {
             builder.push("rendering");
             CONTROL_NAMES = builder.comment("Toggle control name rendering").translation(ModMessages.CONFIG_CONTROL_NAMES).define("control_name_rendering", true);
             PLAY_CONSOLE_IDLE_ANIMATIONS = builder.comment("Play idle console animations").translation(ModMessages.CONFIG_IDLE_CONSOLE_ANIMS).define("console_idle_animations", true);
             RENDER_VORTEX_IN_DOOR = builder.comment("Skip Vortex rendering").translation(ModMessages.CONFIG_RENDER_VORTEX_IN_DOOR).define("render_vortex_in_door", true);
             USE_INTERNAL_SHADERS = builder.comment("Use Custom Internal Shaders").translation(ModMessages.CONFIG_CUSTOM_SHADERS).define("use_internal_shaders", true);
+            SCREEN_SHAKE_MULTIPLIER = builder.comment("Adjust the amount the game shakes the screen during travel").translation(ModMessages.SCREEN_SHAKE_MULTIPLIER).defineInRange("screen_shake_multiplier", 1d, 0, 2);
             builder.pop();
         }
     }

common/src/main/java/whocraft/tardis_refined/TardisRefined.java

@@ -20,6 +20,8 @@
 import whocraft.tardis_refined.common.tardis.themes.ShellTheme;
 import whocraft.tardis_refined.common.world.ChunkGenerators;
 import whocraft.tardis_refined.common.world.Features;
+import whocraft.tardis_refined.compat.ModCompatChecker;
+import whocraft.tardis_refined.compat.create.CreateIntergrationsInit;
 import whocraft.tardis_refined.patterns.ConsolePatterns;
 import whocraft.tardis_refined.patterns.ShellPatterns;
 import whocraft.tardis_refined.registry.*;
@@ -72,6 +74,10 @@ public static void init() {
 
         TRARSStructurePieceRegistry.register();
         //registerFallbackEntries();
+
+        if (ModCompatChecker.create()) {
+            CreateIntergrationsInit.init();
+        }
     }
 
     /**

common/src/main/java/whocraft/tardis_refined/client/ModelRegistry.java

@@ -1,9 +1,12 @@
 package whocraft.tardis_refined.client;
 
 import dev.architectury.injectables.annotations.ExpectPlatform;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.model.geom.EntityModelSet;
 import net.minecraft.client.model.geom.ModelLayerLocation;
 import net.minecraft.client.model.geom.builders.LayerDefinition;
 import net.minecraft.resources.ResourceLocation;
+import whocraft.tardis_refined.client.model.blockentity.life.ZeitonGlassModel;
 import whocraft.tardis_refined.common.util.PlatformWarning;
 
 import java.util.function.Supplier;
@@ -78,6 +81,7 @@ public class ModelRegistry {
     public static ModelLayerLocation BULK_HEAD_DOOR = interiorDoor("bulk_head_door");
 
     public static ModelLayerLocation ARTRON_PILLAR = createLocation("artron_pillar", "technology");
+    public static ModelLayerLocation ZEITON_GLASS = createLocation("zeiton_glass", "living");
 
     private static ModelLayerLocation interiorDoor(String name) {
         return createLocation(name, "door");
@@ -96,6 +100,16 @@ private static ModelLayerLocation createLocation(String name, String layer) {
         return new ModelLayerLocation(new ResourceLocation(MODID, name), layer);
     }
 
+    private static ZeitonGlassModel zeitonGlassModel;
+
+    public static ZeitonGlassModel getZeitonGlassModel() {
+        if (zeitonGlassModel == null) {
+            EntityModelSet entityModels = Minecraft.getInstance().getEntityModels();
+            zeitonGlassModel = new ZeitonGlassModel(entityModels.bakeLayer(ZEITON_GLASS));
+        }
+        return zeitonGlassModel;
+    }
+
     public static void init() {
 
     }

common/src/main/java/whocraft/tardis_refined/client/PoseStackExtension.java

@@ -0,0 +1,7 @@
+package whocraft.tardis_refined.client;
+
+public interface PoseStackExtension {
+
+    void tardis_refined$setUpdateZOffset(boolean updateOffset);
+
+}

common/src/main/java/whocraft/tardis_refined/client/TardisClientLogic.java

@@ -16,6 +16,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.phys.Vec3;
+import whocraft.tardis_refined.TRConfig;
 import whocraft.tardis_refined.client.sounds.HumSoundManager;
 import whocraft.tardis_refined.client.sounds.QuickSimpleSound;
 import whocraft.tardis_refined.client.sounds.TRSoundInstances;
@@ -274,12 +275,12 @@ private static void handleScreenShake(TardisClientData clientData, Player player
 
         if (player.level().dimension() == clientData.getLevelKey()) {
             if (clientData.isCrashing()) {
-                player.setXRot(player.getXRot() + (player.getRandom().nextFloat() - 0.5f) * 0.5f);
-                player.setYHeadRot(player.getYHeadRot() + (player.getRandom().nextFloat() - 0.5f) * 0.5f);
+                player.setXRot((float) (player.getXRot() + (player.getRandom().nextFloat() - 0.5f) * 0.5f * TRConfig.CLIENT.SCREEN_SHAKE_MULTIPLIER.get()));
+                player.setYHeadRot((float) (player.getYHeadRot() + (player.getRandom().nextFloat() - 0.5f) * 0.5f * TRConfig.CLIENT.SCREEN_SHAKE_MULTIPLIER.get()));
             } else {
                 if (clientData.isFlying()) {
-                    player.setXRot(player.getXRot() + (player.getRandom().nextFloat() - 0.5f) * (clientData.getThrottleStage() * 0.1f));
-                    player.setYHeadRot(player.getYHeadRot() + (player.getRandom().nextFloat() - 0.5f) * (clientData.getThrottleStage() * 0.1f));
+                    player.setXRot((float) (player.getXRot() + (player.getRandom().nextFloat() - 0.5f) * (clientData.getThrottleStage() * 0.1f)* TRConfig.CLIENT.SCREEN_SHAKE_MULTIPLIER.get()));
+                    player.setYHeadRot((float) (player.getYHeadRot() + (player.getRandom().nextFloat() - 0.5f) * (clientData.getThrottleStage() * 0.1f)* TRConfig.CLIENT.SCREEN_SHAKE_MULTIPLIER.get()));
                 }
             }
         }

common/src/main/java/whocraft/tardis_refined/client/ZeitonGlassTracker.java

@@ -0,0 +1,24 @@
+package whocraft.tardis_refined.client;
+
+import whocraft.tardis_refined.common.blockentity.life.ZeitonGlassBlockEntity;
+
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class ZeitonGlassTracker {
+    public static final Set<ZeitonGlassBlockEntity> loadedGlass = ConcurrentHashMap.newKeySet();
+
+    public static void onLoad(ZeitonGlassBlockEntity entity) {
+        loadedGlass.add(entity);
+    }
+
+    public static void onUnload(ZeitonGlassBlockEntity entity) {
+        loadedGlass.remove(entity);
+    }
+
+
+
+    public static void clear() {
+        loadedGlass.clear();
+    }
+}

common/src/main/java/whocraft/tardis_refined/client/model/blockentity/life/PortalModel.java

@@ -0,0 +1,9 @@
+package whocraft.tardis_refined.client.model.blockentity.life;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.minecraft.world.level.block.entity.BlockEntity;
+
+public interface PortalModel<T extends BlockEntity> {
+    void renderPortalMask(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha);
+}

common/src/main/java/whocraft/tardis_refined/client/model/blockentity/life/ZeitonGlassModel.java

@@ -0,0 +1,34 @@
+package whocraft.tardis_refined.client.model.blockentity.life;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.minecraft.client.model.EntityModel;
+import net.minecraft.client.model.geom.ModelPart;
+import net.minecraft.world.entity.Entity;
+import whocraft.tardis_refined.common.blockentity.life.ZeitonGlassBlockEntity;
+
+public class ZeitonGlassModel extends EntityModel implements PortalModel<ZeitonGlassBlockEntity> {
+
+    private final ModelPart root;
+
+    public ZeitonGlassModel(ModelPart root) {
+        this.root = root;
+    }
+
+    @Override
+    public void renderPortalMask(PoseStack poseStack, VertexConsumer buffer, int packedLight, int packedOverlay, float red, float green, float blue, float alpha) {
+        root.render(poseStack, buffer, packedLight, packedOverlay, red, green, blue, alpha);
+    }
+
+    @Override
+    public void renderToBuffer(PoseStack poseStack, VertexConsumer vertexConsumer, int packedLight, int packedOverlay,
+                               float red, float green, float blue, float alpha) {
+        root.render(poseStack, vertexConsumer, packedLight, packedOverlay, red, green, blue, alpha);
+    }
+
+
+    @Override
+    public void setupAnim(Entity entity, float f, float g, float h, float i, float j) {
+
+    }
+}

common/src/main/java/whocraft/tardis_refined/client/model/blockentity/shell/ShellModelCollection.java

@@ -83,7 +83,7 @@ public void registerModels(EntityModelSet context) {
         bigBenDoorModel = new SingleInteriorDoorModel(context.bakeLayer((ModelRegistry.BIG_BEN_DOOR)), 275f);
         phoneBoothDoorModel = new SingleInteriorDoorModel(context.bakeLayer((ModelRegistry.PHONE_BOOTH_DOOR)), (ModCompatChecker.immersivePortals() ? 1.75f : -1.75f));
         portalooDoorModel = new SingleInteriorDoorModel(context.bakeLayer((ModelRegistry.PORTALOO_DOOR)), (ModCompatChecker.immersivePortals() ? 1.75f : -1.75f));
-        groeningDoorModel = new SingleInteriorDoorModel(context.bakeLayer((ModelRegistry.GROENING_DOOR)), -275f);
+        groeningDoorModel = new SingleInteriorDoorModel(context.bakeLayer((ModelRegistry.GROENING_DOOR)), 275f);
 
         drifterDoorModel = new SingleTexInteriorDoorModel(context.bakeLayer((ModelRegistry.DRIFTER_DOOR)));
         vendingDoorModel = new SingleTexInteriorDoorModel(context.bakeLayer((ModelRegistry.VENDING_DOOR)));
@@ -95,7 +95,7 @@ public void registerModels(EntityModelSet context) {
 
         growthDoorModel = new GrowthDoorModel(context.bakeLayer((ModelRegistry.GROWTH_DOOR)));
 
-        pagodaDoorModel = new SingleInteriorDoorModel(context.bakeLayer((ModelRegistry.PAGODA_DOOR)), -275f);
+        pagodaDoorModel = new SingleInteriorDoorModel(context.bakeLayer((ModelRegistry.PAGODA_DOOR)), 275f);
 
         liftDoorModel = new DualTexInteriorDoorModel(context.bakeLayer((ModelRegistry.LIFT_DOOR)));
 
@@ -104,7 +104,6 @@ public void registerModels(EntityModelSet context) {
         halfBakedDoorModel = new HalfBakedDoorModel(context.bakeLayer((ModelRegistry.HALF_BAKED_DOOR)));
         shulkerDoorModel = new ShulkerDoorModel(context.bakeLayer((ModelRegistry.SHULKER_DOOR)));
 
-
         TardisClientEvents.SHELLENTRY_MODELS_SETUP.invoker().setUpShellAndInteriorModels(context);
 
         registerShellEntry(ShellTheme.FACTORY.get(), factoryShellModel, factoryDoorModel);

common/src/main/java/whocraft/tardis_refined/client/overlays/VortexOverlay.java

@@ -11,6 +11,7 @@
 import net.minecraft.world.phys.Vec3;
 import org.joml.Matrix4f;
 import whocraft.tardis_refined.client.TardisClientData;
+import whocraft.tardis_refined.client.renderer.RenderHelper;
 import whocraft.tardis_refined.client.renderer.vortex.VortexRenderer;
 import whocraft.tardis_refined.client.screen.screens.ShellSelectionScreen;
 import whocraft.tardis_refined.common.VortexRegistry;
@@ -161,7 +162,7 @@ public static void renderOverlay(GuiGraphics gg) {
 
             Matrix4f perspective = new Matrix4f();
             perspective.perspective((float) Math.toRadians(mc.options.fov().get()), width / height, 1, 9999, false, perspective);
-            perspective.translate(0, 0, Platform.isForge() ? 9990f : 11000f - (float) camdist * mulinv - 5 * mul);
+            perspective.translate(0, 0, RenderHelper.currentProjectionZOffset - (float) camdist * mulinv - 5 * mul);
             RenderSystem.setProjectionMatrix(perspective, VertexSorting.DISTANCE_TO_ORIGIN);
 
             pose.pushPose();
@@ -179,6 +180,9 @@ public static void renderOverlay(GuiGraphics gg) {
             pose.translate(4 * tardisX * mul, 4 * tardisY * mul, 0);
             pose.mulPose(Axis.ZP.rotationDegrees((float) (mul * -450 * velX)));
             pose.mulPose(Axis.ZP.rotationDegrees(mul * VORTEX.lightning_strike * 90 * Mth.sin(VORTEX.lightning_strike)));
+            if (Platform.isForge()) {
+                pose.scale(0.4f, 0.4f, 0.4f);
+            }
 
             pose.pushPose();
             pose.translate(0.5,0,0);

common/src/main/java/whocraft/tardis_refined/client/renderer/RenderHelper.java

@@ -15,6 +15,7 @@ public class RenderHelper {
 
     public static Tesselator tesselator;
 
+    public static float currentProjectionZOffset = 11000;
 
     public static void renderFilledBox(PoseStack stack, VertexConsumer vertexConsumer, AABB box, float red, float green, float blue, float alpha, int combinedLightIn) {
         Matrix4f matrix = stack.last().pose();

common/src/main/java/whocraft/tardis_refined/client/renderer/blockentity/door/BulkHeadDoorExtensionRenderer.java

@@ -0,0 +1,33 @@
+package whocraft.tardis_refined.client.renderer.blockentity.door;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
+import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
+
+import whocraft.tardis_refined.client.ModelRegistry;
+import whocraft.tardis_refined.client.model.blockentity.door.interior.BulkHeadDoorModel;
+import whocraft.tardis_refined.common.blockentity.door.BulkHeadDoorBlockEntity;
+import whocraft.tardis_refined.common.blockentity.door.BulkHeadDoorExtensionBlockEntity;
+
+public class BulkHeadDoorExtensionRenderer implements BlockEntityRenderer<BulkHeadDoorExtensionBlockEntity>, BlockEntityRendererProvider<BulkHeadDoorExtensionBlockEntity> {
+
+    public BulkHeadDoorExtensionRenderer(BlockEntityRendererProvider.Context context) {
+
+    }
+
+    @Override
+    public boolean shouldRenderOffScreen(BulkHeadDoorExtensionBlockEntity blockEntity) {
+        return false;
+    }
+
+    @Override
+    public void render(BulkHeadDoorExtensionBlockEntity blockEntity, float f, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, int j) {
+
+    }
+
+    @Override
+    public BlockEntityRenderer<BulkHeadDoorExtensionBlockEntity> create(BlockEntityRendererProvider.Context context) {
+        return new BulkHeadDoorExtensionRenderer(context);
+    }
+}

common/src/main/java/whocraft/tardis_refined/client/renderer/blockentity/door/BulkHeadDoorRenderer.java

@@ -2,13 +2,20 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
 import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
+import net.minecraft.client.renderer.blockentity.SignRenderer;
 import net.minecraft.client.renderer.texture.OverlayTexture;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.FormattedCharSequence;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.DirectionProperty;
+import org.joml.Matrix4f;
 import whocraft.tardis_refined.TardisRefined;
 import whocraft.tardis_refined.client.ModelRegistry;
 import whocraft.tardis_refined.client.model.blockentity.door.interior.BulkHeadDoorModel;
@@ -26,14 +33,44 @@ public BulkHeadDoorRenderer(BlockEntityRendererProvider.Context context) {
 
     @Override
     public void render(BulkHeadDoorBlockEntity blockEntity, float f, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, int j) {
-        poseStack.pushPose();
-        poseStack.translate(0.5F, 1.475F, 0.5F);
-        poseStack.mulPose(Axis.ZP.rotationDegrees(180F));
+
         BlockState blockstate = blockEntity.getBlockState();
         float rotation = blockstate.getValue(GlobalDoorBlock.FACING).toYRot();
+        boolean isOpen = blockstate.getValue(GlobalDoorBlock.OPEN);
+
+        poseStack.pushPose();
+        poseStack.translate(0.5F, 1.5F, 0.5F);
+        poseStack.mulPose(Axis.ZP.rotationDegrees(180F));
+
         poseStack.mulPose(Axis.YP.rotationDegrees(rotation));
         bulkHeadDoorModel.setDoorPosition(blockstate);
         bulkHeadDoorModel.renderToBuffer(poseStack, multiBufferSource.getBuffer(RenderType.entityTranslucent(getTextureForState(blockstate))), i, OverlayTexture.NO_OVERLAY, 1f, 1f, 1f, 1f);
+
+        if (blockEntity.getDoorName() != null && !isOpen) {
+            Matrix4f textMatrix = poseStack.last().pose();
+            poseStack.scale(-0.025F, 0.025F, 0.025F);
+            int verticalTextOffset = 0;
+            float offDoorOffset = 8f;
+
+            Font font = Minecraft.getInstance().font;
+
+            Component name = Component.literal(blockEntity.getDoorName());
+
+            float textHorizontalPosition = (float) -(font.width(name) / 2);
+
+            FormattedCharSequence sequence = name.getVisualOrderText();
+
+            poseStack.translate(0, 10f, offDoorOffset*2-4.75);
+
+
+            font.drawInBatch8xOutline(sequence, textHorizontalPosition, (float) verticalTextOffset, 16777215, 1, textMatrix, multiBufferSource, 255);
+
+            poseStack.mulPose(Axis.YP.rotationDegrees(180f));
+            poseStack.translate(0, 0, offDoorOffset*2+6);
+
+            font.drawInBatch8xOutline(sequence, textHorizontalPosition, (float) verticalTextOffset, 16777215, 1, textMatrix, multiBufferSource, 255);
+        }
+
         poseStack.popPose();
     }
 

common/src/main/java/whocraft/tardis_refined/client/renderer/blockentity/life/ZeitonGlassRenderer.java

@@ -0,0 +1,27 @@
+package whocraft.tardis_refined.client.renderer.blockentity.life;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
+import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
+import whocraft.tardis_refined.client.ModelRegistry;
+import whocraft.tardis_refined.client.model.blockentity.life.ZeitonGlassModel;
+import whocraft.tardis_refined.common.blockentity.life.ZeitonGlassBlockEntity;
+
+public class ZeitonGlassRenderer implements BlockEntityRenderer<ZeitonGlassBlockEntity>, BlockEntityRendererProvider<ZeitonGlassBlockEntity> {
+
+    private final ZeitonGlassModel zeitonGlassModel;
+
+    public ZeitonGlassRenderer(Context context) {
+        this.zeitonGlassModel = new ZeitonGlassModel(context.bakeLayer(ModelRegistry.ZEITON_GLASS));
+    }
+
+    @Override
+    public void render(ZeitonGlassBlockEntity blockEntity, float partialTick, PoseStack poseStack, MultiBufferSource multiBufferSource, int packedLight, int packedOverlay) {
+    }
+
+    @Override
+    public BlockEntityRenderer<ZeitonGlassBlockEntity> create(Context context) {
+        return new ZeitonGlassRenderer(context);
+    }
+}