From 8d8509fc61015b867018b9d8b3fa3f8d91b6c1d9 Mon Sep 17 00:00:00 2001 From: m1504 Date: Fri, 15 Jul 2022 20:58:31 +0800 Subject: [PATCH] 1.0.3 1 --- .../java/com/laosun/stackone/IgnoreItem.java | 56 +++++++++++++++ src/main/java/com/laosun/stackone/Stack.java | 63 +++++++++++++++++ .../java/com/laosun/stackone/StackOneMod.java | 68 ++++--------------- 3 files changed, 133 insertions(+), 54 deletions(-) create mode 100644 src/main/java/com/laosun/stackone/Stack.java diff --git a/src/main/java/com/laosun/stackone/IgnoreItem.java b/src/main/java/com/laosun/stackone/IgnoreItem.java index 2f587d7..841b622 100644 --- a/src/main/java/com/laosun/stackone/IgnoreItem.java +++ b/src/main/java/com/laosun/stackone/IgnoreItem.java @@ -1,5 +1,61 @@ package com.laosun.stackone; +import com.google.gson.Gson; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; + +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.util.ArrayList; + +import static com.laosun.stackone.StackOneMod.LOGGER; + public class IgnoreItem { public String item; + + public static ArrayList getIgnoreItems() { + File dir = new File("config/stackone"); + if (!dir.exists()) { + dir.mkdirs(); + } + File file = new File(dir, "ignore_item.json"); + if (!file.isFile()) { + try { + if (!file.createNewFile()) { + LOGGER.error("Fail to create file!"); + } + } catch (IOException e) { + LOGGER.error("Fail to create file!"); + e.printStackTrace(); + } + } + char[] a1 = null; + try { + FileReader fileReader = new FileReader(file); + a1 = new char[(int) file.length()]; + fileReader.read(a1); + } catch (IOException e) { + LOGGER.error("Fail to open file!"); + e.printStackTrace(); + } + Gson gson = new Gson(); + JsonArray jsonArray; + ArrayList ignoreItems = new ArrayList<>(); + try { + if (a1 != null) { + jsonArray = JsonParser.parseString(String.copyValueOf(a1)).getAsJsonArray(); + for (JsonElement user : jsonArray) { + IgnoreItem ignore = gson.fromJson(user, IgnoreItem.class); + ignoreItems.add(ignore.item); + } + } + + } catch (Exception e) { + LOGGER.error("Json has syntax error!"); + e.printStackTrace(); + } + return ignoreItems; + } } diff --git a/src/main/java/com/laosun/stackone/Stack.java b/src/main/java/com/laosun/stackone/Stack.java new file mode 100644 index 0000000..c936190 --- /dev/null +++ b/src/main/java/com/laosun/stackone/Stack.java @@ -0,0 +1,63 @@ +package com.laosun.stackone; + +import com.google.gson.Gson; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; + +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import static com.laosun.stackone.StackOneMod.LOGGER; + +public class Stack { + public String item; + public short max_stack_size; + + public static Map getStackList() { + Map map = new HashMap<>(); + File dir = new File("config/stackone"); + if (!dir.exists()) { + dir.mkdirs(); + } + File file = new File(dir, "max_stack_size.json"); + if (!file.isFile()) { + try { + if (!file.createNewFile()) { + LOGGER.error("Fail to create file!"); + } + } catch (IOException e) { + LOGGER.error("Fail to create file!"); + e.printStackTrace(); + } + } + char[] a1 = null; + try { + FileReader fileReader = new FileReader(file); + a1 = new char[(int) file.length()]; + fileReader.read(a1); + } catch (IOException e) { + LOGGER.error("Fail to open file!"); + e.printStackTrace(); + } + Gson gson = new Gson(); + JsonArray jsonArray; + try { + if (a1 != null) { + jsonArray = JsonParser.parseString(String.copyValueOf(a1)).getAsJsonArray(); + for (JsonElement user : jsonArray) { + Stack ignore = gson.fromJson(user, Stack.class); + map.put(ignore.item, ignore.max_stack_size); + } + } + + } catch (Exception e) { + LOGGER.error("Json has syntax error!"); + e.printStackTrace(); + } + return map; + } +} diff --git a/src/main/java/com/laosun/stackone/StackOneMod.java b/src/main/java/com/laosun/stackone/StackOneMod.java index 0fee759..9f847e0 100644 --- a/src/main/java/com/laosun/stackone/StackOneMod.java +++ b/src/main/java/com/laosun/stackone/StackOneMod.java @@ -1,9 +1,5 @@ package com.laosun.stackone; -import com.google.gson.Gson; -import com.google.gson.JsonArray; -import com.google.gson.JsonElement; -import com.google.gson.JsonParser; import com.mojang.logging.LogUtils; import net.minecraft.world.item.Item; import net.minecraftforge.eventbus.api.IEventBus; @@ -13,9 +9,6 @@ import net.minecraftforge.registries.ForgeRegistries; import org.slf4j.Logger; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; import java.lang.reflect.Field; import java.util.ArrayList; @@ -24,7 +17,7 @@ public class StackOneMod { // Define mod id in a common place for everything to reference public static final String MODID = "stackone"; // Directly reference a slf4j logger - private static final Logger LOGGER = LogUtils.getLogger(); + public static final Logger LOGGER = LogUtils.getLogger(); // Create a Deferred Register to hold Blocks which will all be registered under the "examplemod" namespace public StackOneMod() { @@ -34,57 +27,23 @@ public StackOneMod() { modEventBus.addListener(this::commonSetup); } - private void commonSetup(final FMLCommonSetupEvent event) { - File dir = new File("config/stackone"); - if (!dir.exists()) { - dir.mkdirs(); - } - File file = new File(dir, "ignore_item.json"); - if (!file.isFile()) { - try { - if (!file.createNewFile()) { - LOGGER.error("Fail to create file!"); - } - } catch (IOException e) { - LOGGER.error("Fail to create file!"); - e.printStackTrace(); + public boolean isItem(ArrayList descriptionId, Item item) { + boolean is = false; + for (String i : descriptionId) { + if (i.equals(item.getDescriptionId())) { + is = true; + break; } } - char[] a1 = null; - try { - FileReader fileReader = new FileReader(file); - a1 = new char[(int) file.length()]; - fileReader.read(a1); - } catch (IOException e) { - LOGGER.error("Fail to open file!"); - e.printStackTrace(); - } - Gson gson = new Gson(); - JsonArray jsonArray; - ArrayList ignoreItems = new ArrayList<>(); - try { - if (a1 != null) { - jsonArray = JsonParser.parseString(String.copyValueOf(a1)).getAsJsonArray(); - for (JsonElement user : jsonArray) { - IgnoreItem ignore = gson.fromJson(user, IgnoreItem.class); - ignoreItems.add(ignore.item); - } - } + return is; + } - } catch (Exception e) { - LOGGER.error("Json has syntax error!"); - e.printStackTrace(); - } + + private void commonSetup(final FMLCommonSetupEvent event) { + ArrayList ignoreItems = IgnoreItem.getIgnoreItems(); for (Item i : ForgeRegistries.ITEMS) { Field a; - boolean is = false; - for (String j : ignoreItems) { - if (j.equals(i.getDescriptionId())) { - is = true; - break; - } - } - if (is) { + if (isItem(ignoreItems, i)) { continue; } try { @@ -99,6 +58,7 @@ private void commonSetup(final FMLCommonSetupEvent event) { } a.setAccessible(true); try { + a.set(i, 1); } catch (IllegalAccessException e) { LOGGER.error("Failed to set field!!!");