* refactor

bioastroiner · Dec 18, 2023 · f37f18e · f37f18e
1 parent bf2cca5
commit f37f18e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/...in/java/mods/bio/gttweaker/GTTweaker.java → ...va/mods/bio/gttweaker/core/GTTweaker.java b/...in/java/mods/bio/gttweaker/GTTweaker.java → ...va/mods/bio/gttweaker/core/GTTweaker.java
@@ -1,13 +1,13 @@
-package mods.bio.gttweaker;
+package mods.bio.gttweaker.core;
 
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import gregapi.recipes.Recipe;
 import minetweaker.MineTweakerAPI;
 import minetweaker.MineTweakerImplementationAPI;
 import minetweaker.api.item.IIngredient;
 import minetweaker.util.IEventHandler;
-import mods.bio.gttweaker.command.GTCommand;
-import mods.bio.gttweaker.json.OreDictMaterial_Serializable;
+import mods.bio.gttweaker.core.command.GTCommand;
+import mods.bio.gttweaker.core.json.OreDictMaterial_Serializable;
 import mods.bio.gttweaker.mods.gregtech.oredict.*;
 import mods.bio.gttweaker.mods.gregtech.recipe.CTRecipe;
 import mods.bio.gttweaker.mods.gregtech.recipe.CTRecipeFactory;
@@ -24,7 +24,7 @@
 import net.minecraftforge.oredict.OreDictionary;
 import java.util.Objects;
 
-@cpw.mods.fml.common.Mod(modid = mods.bio.gttweaker.GTTweaker.MOD_ID, name = mods.bio.gttweaker.GTTweaker.MOD_NAME, version = mods.bio.gttweaker.GTTweaker.VERSION)
+@cpw.mods.fml.common.Mod(modid = GTTweaker.MOD_ID, name = GTTweaker.MOD_NAME, version = GTTweaker.VERSION)
 public final class GTTweaker extends gregapi.api.Abstract_Mod {
 	// https://github.com/GTNewHorizons/Minetweaker-Gregtech-5-Addon/blob/master/src/main/java/gttweaker/GTTweaker.java
 	public static final String MOD_ID = "GRADLETOKEN_MODID";

diff --git a/...mods/bio/gttweaker/command/GTCommand.java → ...bio/gttweaker/core/command/GTCommand.java b/...mods/bio/gttweaker/command/GTCommand.java → ...bio/gttweaker/core/command/GTCommand.java
@@ -1,4 +1,4 @@
-package mods.bio.gttweaker.command;
+package mods.bio.gttweaker.core.command;
 
 import gregapi.data.CS;
 import gregapi.oredict.OreDictItemData;

diff --git a/...er/json/OreDictMaterial_Serializable.java → ...re/json/OreDictMaterial_Serializable.java b/...er/json/OreDictMaterial_Serializable.java → ...re/json/OreDictMaterial_Serializable.java
@@ -1,12 +1,9 @@
-package mods.bio.gttweaker.json;
+package mods.bio.gttweaker.core.json;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import gregapi.oredict.OreDictMaterial;
 
-import java.io.File;
-import java.io.FileWriter;
-
 public class OreDictMaterial_Serializable {
 	public final transient OreDictMaterial _mat;
 

diff --git a/src/main/java/mods/bio/gttweaker/mods/gregtech/recipe/CTRecipeMap.java b/src/main/java/mods/bio/gttweaker/mods/gregtech/recipe/CTRecipeMap.java
@@ -6,7 +6,7 @@
 import minetweaker.api.item.IItemStack;
 import minetweaker.api.liquid.ILiquidStack;
 import minetweaker.api.minecraft.MineTweakerMC;
-import mods.bio.gttweaker.GTTweaker;
+import mods.bio.gttweaker.core.GTTweaker;
 import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenGetter;
 import stanhebben.zenscript.annotations.ZenMethod;

diff --git a/src/main/java/mods/bio/gttweaker/mods/gregtech/recipe/CTRecipeMaps.java b/src/main/java/mods/bio/gttweaker/mods/gregtech/recipe/CTRecipeMaps.java
@@ -1,7 +1,7 @@
 package mods.bio.gttweaker.mods.gregtech.recipe;
 
 import gregapi.recipes.Recipe;
-import mods.bio.gttweaker.GTTweaker;
+import mods.bio.gttweaker.core.GTTweaker;
 import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenGetter;
 import stanhebben.zenscript.annotations.ZenMethod;

diff --git a/src/main/java/mods/bio/gttweaker/mods/gregtech/recipe/bracket/CTRecipeMapBracketHandler.java b/src/main/java/mods/bio/gttweaker/mods/gregtech/recipe/bracket/CTRecipeMapBracketHandler.java
@@ -5,7 +5,7 @@
 import minetweaker.MineTweakerAPI;
 import minetweaker.annotations.BracketHandler;
 import minetweaker.runtime.GlobalRegistry;
-import mods.bio.gttweaker.GTTweaker;
+import mods.bio.gttweaker.core.GTTweaker;
 import mods.bio.gttweaker.mods.gregtech.recipe.CTRecipeMap;
 import stanhebben.zenscript.compiler.IEnvironmentGlobal;
 import stanhebben.zenscript.expression.ExpressionCallStatic;