From 86968497221ff4491d5e2e02e9847b728f449700 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 24 May 2017 21:38:13 -0400 Subject: [PATCH] Refactor to just "Blur" --- build.gradle | 4 +++- .../tterrag/{blurbg/BlurBG.java => blur/Blur.java} | 14 +++++++------- .../BlurBGPlugin.java => blur/BlurPlugin.java} | 6 +++--- .../BlurTransformer.java} | 6 +++--- .../{blurbg => blur}/config/BlurConfigGui.java | 6 +++--- .../{blurbg => blur}/config/BlurGuiFactory.java | 2 +- 6 files changed, 20 insertions(+), 18 deletions(-) rename src/main/java/com/tterrag/{blurbg/BlurBG.java => blur/Blur.java} (95%) rename src/main/java/com/tterrag/{blurbg/BlurBGPlugin.java => blur/BlurPlugin.java} (77%) rename src/main/java/com/tterrag/{blurbg/BlurBGTransformer.java => blur/BlurTransformer.java} (97%) rename src/main/java/com/tterrag/{blurbg => blur}/config/BlurConfigGui.java (55%) rename src/main/java/com/tterrag/{blurbg => blur}/config/BlurGuiFactory.java (95%) diff --git a/build.gradle b/build.gradle index d62fecf..d56de7b 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,8 @@ minecraft { mappings = 'stable_29' runDir = 'run' + + clientJvmArgs += '-Dfml.coreMods.load=com.tterrag.blur.BlurPlugin' replace "@VERSION@", project.version } @@ -46,7 +48,7 @@ processResources { } jar.manifest { - attributes 'FMLCorePlugin': 'com.tterrag.blurbg.BlurBGPlugin' + attributes 'FMLCorePlugin': 'com.tterrag.blur.BlurPlugin' attributes 'FMLCorePluginContainsFMLMod': 'true' } diff --git a/src/main/java/com/tterrag/blurbg/BlurBG.java b/src/main/java/com/tterrag/blur/Blur.java similarity index 95% rename from src/main/java/com/tterrag/blurbg/BlurBG.java rename to src/main/java/com/tterrag/blur/Blur.java index bc1783c..ec25fa0 100644 --- a/src/main/java/com/tterrag/blurbg/BlurBG.java +++ b/src/main/java/com/tterrag/blur/Blur.java @@ -1,4 +1,4 @@ -package com.tterrag.blurbg; +package com.tterrag.blur; import java.io.File; import java.lang.reflect.Field; @@ -8,7 +8,7 @@ import org.apache.commons.lang3.ArrayUtils; import com.google.common.base.Throwables; -import static com.tterrag.blurbg.BlurBG.*; +import static com.tterrag.blur.Blur.*; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiChat; @@ -31,14 +31,14 @@ import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent; import net.minecraftforge.fml.relauncher.ReflectionHelper; @Mod(modid = MODID, name = MOD_NAME, version = VERSION, acceptedMinecraftVersions = "[1.9, 1.12)", clientSideOnly = true, guiFactory = "com.tterrag.blurbg.config.BlurGuiFactory") -public class BlurBG { +public class Blur { - public static final String MODID = "blurbg"; - public static final String MOD_NAME = "BlurBG"; + public static final String MODID = "blur"; + public static final String MOD_NAME = "Blur"; public static final String VERSION = "@VERSION@"; @Instance - public static BlurBG instance; + public static Blur instance; public Configuration config; @@ -54,7 +54,7 @@ public class BlurBG { public void preInit(FMLPreInitializationEvent event) { MinecraftForge.EVENT_BUS.register(this); - config = new Configuration(new File(event.getModConfigurationDirectory(), "blurbg.cfg")); + config = new Configuration(new File(event.getModConfigurationDirectory(), "blur.cfg")); saveConfig(); } diff --git a/src/main/java/com/tterrag/blurbg/BlurBGPlugin.java b/src/main/java/com/tterrag/blur/BlurPlugin.java similarity index 77% rename from src/main/java/com/tterrag/blurbg/BlurBGPlugin.java rename to src/main/java/com/tterrag/blur/BlurPlugin.java index 852b943..2134c72 100644 --- a/src/main/java/com/tterrag/blurbg/BlurBGPlugin.java +++ b/src/main/java/com/tterrag/blur/BlurPlugin.java @@ -1,15 +1,15 @@ -package com.tterrag.blurbg; +package com.tterrag.blur; import java.util.Map; import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; @IFMLLoadingPlugin.SortingIndex(Integer.MAX_VALUE) -public class BlurBGPlugin implements IFMLLoadingPlugin { +public class BlurPlugin implements IFMLLoadingPlugin { @Override public String[] getASMTransformerClass() { - return new String[] { "com.tterrag.blurbg.BlurBGTransformer" }; + return new String[] { "com.tterrag.blur.BlurTransformer" }; } @Override diff --git a/src/main/java/com/tterrag/blurbg/BlurBGTransformer.java b/src/main/java/com/tterrag/blur/BlurTransformer.java similarity index 97% rename from src/main/java/com/tterrag/blurbg/BlurBGTransformer.java rename to src/main/java/com/tterrag/blur/BlurTransformer.java index dfe76c8..c1b81bc 100644 --- a/src/main/java/com/tterrag/blurbg/BlurBGTransformer.java +++ b/src/main/java/com/tterrag/blur/BlurTransformer.java @@ -1,4 +1,4 @@ -package com.tterrag.blurbg; +package com.tterrag.blur; import java.util.Iterator; @@ -13,14 +13,14 @@ import org.objectweb.asm.tree.MethodNode; import net.minecraft.launchwrapper.IClassTransformer; -public class BlurBGTransformer implements IClassTransformer { +public class BlurTransformer implements IClassTransformer { private static final String GUI_SCREEN_CLASS_NAME = "net.minecraft.client.gui.GuiScreen"; private static final String DRAW_WORLD_BAGKGROUND_METHOD = "drawWorldBackground"; private static final String DRAW_WORLD_BAGKGROUND_METHOD_OBF = "func_146270_b"; - private static final String BLUR_MAIN_CLASS = "com/tterrag/blurbg/BlurBG"; + private static final String BLUR_MAIN_CLASS = "com/tterrag/blur/Blur"; private static final String COLOR_HOOK_METHOD_NAME = "getBackgroundColor"; private static final String COLOR_HOOK_METHOD_DESC = "(Z)I"; diff --git a/src/main/java/com/tterrag/blurbg/config/BlurConfigGui.java b/src/main/java/com/tterrag/blur/config/BlurConfigGui.java similarity index 55% rename from src/main/java/com/tterrag/blurbg/config/BlurConfigGui.java rename to src/main/java/com/tterrag/blur/config/BlurConfigGui.java index dd6fb91..086b2ef 100644 --- a/src/main/java/com/tterrag/blurbg/config/BlurConfigGui.java +++ b/src/main/java/com/tterrag/blur/config/BlurConfigGui.java @@ -1,6 +1,6 @@ -package com.tterrag.blurbg.config; +package com.tterrag.blur.config; -import com.tterrag.blurbg.BlurBG; +import com.tterrag.blur.Blur; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; @@ -10,6 +10,6 @@ import net.minecraftforge.fml.client.config.GuiConfig; public class BlurConfigGui extends GuiConfig { public BlurConfigGui(GuiScreen parentScreen) { - super(parentScreen, new ConfigElement(BlurBG.instance.config.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), "blurbg", false, false, "blurbg.config.title"); + super(parentScreen, new ConfigElement(Blur.instance.config.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), Blur.MODID, false, false, Blur.MODID + ".config.title"); } } diff --git a/src/main/java/com/tterrag/blurbg/config/BlurGuiFactory.java b/src/main/java/com/tterrag/blur/config/BlurGuiFactory.java similarity index 95% rename from src/main/java/com/tterrag/blurbg/config/BlurGuiFactory.java rename to src/main/java/com/tterrag/blur/config/BlurGuiFactory.java index bd5fefb..4298312 100644 --- a/src/main/java/com/tterrag/blurbg/config/BlurGuiFactory.java +++ b/src/main/java/com/tterrag/blur/config/BlurGuiFactory.java @@ -1,4 +1,4 @@ -package com.tterrag.blurbg.config; +package com.tterrag.blur.config; import java.util.Set;