From 2bc051c4d13b53218649bebe42cd4022aafe8644 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Thu, 7 May 2020 18:03:53 +0200 Subject: minor code refactor, using more Logger instead of Sysout --- src/main/java/common/Blocks.java | 7 ++++--- src/main/java/common/Recipes.java | 6 +++--- src/main/java/kekztech/KekzCore.java | 39 +++++++++++++++++++----------------- 3 files changed, 28 insertions(+), 24 deletions(-) (limited to 'src/main') diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java index d7211e2b13..cfa4b87b7a 100644 --- a/src/main/java/common/Blocks.java +++ b/src/main/java/common/Blocks.java @@ -21,6 +21,7 @@ import common.blocks.Block_TFFTStorageFieldBlockT4; import common.blocks.Block_TFFTStorageFieldBlockT5; import common.blocks.Block_ThaumiumReinforcedJar; import common.blocks.Block_YSZUnit; +import kekztech.KekzCore; import net.minecraft.block.Block; public class Blocks { @@ -54,7 +55,7 @@ public class Blocks { public static Block lscLapotronicEnergyUnit; public static void init() { - System.out.println("Registering blocks..."); + KekzCore.LOGGER.info("Registering blocks..."); registerBlocks_SOFC(); registerBlocks_TFFT(); @@ -63,8 +64,8 @@ public class Blocks { //registerBlocks_ItemProxy(); registerBlocks_Jars(); registerBlocks_LSC(); - - System.out.println("Finished registering blocks"); + + KekzCore.LOGGER.info("Finished registering blocks"); } private static void registerBlocks_SOFC() { diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java index 782b9fa216..d4728bf4dd 100644 --- a/src/main/java/common/Recipes.java +++ b/src/main/java/common/Recipes.java @@ -31,15 +31,15 @@ public class Recipes { public static final HashMap infusionRecipes = new HashMap<>(); public static void init() { - System.out.println("Registering recipes..."); + KekzCore.LOGGER.info("Registering recipes..."); registerRecipes_TFFT(); registerRecipes_SOFC(); registerRecipes_Nuclear(); //registerRecipes_ItemServer(); registerRecipes_Jars(); - - System.out.println("Finished registering recipes"); + + KekzCore.LOGGER.info("Finished registering recipes"); } private static void registerRecipes_TFFT() { diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index b5aceb6221..f5b8226c74 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -3,18 +3,19 @@ package kekztech; import common.Blocks; import common.Recipes; import common.tileentities.*; -import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; -import items.*; +import items.ErrorItem; +import items.Item_ThaumiumReinforcedJarFilled; +import items.MetaItem_CraftingComponent; +import items.MetaItem_ReactorComponent; import net.minecraft.item.ItemStack; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import render.ConduitRenderer; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; @@ -95,21 +96,23 @@ public class KekzCore { Recipes.init(); // Thaumcraft research - final ResearchItem jar_thaumiumreinforced = new ResearchItem("THAUMIUMREINFORCEDJAR", "ALCHEMY", new AspectList(), 3, -4, 2, new ItemStack(Blocks.jarThaumiumReinforced, 1)); - jar_thaumiumreinforced.setPages( - new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.0"), - new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDJAR")), - new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.1") - ); - jar_thaumiumreinforced.setParents("JARLABEL"); - jar_thaumiumreinforced.registerResearchItem(); + final ResearchItem jar_thaumiumreinforced = new ResearchItem("THAUMIUMREINFORCEDJAR", "ALCHEMY", new AspectList(), 3, -4, 2, new ItemStack(Blocks.jarThaumiumReinforced, 1)) + .setPages( + new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.0"), + new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDJAR")), + new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.1") + ) + .setConcealed() + .setParents("JARLABEL") + .registerResearchItem(); - final ResearchItem jar_ichor = new ResearchItem("ICHORJAR", "ALCHEMY", new AspectList(), 2, -5, 3, new ItemStack(Blocks.jarIchor, 1)); - jar_ichor.setPages( - new ResearchPage("kekztech.research_page.ICHORJAR"), - new ResearchPage(Recipes.infusionRecipes.get("ICHORJAR")) - ); - jar_ichor.setParents("THAUMIUMREINFORCEDJAR"); - jar_ichor.registerResearchItem(); + final ResearchItem jar_ichor = new ResearchItem("ICHORJAR", "ALCHEMY", new AspectList(), 2, -5, 3, new ItemStack(Blocks.jarIchor, 1)) + .setPages( + new ResearchPage("kekztech.research_page.ICHORJAR"), + new ResearchPage(Recipes.infusionRecipes.get("ICHORJAR")) + ) + .setConcealed() + .setParents("THAUMIUMREINFORCEDJAR") + .registerResearchItem(); } } -- cgit