Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
xkball committed Jul 1, 2023
1 parent 2db00c9 commit 3fae56b
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 631 deletions.
10 changes: 0 additions & 10 deletions LICENSE-Paulscode IBXM Library.txt

This file was deleted.

40 changes: 0 additions & 40 deletions LICENSE-Paulscode SoundSystem CodecIBXM.txt

This file was deleted.

526 changes: 0 additions & 526 deletions LICENSE.txt

This file was deleted.

53 changes: 0 additions & 53 deletions README.txt

This file was deleted.

2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,5 @@ publishing {
}
}
}

compileJava.options.encoding = 'UTF-8'
19 changes: 19 additions & 0 deletions src/main/java/com/xkball/key_command/JsonGen.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.xkball.key_command;

import com.google.gson.JsonArray;
import com.google.gson.JsonObject;

public class JsonGen {
public static void main(String[] args) {
JsonObject key = new JsonObject();
key.addProperty("command","kill @s");
key.addProperty("default_key",0x2F);
JsonArray array = new JsonArray();
array.add(key);

JsonObject out = new JsonObject();
out.add("key_array",array);

System.out.println(KeyCommand.jsonToString(out));
}
}
19 changes: 18 additions & 1 deletion src/main/java/com/xkball/key_command/KeyCommand.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.xkball.key_command;

import com.google.gson.JsonElement;
import com.google.gson.internal.Streams;
import com.google.gson.stream.JsonWriter;
import com.xkball.key_command.client.KeyManager;
import com.xkball.key_command.config.ConfigReader;
import net.minecraftforge.fml.common.Loader;
Expand All @@ -11,11 +14,12 @@

import java.io.File;
import java.io.IOException;
import java.io.StringWriter;

@Mod(modid = KeyCommand.MODID, name = KeyCommand.NAME, version = KeyCommand.VERSION)
public class KeyCommand
{
public static final String MODID = "key_command";
public static final String MODID = "assets/key_command";
public static final String NAME = "Key Command";
public static final String VERSION = "1.0";

Expand Down Expand Up @@ -58,4 +62,17 @@ public void init(FMLInitializationEvent event)
{
KeyManager.init();
}

public static String jsonToString(JsonElement element){
try {
StringWriter stringWriter = new StringWriter();
JsonWriter jsonWriter = new JsonWriter(stringWriter);
jsonWriter.setLenient(true);
jsonWriter.setIndent(" ");
Streams.write(element, jsonWriter);
return stringWriter.toString();
} catch (IOException e) {
throw new AssertionError(e);
}
}
}
2 changes: 2 additions & 0 deletions src/main/java/com/xkball/key_command/client/KeyManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
import net.minecraftforge.client.settings.KeyConflictContext;
import net.minecraftforge.client.settings.KeyModifier;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.InputEvent;

import java.util.ArrayList;
import java.util.List;

@Mod.EventBusSubscriber
public class KeyManager {
public static List<KeyBind> keys = new ArrayList<>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public static void readConfig(File file) throws IllegalArgumentException{
JsonElement jsonExisted = new JsonParser().parse(new String(Files.readAllBytes(file.toPath())));
if(jsonExisted.isJsonNull()) throw new IllegalArgumentException();

JsonArray keyArray = jsonExisted.getAsJsonArray();
JsonArray keyArray = jsonExisted.getAsJsonObject().getAsJsonArray("key_array");

for (JsonElement element : keyArray) {
JsonObject obj = element.getAsJsonObject();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import io.netty.buffer.ByteBuf;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
Expand Down Expand Up @@ -58,7 +59,13 @@ public World getEntityWorld() {
public MinecraftServer getServer() {
return server;
}

@Override
public Entity getCommandSenderEntity() {
return player;
}
},command);
return;
}
}
}
Expand Down
Empty file.
Empty file.

0 comments on commit 3fae56b

Please sign in to comment.