WhoCraft · CommandrMoose · Dec 25, 2024 · Dec 25, 2024 · Dec 25, 2024 · Dec 25, 2024
diff --git a/.github/ISSUE_TEMPLATE/bug_report_template.yml b/.github/ISSUE_TEMPLATE/bug_report_template.yml
@@ -53,6 +53,12 @@ body:
       label: Tardis Refined version
       description: What version of Tardis Refined are you using?
       options:
+        - v2.1.5
+        - v2.1.4
+        - v2.1.3
+        - v2.1.2
+        - v2.1.1
+        - v2.1.0
         - v2.0.7
         - v2.0.6
         - v2.0.5
@@ -63,12 +69,29 @@ body:
         - v2.0
         - v1.0
         - Pre-release v0.1
+        - I am using a Github Test version, and will tell you which version in additional info!
     validations:
       required: true
   - type: textarea
     attributes:
       label: Other relevant versions
       description: If this issue is related to any other mods that have been installed alongside Tardis Refined, list the mod's name and version here.
+  - type: textarea
+    attributes:
+      label: Mod List
+      description: In order to check for compatibility issues, we require your mods list
+  - type: checkboxes
+    id: existing
+    attributes:
+      label: Please confirm that you have searched existing issues in the repo.
+      options:
+        - label: 'Yes, I have checked all open issues and am aware my issue will be closed if it is a duplicate of another'
+  - type: checkboxes
+    id: rendering
+    attributes:
+      label: Please confirm that if your issue is related to rendering, that you have tested without the following before testing; (Shaders, Optifine, Rubidium, embeddium, Sodium)
+      options:
+        - label: 'Yes, I have done testing without these mods before reported a rendering issue or my issue does not relate to rendering'
   - type: input
     attributes:
       label: "Attach the relevant crash report file or log file: (Don't know how to find a crash report file? See the [Minecraft Wiki Tutorial](https://minecraft.fandom.com/wiki/Tutorials/How_to_get_a_crash_report)"

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -21,7 +21,7 @@ jobs:
     - uses: actions/stale@v5
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'This issue has not recieved activity in a while - is it still a issue?'
-        stale-pr-message: 'This PR has not recieved activity for a while - please provide activity'
+        stale-issue-message: 'This issue has not received activity in a while - is it still a issue?'
+        stale-pr-message: 'This PR has not received activity for a while - please provide activity'
         stale-issue-label: 'stale'
         stale-pr-label: 'stale'
diff --git a/LICENSE.MD b/LICENSE.MD
@@ -149,8 +149,8 @@ or other kind of organization that you work for, plus all
 its affiliates.
 
 **Affiliates** means the other organizations than an
-organization has controlEntity over, is under the controlEntity of, or is
-under common controlEntity with.
+organization has control over, is under the control of, or is
+under common control with.
 
 **Control** means ownership of substantially all the assets of
 an entity, or the power to direct its management and policies

