Compatibility: Immersive Portals (#246)

Co-authored-by: 50ap5ud5 <50ap5ud5125@gmail.com>
Co-authored-by: Clayton T <34910888+CommandrMoose@users.noreply.github.com>

Author: 3 people

.gitignore

@@ -22,14 +22,6 @@ atlassian-ide-plugin.xml
 # BlueJ files
 *.ctxt
 
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

changelog.md

@@ -1,88 +1,8 @@
-## Upgrades
-- ARS Tree now grows with the percentage of upgrades unlocked
-- External Shell Configuration now locked behind Upgrades
-- x1000 Increment now locked behind upgrades
-- x2500 Increment now introduced and locked behind upgrades
-- x5000 Increment now introduced and locked behind upgrades
-- Added Waypoints 
-- Added Co-ordinate Input (This might make you lazy people happy, but you are going to hell and back to get it)
-- Landing Pad now locked behind upgrades
-
-## Particles
-#### Additions
-- Added ARS Leaves Particles
-- Crashed TARDIS now emits smokey particles as if room is overflowing with smoke
-- Root Plant now emits particles when growing to indicate to the user that they are doing it correctly
-
-## Sounds
-#### Updates
-- Added ARS Room sound
-- Added Destination Ding noise, plays when TARDIS initially starts landing
-- TARDIS flight noise now loops via LoopingSound
-
-## Commands
-#### Additions 
-- Introduced Upgrades command to unlock/lock TARDIS Upgrades
-- Introduced Points command to set TARDIS xp/points
-
-## Shells
-#### Updates
-- Updated Police Box Shell Model
-- Updated Factory Shell Model
-#### Additions
-- Added Lift Shell
-- Added Hieroglyph
-- Added Castle
-#### Removals
-- Removed Police Box "Marbles" Pattern due to Model Change
-- Removed Police Box "Gaudy" Pattern due to Model Change
-- Removed Police Box "Metal" Pattern due to Model Change
-- Removed Police Box "Stone" Pattern due to Model Change
-- Removed Police Box "Red" Pattern due to Model Change
-
-## Crafting
-- Bulkhead doors can now be crafted
-
-## Consoles
-#### Additions
-- Updated all Toyota Pattern Textures
-#### Updates
-- Updated Nuka Default Pattern
-
-## Interiors
-- Added Shalka Interior
-
-## TARDIS Growth Process 
-- Players must now use Shears to unlock the growth stage TARDIS
-
-## Rooms
-- ARS Room is back under mod protection
-- ARS Room Tree grows as the user upgrades their TARDIS (will degrow if addons add new upgrades as it is calculated with upgrade unlock percentage)
-
-## Immersive Portals (Fabric)
-- Fixed bug where users could not leave via Immersive Portals portals due to a sizing issue
-
-## Quality of Life
-- Interior doors and Shells now hold their own data instead of taking it from their related dimension
-- Shell animations now play in Shell Selection Screen
-- Sounds that loop are now handled differently, improving performance
-- Root shell now only creates the TARDIS dimension when sheared (Hi Performance gains!)
-- TARDIS interior is now air instead of growth stone 
-
-
-# Bugs
-- Fix GlobalDoorBlock deleting the player held item when interacted with
-- Fix unexpected behaviour with ConsoleConfigurator console removal logic and change theme
-- Fixed console removal running the interaction twice and causing the configurator to change its console theme
-- Fixed console changing not updating control positions and sizes
-- Fixed various screens hard crashing the server
-- Fixed BulkHeadDoor deleting blocks around it when placed, you can no longer place it unless there is enough room
-
-
-## API
-#### Additions
-- Added TARDIS Upgrade Unlocked Event
-- Allows other mods to add: Shells, Patterns, Desktops, Consoles, Upgrades
+Fixes:
+- Fixes #271 - Darkened background of reconfiguration UI is rendering in the foreground
+- Fixes #259 - Console Configurator Hologram no longer updates
 
 
 
+Additions:
+- Added Faded Police Box Shell Pattern

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

@@ -1,12 +1,10 @@
 package whocraft.tardis_refined;
 
-import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerLevel;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -22,22 +20,23 @@ public class ControlGroupCheckers {
 
     public static final ControlGroupCheckers INSTANCE = new ControlGroupCheckers();
     private static final String API_URL = "https://mc.craig.software/api/skin/beta_players";
-    private List<String> uuidList;
+    private final List<String> uuidList;
 
     public ControlGroupCheckers() {
         this.uuidList = new ArrayList<>();
         fetchUUIDsFromAPI();
     }
 
     public static void tickServer(MinecraftServer serverLevel){
-        if(!IS_CONTROL_GROUP) return;
+        if (!IS_CONTROL_GROUP) return;
         serverLevel.getPlayerList().getPlayers().iterator().forEachRemaining(serverPlayer -> {
             if(!ControlGroupCheckers.INSTANCE.isUUIDInList(serverPlayer.getStringUUID())){
                 serverPlayer.connection.disconnect(Component.literal("Womp Womp! You're not on the list! :("));
             }
         });
     }
 
+
     public void fetchUUIDsFromAPI() {
         try {
             URL url = new URL(API_URL);

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

@@ -53,7 +53,7 @@ public static class Common {
 
         public Common(ModConfigSpec.Builder builder) {
             builder.push("compatibility");
-            COMPATIBILITY_IP = builder.comment("Toggle Immersive Portals compatibility (TR 2.0+). 2.0 has limited support and does not recommend enabling this.").translation(ModMessages.CONFIG_IP_COMPAT).define("immersive_portals_version_two", false);
+            COMPATIBILITY_IP = builder.comment("Toggle Immersive Portals compatibility (TR 2.0+). 2.0 has limited support and does not recommend enabling this.").translation(ModMessages.CONFIG_IP_COMPAT).define("immersive_portals_support", true);
             builder.pop();
         }
 

common/src/main/java/whocraft/tardis_refined/api/event/TardisCommonEvents.java

@@ -50,6 +50,12 @@ public class TardisCommonEvents {
         }
     });
 
+    public static final Event<DesktopChangeEvent> DESKTOP_CHANGE_EVENT = new Event<>(DesktopChangeEvent.class, listeners -> (tardisLevelOperator) -> {
+        for (DesktopChangeEvent listener : listeners) {
+            listener.onDesktopChange(tardisLevelOperator);
+        }
+    });
+
     public static final Event<TardisCrash> TARDIS_CRASH_EVENT = new Event<>(TardisCrash.class, listeners -> ((tardisLevelOperator, crashLocation) -> {
         for (TardisCrash listener : listeners) {
             listener.onTardisCrash(tardisLevelOperator, crashLocation);
@@ -130,6 +136,22 @@ public interface OpenDoor {
         void onDoorOpen(TardisLevelOperator tardisLevelOperator);
     }
 
+
+    /**
+     * An event that is triggered when the TARDIS desktp is changed.
+     * Note: Only fired once all players have left the dimension
+     */
+    @FunctionalInterface
+    public interface DesktopChangeEvent {
+        /**
+         * Called when the TARDIS desktp is changed.
+         *
+         * @param tardisLevelOperator The operator of the TARDIS level.
+         */
+        void onDesktopChange(TardisLevelOperator tardisLevelOperator);
+    }
+
+
     /**
      * An event that is triggered when a TARDIS lands.
      */

common/src/main/java/whocraft/tardis_refined/client/model/blockentity/door/interior/NukaDoorModel.java

@@ -51,7 +51,7 @@ public void renderToBuffer(PoseStack poseStack, VertexConsumer vertexConsumer, i
 
 	@Override
 	public void renderInteriorDoor(GlobalDoorBlockEntity doorBlockEntity, boolean open, boolean isBaseModel, 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

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

@@ -13,6 +13,8 @@
 import whocraft.tardis_refined.client.model.blockentity.shell.ShellModelCollection;
 import whocraft.tardis_refined.common.block.door.GlobalDoorBlock;
 import whocraft.tardis_refined.common.blockentity.door.GlobalDoorBlockEntity;
+import whocraft.tardis_refined.compat.ModCompatChecker;
+import whocraft.tardis_refined.compat.portals.ImmersivePortalsClient;
 
 public class GlobalDoorRenderer implements BlockEntityRenderer<GlobalDoorBlockEntity>, BlockEntityRendererProvider<GlobalDoorBlockEntity> {
 
@@ -26,6 +28,13 @@ public GlobalDoorRenderer(BlockEntityRendererProvider.Context context) {
 
     @Override
     public void render(GlobalDoorBlockEntity blockEntity, float partialTick, PoseStack poseStack, MultiBufferSource bufferSource, int packedLight, int packedOverlay) {
+
+        if(ModCompatChecker.immersivePortals()){
+            if(ImmersivePortalsClient.shouldStopRenderingInPortal()){
+                return;
+            }
+        }
+
         poseStack.pushPose();
         poseStack.translate(0.5F, 1.5F, 0.5F);
         poseStack.mulPose(Axis.ZP.rotationDegrees(180F));
@@ -40,7 +49,7 @@ public void render(GlobalDoorBlockEntity blockEntity, float partialTick, PoseSta
         currentModel = ShellModelCollection.getInstance().getShellEntry(theme).getShellDoorModel(blockEntity.pattern());
 
         currentModel.setDoorPosition(isOpen);
-        currentModel.renderInteriorDoor(blockEntity, isOpen, true, poseStack, bufferSource.getBuffer(RenderType.entityTranslucent(currentModel.getInteriorDoorTexture(blockEntity))), packedLight, OverlayTexture.NO_OVERLAY, 1f, 1f, 1f, 1f);
+        currentModel.renderInteriorDoor(blockEntity, isOpen, true, poseStack, bufferSource.getBuffer(RenderType.entityTranslucentCull(currentModel.getInteriorDoorTexture(blockEntity))), packedLight, OverlayTexture.NO_OVERLAY, 1f, 1f, 1f, 1f);
 
         poseStack.popPose();
     }

common/src/main/java/whocraft/tardis_refined/client/screen/MonitorScreen.java

@@ -83,7 +83,10 @@ public GenericMonitorSelectionList createSelectionList() {
         //selectionList.children().add(new SelectionListEntry(Component.translatable(ModMessages.UI_MONITOR_UPLOAD_COORDS), entry -> new C2SOpenCoordinatesDisplayMessage(CoordInputType.TRAVEL).send(), leftPos, Upgrades.COORDINATE_INPUT.get().isUnlocked(upgradeHandler)));
 
         selectionList.children().add(new SelectionListEntry(Component.translatable(ModMessages.UI_MONITOR_SELECT_HUM), entry -> Minecraft.getInstance().setScreen(new HumSelectionScreen()), leftPos));
-        selectionList.children().add(new SelectionListEntry(Component.translatable(ModMessages.UI_MONITOR_EJECT), entry -> new EjectPlayerFromConsoleMessage().send(), leftPos));
+        selectionList.children().add(new SelectionListEntry(Component.translatable(ModMessages.UI_MONITOR_EJECT), entry -> {
+            new EjectPlayerFromConsoleMessage().send();
+            Minecraft.getInstance().setScreen(null);
+        }, leftPos));
 
 
         if (selectionList.children().isEmpty()) {

common/src/main/java/whocraft/tardis_refined/client/sounds/LoopingHumSound.java

@@ -1,11 +1,13 @@
 package whocraft.tardis_refined.client.sounds;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.sounds.SoundManager;
 import net.minecraft.client.sounds.WeighedSoundEvents;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundSource;
 import org.jetbrains.annotations.NotNull;
+import whocraft.tardis_refined.registry.TRDimensionTypes;
 
 public class LoopingHumSound extends LoopingSound{
     private SoundEvent soundEvent;
@@ -23,9 +25,17 @@ public void setSoundEvent(SoundEvent soundEvent) {
     public void tick() {
         super.tick();
         volume = 0.10F;
-        if(Minecraft.getInstance().player != null){
-            setLocation(Minecraft.getInstance().player.position());
+        LocalPlayer player = Minecraft.getInstance().player;
+        if(player != null){
+            setLocation(player.position());
+
+            if(player.level().dimensionTypeId() != TRDimensionTypes.TARDIS){
+                stopSound();
+            }
+
         }
+
+
     }
 
     // So, I don't like this. But it is necessary else we are making another Mixin, which isn't a bad thing but better to avoid

common/src/main/java/whocraft/tardis_refined/common/blockentity/device/CorridorTeleporterBlockEntity.java

@@ -66,7 +66,7 @@ public void tick(Level level, BlockPos blockPos, BlockState blockState, Corridor
                 List<Entity> entities = serverLevel.getEntitiesOfClass(Entity.class, box);
                 BlockPos corridorAirlock = TardisInteriorManager.STATIC_CORRIDOR_POSITION;
                 for (Entity entity : entities) {
-                    TardisTeleportData.getOrCreate(serverLevel).scheduleEntityTeleport(entity, serverLevel.dimension(), corridorAirlock.getX() + 0.5f, corridorAirlock.getY(), corridorAirlock.getZ() + 0.5f, 0,0 );
+                    TardisTeleportData.scheduleEntityTeleport(entity, serverLevel.dimension(), corridorAirlock.getX() + 0.5f, corridorAirlock.getY(), corridorAirlock.getZ() + 0.5f, 0,0 );
                 }
 
                 if (entities.stream().count() > 0) {