From 3d743ff6ab49677321eba06a96aff8f4262b85d9 Mon Sep 17 00:00:00 2001 From: Elisis Date: Tue, 11 Jan 2022 21:47:17 +1100 Subject: General new-mod additions, add some materials --- .../java/com/elisis/gtnhlanth/GTNHLanthanides.java | 42 ++++++++++++ src/main/java/com/elisis/gtnhlanth/Tags.java | 10 +++ .../com/elisis/gtnhlanth/client/ClientProxy.java | 7 ++ .../com/elisis/gtnhlanth/common/CommonProxy.java | 23 +++++++ .../common/register/WerkstoffMaterialPool.java | 68 +++++++++++++++++++ src/main/java/com/myname/mymodid/ClientProxy.java | 43 ------------ src/main/java/com/myname/mymodid/CommonProxy.java | 46 ------------- src/main/java/com/myname/mymodid/Config.java | 31 --------- src/main/java/com/myname/mymodid/MyMod.java | 77 ---------------------- src/main/java/com/myname/mymodid/Tags.java | 12 ---- src/main/resources/LICENSE | 21 ------ 11 files changed, 150 insertions(+), 230 deletions(-) create mode 100644 src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java create mode 100644 src/main/java/com/elisis/gtnhlanth/Tags.java create mode 100644 src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java create mode 100644 src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java create mode 100644 src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java delete mode 100644 src/main/java/com/myname/mymodid/ClientProxy.java delete mode 100644 src/main/java/com/myname/mymodid/CommonProxy.java delete mode 100644 src/main/java/com/myname/mymodid/Config.java delete mode 100644 src/main/java/com/myname/mymodid/MyMod.java delete mode 100644 src/main/java/com/myname/mymodid/Tags.java delete mode 100644 src/main/resources/LICENSE (limited to 'src') diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java new file mode 100644 index 0000000000..6f22d039e5 --- /dev/null +++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java @@ -0,0 +1,42 @@ +package com.elisis.gtnhlanth; + +import com.elisis.gtnhlanth.common.CommonProxy; +import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool; +import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry; + +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; + +@Mod(modid = Tags.MODID, version = Tags.VERSION, name = Tags.MODNAME, + dependencies = "required-after:IC2; " + "required-after:gregtech; " + ) +public class GTNHLanthanides { + + @Mod.Instance + public static GTNHLanthanides instance; + + @SidedProxy(clientSide = "com.elisis.gtnhlanth.client.ClientProxy",serverSide = "com.elisis.gtnhlanth.common.CommonProxy") + public static CommonProxy proxy; + + @EventHandler + public static void preInit(FMLPreInitializationEvent e) { + WerkstoffAdderRegistry.addWerkstoffAdder(new WerkstoffMaterialPool()); + proxy.preInit(e); + } + + @EventHandler + public static void init(FMLInitializationEvent e) { + proxy.init(e); + } + + @EventHandler + public static void postInit(FMLPostInitializationEvent e) { + proxy.postInit(e); + } + + +} diff --git a/src/main/java/com/elisis/gtnhlanth/Tags.java b/src/main/java/com/elisis/gtnhlanth/Tags.java new file mode 100644 index 0000000000..bd71de9398 --- /dev/null +++ b/src/main/java/com/elisis/gtnhlanth/Tags.java @@ -0,0 +1,10 @@ +package com.elisis.gtnhlanth; + +public class Tags { + + public static final String MODID = "GRADLETOKEN_MODID"; + public static final String MODNAME = "GRADLETOKEN_MODNAME"; + public static final String VERSION = "GRADLETOKEN_VERSION"; + public static final String GROUPNAME = "GRADLETOKEN_GROUPNAME"; + +} diff --git a/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java b/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java new file mode 100644 index 0000000000..d663dcde51 --- /dev/null +++ b/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java @@ -0,0 +1,7 @@ +package com.elisis.gtnhlanth.client; + +import com.elisis.gtnhlanth.common.CommonProxy; + +public class ClientProxy extends CommonProxy { + +} diff --git a/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java b/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java new file mode 100644 index 0000000000..c99a60fd79 --- /dev/null +++ b/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java @@ -0,0 +1,23 @@ +package com.elisis.gtnhlanth.common; + +import java.util.logging.Logger; + +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; + +public class CommonProxy { + + public void preInit(FMLPreInitializationEvent e) { + + } + + public void init(FMLInitializationEvent e) { + + } + + public void postInit(FMLPostInitializationEvent e) { + + } + +} diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java new file mode 100644 index 0000000000..ec8bb8cbbf --- /dev/null +++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -0,0 +1,68 @@ +package com.elisis.gtnhlanth.common.register; + +import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; + +import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; + +import gregtech.api.enums.TextureSet; + +@SuppressWarnings({"unchecked"}) +public class WerkstoffMaterialPool implements Runnable { + + private static final int offsetID = 11_000; + + //Misc. + public static final Werkstoff Hafnia = new Werkstoff( + new short[] {247, 223, 203}, + "Hafnia", + subscriptNumbers("HfO2"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), //Perhaps use hafnia liquid in elemental hafnium synthesis + offsetID, + TextureSet.SET_DULL + ); + + + //Lanthanide Line + public static final Werkstoff MuddyRareEarthSolution = new Werkstoff( + new short[] {111, 78, 55}, + "Muddy Rare Earth Solution", + subscriptNumbers("??LaNdZr??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 1, + TextureSet.SET_FLUID + ); + + public static final Werkstoff DilutedRareEarthMud = new Werkstoff( + new short[] {160, 120, 90}, + "Diluted Rare Earth Mud", + subscriptNumbers("??LaNdHf??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 2, + TextureSet.SET_FLUID + ); + + public static final Werkstoff DilutedMonaziteSulfate = new Werkstoff( + new short[] {237, 201, 175}, + "Diluted Monazite Sulfate", + subscriptNumbers("??LaNd??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 3, + TextureSet.SET_FLUID + ); + + + @Override + public void run() { + + } + + +} diff --git a/src/main/java/com/myname/mymodid/ClientProxy.java b/src/main/java/com/myname/mymodid/ClientProxy.java deleted file mode 100644 index 5c5252b1ff..0000000000 --- a/src/main/java/com/myname/mymodid/ClientProxy.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.myname.mymodid; - -import cpw.mods.fml.common.event.*; - -public class ClientProxy extends CommonProxy { - - // preInit "Run before anything else. Read your config, create blocks, items, - // etc, and register them with the GameRegistry." - public void preInit(FMLPreInitializationEvent event) { - super.preInit(event); - } - - // load "Do your mod setup. Build whatever data structures you care about. Register recipes." - public void init(FMLInitializationEvent event) { - super.init(event); - } - - // postInit "Handle interaction with other mods, complete your setup based on this." - public void postInit(FMLPostInitializationEvent event) { - super.postInit(event); - } - - public void serverAboutToStart(FMLServerAboutToStartEvent event) { - super.serverAboutToStart(event); - } - - // register server commands in this event handler - public void serverStarting(FMLServerStartingEvent event) { - super.serverStarting(event); - } - - public void serverStarted(FMLServerStartedEvent event) { - super.serverStarted(event); - } - - public void serverStopping(FMLServerStoppingEvent event) { - super.serverStopping(event); - } - - public void serverStopped(FMLServerStoppedEvent event) { - super.serverStopped(event); - } -} \ No newline at end of file diff --git a/src/main/java/com/myname/mymodid/CommonProxy.java b/src/main/java/com/myname/mymodid/CommonProxy.java deleted file mode 100644 index bcc59217a5..0000000000 --- a/src/main/java/com/myname/mymodid/CommonProxy.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.myname.mymodid; - -import cpw.mods.fml.common.event.*; - -public class CommonProxy { - - // preInit "Run before anything else. Read your config, create blocks, items, - // etc, and register them with the GameRegistry." - public void preInit(FMLPreInitializationEvent event) { - Config.syncronizeConfiguration(event.getSuggestedConfigurationFile()); - - MyMod.info(Config.greeting); - MyMod.info("I am " + Tags.MODNAME + " at version " + Tags.VERSION + " and group name " + Tags.GROUPNAME); - } - - // load "Do your mod setup. Build whatever data structures you care about. Register recipes." - public void init(FMLInitializationEvent event) { - - } - - // postInit "Handle interaction with other mods, complete your setup based on this." - public void postInit(FMLPostInitializationEvent event) { - - } - - public void serverAboutToStart(FMLServerAboutToStartEvent event) { - - } - - // register server commands in this event handler - public void serverStarting(FMLServerStartingEvent event) { - - } - - public void serverStarted(FMLServerStartedEvent event) { - - } - - public void serverStopping(FMLServerStoppingEvent event) { - - } - - public void serverStopped(FMLServerStoppedEvent event) { - - } -} diff --git a/src/main/java/com/myname/mymodid/Config.java b/src/main/java/com/myname/mymodid/Config.java deleted file mode 100644 index 09a54f30ef..0000000000 --- a/src/main/java/com/myname/mymodid/Config.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.myname.mymodid; - -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.config.Property; - -import java.io.File; - -public class Config { - - private static class Defaults { - public static final String greeting = "Hello World"; - } - - private static class Categories { - public static final String general = "general"; - } - - public static String greeting = Defaults.greeting; - - public static void syncronizeConfiguration(File configFile) { - Configuration configuration = new Configuration(configFile); - configuration.load(); - - Property greetingProperty = configuration.get(Categories.general, "greeting", Defaults.greeting, "How shall I greet?"); - greeting = greetingProperty.getString(); - - if(configuration.hasChanged()) { - configuration.save(); - } - } -} \ No newline at end of file diff --git a/src/main/java/com/myname/mymodid/MyMod.java b/src/main/java/com/myname/mymodid/MyMod.java deleted file mode 100644 index 9f9618ce8a..0000000000 --- a/src/main/java/com/myname/mymodid/MyMod.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.myname.mymodid; - -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -@Mod(modid = Tags.MODID, version = Tags.VERSION, name = Tags.MODNAME, acceptedMinecraftVersions = "[1.7.10]") -public class MyMod { - - private static Logger LOG = LogManager.getLogger(Tags.MODID); - - @SidedProxy(clientSide= Tags.GROUPNAME + ".ClientProxy", serverSide=Tags.GROUPNAME + ".CommonProxy") - public static CommonProxy proxy; - - @Mod.EventHandler - // preInit "Run before anything else. Read your config, create blocks, items, - // etc, and register them with the GameRegistry." - public void preInit(FMLPreInitializationEvent event) { - proxy.preInit(event); - } - - @Mod.EventHandler - // load "Do your mod setup. Build whatever data structures you care about. Register recipes." - public void init(FMLInitializationEvent event) { - proxy.init(event); - } - - @Mod.EventHandler - // postInit "Handle interaction with other mods, complete your setup based on this." - public void postInit(FMLPostInitializationEvent event) { - proxy.postInit(event); - } - - @Mod.EventHandler - public void serverAboutToStart(FMLServerAboutToStartEvent event) { - proxy.serverAboutToStart(event); - } - - @Mod.EventHandler - // register server commands in this event handler - public void serverStarting(FMLServerStartingEvent event) { - proxy.serverStarting(event); - } - - @Mod.EventHandler - public void serverStarted(FMLServerStartedEvent event) { - proxy.serverStarted(event); - } - - @Mod.EventHandler - public void serverStopping(FMLServerStoppingEvent event) { - proxy.serverStopping(event); - } - - @Mod.EventHandler - public void serverStopped(FMLServerStoppedEvent event) { - proxy.serverStopped(event); - } - - public static void debug(String message) { - LOG.debug(message); - } - - public static void info(String message) { - LOG.info(message); - } - - public static void warn(String message) { - LOG.warn(message); - } - - public static void error(String message) { - LOG.error(message); - } -} \ No newline at end of file diff --git a/src/main/java/com/myname/mymodid/Tags.java b/src/main/java/com/myname/mymodid/Tags.java deleted file mode 100644 index 568778f647..0000000000 --- a/src/main/java/com/myname/mymodid/Tags.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.myname.mymodid; - -// Use this class for Strings only. Do not import any classes here. It will lead to issues with Mixins if in use! - -public class Tags { - - // GRADLETOKEN_* will be replaced by your configuration values at build time - public static final String MODID = "GRADLETOKEN_MODID"; - public static final String MODNAME = "GRADLETOKEN_MODNAME"; - public static final String VERSION = "GRADLETOKEN_VERSION"; - public static final String GROUPNAME = "GRADLETOKEN_GROUPNAME"; -} \ No newline at end of file diff --git a/src/main/resources/LICENSE b/src/main/resources/LICENSE deleted file mode 100644 index 63b4b681cb..0000000000 --- a/src/main/resources/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) [year] [fullname] - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file -- cgit