From 3278d3518d6994e048639f82b9fa6d297b07fb2f Mon Sep 17 00:00:00 2001 From: Jeff McClure Date: Wed, 12 Oct 2022 12:50:00 +0000 Subject: [PATCH] 1.19.2 --- 1.19.2.properties | 45 +++++++++++++++++++ 1.19.properties | 6 ++- build.gradle | 25 +++++++---- .../common/wrappers/McObjectConverter.java | 10 ++++- .../common/wrappers/gui/ConfigScreenMC.java | 21 +++++---- .../common/wrappers/gui/UpdateModScreen.java | 29 +++++++----- .../minecraft/MinecraftClientWrapper.java | 2 +- gradle.properties | 6 ++- settings.gradle | 15 ++++++- 9 files changed, 124 insertions(+), 35 deletions(-) create mode 100644 1.19.2.properties diff --git a/1.19.2.properties b/1.19.2.properties new file mode 100644 index 000000000..61681a13d --- /dev/null +++ b/1.19.2.properties @@ -0,0 +1,45 @@ +java_version = 17 +minecraft_version=1.19.2 +parchment_version=2022.08.10 +compatible_minecraft_versions=["1.19.2"] + +# Fabric loader +fabric_loader_version=0.14.9 +fabric_api_version=0.60.0+1.19.2 +architectury_version=6.2.46 + # Fabric mod versions + modmenu_version=4.0.6 + starlight_version_fabric= + phosphor_version_fabric= + lithium_version= + sodium_version=mc1.19.2-0.4.4 + iris_version=1.19.2-v1.3.1 + bclib_version=1.4.5 + immersive_portals_version = + canvas_version=mc119-1.0.2480 + + # Fabric mod run + # 0 = Don't enable and don't run + # 1 = Can be referenced in code but doesn't run + # 2 = Can be referenced in code and runs in client + enable_starlight=0 + enable_phosphor=0 + enable_sodium=1 + enable_lithium=0 + enable_iris=0 + enable_bclib=1 + enable_canvas=0 + +# Forge loader + forge_version=43.1.1 +# forge_version=43.1.34 + # Forge mod versions + starlight_version_forge=0 + terraforged_version= + + # Forge mod run + # 0 = Don't enable and don't run + # 1 = Can be referenced in code but doesn't run + # 2 = Can be referenced in code and runs in client + enable_starlight_forge=0 + enable_terraforged=0 diff --git a/1.19.properties b/1.19.properties index 567f2793a..4d2287315 100644 --- a/1.19.properties +++ b/1.19.properties @@ -2,7 +2,7 @@ java_version = 17 minecraft_version=1.19 -parchment_version=2022.03.13 +parchment_version=2022.08.10 compatible_minecraft_versions=["1.19"] # Fabric loader @@ -14,10 +14,11 @@ architectury_version=5.6.24 starlight_version_fabric= phosphor_version_fabric= lithium_version= - sodium_version=mc1.19-0.4.2 + sodium_version=3820973 iris_version=1.19.x-v1.2.5 immersive_portals_version = bclib_version= + canvas_version=mc118:1.0.2397 # Fabric mod run # 0 = Don't enable and don't run @@ -29,6 +30,7 @@ architectury_version=5.6.24 enable_lithium=0 enable_iris=0 enable_bclib=0 + enable_canvas=0 # Forge loader forge_version=41.0.19 diff --git a/build.gradle b/build.gradle index 18875767d..d3fb07d2a 100644 --- a/build.gradle +++ b/build.gradle @@ -56,7 +56,7 @@ def writeBuildGradlePredefine(List mcVers, int mcIndex) { // Sets up the variables for Manifold in the code def loadProperties() { - def defaultMcVersion = "1.18.2" + def defaultMcVersion = "1.19.2" // def defaultMcVersion = "1.19" // For now use 1.18.2 as default until 1.19 is done def mcVersion = "" def mcVers = mcVersions.split(",") @@ -90,7 +90,9 @@ def loadProperties() { "1.17.1": "1_17", "1.18.1": "1_18", "1.18.2": "1_18", - "1.19": "1_19" + "1.19": "1_19", + "1.19.1": "1_19", + "1.19.2": "1_19" ] // Use this as sometimes multiple versions use the same access wideners rootProject.ext.set("accessWidenerVersion", mcVersionToAcsessWidenerVersion.get(mcVersion)) @@ -116,7 +118,7 @@ makeAccessWidener() // Sets up the version string -rootProject.versionStr = rootProject.mod_version + "-" + rootProject.minecraft_version + "-" + new Date().format("yyyy_MM_dd_HH_mm") +rootProject.versionStr = rootProject.mod_version + "-" + rootProject.minecraft_version // + "-" + new Date().format("yyyy_MM_dd_HH_mm") // Merged jar settings forgix { @@ -212,8 +214,18 @@ subprojects { p -> // conditional dependencies // //==========================// + // The logic for buildForge can be made more succinct, but the readability goes way down. + def buildForge = true + if (gradle.startParameter.taskRequests.size() > 0) { + if (gradle.startParameter.taskRequests[0].args.size() > 0) { + if (gradle.startParameter.taskRequests[0].args[0].startsWith("fabric:")) { + buildForge = false + } + } + } + // Minecraft dependent sub-projects - if (p == project(":common") || p == project(":forge") || p == project(":fabric")) { + if (p == project(":common") || (buildForge && p == project(":forge")) || p == project(":fabric")) { // Add Minecraft minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" // The following line declares the mojmap mappings & parchment mappings @@ -221,10 +233,7 @@ subprojects { p -> // Mojmap mappings officialMojangMappings() // Parchment mappings (it adds parameter mappings & javadoc) - if (rootProject.minecraft_version != "1.19") - parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip") - else // As 1.19 doesn't have parchment mappings yet, we use 1.18.2 mapping - parchment("org.parchmentmc.data:parchment-1.18.2:${rootProject.parchment_version}@zip") + parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip") } } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java b/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java index fda8ae3ee..d8869feb0 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/McObjectConverter.java @@ -60,7 +60,15 @@ public class McObjectConverter directions = new Direction[lodDirs.length]; lodDirections = new ELodDirection[lodDirs.length]; for (ELodDirection lodDir : lodDirs) { - Direction dir = Direction.byName(lodDir.name()); + Direction dir = switch (lodDir.name().toUpperCase()) { + case "DOWN" -> Direction.DOWN; + case "UP" -> Direction.UP; + case "NORTH" -> Direction.NORTH; + case "SOUTH" -> Direction.SOUTH; + case "WEST" -> Direction.WEST; + case "EAST" -> Direction.EAST; + default -> null; + }; if (dir == null) { throw new IllegalArgumentException("Invalid direction on init mapping: " + lodDir); } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/ConfigScreenMC.java b/common/src/main/java/com/seibel/lod/common/wrappers/gui/ConfigScreenMC.java index e8b01db24..7ca272541 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/ConfigScreenMC.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/gui/ConfigScreenMC.java @@ -6,9 +6,6 @@ import com.seibel.lod.core.config.gui.AbstractScreen; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.ContainerObjectSelectionList; import net.minecraft.client.gui.screens.Screen; -#if PRE_MC_1_19 -import net.minecraft.network.chat.TranslatableComponent; -#endif import java.util.*; @@ -22,12 +19,20 @@ public class ConfigScreenMC { private final Screen parent; private ConfigListWidget list; private AbstractScreen screen; + + + #if PRE_MC_1_19 + public static net.minecraft.network.chat.TranslatableComponent translate (String str, Object... args) { + return new net.minecraft.network.chat.TranslatableComponent(str, args); + } + #else + public static net.minecraft.network.chat.MutableComponent translate (String str, Object... args) { + return net.minecraft.network.chat.Component.translatable(str, args); + } + #endif + protected ConfigScreenRenderer(Screen parent, AbstractScreen screen) { - #if PRE_MC_1_19 - super(new TranslatableComponent(ModInfo.ID + ".config.title")); - #else - super(Component.translatable(ModInfo.ID + ".config.title")); - #endif + super(translate(ModInfo.ID + ".config.title")); this.parent = parent; this.screen = screen; } diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/gui/UpdateModScreen.java b/common/src/main/java/com/seibel/lod/common/wrappers/gui/UpdateModScreen.java index 8f43e4d98..376cbd329 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/gui/UpdateModScreen.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/gui/UpdateModScreen.java @@ -13,7 +13,6 @@ import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; import java.util.*; @@ -23,12 +22,18 @@ public class UpdateModScreen extends Screen { private Screen parent; private String newVersion; + #if PRE_MC_1_19 + public static net.minecraft.network.chat.TranslatableComponent translate (String str, Object... args) { + return new net.minecraft.network.chat.TranslatableComponent(str, args); + } + #else + public static net.minecraft.network.chat.MutableComponent translate (String str, Object... args) { + return net.minecraft.network.chat.Component.translatable(str, args); + } + #endif + public UpdateModScreen(Screen parent, String newVersion) { - #if PRE_MC_1_19 - super(new TranslatableComponent(ModInfo.ID + ".updater.title")); - #else - super(Component.translatable(ModInfo.ID + ".updater.title")); - #endif + super(translate(ModInfo.ID + ".updater.title")); this.parent = parent; this.newVersion = newVersion; } @@ -42,24 +47,24 @@ public class UpdateModScreen extends Screen { this.addBtn( - new Button(this.width / 2 - 100, this.height / 2 - 20, 150, 20, new TranslatableComponent(ModInfo.ID + ".updater.update"), (btn) -> { + new Button(this.width / 2 - 100, this.height / 2 - 20, 150, 20, translate(ModInfo.ID + ".updater.update"), (btn) -> { this.onClose(); modUpdated = true; }) ); this.addBtn( - new Button(this.width / 2 - 100, this.height / 2 + 5, 150, 20, new TranslatableComponent(ModInfo.ID + ".updater.later"), (btn) -> { + new Button(this.width / 2 - 100, this.height / 2 + 5, 150, 20, translate(ModInfo.ID + ".updater.later"), (btn) -> { this.onClose(); }) ); this.addBtn( - new Button(this.width / 2 - 100, this.height / 2 + 30, 150, 20, new TranslatableComponent(ModInfo.ID + ".updater.never"), (btn) -> { + new Button(this.width / 2 - 100, this.height / 2 + 30, 150, 20, translate(ModInfo.ID + ".updater.never"), (btn) -> { this.onClose(); Config.Client.AutoUpdater.enableAutoUpdater.set(false); }) ); this.addBtn( - new Button(this.width / 2 - 100, this.height / 2 + 55, 150, 20, new TranslatableComponent(ModInfo.ID + ".updater.silentUpdate"), (btn) -> { + new Button(this.width / 2 - 100, this.height / 2 + 55, 150, 20, translate(ModInfo.ID + ".updater.silentUpdate"), (btn) -> { this.onClose(); Config.Client.AutoUpdater.promptForUpdate.set(false); }) @@ -74,8 +79,8 @@ public class UpdateModScreen extends Screen { super.render(matrices, mouseX, mouseY, delta); // Render the vanilla stuff (currently only used for the background and tint) - drawCenteredString(matrices, this.font, new TranslatableComponent(ModInfo.ID + ".updater.text1"), this.width / 2, this.height / 2 - 60, 0xFFFFFF); - drawCenteredString(matrices, this.font, new TranslatableComponent(ModInfo.ID + ".updater.text2", ModInfo.VERSION, this.newVersion), this.width / 2, this.height / 2 - 45, 0xFFFFFF); + drawCenteredString(matrices, this.font, translate(ModInfo.ID + ".updater.text1"), this.width / 2, this.height / 2 - 60, 0xFFFFFF); + drawCenteredString(matrices, this.font, translate(ModInfo.ID + ".updater.text2", ModInfo.VERSION, this.newVersion), this.width / 2, this.height / 2 - 45, 0xFFFFFF); } @Override diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java index b5271c7d4..fa4e4da7d 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/minecraft/MinecraftClientWrapper.java @@ -224,7 +224,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra #if PRE_MC_1_19 getPlayer().sendMessage(new TextComponent(string), getPlayer().getUUID()); #else - getPlayer().sendSystemMessage(Component.translatable(string)); + getPlayer().sendSystemMessage(net.minecraft.network.chat.Component.translatable(string)); #endif } diff --git a/gradle.properties b/gradle.properties index 817b50c72..d77d3025d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,14 +16,16 @@ architectury_version=5.7.28 enabled_platforms=fabric,forge # Global Plugin Versions +toml_version=3.6.4 nightconfig_version=3.6.6 flatlaf_version=2.3 svgSalamander_version=1.1.3 manifold_version=2022.1.19 -mcVersions=1.16.5,1.17.1,1.18.1,1.18.2,1.19 +mcVersions=1.16.5,1.17.1,1.18.1,1.18.2,1.19,1.19.1,1.19.2 # Internal Properties (These are set at runtime) versionStr= ##### FOR IDE SUPPORT AND TELL IDE TO USE CERTIAN MC VERSION: SWITCH THIS: -mcVer=1.18.2 +##### Determines which mc version is built +mcVer=1.19.2 diff --git a/settings.gradle b/settings.gradle index 52d4a6589..9dd81f28b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,7 +11,20 @@ pluginManagement { // Minecraft dependent sub-projects include("common") include("fabric") -include("forge") + +// The logic for buildForge can be made more succinct, but the readability goes way down. +def buildForge = true +if (gradle.startParameter.taskRequests.size() > 0) { + if (gradle.startParameter.taskRequests[0].args.size() > 0) { + if (gradle.startParameter.taskRequests[0].args[0].startsWith("fabric:")) { + buildForge = false + } + } +} + +if (buildForge) { + include("forge") +} // Minecraft independent sub-projects include("core")