wisplite/distant-horizons-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of gitlab.com:jeseibel/minecraft-lod-mod

Browse Source
This commit is contained in:
James Seibel
2023-08-24 07:08:39 -05:00
parent 73a42284f1 263574bf38
commit 640559239c
7 changed files with 144 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Readme.md
+5 -5
View File
@@ -20,7 +20,7 @@ If you want to see a quick demo, check out a video covering the mod here:
### This branch supports the following versions of Minecraft:
#### 1.20.1, 1.20
#### 1.20.1, 1.20 (Default)
Fabric: 0.14.21\
Fabric API: 0.85.0+1.20.1\
Forge: 45.1.0\
@@ -41,21 +41,21 @@ Forge: 43.2.14\
Parchment: 1.19.2:2022.11.27\
Modmenu: 4.2.0-beta.2
#### 1.18.2 (Default)
#### 1.18.2
Fabric: 0.14.21\
Fabric API: 0.76.0+1.18.2\
Forge: 40.2.10\
Parchment: 1.18.2:2022.11.06\
Modmenu: 3.2.5
#### 1.17.1, 1.17 (BROKE)
#### 1.17.1, 1.17
Fabric: 0.14.21\
Fabric API: 0.46.1+1.17\
Forge: 37.1.1\
Parchment: 1.17.1:2021.12.12\
Modmenu: 2.0.14
#### 1.16.5, 1.16.4 (BROKE)
#### 1.16.5, 1.16.4
Fabric: 0.14.21\
Fabric API: 0.42.0+1.16\
Forge: 36.2.39\
@@ -196,5 +196,5 @@ https://github.com/TheElectronWill/night-config
SVG Salamander for SVG support\
https://github.com/blackears/svgSalamander
FlatLaf for theming (for development testing, may remove later)\
FlatLaf for Java Swing theming (for development testing, may remove later, and not included in compiled jars)\
https://www.formdev.com/flatlaf/
common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java
+9 -3
View File
@@ -385,9 +385,15 @@ public class ClassicConfigGUI
DhDrawCenteredString(matrices, font, title, width / 2, 15, 0xFFFFFF); // Render title
// If the update is pending, display this message to inform the user that it will apply when the game restarts
if (SelfUpdater.deleteOldOnClose)
DhDrawString(matrices, font, Translatable(configBase.modID + ".updater.waitingForClose"), 4, height - 38, 0xFFFFFF);
if (this.configBase.modID == "distanthorizons")
{
// Display version
DhDrawString(matrices, font, TextOrLiteral(ModInfo.VERSION), 2, height - 10, 0xAAAAAA);
// If the update is pending, display this message to inform the user that it will apply when the game restarts
if (SelfUpdater.deleteOldOnClose)
DhDrawString(matrices, font, Translatable(configBase.modID + ".updater.waitingForClose"), 4, height - 38, 0xFFFFFF);
}
// Render the tooltip only if it can find a tooltip in the language file
coreSubProjects
+1 -1
Submodule coreSubProjects updated: f8814e3a11...48a3675eec
fabric/src/main/resources/DistantHorizons.fabric.mixins.json
+27 -28
View File
@@ -1,30 +1,29 @@
{
"required": true,
"minVersion": "0.8",
"package": "com.seibel.distanthorizons.fabric.mixins",
"mixins": [
"server.unsafe.MixinThreadingDetector",
"server.MixinChunkGenerator",
"server.MixinChunkMap",
"server.MixinUtilBackgroundThread"
],
"client": [
"client.MixinClientLevel",
"client.MixinClientPacketListener",
"client.MixinDebugScreenOverlay",
"client.MixinFogRenderer",
"client.MixinGameRenderer",
"client.MixinLevelRenderer",
"client.MixinLightmap",
"client.MixinOptionsScreen",
"client.MixinMinecraft",
"client.MixinTextureUtil",
"mods.sodium.MixinSodiumRenderer"
],
"server": [],
"injectors": {
"defaultRequire": 1
},
"plugin": "com.seibel.distanthorizons.fabric.mixins.FabricMixinPlugin"
"required": true,
"minVersion": "0.8",
"package": "com.seibel.distanthorizons.fabric.mixins",
"mixins": [
"server.unsafe.MixinThreadingDetector",
"server.MixinChunkGenerator",
"server.MixinChunkMap",
"server.MixinUtilBackgroundThread"
],
"client": [
"client.MixinClientLevel",
"client.MixinClientPacketListener",
"client.MixinDebugScreenOverlay",
"client.MixinFogRenderer",
"client.MixinGameRenderer",
"client.MixinLevelRenderer",
"client.MixinLightmap",
"client.MixinOptionsScreen",
"client.MixinMinecraft",
"client.MixinTextureUtil",
"mods.sodium.MixinSodiumRenderer"
],
"server": [],
"injectors": {
"defaultRequire": 1
},
"plugin": "com.seibel.distanthorizons.fabric.mixins.FabricMixinPlugin"
}
fabric/src/main/resources/fabric.mod.json
+55 -52
View File
@@ -1,56 +1,59 @@
{
"schemaVersion": 1,
"id": "distanthorizons",
"version": "${version}",
"name": "${mod_name}",
"description": "${description}",
"authors": $authors,
"contact": {
"homepage": "${homepage}",
"sources": "${source}",
"issues": "${issues}"
},
"license": "LGPL-3",
"icon": "icon.png",
"accessWidener": "distanthorizons.accesswidener",
"environment": "*",
"entrypoints": {
"client": [
"com.seibel.distanthorizons.fabric.FabricClientMain"
"schemaVersion": 1,
"id": "distanthorizons",
"version": "${version}",
"name": "${mod_name}",
"description": "${description}",
"authors": $authors,
"contact": {
"homepage": "${homepage}",
"sources": "${source}",
"issues": "${issues}"
},
"license": "LGPL-3",
"icon": "icon.png",
"accessWidener": "distanthorizons.accesswidener",
"environment": "*",
"entrypoints": {
"client": [
"com.seibel.distanthorizons.fabric.FabricClientMain"
],
"server": [
"com.seibel.distanthorizons.fabric.FabricDedicatedServerMain"
],
"modmenu": [
"com.seibel.distanthorizons.fabric.wrappers.config.ModMenuIntegration"
]
},
"mixins": [
"DistantHorizons.fabric.mixins.json"
],
"server": [
"com.seibel.distanthorizons.fabric.FabricDedicatedServerMain"
],
"modmenu": [
"com.seibel.distanthorizons.fabric.wrappers.config.ModMenuIntegration"
]
},
"mixins": [
"DistantHorizons.fabric.mixins.json"
],
"depends": {
"fabricloader": "*",
"fabric-api-base": "*",
"fabric-lifecycle-events-v1": "*",
"fabric-key-binding-api-v1": "*",
"fabric-resource-loader-v0": "*",
"minecraft": $compatible_minecraft_versions,
"java": ">=${java_version}"
},
"custom": {
"modmenu": {
"links": {
"modmenu.discord": "${discord}"
}
"depends": {
"fabricloader": "*",
"fabric-api-base": "*",
"fabric-lifecycle-events-v1": "*",
"fabric-key-binding-api-v1": "*",
"fabric-resource-loader-v0": "*",
"minecraft": $compatible_minecraft_versions,
"java": ">=${java_version}"
},
"custom": {
"modmenu": {
"links": {
"modmenu.discord": "${discord}"
}
}
},
"suggests": {
"blendium": "*"
}
}
}
forge/src/main/resources/DistantHorizons.mixins.json
+21 -21
View File
@@ -1,23 +1,23 @@
{
"required": true,
"minVersion": "0.8",
"package": "com.seibel.distanthorizons.forge.mixins",
"mixins": [
"server.unsafe.MixinThreadingDetector",
"server.MixinUtilBackgroundThread",
"server.MixinChunkGenerator",
"server.MixinTFChunkGenerator"
],
"client": [
"client.MixinClientPacketListener",
"client.MixinDebugScreenOverlay",
"client.MixinFogRenderer",
"client.MixinGameRenderer",
"client.MixinLevelRenderer",
"client.MixinLightmap",
"client.MixinOptionsScreen",
"client.MixinTextureUtil"
],
"server": [],
"plugin": "com.seibel.distanthorizons.forge.mixins.ForgeMixinPlugin"
"required": true,
"minVersion": "0.8",
"package": "com.seibel.distanthorizons.forge.mixins",
"mixins": [
"server.unsafe.MixinThreadingDetector",
"server.MixinUtilBackgroundThread",
"server.MixinChunkGenerator",
"server.MixinTFChunkGenerator"
],
"client": [
"client.MixinClientPacketListener",
"client.MixinDebugScreenOverlay",
"client.MixinFogRenderer",
"client.MixinGameRenderer",
"client.MixinLevelRenderer",
"client.MixinLightmap",
"client.MixinOptionsScreen",
"client.MixinTextureUtil"
],
"server": [],
"plugin": "com.seibel.distanthorizons.forge.mixins.ForgeMixinPlugin"
}
forge/src/main/resources/META-INF/mods.toml
+26 -27
View File
@@ -1,33 +1,32 @@
modLoader="javafml" #//mandatory
loaderVersion="*" # // mandatory. Allow all forge versions as we are definding what Minecraft versions we requre later on
license="LGPL"
issueTrackerURL="${issues}"
modLoader = "javafml" #//mandatory
loaderVersion = "*" # // mandatory. Allow all forge versions as we are definding what Minecraft versions we requre later on
license = "LGPL"
issueTrackerURL = "${issues}"
[[mods]] #//mandatory
modId="distanthorizons" #//mandatory
version= "${version}" #//mandatory, gets the version number from jar populated by the build.gradle script
displayName="${mod_name}" #//mandatory
authors=["James Seibel", "Leonardo Amato", "Cola", "coolGi", "Ran", "Leetom"]
#//updateJSONURL="https://change.me.example.invalid/updates.json" # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
displayURL="${homepage}"
description= "${description}" #//mandatory. The description text for the mod
logoFile="logo.png"
catalogueImageIcon="icon.png"
credits="Massive thanks to: Leonardo, Cola, Ran, CoolGi, and Leetom. For their hard work to bring Distant Horizons to where it is today. - James"
#// if not set defaults to "false"
clientSideOnly="true"
#// if not set side defaults to "BOTH"
#// TODO change to "BOTH" when we add server support
side="CLIENT"
#// Allow any version to be present (or not) on the server
acceptableRemoteVersions="*"
modId = "distanthorizons" #//mandatory
version = "${version}" #//mandatory, gets the version number from jar populated by the build.gradle script
displayName = "${mod_name}" #//mandatory
authors = ["James Seibel", "Leonardo Amato", "Cola", "coolGi", "Ran", "Leetom"]
#//updateJSONURL="https://change.me.example.invalid/updates.json" # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
displayURL = "${homepage}"
description = "${description}" #//mandatory. The description text for the mod
logoFile = "logo.png"
catalogueImageIcon = "icon.png"
credits = "Massive thanks to: Leonardo, Cola, Ran, CoolGi, and Leetom. For their hard work to bring Distant Horizons to where it is today. - James"
#// if not set defaults to "false"
clientSideOnly = "true"
#// if not set side defaults to "BOTH"
#// TODO change to "BOTH" when we add server support
side = "CLIENT"
#// Allow any version to be present (or not) on the server
acceptableRemoteVersions = "*"
[[dependencies.distanthorizons]]
modId="minecraft"
mandatory=true
versionRange="${compatible_forgemc_versions}" # Where we set what version of mc it is avalible for
ordering="NONE"
side="BOTH"
modId = "minecraft"
mandatory = true
versionRange = "${compatible_forgemc_versions}" # Where we set what version of mc it is avalible for
ordering = "NONE"
side = "BOTH"