From 88eb4eb3f8011f5116c5808f2d34405b19b02f16 Mon Sep 17 00:00:00 2001 From: srw Date: Sun, 2 Jul 2017 14:28:18 -0700 Subject: [PATCH] update forge, change modid, fix environment so it actually runs --- gradle.properties | 6 +++--- .../{lighting => gable}/client/ClientProxy.java | 9 +++++++-- .../{lighting => gable}/common/CommonProxy.java | 4 ++-- .../common/GablesLighting.java | 17 ++++++++++------- .../common/init/ModInfo.java | 11 ++++++----- src/main/resources/mcmod.info | 10 +++++----- 6 files changed, 33 insertions(+), 24 deletions(-) rename src/main/java/nmd/primal/{lighting => gable}/client/ClientProxy.java (69%) rename src/main/java/nmd/primal/{lighting => gable}/common/CommonProxy.java (90%) rename src/main/java/nmd/primal/{lighting => gable}/common/GablesLighting.java (90%) rename src/main/java/nmd/primal/{lighting => gable}/common/init/ModInfo.java (86%) diff --git a/gradle.properties b/gradle.properties index ccd4403..2f5a59b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,12 @@ #org.gradle.daemon=true org.gradle.jvmargs=-Xmx3G -mod_group=nmd.primal.sample -mod_name=PrimalSample +mod_group=nmd.primal.lighting +mod_name=GablesLighting mod_version=0.0.0 mod_build=1 -forge_version=13.20.0.2366 +forge_version=13.20.1.2388 mcp_mappings=snapshot_20170610 mc_version=1.11.2 diff --git a/src/main/java/nmd/primal/lighting/client/ClientProxy.java b/src/main/java/nmd/primal/gable/client/ClientProxy.java similarity index 69% rename from src/main/java/nmd/primal/lighting/client/ClientProxy.java rename to src/main/java/nmd/primal/gable/client/ClientProxy.java index c7e1ea4..02c0aea 100644 --- a/src/main/java/nmd/primal/lighting/client/ClientProxy.java +++ b/src/main/java/nmd/primal/gable/client/ClientProxy.java @@ -1,4 +1,9 @@ -package nmd.primal.lighting.client; +package nmd.primal.gable.client; + +import net.minecraft.client.Minecraft; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import nmd.primal.gable.common.CommonProxy; @SideOnly(Side.CLIENT) public class ClientProxy extends CommonProxy @@ -25,4 +30,4 @@ public class ClientProxy extends CommonProxy { } -} +} \ No newline at end of file diff --git a/src/main/java/nmd/primal/lighting/common/CommonProxy.java b/src/main/java/nmd/primal/gable/common/CommonProxy.java similarity index 90% rename from src/main/java/nmd/primal/lighting/common/CommonProxy.java rename to src/main/java/nmd/primal/gable/common/CommonProxy.java index 33dd8a7..3e8b155 100644 --- a/src/main/java/nmd/primal/lighting/common/CommonProxy.java +++ b/src/main/java/nmd/primal/gable/common/CommonProxy.java @@ -1,4 +1,4 @@ -package nmd.primal.lighting.common; +package nmd.primal.gable.common; public class CommonProxy { @@ -19,4 +19,4 @@ public class CommonProxy { } -} +} \ No newline at end of file diff --git a/src/main/java/nmd/primal/lighting/common/GablesLighting.java b/src/main/java/nmd/primal/gable/common/GablesLighting.java similarity index 90% rename from src/main/java/nmd/primal/lighting/common/GablesLighting.java rename to src/main/java/nmd/primal/gable/common/GablesLighting.java index db7b243..a24a126 100644 --- a/src/main/java/nmd/primal/lighting/common/GablesLighting.java +++ b/src/main/java/nmd/primal/gable/common/GablesLighting.java @@ -1,4 +1,4 @@ -package nmd.primal.lighting.common; +package nmd.primal.gable.common; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -10,7 +10,7 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import nmd.primal.lighting.common.init.ModInfo; +import nmd.primal.gable.common.init.ModInfo; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -24,7 +24,7 @@ import java.util.Locale; updateJSON = ModInfo.UPDATE_JSON ) -public class PrimalSample +public class GablesLighting { @Instance(ModInfo.MOD_ID) public static GablesLighting INSTANCE; @@ -72,15 +72,18 @@ public class PrimalSample // ***************************************************************************** // // helper methods // ***************************************************************************** // - public static SimpleNetworkWrapper getNetwork() { + public static SimpleNetworkWrapper getNetwork() + { return NETWORK; } - public static CommonProxy getProxy() { + public static CommonProxy getProxy() + { return PROXY; } - public static Logger getLogger() { + public static Logger getLogger() + { return LOGGER; } -} +} \ No newline at end of file diff --git a/src/main/java/nmd/primal/lighting/common/init/ModInfo.java b/src/main/java/nmd/primal/gable/common/init/ModInfo.java similarity index 86% rename from src/main/java/nmd/primal/lighting/common/init/ModInfo.java rename to src/main/java/nmd/primal/gable/common/init/ModInfo.java index d678de2..898168c 100644 --- a/src/main/java/nmd/primal/lighting/common/init/ModInfo.java +++ b/src/main/java/nmd/primal/gable/common/init/ModInfo.java @@ -1,6 +1,7 @@ -package nmd.primal.lighting.common.init; +package nmd.primal.gable.common.init; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; @@ -11,7 +12,7 @@ public class ModInfo // ***************************************************************************** // // Mod Details // ***************************************************************************** // - public static final String MOD_ID = "lighting"; + public static final String MOD_ID = "gable"; public static final String MOD_CONFIG = "primal/" + MOD_ID; public static final String MOD_VERSION = "@MOD_VERSION@"; public static final String MC_VERSIONS = "[1.11.0, 1.12.0)"; @@ -23,8 +24,8 @@ public class ModInfo // ***************************************************************************** // //public static final Marker MOD_MARKER = MarkerManager.getMarker(MOD_ID); //public static final String GUI_FACTORY = "nmd.primal.sample.client.gui.GuiFactory"; - public static final String COMMON_PROXY = "nmd.primal.lighting.common.CommonProxy"; - public static final String CLIENT_PROXY = "nmd.primal.lighting.client.ClientProxy"; + public static final String COMMON_PROXY = "nmd.primal.gable.common.CommonProxy"; + public static final String CLIENT_PROXY = "nmd.primal.gable.client.ClientProxy"; public static final String UPDATE_JSON = "http://insecure.www.nmd.so/update-sample.json"; // ***************************************************************************** // @@ -44,4 +45,4 @@ public class ModInfo return new ItemStack(Blocks.GLOWSTONE); } }; -} +} \ No newline at end of file diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 2e8c8fa..ba07687 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,16 +1,16 @@ [ { - "modid": "examplemod", - "name": "Example PrimalCore Sub-Mod", - "description": "Example placeholder mod.", + "modid": "gable", + "name": "Elite Gable's Lighting", + "description": "Adds lighting and more Gable-like blocks", "version": "${version}", "mcversion": "${mcversion}", "url": "", "updateUrl": "", - "authorList": ["ExampleDude"], + "authorList": ["EliteGable"], "credits": "The Forge and FML guys, for making this example", "logoFile": "", "screenshots": [], "dependencies": [] } -] +] \ No newline at end of file