diff options
| author | Glease <4586901+Glease@users.noreply.github.com> | 2022-08-13 15:34:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-13 09:34:51 +0200 |
| commit | 554d3f6a75433a90f07c751297c404adaaf12cdf (patch) | |
| tree | 4bd601ab0528d1818ae94e1a63589a54c8cb6f68 /src/main/java/gregtech/common | |
| parent | bbd40c34e104dcead78290af1394e6f5867df565 (diff) | |
| download | GT5-Unofficial-554d3f6a75433a90f07c751297c404adaaf12cdf.tar.gz GT5-Unofficial-554d3f6a75433a90f07c751297c404adaaf12cdf.tar.bz2 GT5-Unofficial-554d3f6a75433a90f07c751297c404adaaf12cdf.zip | |
switch to gson (#1247)
* switch to gson
* json loader code cleanup
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Client.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java index 2a37cbd142..0d2a76731b 100644 --- a/src/main/java/gregtech/common/GT_Client.java +++ b/src/main/java/gregtech/common/GT_Client.java @@ -19,10 +19,7 @@ import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.network.FMLNetworkEvent; import gregtech.GT_Mod; import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.SoundResource; +import gregtech.api.enums.*; import gregtech.api.interfaces.IHasFluidDisplayItem; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -41,6 +38,8 @@ import gregtech.common.entities.GT_Entity_Arrow; import gregtech.common.entities.GT_Entity_Arrow_Potion; import gregtech.common.net.MessageUpdateFluidDisplayItem; import gregtech.common.render.*; +import gregtech.loaders.ExtraIcons; +import gregtech.loaders.misc.GT_JsonLoader; import gregtech.loaders.preload.GT_PreLoad; import ic2.api.tile.IWrenchable; import net.minecraft.block.Block; @@ -57,6 +56,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import net.minecraftforge.client.event.DrawBlockHighlightEvent; +import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; @@ -399,6 +399,13 @@ public class GT_Client extends GT_Proxy @Override public void onPreLoad() { super.onPreLoad(); + + MinecraftForge.EVENT_BUS.register(new ExtraIcons()); + GT_Mod.jsonGuiColors = new GT_JsonLoader("textures/guiColors.json"); + for (GuiColors value : GuiColors.values()) { + GT_Mod.jsonGuiColors.registerReloadListener(l -> value.reload(l::getString)); + } + final String[] arr = { "renadi", "hanakocz", "MysteryDump", "Flaver4", "x_Fame", "Peluche321", "Goshen_Ithilien", "manf", "Bimgo", "leagris", "IAmMinecrafter02", "Cerous", "Devilin_Pixy", "Bkarlsson87", "BadAlchemy", "CaballoCraft", "melanclock", "Resursator", "demanzke", "AndrewAmmerlaan", |