From 3fdfc097cbe0f1d7a4b2df4fce9689a0a6147536 Mon Sep 17 00:00:00 2001 From: JFronny Date: Sun, 21 Aug 2022 16:22:54 +0200 Subject: [PATCH] Use quickmath as the mod id for consistency --- README.md | 2 +- gradle.properties | 2 +- .../BytecodeTransformer.java | 12 ++++++------ .../jfronny/{quickmeth => quickmath}/Cfg.java | 2 +- .../jfronny/{quickmeth => quickmath}/DMap.java | 2 +- .../{quickmeth => quickmath}/MathUtil.java | 2 +- .../{quickmeth => quickmath}/MixinPlugin.java | 4 ++-- .../{quickmeth => quickmath}/ModMain.java | 2 +- .../mixin/MathHelperMixin.java | 4 ++-- .../mixin/MathHelperMixin2.java | 4 ++-- .../mixin/MixinPerlinNoiseSampler.java | 4 ++-- .../mixin/MixinSimplexNoiseSampler.java | 4 ++-- .../assets/{quickmeth => quickmath}/icon.png | Bin .../resources/assets/quickmath/lang/en_us.json | 17 +++++++++++++++++ .../resources/assets/quickmeth/lang/en_us.json | 17 ----------------- src/main/resources/fabric.mod.json | 17 +++++++++-------- ...kmeth.mixins.json => quickmath.mixins.json} | 4 ++-- 17 files changed, 50 insertions(+), 49 deletions(-) rename src/main/java/io/gitlab/jfronny/{quickmeth => quickmath}/BytecodeTransformer.java (96%) rename src/main/java/io/gitlab/jfronny/{quickmeth => quickmath}/Cfg.java (94%) rename src/main/java/io/gitlab/jfronny/{quickmeth => quickmath}/DMap.java (98%) rename src/main/java/io/gitlab/jfronny/{quickmeth => quickmath}/MathUtil.java (98%) rename src/main/java/io/gitlab/jfronny/{quickmeth => quickmath}/MixinPlugin.java (95%) rename src/main/java/io/gitlab/jfronny/{quickmeth => quickmath}/ModMain.java (89%) rename src/main/java/io/gitlab/jfronny/{quickmeth => quickmath}/mixin/MathHelperMixin.java (97%) rename src/main/java/io/gitlab/jfronny/{quickmeth => quickmath}/mixin/MathHelperMixin2.java (94%) rename src/main/java/io/gitlab/jfronny/{quickmeth => quickmath}/mixin/MixinPerlinNoiseSampler.java (95%) rename src/main/java/io/gitlab/jfronny/{quickmeth => quickmath}/mixin/MixinSimplexNoiseSampler.java (95%) rename src/main/resources/assets/{quickmeth => quickmath}/icon.png (100%) create mode 100644 src/main/resources/assets/quickmath/lang/en_us.json delete mode 100644 src/main/resources/assets/quickmeth/lang/en_us.json rename src/main/resources/{quickmeth.mixins.json => quickmath.mixins.json} (72%) diff --git a/README.md b/README.md index 1caf127..8c64898 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Quickmeth allows you to break math methods in minecraft by enabling replacements for: +QuickMäth allows you to break math methods in minecraft by enabling replacements for: - The standard math methods (used almost everywhere where math is needed) - Trigonometry (which is also used across the codebase and affect things like rendering) - Perlin & Simplex noise methods (used in terrain generation) diff --git a/gradle.properties b/gradle.properties index fda870a..db7bc49 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ minecraft_version=1.19.1 yarn_mappings=build.1 loader_version=0.14.8 maven_group=io.jfronny.gitlab -archives_base_name=quickmeth +archives_base_name=quickmath fabric_version=0.58.5+1.19.1 jfapi_version=2.10.0 diff --git a/src/main/java/io/gitlab/jfronny/quickmeth/BytecodeTransformer.java b/src/main/java/io/gitlab/jfronny/quickmath/BytecodeTransformer.java similarity index 96% rename from src/main/java/io/gitlab/jfronny/quickmeth/BytecodeTransformer.java rename to src/main/java/io/gitlab/jfronny/quickmath/BytecodeTransformer.java index b9cddd8..9bf3787 100644 --- a/src/main/java/io/gitlab/jfronny/quickmeth/BytecodeTransformer.java +++ b/src/main/java/io/gitlab/jfronny/quickmath/BytecodeTransformer.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.quickmeth; +package io.gitlab.jfronny.quickmath; import io.gitlab.jfronny.libjf.unsafe.asm.AsmConfig; import io.gitlab.jfronny.libjf.unsafe.asm.AsmTransformer; @@ -13,19 +13,19 @@ import java.util.Set; public class BytecodeTransformer implements AsmConfig { private static final String math = "java/lang/Math"; private static final String random = "java/util/Random"; - private static final String mathUtil = "io/gitlab/jfronny/quickmeth/MathUtil"; + private static final String mathUtil = "io/gitlab/jfronny/quickmath/MathUtil"; private static final String mathHelperIntermediary = "net.minecraft.class_3532"; private static final String mathHelper = PatchUtil.getRemappedInternal(mathHelperIntermediary); private static final String mojangRandomIntermediary = "net.minecraft.class_5819"; private static final String mojangRandom = PatchUtil.getRemappedInternal(mojangRandomIntermediary); private static final String mathHelperRandomUuid = mth("method_15378", "(Lnet/minecraft/class_5819;)Ljava/util/UUID;"); - private static final Map mth = DMap.of( // Maps methods in mathHelper to quickmeth MathUtil methods + private static final Map mth = DMap.of( // Maps methods in mathHelper to QuickMäth MathUtil methods mth("method_15374", "(F)F"), "sinM", mth("method_15362", "(F)F"), "cosM", mth("method_15355", "(F)F"), "sqrtM", mth("method_15375", "(D)I"), "floor" ); - private static final Map rnd = DMap.of( // Maps methods in minecrafts Random to quickmeth MathUtil methods + private static final Map rnd = DMap.of( // Maps methods in Minecraft Random to QuickMäth MathUtil methods rnd("method_43054", "()I"), "nextInt", rnd("method_43048", "(I)I"), "nextInt", rnd("method_43055", "()J"), "nextLong", @@ -34,7 +34,7 @@ public class BytecodeTransformer implements AsmConfig { rnd("method_43058", "()D"), "random", rnd("method_43059", "()D"), "random" ); - private static final Map stat = Map.of( // Maps quickmeth MathUtil methods to booleans representing whether to overwrite them + private static final Map stat = Map.of( // Maps QuickMäth MathUtil methods to booleans representing whether to overwrite them "sin", Cfg.corruptTrigonometry2, "cos", Cfg.corruptTrigonometry2, "sinM", Cfg.corruptTrigonometry, @@ -79,7 +79,7 @@ public class BytecodeTransformer implements AsmConfig { if (insn.getOpcode() == Opcodes.INVOKESTATIC || insn.getOpcode() == Opcodes.INVOKEVIRTUAL || insn.getOpcode() == Opcodes.INVOKEINTERFACE) { String insNew = null; MethodInsnNode mIns = (MethodInsnNode) insn; - // Resolve a possible replacement method in quickmeth MathUtil + // Resolve a possible replacement method in QuickMäth MathUtil if (mIns.owner.equals(math)) { if (stat.containsKey(mIns.name)) insNew = mIns.name; diff --git a/src/main/java/io/gitlab/jfronny/quickmeth/Cfg.java b/src/main/java/io/gitlab/jfronny/quickmath/Cfg.java similarity index 94% rename from src/main/java/io/gitlab/jfronny/quickmeth/Cfg.java rename to src/main/java/io/gitlab/jfronny/quickmath/Cfg.java index 630fc3d..cea3f0a 100644 --- a/src/main/java/io/gitlab/jfronny/quickmeth/Cfg.java +++ b/src/main/java/io/gitlab/jfronny/quickmath/Cfg.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.quickmeth; +package io.gitlab.jfronny.quickmath; import io.gitlab.jfronny.libjf.config.api.Entry; import io.gitlab.jfronny.libjf.config.api.JfConfig; diff --git a/src/main/java/io/gitlab/jfronny/quickmeth/DMap.java b/src/main/java/io/gitlab/jfronny/quickmath/DMap.java similarity index 98% rename from src/main/java/io/gitlab/jfronny/quickmeth/DMap.java rename to src/main/java/io/gitlab/jfronny/quickmath/DMap.java index 17cb6de..248f96b 100644 --- a/src/main/java/io/gitlab/jfronny/quickmeth/DMap.java +++ b/src/main/java/io/gitlab/jfronny/quickmath/DMap.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.quickmeth; +package io.gitlab.jfronny.quickmath; import java.util.*; diff --git a/src/main/java/io/gitlab/jfronny/quickmeth/MathUtil.java b/src/main/java/io/gitlab/jfronny/quickmath/MathUtil.java similarity index 98% rename from src/main/java/io/gitlab/jfronny/quickmeth/MathUtil.java rename to src/main/java/io/gitlab/jfronny/quickmath/MathUtil.java index ecbf5ac..ce8ceae 100644 --- a/src/main/java/io/gitlab/jfronny/quickmeth/MathUtil.java +++ b/src/main/java/io/gitlab/jfronny/quickmath/MathUtil.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.quickmeth; +package io.gitlab.jfronny.quickmath; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/io/gitlab/jfronny/quickmeth/MixinPlugin.java b/src/main/java/io/gitlab/jfronny/quickmath/MixinPlugin.java similarity index 95% rename from src/main/java/io/gitlab/jfronny/quickmeth/MixinPlugin.java rename to src/main/java/io/gitlab/jfronny/quickmath/MixinPlugin.java index e5614b1..409bc99 100644 --- a/src/main/java/io/gitlab/jfronny/quickmeth/MixinPlugin.java +++ b/src/main/java/io/gitlab/jfronny/quickmath/MixinPlugin.java @@ -1,6 +1,6 @@ -package io.gitlab.jfronny.quickmeth; +package io.gitlab.jfronny.quickmath; -import io.gitlab.jfronny.quickmeth.mixin.*; +import io.gitlab.jfronny.quickmath.mixin.*; import org.objectweb.asm.tree.ClassNode; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; diff --git a/src/main/java/io/gitlab/jfronny/quickmeth/ModMain.java b/src/main/java/io/gitlab/jfronny/quickmath/ModMain.java similarity index 89% rename from src/main/java/io/gitlab/jfronny/quickmeth/ModMain.java rename to src/main/java/io/gitlab/jfronny/quickmath/ModMain.java index eb09cfc..126b790 100644 --- a/src/main/java/io/gitlab/jfronny/quickmeth/ModMain.java +++ b/src/main/java/io/gitlab/jfronny/quickmath/ModMain.java @@ -1,4 +1,4 @@ -package io.gitlab.jfronny.quickmeth; +package io.gitlab.jfronny.quickmath; import io.gitlab.jfronny.commons.log.*; import net.fabricmc.api.*; diff --git a/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperMixin.java b/src/main/java/io/gitlab/jfronny/quickmath/mixin/MathHelperMixin.java similarity index 97% rename from src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperMixin.java rename to src/main/java/io/gitlab/jfronny/quickmath/mixin/MathHelperMixin.java index 2dac1b3..b3d509b 100644 --- a/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperMixin.java +++ b/src/main/java/io/gitlab/jfronny/quickmath/mixin/MathHelperMixin.java @@ -1,6 +1,6 @@ -package io.gitlab.jfronny.quickmeth.mixin; +package io.gitlab.jfronny.quickmath.mixin; -import io.gitlab.jfronny.quickmeth.MathUtil; +import io.gitlab.jfronny.quickmath.MathUtil; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.random.*; import org.spongepowered.asm.mixin.Final; diff --git a/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperMixin2.java b/src/main/java/io/gitlab/jfronny/quickmath/mixin/MathHelperMixin2.java similarity index 94% rename from src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperMixin2.java rename to src/main/java/io/gitlab/jfronny/quickmath/mixin/MathHelperMixin2.java index 50f04c5..1fd6c73 100644 --- a/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MathHelperMixin2.java +++ b/src/main/java/io/gitlab/jfronny/quickmath/mixin/MathHelperMixin2.java @@ -1,6 +1,6 @@ -package io.gitlab.jfronny.quickmeth.mixin; +package io.gitlab.jfronny.quickmath.mixin; -import io.gitlab.jfronny.quickmeth.MathUtil; +import io.gitlab.jfronny.quickmath.MathUtil; import net.minecraft.util.math.MathHelper; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MixinPerlinNoiseSampler.java b/src/main/java/io/gitlab/jfronny/quickmath/mixin/MixinPerlinNoiseSampler.java similarity index 95% rename from src/main/java/io/gitlab/jfronny/quickmeth/mixin/MixinPerlinNoiseSampler.java rename to src/main/java/io/gitlab/jfronny/quickmath/mixin/MixinPerlinNoiseSampler.java index c810fef..e526699 100644 --- a/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MixinPerlinNoiseSampler.java +++ b/src/main/java/io/gitlab/jfronny/quickmath/mixin/MixinPerlinNoiseSampler.java @@ -1,6 +1,6 @@ -package io.gitlab.jfronny.quickmeth.mixin; +package io.gitlab.jfronny.quickmath.mixin; -import io.gitlab.jfronny.quickmeth.MathUtil; +import io.gitlab.jfronny.quickmath.MathUtil; import net.minecraft.util.math.noise.PerlinNoiseSampler; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MixinSimplexNoiseSampler.java b/src/main/java/io/gitlab/jfronny/quickmath/mixin/MixinSimplexNoiseSampler.java similarity index 95% rename from src/main/java/io/gitlab/jfronny/quickmeth/mixin/MixinSimplexNoiseSampler.java rename to src/main/java/io/gitlab/jfronny/quickmath/mixin/MixinSimplexNoiseSampler.java index c478d67..f356322 100644 --- a/src/main/java/io/gitlab/jfronny/quickmeth/mixin/MixinSimplexNoiseSampler.java +++ b/src/main/java/io/gitlab/jfronny/quickmath/mixin/MixinSimplexNoiseSampler.java @@ -1,6 +1,6 @@ -package io.gitlab.jfronny.quickmeth.mixin; +package io.gitlab.jfronny.quickmath.mixin; -import io.gitlab.jfronny.quickmeth.MathUtil; +import io.gitlab.jfronny.quickmath.MathUtil; import net.minecraft.util.math.noise.SimplexNoiseSampler; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/resources/assets/quickmeth/icon.png b/src/main/resources/assets/quickmath/icon.png similarity index 100% rename from src/main/resources/assets/quickmeth/icon.png rename to src/main/resources/assets/quickmath/icon.png diff --git a/src/main/resources/assets/quickmath/lang/en_us.json b/src/main/resources/assets/quickmath/lang/en_us.json new file mode 100644 index 0000000..3316766 --- /dev/null +++ b/src/main/resources/assets/quickmath/lang/en_us.json @@ -0,0 +1,17 @@ +{ + "quickmath.jfconfig.title": "QuickMäth - Restart to apply changes", + "quickmath.jfconfig.corruptGenericMath": "Corrupt generic math", + "quickmath.jfconfig.corruptGenericMath.tooltip": "Corrupts methods in MathHelper. This will impact many things but most notably movement", + "quickmath.jfconfig.corruptGenericMath2": "Corrupt more generic math", + "quickmath.jfconfig.corruptGenericMath2.tooltip": "Corrupts more methods in MathHelper. These WILL break a lot of things so they are separate", + "quickmath.jfconfig.corruptTrigonometry": "Corrupt Trigonometry", + "quickmath.jfconfig.corruptTrigonometry.tooltip": "Corrupts trigonometry methods. Effects vary", + "quickmath.jfconfig.corruptTrigonometry2": "Corrupt more Trigonometry", + "quickmath.jfconfig.corruptTrigonometry2.tooltip": "Corrupts all trigonometry methods. This WILL break a lot of things", + "quickmath.jfconfig.corruptPerlinNoise": "Corrupt perlin noise", + "quickmath.jfconfig.corruptPerlinNoise.tooltip": "Corrupts methods in OctavePerlinNoiseSampler and PerlinNoiseSampler. This will mostly impact world generation", + "quickmath.jfconfig.corruptSimplexNoise": "Corrupt simplex noise", + "quickmath.jfconfig.corruptSimplexNoise.tooltip": "Corrupts methods in SimplexNoiseSampler. I am actually not sure what this breaks", + "quickmath.jfconfig.debugAsm": "Debug ASM", + "quickmath.jfconfig.debugAsm.tooltip": "Prints debug messages for the purpose of debugging" +} \ No newline at end of file diff --git a/src/main/resources/assets/quickmeth/lang/en_us.json b/src/main/resources/assets/quickmeth/lang/en_us.json deleted file mode 100644 index 25c477b..0000000 --- a/src/main/resources/assets/quickmeth/lang/en_us.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "quickmeth.jfconfig.title": "QuickMäth - Restart to apply changes", - "quickmeth.jfconfig.corruptGenericMath": "Corrupt generic math", - "quickmeth.jfconfig.corruptGenericMath.tooltip": "Corrupts methods in MathHelper. This will impact many things but most notably movement", - "quickmeth.jfconfig.corruptGenericMath2": "Corrupt more generic math", - "quickmeth.jfconfig.corruptGenericMath2.tooltip": "Corrupts more methods in MathHelper. These WILL break a lot of things so they are separate", - "quickmeth.jfconfig.corruptTrigonometry": "Corrupt Trigonometry", - "quickmeth.jfconfig.corruptTrigonometry.tooltip": "Corrupts trigonometry methods. Effects vary", - "quickmeth.jfconfig.corruptTrigonometry2": "Corrupt more Trigonometry", - "quickmeth.jfconfig.corruptTrigonometry2.tooltip": "Corrupts all trigonometry methods. This WILL break a lot of things", - "quickmeth.jfconfig.corruptPerlinNoise": "Corrupt perlin noise", - "quickmeth.jfconfig.corruptPerlinNoise.tooltip": "Corrupts methods in OctavePerlinNoiseSampler and PerlinNoiseSampler. This will mostly impact world generation", - "quickmeth.jfconfig.corruptSimplexNoise": "Corrupt simplex noise", - "quickmeth.jfconfig.corruptSimplexNoise.tooltip": "Corrupts methods in SimplexNoiseSampler. I am actually not sure what this breaks", - "quickmeth.jfconfig.debugAsm": "Debug ASM", - "quickmeth.jfconfig.debugAsm.tooltip": "Prints debug messages for the purpose of debugging" -} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 249cbd7..2cdfc2b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,32 +1,33 @@ { "schemaVersion": 1, - "id": "quickmeth", + "id": "quickmath", + "provides": ["quickmeth"], "version": "${version}", - "name": "Quickmeth", + "name": "QuickMäth", "description": "Replaces math methods with incorrect alternatives", "authors": [ "JFronny" ], "contact": { "website": "https://jfronny.gitlab.io", - "repo": "https://gitlab.com/jfmods/Quickmeth" + "repo": "https://gitlab.com/jfmods/quickmath" }, "license": "MIT", - "icon": "assets/quickmeth/icon.png", + "icon": "assets/quickmath/icon.png", "environment": "*", "entrypoints": { "libjf:config": [ - "io.gitlab.jfronny.quickmeth.Cfg" + "io.gitlab.jfronny.quickmath.Cfg" ], "libjf:asm": [ - "io.gitlab.jfronny.quickmeth.BytecodeTransformer" + "io.gitlab.jfronny.quickmath.BytecodeTransformer" ], "main": [ - "io.gitlab.jfronny.quickmeth.ModMain" + "io.gitlab.jfronny.quickmath.ModMain" ] }, "mixins": [ - "quickmeth.mixins.json" + "quickmath.mixins.json" ], "depends": { "fabricloader": ">=0.13.3", diff --git a/src/main/resources/quickmeth.mixins.json b/src/main/resources/quickmath.mixins.json similarity index 72% rename from src/main/resources/quickmeth.mixins.json rename to src/main/resources/quickmath.mixins.json index c521a3b..944f976 100644 --- a/src/main/resources/quickmeth.mixins.json +++ b/src/main/resources/quickmath.mixins.json @@ -1,9 +1,9 @@ { "required": true, "minVersion": "0.8", - "package": "io.gitlab.jfronny.quickmeth.mixin", + "package": "io.gitlab.jfronny.quickmath.mixin", "compatibilityLevel": "JAVA_17", - "plugin": "io.gitlab.jfronny.quickmeth.MixinPlugin", + "plugin": "io.gitlab.jfronny.quickmath.MixinPlugin", "mixins": [ "MathHelperMixin", "MathHelperMixin2",