diff --git a/README.md b/README.md
@@ -1,72 +1,73 @@
 ![image](https://i.imgur.com/eIfAaYJ.png)
 
-<img src="https://discordapp.com/api/guilds/1054629302152478730/widget.png?style=shield" alt="Discord Shield"/>[![Crowdin](https://badges.crowdin.net/tardis-refined/localized.svg)](https://crowdin.com/project/tardis-refined)
-[![CurseForge](https://cf.way2muchnoise.eu/782697.svg?badge_style=flat)](https://www.curseforge.com/minecraft/mc-mods/tardis-refined)
-[![ModRinth](https://modrinth-utils.vercel.app/api/badge/downloads?id=nqVt6aES&logo=true)](https://modrinth.com/mod/tardis-refined)
 
 
+<p align="center">
+    <a href="https://crowdin.com/project/tardis-refined">
+        <img src="https://badges.crowdin.net/tardis-refined/localized.svg" alt="Crowdin">
+    </a>
+    <a href="https://www.curseforge.com/minecraft/mc-mods/tardis-refined">
+        <img src="https://cf.way2muchnoise.eu/782697.svg?badge_style=flat" alt="CurseForge">
+    </a>
+    <a href="https://modrinth.com/mod/tardis-refined">
+        <img src="https://modrinth-utils.vercel.app/api/badge/downloads?id=nqVt6aES&logo=true" alt="ModRinth">
+    </a>
+    <a href="https://discord.gg/your-discord-invite">
+        <img src="https://discordapp.com/api/guilds/1054629302152478730/widget.png?style=shield" alt="Discord Shield">
+    </a>
+</p>
 
 
- TARDIS Refined is a Minecraft mod for Forge and Fabric which brings the TARDIS from Doctor Who to Minecraft.
-
-
- <a href="https://wiki.tardisrefined.net">View the wiki.</a>
+# TARDIS Refined
+
+TARDIS Refined is a Minecraft mod for Forge and Fabric that brings the TARDIS from *Doctor Who* to Minecraft.
+
+🔗 **[View the Wiki](https://wiki.tardisrefined.net)**
+
+---
 
 ## Workspace
-TARDIS Refined implements the <a href="https://github.com/architectury/architectury-plugin">Architectuary Gradle plugin</a>, allowing easy multi-modloader development via a common module. This functionality does not require any additional installation of plugins or files. It is recommended you familiarise yourself with Achitectury first before proceeding with PR submissions. 
 
-This repository has been set up to utilise Forge's data generation for most common data gen items. The repository does not include these generated files, so it is recommended to run the Forge Data task when you clone the repository. It is also recommended to run this task regularly to stay concurrent with your branch's data.
+TARDIS Refined implements the [Architectury Gradle plugin](https://github.com/architectury/architectury-plugin), enabling seamless multi-modloader development through a common module. No additional plugins or files are required. It is recommended to familiarise yourself with Architectury before submitting pull requests.
+
+This repository is configured to utilise Forge's data generation for common data-driven content. However, generated files are not included in the repository. Running the Forge Data task after cloning the repository—and periodically thereafter—is highly recommended to keep your data up to date.
 
+---
 
 ## Contributions
 
-We welcome contributions to TARDIS Refined. If you have an idea for a new feature or have found a bug, please open an issue. If you would like to contribute code, please submit a pull request. Please understand that the associated development team have set tasks and goals for the project, and PRs that include large additions/changes will be closely examined to determine if they meet the project's design.
-
-<table>
-   <thead>
-      <tr>
-         <th>Credit</th>
-         <th>Contribution</th>
-      </tr>
-   </thead>
-   <tbody>
-<tr><td><a href="https://twitter.com/CommandrMoose">CommandrMoose</a></td>
-         <td>Project lead and Developer</td> </tr>
-      <tr>
-         <td><a href="https://github.com/Jeryn99">Jeryn</a></td>
-         <td>Developer</td>
-      </tr>
-            <tr>
-         <td><a href="https://twitter.com/50ap5ud5">50ap5ud5</a></td>
-         <td>Developer</td>
-      </tr>
-    <tr>
-         <td><a href="https://github.com/Duzos">duzo</a></td>
-         <td>Developer</td>
-      </tr>
-<tr><td><a href="https://twitter.com/MagicMrmann">MagicMan</a></td>
-         <td>Art Lead</td> </tr>
-<tr><td><a href="https://twitter.com/ILikePandas18">ILikePandas</a></td>
-         <td>Console Builds</td> </tr>
-         <tr><td><a href="https://twitter.com/JacobKauffman11">Jacob.K</a></td>
-         <td>Console Builds</td> </tr>
-   </tbody>
-</table>
-
-With special thanks to Commoble, Lucraft, starray1000000, The Judge, Monsterwaill and Sea Pickle<br/><hr/>
-
-Additionally, thanks to the additional builders who contributed desktops:
-"Radiance" by Getsuga Tenno
-"Watchface" by t___cup
-"Vapor" by Tank
-"Newwave" by Muffled
-
-Other builds made by members of the team. 
-
-![image](https://user-images.githubusercontent.com/34910888/209611682-abeaedc6-cf9a-465f-a693-9ba85f38cca6.png)
+We welcome contributions to TARDIS Refined! If you have an idea for a new feature or have found a bug, please open an issue. If you’d like to contribute code, submit a pull request. Please note that the development team follows a set roadmap, and substantial additions or changes will be reviewed to ensure they align with the project’s vision.
+
+### 🏆 Contributors
+
+| **Credit** | **Contribution** |
+|------------|-----------------|
+| [CommandrMoose](https://twitter.com/CommandrMoose) | Project Lead & Developer |
+| [Jeryn](https://github.com/Jeryn99) | Developer |
+| [50ap5ud5](https://twitter.com/50ap5ud5) | Developer |
+| [duzo](https://github.com/Duzos) | Developer |
+| [MagicMan](https://twitter.com/MagicMrmann) | Art Lead |
+| [ILikePandas](https://twitter.com/ILikePandas18) | Console Builds |
+| [Jacob.K](https://twitter.com/JacobKauffman11) | Console Builds |
+
+Special thanks to: **Commoble, Lucraft, starray1000000, The Judge, Monsterwaill, and Sea Pickle**.
+
+### 🏗 Additional Builders
+- **"Radiance"** – *Getsuga Tenno*
+- **"Watchface"** – *t___cup*
+- **"Vapor"** – *Tank*
+- **"Newwave"** – *Muffled*
+
+Other builds were contributed by members of the team.
+
+---
 
 ## Immersive Portals Support (Developer Note)
-This mod has dedicated support for being compatible and integrating with Immersive Portals when Immersive Portals is present.
-By default, Immersive Portals is not enabled in dev and fabrics build.gradle file must be edited to allow for this.
-Instructions on how to do this can be found in the relevant build.gradle
-If you are a user, the above is not relevant to you. All you should need to do is install Fabric TR and Fabric IP and you will be all ready to go.
+
+This mod includes dedicated compatibility and integration with **Immersive Portals** when it is installed.
+
+- By default, Immersive Portals is *not* enabled in development.
+- Fabric's `build.gradle` must be modified to allow support.
+- Instructions on enabling this can be found within `build.gradle`.
+
+🚀 **For users:** No additional steps are required. Simply install **Fabric TR** and **Fabric IP**, and you’re good to go!
diff --git a/build.gradle b/build.gradle
@@ -15,6 +15,7 @@ plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
     id "dev.architectury.loom" version "1.6+" apply false
     id "me.shedaniel.unified-publishing" version "0.1.+"
+    id "com.github.breadmoirai.github-release" version "2.4.1"
 }
 
 architectury {
@@ -38,6 +39,42 @@ subprojects {
     }
 }
 
+
+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)
+def fabricFiles = fabricDir.listFiles(filter)
+def commonFiles = commonDir.listFiles(filter)
+
+githubRelease {
+    token project.findProperty("github") ?: System.getenv("github") ?: ""
+    owner "WhoCraft"
+    repo "TardisRefined"
+    tagName "v$rootProject.minecraft_version-$project.mod_version"
+    targetCommitish "mc/1.20.2"
+    releaseName "[$rootProject.minecraft_version] Tardis Refined - v$project.mod_version"
+    generateReleaseNotes true
+    body new File("${rootProject.projectDir}/changelog.md").text
+    draft false
+    prerelease false
+    releaseAssets(forgeFiles + fabricFiles + commonFiles)
+    allowUploadToExisting.set false
+    overwrite true
+    dryRun false
+    apiEndpoint "https://api.github.com"
+    client
+}
+
+
+
 allprojects {
     apply plugin: "java"
     apply plugin: "architectury-plugin"
@@ -66,7 +103,7 @@ allprojects {
         maven { url 'https://jitpack.io' }
 
         flatDir {
-            dirs '../modlibs'
+            dirs '../mods'
         }
 
 
@@ -82,6 +119,13 @@ allprojects {
     }
 }
 
+task publishMeEverywhere(){
+    dependsOn ':forge:publishUnified'
+    dependsOn ':fabric:publishUnified'
+    dependsOn ':githubRelease'
+}
+
+
 def generatedResources = project(":forge").file("src/generated/resources")
 
 sourceSets {

diff --git a/changelog.md b/changelog.md
@@ -1,95 +1,8 @@
-# Version 2.1.0
+# Version 2.1.5 - HOTFIX
 
-![TARDIS Refined](https://wiki.tardisrefined.net/TARDIS-Refined-Wiki/tardis_refined_v2.png)
-
-#### Bug Fixes
-- Bug fix: Added "Compatibility" with [Diagonal Windows](https://www.curseforge.com/minecraft/mc-mods/diagonal-windows)
-- Bug fix: Exception Ticking World [#388](https://github.com/WhoCraft/TardisRefined/issues/388)
-- Bug fix: Nuka Console Duplicate Control Entity Failing Flight Dance Events [#376](https://github.com/WhoCraft/TardisRefined/issues/376)
-- Bug fix: land pad dont work and crash on server [#377](https://github.com/WhoCraft/TardisRefined/issues/377)
-- Bug fix: tardis is damaged [#351](https://github.com/WhoCraft/TardisRefined/issues/351)
-- Bug fix: Diagonal Windows makes it impossible to craft the terraformer [#383](https://github.com/WhoCraft/TardisRefined/issues/383)
-- Bug fix: relogging causes TARDIS Dance events to not occur [#387](https://github.com/WhoCraft/TardisRefined/issues/387)
-- Bug fix: [Incompatibility] Tardis refined dimensions fail to load with Dimension Threads  [#374](https://github.com/WhoCraft/TardisRefined/issues/374)
-- Bug fix: Console cannot be removed/changed with the console configurator outside the TARDIS dimension  [#380](https://github.com/WhoCraft/TardisRefined/issues/380)
-- Bug fix: Fixed a bug where the overlay keybinds always rendered the default key
-- Bug fix: Fixed a bug where a new TARDIS would believe it was at 0,0,0
-
-#### Enhancements
-- Enhancement: Added Adventure Mode
-- Enhancement: Standing in a Crashed smoke of a crashed TARDIS will cause 0.5 damage to the player for the duration their standing in it
-- Enhancement: Recovery Progress of crashed TARDIS now displayed on controls until repair is complete
-- Enhancement: Recovery Progress of crashed TARDIS is now displayed on Key tooltip
-- Enhancement: Holographic exteriors on consoles now spin according to throttle
-- Enhancement: Shell Viewer/Time Vortex (Accessed Via Monitor Screen)
-- Enhancement: Speed up downwards descent for Gravity Shaft
-- Enhancement: Improved UI for Gravity Shaft
-- Enhancement: Colored various texts on Key item
-- Enhancement: Alarm now sounds when Fuel is below 5% and the TARDIS is not fueling+
-- Enhancement: Bulkhead doors now have some variants, changed via the Pattern Manipulator
-- Enhancement: Alarm now sounds when Fuel is below 5% and the TARDIS is not fueling
-
-#### Additions
-- Added Item: Mallet 
-- Added Villager: Pilot  (POI: Console)
-- Added Interior: Useable Terraformed 
-- "Added" Shell: Half Baked
-- Added Vortex: Clouds
-- Added Vortex: Flow
-- Added Vortex: Space
-- Added Vortex: Waves
-- Added Vortex: Stars
-- Added Vortex: Twilight Glow
-- Added Vortex: Aurora Dreams
-- Added Vortex: Desert Mirage
-- Added Vortex: Neon Pulse
-- Added Vortex: Ocean Breeze
-- Added Vortex: Solar Flare
-- Added Vortex: Crystal Lagoon
-- Added Vortex: Velvet Night
-- Added Vortex: Candy Pop
-- Added Vortex: Emerald Forest
-- Added Vortex: LGBT Rainbow
-- Added Vortex: Transgender Flag
-- Added Vortex: Bisexual Flag
-- Added Vortex: Lesbian Flag
-- Added Vortex: Non-Binary Flag
-- Added Vortex: Agender Flag
-- Added Vortex: Gay Flag
-
-#### Textures, Models & Animations
-- Texture: Updated all Factory Console Variants
-- Model: Updated Coral Console Model
-- Model: Updated Victorian Console Model
-- Model: Updated Factory Console Model
-- Model: Updated Big Ben Interior Model
-- Model: Updated Pathfinder Interior Model
-- Animation: Updated Factory Console Flight Animation
-- Animation: Updated Factory Console Idle Animation
-- Animation: Added Factory Console Crash Animation
-- Animation: Added Factory Console Power on Animation
-- Animation: Added Factory Console Power off Animation
-- Animation: Updated Victorian Console Flight Animation
-- Animation: Updated Victorian Console Idle Animation
-- Animation: Added Victorian Console Crash Animation
-- Animation: Added Victorian Console Power on Animation
-- Animation: Added Victorian Console Power off Animation
-
-#### Adventure Mode
-Mod Pack creators can now enable adventure mode in the server config - this will activate a mode where players have to visit a dimension and sample it in order to have their TARDIS travel there - Mod Pack creators can also add levels to automatically be sampled by a TARDIS
-
-#### Compatibility Notes
-- [Trinkets](https://wiki.tardisrefined.net/extendedinventorymods.html#trinkets)
-- [Curios](https://wiki.tardisrefined.net/extendedinventorymods.html#curios)
-- [Diagonal Windows](https://wiki.tardisrefined.net/diagonal-blocks-windows-walls.html#diagonal-walls)
-
-
-#### Technical changes
-- Most animations for Consoles are now loaded from JSON
-- Some models for Consoles are now loaded from JSON
-
-#### NOTE
-- Upon updating to this version, your previous: ``Return Location``, ``Current Location`` and ``Target Location`` will be reset 
-This will not lead to any other data loss and your TARDIS will be exactly where you left it, take off once and you will be all sorted. This was a required change to resolve some issues
+![TARDIS Refined](https://wiki.tardisrefined.net/TARDIS-Refined-Wiki/tardis_refined_v2_1.png)
 
+All previous changes from 2.1.4: https://wiki.tardisrefined.net/version-2-1-4.html
 
+#### Bug Fix
+- Bug fix: Fixed class loading destroying other mods ability to load
diff --git a/common/build.gradle b/common/build.gradle
@@ -16,6 +16,8 @@ dependencies {
         because "Ensure the dependency is resolved from the specified repository."
     }
 
+    // Sodium
+    modImplementation "maven.modrinth:sodium:${rootProject.sodium_version}"
 
     modCompileOnlyApi ("com.github.iPortalTeam.ImmersivePortalsMod:imm_ptl_core:${rootProject.immersive_portals_version}"){
         exclude(group: "net.fabricmc.fabric-api")