diff --git a/build.gradle b/build.gradle index 3eb19a2..6274cb2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1704751096 +//version: 1705357285 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -122,6 +122,7 @@ propertyDefaultIfUnset("modrinthProjectId", "") propertyDefaultIfUnset("modrinthRelations", "") propertyDefaultIfUnset("curseForgeProjectId", "") propertyDefaultIfUnset("curseForgeRelations", "") +propertyDefaultIfUnset("versionPattern", "") propertyDefaultIfUnset("minimizeShadowedDependencies", true) propertyDefaultIfUnset("relocateShadowedDependencies", true) // Deprecated properties (kept for backwards compat) @@ -370,6 +371,7 @@ catch (Exception ignored) { // Pulls version first from the VERSION env and then git tag String identifiedVersion String versionOverride = System.getenv("VERSION") ?: null +boolean checkVersion = false try { // Produce a version based on the tag, or for branches something like 0.2.2-configurable-maven-and-extras.38+43090270b6-dirty if (versionOverride == null) { @@ -388,6 +390,8 @@ try { } } else if (isDirty) { identifiedVersion += "-${branchName}+${gitDetails.gitHash}-dirty" + } else { + checkVersion = true } } else { identifiedVersion = versionOverride @@ -409,6 +413,8 @@ ext { if (identifiedVersion == versionOverride) { out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7') +} else if (checkVersion && versionPattern && !(identifiedVersion ==~ versionPattern)) { + throw new GradleException("Invalid version: '$identifiedVersion' does not match version pattern '$versionPattern'") } group = "com.github.GTNewHorizons" @@ -428,18 +434,31 @@ minecraft { for (f in replaceGradleTokenInFile.split(',')) { tagReplacementFiles.add f } + out.style(Style.Info).text('replaceGradleTokenInFile is deprecated! Consider using generateGradleTokenClass.').println() } if (gradleTokenModId) { - injectedTags.put gradleTokenModId, modId + if (replaceGradleTokenInFile) { + injectedTags.put gradleTokenModId, modId + } else { + out.style(Style.Failure).text('gradleTokenModId is deprecated! The field will no longer be generated.').println() + } } if (gradleTokenModName) { - injectedTags.put gradleTokenModName, modName + if (replaceGradleTokenInFile) { + injectedTags.put gradleTokenModName, modName + } else { + out.style(Style.Failure).text('gradleTokenModName is deprecated! The field will no longer be generated.').println() + } } if (gradleTokenVersion) { injectedTags.put gradleTokenVersion, modVersion } if (gradleTokenGroupName) { - injectedTags.put gradleTokenGroupName, modGroup + if (replaceGradleTokenInFile) { + injectedTags.put gradleTokenGroupName, modGroup + } else { + out.style(Style.Failure).text('gradleTokenGroupName is deprecated! The field will no longer be generated.').println() + } } if (enableGenericInjection.toBoolean()) { injectMissingGenerics.set(true) diff --git a/dependencies.gradle b/dependencies.gradle index ad689ba..f45d5b6 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -32,21 +32,22 @@ dependencies { shadowImplementation("com.sun.xml.bind:jaxb-impl:3.0.2") shadowImplementation("org.mozilla:rhino-engine:1.7.14") - runtimeOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev') + runtimeOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.5.4-GTNH:dev') + // runtimeOnlyNonPublishable('com.github.GTNewHorizons:inventory-tweaks:1.6.2:dev') if (addGtForTesting) { - runtimeOnlyNonPublishable('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.15:dev') - runtimeOnlyNonPublishable("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-307-GTNH:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:Chisel:2.13.0-GTNH:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.8.1:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:Railcraft:9.15.3:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:EnderIO:2.6.2:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:ProjectRed:4.9.1-GTNH:dev") { transitive = false } - runtimeOnlyNonPublishable("com.github.GTNewHorizons:MrTJPCore:1.1.5:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForgeMultipart:1.4.3:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForgeRelocation:0.0.3:dev") + runtimeOnlyNonPublishable('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.38:dev') + runtimeOnlyNonPublishable("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-312-GTNH:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:Chisel:2.13.4-GTNH:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.8.2:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:Railcraft:9.15.5:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:EnderIO:2.6.3:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:ProjectRed:4.9.3-GTNH:dev") { transitive = false } + runtimeOnlyNonPublishable("com.github.GTNewHorizons:MrTJPCore:1.1.6:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForgeMultipart:1.4.7:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForgeRelocation:0.1.0:dev") reobfJarConfiguration group: 'curse.maven', name: 'cofh-core-69162', version: '2388750' - runtimeOnlyNonPublishable("com.github.GTNewHorizons:AppleCore:3.2.12:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:Hodgepodge:2.4.5:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:AppleCore:3.3.0:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:Hodgepodge:2.4.9:dev") } if (addReikaModsForTesting) { // DragonAPI diff --git a/gradle.properties b/gradle.properties index 4770b53..09d29e5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,10 +38,10 @@ enableGenericInjection = false # Generate a class with String fields for the mod id, name, version and group name named with the fields below generateGradleTokenClass = me.eigenraven.lwjgl3ify.Tags -gradleTokenModId = MODID -gradleTokenModName = MODNAME +gradleTokenModId = +gradleTokenModName = gradleTokenVersion = VERSION -gradleTokenGroupName = GROUPNAME +gradleTokenGroupName = # [DEPRECATED] # Multiple source files can be defined here by providing a comma-seperated list: Class1.java,Class2.java,Class3.java # public static final String VERSION = "GRADLETOKEN_VERSION"; diff --git a/src/main/java/me/eigenraven/lwjgl3ify/ClientProxy.java b/src/main/java/me/eigenraven/lwjgl3ify/ClientProxy.java index 825f6b0..75694e3 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/ClientProxy.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/ClientProxy.java @@ -7,6 +7,8 @@ import net.minecraft.client.Minecraft; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.common.MinecraftForge; +import org.lwjglx.input.Keyboard; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.ICrashCallable; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -34,6 +36,8 @@ public class ClientProxy extends CommonProxy { if (Config.DEBUG_REGISTER_OPENGL_LOGGER) { GLDebugLog.setupDebugMessageCallback(); } + // Populate keyboard-layout-dependent key lookup tables + Keyboard.populateKeyLookupTables(); } @Override diff --git a/src/main/java/me/eigenraven/lwjgl3ify/Lwjgl3ify.java b/src/main/java/me/eigenraven/lwjgl3ify/Lwjgl3ify.java index 0751de7..1d758a8 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/Lwjgl3ify.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/Lwjgl3ify.java @@ -27,12 +27,12 @@ import me.eigenraven.lwjgl3ify.core.Config; guiFactory = "me.eigenraven.lwjgl3ify.client.GuiFactory") public class Lwjgl3ify { - public static Logger LOG = LogManager.getLogger(Tags.MODID); + public static Logger LOG = LogManager.getLogger("lwjgl3ify"); @Mod.Instance public static Lwjgl3ify INSTANCE; - @SidedProxy(clientSide = Tags.GROUPNAME + ".ClientProxy", serverSide = Tags.GROUPNAME + ".CommonProxy") + @SidedProxy(clientSide = "me.eigenraven.lwjgl3ify.ClientProxy", serverSide = "me.eigenraven.lwjgl3ify.CommonProxy") public static CommonProxy PROXY; @Mod.EventHandler diff --git a/src/main/java/me/eigenraven/lwjgl3ify/client/GuiConfigLwjgl3ify.java b/src/main/java/me/eigenraven/lwjgl3ify/client/GuiConfigLwjgl3ify.java index f0da948..6c58b90 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/client/GuiConfigLwjgl3ify.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/client/GuiConfigLwjgl3ify.java @@ -13,7 +13,6 @@ import org.lwjglx.input.Mouse; import com.google.common.collect.Lists; import cpw.mods.fml.client.config.GuiConfig; -import me.eigenraven.lwjgl3ify.Tags; import me.eigenraven.lwjgl3ify.core.Config; @SuppressWarnings("unused") @@ -26,7 +25,7 @@ public class GuiConfigLwjgl3ify extends GuiConfig { new ConfigElement<>(Config.config.getCategory(Config.CATEGORY_WINDOW)), new ConfigElement<>(Config.config.getCategory(Config.CATEGORY_INPUT)), new ConfigElement<>(Config.config.getCategory(Config.CATEGORY_GLCONTEXT))), - Tags.MODID, + "lwjgl3ify", "config", false, false, diff --git a/src/main/java/me/eigenraven/lwjgl3ify/core/Lwjgl3ifyCoremod.java b/src/main/java/me/eigenraven/lwjgl3ify/core/Lwjgl3ifyCoremod.java index 3bf725b..ed3b7e1 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/core/Lwjgl3ifyCoremod.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/core/Lwjgl3ifyCoremod.java @@ -23,13 +23,12 @@ import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader; import cpw.mods.fml.relauncher.FMLLaunchHandler; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; -import me.eigenraven.lwjgl3ify.Tags; @IFMLLoadingPlugin.MCVersion("1.7.10") @IFMLLoadingPlugin.SortingIndex(Integer.MAX_VALUE - 2) public class Lwjgl3ifyCoremod implements IFMLLoadingPlugin, IEarlyMixinLoader { - public static final Logger LOGGER = LogManager.getLogger(Tags.MODID); + public static final Logger LOGGER = LogManager.getLogger("lwjgl3ify"); public Lwjgl3ifyCoremod() { Config.loadConfig(); diff --git a/src/main/java/org/lwjglx/input/Keyboard.java b/src/main/java/org/lwjglx/input/Keyboard.java index d7011c3..70f773a 100644 --- a/src/main/java/org/lwjglx/input/Keyboard.java +++ b/src/main/java/org/lwjglx/input/Keyboard.java @@ -165,6 +165,8 @@ public class Keyboard { public static final int keyCount; + private static final Map reverseKeyMap = new ConcurrentHashMap<>(); + public enum KeyState { PRESS(true), @@ -203,6 +205,7 @@ public class Keyboard { String name = field.getName() .substring(4); unlocalizedKeyNameMiniLut[key] = name; + reverseKeyMap.put(name, key); keyCounter++; } } @@ -216,6 +219,13 @@ public class Keyboard { eventQueue.add(new KeyEvent(0, '\0', KeyState.RELEASE, Sys.getNanoTime())); } + /** Populates the key name->index lookup table with the current keyboard layout based names. */ + public static void populateKeyLookupTables() { + for (int key = 0; key <= 255; key++) { + getKeyName(key); + } + } + public static void addRawKeyEvent(KeyEvent event) { if (event == null || (event.state == KeyState.REPEAT && !doRepeatEvents)) { return; @@ -312,8 +322,6 @@ public class Keyboard { return eventQueue.peek().nano; } - private static final Map reverseKeyMap = new ConcurrentHashMap<>(); - public static String getKeyName(int key) { if (key == KEY_NONE) { return "NONE";