- Bug Fix: Fixed Dedicated Servers on Fabric having issues loading da…

…ta from disk (Caused dupe TARDIS and loss of Upgrades etc) - Altered: Factory Console Emission Texture - Altered: Factory Console (Mint) Emission Texture - Altered: Factory Console (Vintage) Emission Texture - Altered: Factory Console (Wood) Emission Texture
WhoCraft · Jan 4, 2025 · b492a65 · b492a65
1 parent 3211fb5
commit b492a65
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -44,6 +44,10 @@ def forgeDir = new File(project.projectDir, 'forge/build/libs/')
 def fabricDir = new File(project.projectDir, 'fabric/build/libs/')
 def commonDir = new File(project.projectDir, 'common/build/libs/')
 
+forgeDir.mkdirs()
+fabricDir.mkdirs()
+commonDir.mkdirs()
+
 def filter = { File file -> file.getName().contains(mod_version) } as FileFilter
 
 def forgeFiles = forgeDir.listFiles(filter)

diff --git a/changelog.md b/changelog.md
@@ -6,3 +6,10 @@
 - Bug Fix: Placing and entering TARDIS door in the overworld crashes the game with Immersive Portals [#444](https://github.com/WhoCraft/TardisRefined/issues/444)
 - Bug Fix: Players can land TARDIS within TARDIS with Landing Pad [#447](https://github.com/WhoCraft/TardisRefined/issues/447)
 - Bug Fix: Fixed TARDIS not storing Adventure Mode Dimensions correctly
+- Bug Fix: Fixed Dedicated Servers on Fabric having issues loading data from disk (Caused dupe TARDIS and loss of Upgrades etc)
+
+#### Textures and Models
+- Altered: Factory Console Emission Texture 
+- Altered: Factory Console (Mint) Emission Texture 
+- Altered: Factory Console (Vintage) Emission Texture 
+- Altered: Factory Console (Wood) Emission Texture 
diff --git a/...java/whocraft/tardis_refined/client/renderer/blockentity/device/ArtronPillarRenderer.java b/...java/whocraft/tardis_refined/client/renderer/blockentity/device/ArtronPillarRenderer.java
@@ -19,15 +19,9 @@
 import org.joml.Random;
 import whocraft.tardis_refined.TardisRefined;
 import whocraft.tardis_refined.client.ModelRegistry;
-import whocraft.tardis_refined.client.model.blockentity.device.ArtronPillarBlockModel;
-import whocraft.tardis_refined.client.model.blockentity.door.interior.BulkHeadDoorModel;
-import whocraft.tardis_refined.client.model.blockentity.life.ArsEggModel;
-import whocraft.tardis_refined.client.renderer.RenderHelper;
 import whocraft.tardis_refined.client.model.GenericModel;
 import whocraft.tardis_refined.common.block.device.ArtronPillarBlock;
-import whocraft.tardis_refined.common.block.door.GlobalDoorBlock;
 import whocraft.tardis_refined.common.blockentity.device.ArtronPillarBlockEntity;
-import whocraft.tardis_refined.common.blockentity.door.GlobalDoorBlockEntity;
 
 public class ArtronPillarRenderer implements BlockEntityRenderer<ArtronPillarBlockEntity>, BlockEntityRendererProvider<ArtronPillarBlockEntity> {
 

diff --git a/...ava/whocraft/tardis_refined/common/network/messages/waypoints/S2CWaypointsListScreen.java b/...ava/whocraft/tardis_refined/common/network/messages/waypoints/S2CWaypointsListScreen.java
@@ -29,7 +29,6 @@ public S2CWaypointsListScreen(FriendlyByteBuf friendlyByteBuf) {
         for (int i = 0; i < size; i++) {
             CompoundTag tardisWay = friendlyByteBuf.readNbt();
             TardisWaypoint waypoint = TardisWaypoint.deserialise(tardisWay);
-
             waypoints.add(waypoint);
         }
     }

diff --git a/common/src/main/java/whocraft/tardis_refined/common/tardis/TardisNavLocation.java b/common/src/main/java/whocraft/tardis_refined/common/tardis/TardisNavLocation.java
@@ -78,6 +78,11 @@ public CompoundTag serialise() {
     }
 
     public ServerLevel getLevel() {
+
+        if(Platform.getServer() == null){
+            throw new RuntimeException("Called TardisNavLocation::getLevel before server was created! Please adjust your code!");
+        }
+
         if (this.level != null) {
             this.dimensionKey = this.level.dimension();
             return Platform.getServer().getLevel(dimensionKey);

diff --git a/...ardis_refined/textures/blockentity/console/factory/factory_console_emissive.png b/...ardis_refined/textures/blockentity/console/factory/factory_console_emissive.png
diff --git a/..._refined/textures/blockentity/console/factory/factory_console_mint_emissive.png b/..._refined/textures/blockentity/console/factory/factory_console_mint_emissive.png
diff --git a/...fined/textures/blockentity/console/factory/factory_console_vintage_emissive.png b/...fined/textures/blockentity/console/factory/factory_console_vintage_emissive.png
diff --git a/..._refined/textures/blockentity/console/factory/factory_console_wood_emissive.png b/..._refined/textures/blockentity/console/factory/factory_console_wood_emissive.png
diff --git a/fabric/src/main/java/whocraft/tardis_refined/common/util/fabric/PlatformImpl.java b/fabric/src/main/java/whocraft/tardis_refined/common/util/fabric/PlatformImpl.java
@@ -48,6 +48,7 @@ public static MinecraftServer getServer() {
     }
 
     public static void init() {
+        ServerLifecycleEvents.SERVER_STARTING.register(server -> MINECRAFT_SERVER = server);
         ServerLifecycleEvents.SERVER_STARTED.register(server -> MINECRAFT_SERVER = server);
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -46,7 +46,7 @@ neoforge_data_pack_format=18
 ##Mod Information
 
 #Common Mod Information
-mod_version=2.1.2
+mod_version=2.1.3
 license=https://github.com/Whocraft/TardisRefined/blob/minecraft/1.20/LICENSE.MD
 credits=Commoble, Lucraft, starray1000000, Monsterwaill, TheJudge, LoxiGoose
 mod_authors=CommandrMoose / River, Jeryn99, Magic Man, ILikePandas, Jacob K, 50ap5ud5
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,6 +48,7 @@ public static MinecraftServer getServer() { @@
         }
         public static void init() {
+            ServerLifecycleEvents.SERVER_STARTING.register(server -> MINECRAFT_SERVER = server);
             ServerLifecycleEvents.SERVER_STARTED.register(server -> MINECRAFT_SERVER = server);
         }
@@ Expand Down @@