Remove uses of java.awt (#5591)

`java.awt` will statically load itself when `java.awt.Color`, `java.awt.Dimension`, etc are loaded.
This conflicts with lwjgl3 and must be avoided (except for in mojang's server gui).
This commit is contained in:
mezz authored and LexManos committed 2019-03-25 12:06:20 -07:00
1 parent 5e7279b0a2
commit 5fa732d223
11 files changed
+83 -39

No files matched your search

@@ -19,8 +19,6 @@
package net.minecraftforge.debug.fluid;
import java.awt.Color;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.util.ResourceLocation;
@@ -41,7 +39,7 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
public class ColoredFluidTest
{
static final boolean ENABLED = false; // <-- enable mod
static final Color COLOR = Color.PINK; // <-- change this to try other colors
static final int COLOR = 0xFFAFAF; // <-- change this to try other colors
static final String MODID = "fluidadditionalfields";
static final ResourceLocation RES_LOC = new ResourceLocation(MODID, "slime");
@@ -19,7 +19,6 @@
package net.minecraftforge.debug.gameplay;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
@@ -44,6 +43,7 @@ import net.minecraftforge.fml.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
// TODO 1.13: implement without java.awt
@Mod(modid = DynamicBannerTest.MODID, name = "ForgeDebugDynamicBanner", version = DynamicBannerTest.VERSION, acceptableRemoteVersions = "*")
public class DynamicBannerTest
{
@@ -31,11 +31,11 @@ import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.nio.IntBuffer;
// TODO 1.13: implement without java.awt
@Mod(modid = TextureDumper.MODID, name = "Forge Texture Atlas Dump", version = TextureDumper.VERSION, clientSideOnly = true)
public class TextureDumper
{