Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit ab4401f

Browse files
TexBlockTexBlock
committed
fix
1 parent 7bdc553 commit ab4401f

File tree

9 files changed

+26
-37
lines changed

9 files changed

+26
-37
lines changed

‎build.gradle‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ version = project.mod_version
1010
group = project.maven_group
1111

1212
repositories {
13-
maven { url "https://files.minecraftforge.net/maven/" }
14-
maven { url 'https://jitpack.io' }
13+
1514
}
1615

1716
dependencies {
@@ -20,8 +19,6 @@ dependencies {
2019
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
2120

2221
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
23-
24-
modImplementation "com.github.TexTrueStudio:FabricatedEventBus:fabric-SNAPSHOT"
2522
}
2623

2724
processResources {

src/main/java/org/localmc/tools/hardcodepatcher/HardcodeTextPatcher.java renamed to src/main/java/org/localmc/tools/hardcodepatcher/HardcodePatcher.java

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.localmc.tools.hardcodepatcher;
22

3-
import net.minecraftforge.eventbus.api.EventPriority;
4-
import net.minecraftforge.eventbus.api.SubscribeEvent;
53
import org.localmc.tools.hardcodepatcher.command.CommandEventHandler;
64
import org.localmc.tools.hardcodepatcher.config.HardcodeTextPatcherConfig;
75
import org.localmc.tools.hardcodepatcher.config.HardcodeTextPatcherPatch;
@@ -16,9 +14,9 @@
1614
import java.util.ArrayList;
1715
import java.util.List;
1816

19-
public class HardcodeTextPatcher implements ModInitializer {
20-
public static final String MODID = "vaultpatcher";
21-
public static final String patchFileName = "localpatcher.json";
17+
public class HardcodePatcher implements ModInitializer {
18+
public static final String MODID = "hardcodepatcher";
19+
public static final String patchFileName = "hardcodepatcher.json";
2220
public static final Path configPath = FabricLoader.getInstance().getConfigDir().resolve("HardcodePatcher");
2321
public static final Logger LOGGER = LogManager.getLogger();
2422
public static ArrayList<String> exportList = new ArrayList<>();
@@ -27,7 +25,7 @@ public class HardcodeTextPatcher implements ModInitializer {
2725
@Override
2826
public void onInitialize() {
2927
CommandRegistrationCallback.EVENT.register(CommandEventHandler::registerClientCommands);
30-
/*
28+
3129
try {
3230
HardcodeTextPatcherConfig.readConfig();
3331
List<String> mods = HardcodeTextPatcherConfig.getMods();
@@ -44,14 +42,10 @@ public void onInitialize() {
4442
LOGGER.error("Failed to load config: ", e);
4543
throw new RuntimeException(e);
4644
}
47-
*/
4845
}
49-
50-
//@Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
46+
/*
5147
public static final class Events {
52-
@SubscribeEvent(priority = EventPriority.LOWEST)
53-
public static void loadConfig(FMLConstructModEvent event) {
54-
event.enqueueWork(() -> {
48+
public static void loadConfig() {
5549
try {
5650
HardcodeTextPatcherConfig.readConfig();
5751
List<String> mods = HardcodeTextPatcherConfig.getMods();
@@ -68,7 +62,7 @@ public static void loadConfig(FMLConstructModEvent event) {
6862
LOGGER.error("Failed to load config: ", e);
6963
throw new RuntimeException(e);
7064
}
71-
});
7265
}
7366
}
67+
*/
7468
}

‎src/main/java/org/localmc/tools/hardcodepatcher/ThePatcher.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@ public static String patch(String s) {
1414
if (s == null || s.trim().equals("")) {
1515
return s;
1616
}
17-
HardcodeTextPatcher.exportList.add(s);
17+
HardcodePatcher.exportList.add(s);
1818
// VaultPatcher.LOGGER.info(Arrays.toString(Thread.currentThread().getStackTrace()));
1919
String ret;
20-
for (HardcodeTextPatcherPatch vpp : HardcodeTextPatcher.vpps) {
20+
for (HardcodeTextPatcherPatch vpp : HardcodePatcher.vpps) {
2121
StackTraceElement[] stacks = Thread.currentThread().getStackTrace();
2222
ret = vpp.patch(s, stacks);
2323
DebugMode debug = HardcodeTextPatcherConfig.getDebugMode();
2424
if (ret != null && !ret.equals(s)) {
2525
if (debug.isEnable() && debug.getOutputMode() == 0) {
26-
HardcodeTextPatcher.LOGGER.info(String.format(debug.getOutputFormat(), s, ret, Arrays.toString(stacks)));
26+
HardcodePatcher.LOGGER.info(String.format(debug.getOutputFormat(), s, ret, Arrays.toString(stacks)));
2727
}
2828
return ret;
2929
} else {
3030
if (debug.isEnable() && debug.getOutputMode() == 1) {
31-
HardcodeTextPatcher.LOGGER.info(String.format(debug.getOutputFormat(), s, ret, Arrays.toString(stacks)));
31+
HardcodePatcher.LOGGER.info(String.format(debug.getOutputFormat(), s, ret, Arrays.toString(stacks)));
3232
}
3333
return s;
3434
}

‎src/main/java/org/localmc/tools/hardcodepatcher/command/CommandEventHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package org.localmc.tools.hardcodepatcher.command;
22

33
import com.mojang.brigadier.CommandDispatcher;
4-
import org.localmc.tools.hardcodepatcher.HardcodeTextPatcher;
4+
import org.localmc.tools.hardcodepatcher.HardcodePatcher;
55
import net.minecraft.server.command.CommandManager;
66
import net.minecraft.server.command.ServerCommandSource;
77

88
public class CommandEventHandler {
99
public static void registerClientCommands(CommandDispatcher<ServerCommandSource> dispatcher, Boolean dedicated) {
1010
dispatcher.register(
11-
CommandManager.literal(HardcodeTextPatcher.MODID
11+
CommandManager.literal(HardcodePatcher.MODID
1212
).then(
1313
CommandManager.literal("export")
1414
.executes(ExportCommand.instance)

‎src/main/java/org/localmc/tools/hardcodepatcher/command/ExportCommand.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.google.gson.reflect.TypeToken;
55
import com.mojang.brigadier.Command;
66
import com.mojang.brigadier.context.CommandContext;
7-
import org.localmc.tools.hardcodepatcher.HardcodeTextPatcher;
7+
import org.localmc.tools.hardcodepatcher.HardcodePatcher;
88
import net.fabricmc.loader.api.FabricLoader;
99
import net.minecraft.server.command.ServerCommandSource;
1010
import net.minecraft.text.TranslatableText;
@@ -22,12 +22,11 @@ public class ExportCommand implements Command<ServerCommandSource> {
2222
public int run(CommandContext<ServerCommandSource> context) {
2323
context.getSource().sendFeedback(new TranslatableText("commands.hardcodepatcher.export.warning.wip"), true);
2424
Gson gson = new Gson();
25-
String json = gson.toJson(HardcodeTextPatcher.exportList, new TypeToken<ArrayList<String>>() {
25+
String json = gson.toJson(HardcodePatcher.exportList, new TypeToken<ArrayList<String>>() {
2626
}.getType());
2727
//Export langs
2828
try {
29-
BufferedWriter bw = new BufferedWriter(
30-
new FileWriter(FabricLoader.getInstance().getGameDir().resolve(HardcodeTextPatcher.patchFileName).toFile()));
29+
BufferedWriter bw = new BufferedWriter(new FileWriter(FabricLoader.getInstance().getGameDir().resolve(HardcodePatcher.patchFileName).toFile()));
3130
bw.write(json);
3231
bw.flush();
3332

‎src/main/java/org/localmc/tools/hardcodepatcher/config/HardcodeTextPatcherConfig.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.google.gson.stream.JsonReader;
66
import com.google.gson.stream.JsonToken;
77
import com.google.gson.stream.JsonWriter;
8-
import org.localmc.tools.hardcodepatcher.HardcodeTextPatcher;
8+
import org.localmc.tools.hardcodepatcher.HardcodePatcher;
99

1010
import java.io.File;
1111
import java.io.FileInputStream;
@@ -15,11 +15,10 @@
1515
import java.nio.file.Path;
1616
import java.util.ArrayList;
1717
import java.util.List;
18-
import java.util.Objects;
1918

2019
public class HardcodeTextPatcherConfig {
2120
private static final Gson GSON = new Gson();
22-
private static final Path configFile = HardcodeTextPatcher.configPath.resolve("config.json");
21+
private static final Path configFile = HardcodePatcher.configPath.resolve("config.json");
2322
private static List<String> mods = new ArrayList<>();
2423
private static final DebugMode debug = new DebugMode();
2524

‎src/main/java/org/localmc/tools/hardcodepatcher/config/HardcodeTextPatcherPatch.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.google.gson.Gson;
44
import com.google.gson.stream.JsonReader;
55
import com.google.gson.stream.JsonToken;
6-
import org.localmc.tools.hardcodepatcher.HardcodeTextPatcher;
6+
import org.localmc.tools.hardcodepatcher.HardcodePatcher;
77
import net.minecraft.client.resource.language.I18n;
88

99
import java.io.FileInputStream;
@@ -23,12 +23,12 @@ public class HardcodeTextPatcherPatch {
2323
private PatchInfo info = new PatchInfo();
2424

2525
public HardcodeTextPatcherPatch(String patchFile) {
26-
HardcodeTextPatcher.LOGGER.info("Load Module " + patchFile);
27-
Path p = HardcodeTextPatcher.configPath.resolve(patchFile);
26+
HardcodePatcher.LOGGER.info("Load Module " + patchFile);
27+
Path p = HardcodePatcher.configPath.resolve(patchFile);
2828
try {
2929
Files.createDirectories(p.getParent());
3030
} catch (IOException e) {
31-
HardcodeTextPatcher.LOGGER.error("Failed to create {}", p.getParent(), e);
31+
HardcodePatcher.LOGGER.error("Failed to create {}", p.getParent(), e);
3232
throw new RuntimeException(e);
3333
}
3434
this.patchFile = p;

‎src/main/java/org/localmc/tools/hardcodepatcher/mixin/TextRendererMixin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.localmc.tools.hardcodepatcher.ThePatcher;
44
import net.minecraft.client.font.TextRenderer;
5-
import org.localmc.tools.hardcodepatcher.HardcodeTextPatcher;
5+
import org.localmc.tools.hardcodepatcher.HardcodePatcher;
66
import org.spongepowered.asm.mixin.Mixin;
77
import org.spongepowered.asm.mixin.injection.At;
88
import org.spongepowered.asm.mixin.injection.ModifyArgs;
@@ -22,7 +22,7 @@ public class TextRendererMixin {
2222
target = "Lnet/minecraft/client/font/TextRenderer;draw(Ljava/lang/String;FFILnet/minecraft/util/math/Matrix4f;ZZ)I"
2323
))
2424
private void proxy_draw(Args args) {
25-
HardcodeTextPatcher.exportList.add(args.get(0));
25+
HardcodePatcher.exportList.add(args.get(0));
2626
//Modify String
2727
String modifyString = ThePatcher.patch(args.get(0));
2828
modifyString = modifyString == null ? args.get(0) : modifyString;

‎src/main/resources/fabric.mod.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"environment": "*",
1717
"entrypoints": {
1818
"main": [
19-
"org.localmc.tools.hardcodepatcher.HardcodeTextPatcher"
19+
"org.localmc.tools.hardcodepatcher.HardcodePatcher"
2020
]
2121
},
2222
"mixins": [

0 commit comments

Comments
 (0)