From 17ae55c35992829bf377ac5bc0741b234cb90bda Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 8 Feb 2018 19:37:21 +0100 Subject: 1.12.2; not well tested; book integration still broken --- src/main/java/com/sosnitzka/taiga/TAIGA.java | 63 ++++++++++++++++++---------- 1 file changed, 41 insertions(+), 22 deletions(-) (limited to 'src/main/java/com/sosnitzka/taiga/TAIGA.java') diff --git a/src/main/java/com/sosnitzka/taiga/TAIGA.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java index a0c3f2b..75edf2e 100644 --- a/src/main/java/com/sosnitzka/taiga/TAIGA.java +++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java @@ -14,7 +14,6 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.event.FMLServerStartingEvent; import net.minecraftforge.fml.common.registry.GameRegistry; -import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import slimeknights.tconstruct.library.MaterialIntegration; import slimeknights.tconstruct.library.materials.BowMaterialStats; @@ -27,47 +26,58 @@ import static com.sosnitzka.taiga.util.Utils.integrateMaterial; import static com.sosnitzka.taiga.util.Utils.integrateOre; import static slimeknights.tconstruct.library.utils.HarvestLevels.*; -@Mod(modid = TAIGA.MODID, version = TAIGA.VERSION, guiFactory = TAIGA.GUIFACTORY, dependencies = "required-after:tconstruct@[1.10.2-2.5.0,);" + "required-after:mantle@[1.10.2-1.0.0,)") +@Mod(modid = TAIGA.MODID, version = TAIGA.VERSION, guiFactory = TAIGA.GUIFACTORY, dependencies = + "required-after:tconstruct@[1.10.2-2.5.0,);" + "required-after:mantle@[1.10.2-1.0.0,)") public class TAIGA { public static final String MODID = "taiga"; public static final String VERSION = "@VERSION@"; public static final String GUIFACTORY = "com.sosnitzka.taiga.TAIGAGuiFactory"; - public static final Logger logger = LogManager.getLogger("TAIGA"); + public static Logger logger; - @SidedProxy(clientSide = "com.sosnitzka.taiga.proxy.ClientProxy", serverSide = "com.sosnitzka.taiga.proxy.CommonProxy") + @SidedProxy(clientSide = "com.sosnitzka.taiga.proxy.ClientProxy", serverSide = "com.sosnitzka.taiga.proxy" + + ".CommonProxy") public static CommonProxy proxy; public static List integrateList = Lists.newArrayList(); // List of materials needed to be integrated @EventHandler public void preInit(FMLPreInitializationEvent e) { + logger = e.getModLog(); + + Fluids.register(); + Blocks.register(false); + Blocks.registerItems(); + Items.register(); + proxy.initConfig(); - Items.register(); // Registers items and its oreDict - Blocks.register(); // Registers blocks and its items form a long with its oreDict - Fluids.register(); // Registers all fluids and its buckets - Fluids.registerfromItem(); // Registers some special smeltery recipes (not alloying) - Alloys.register(); // Registers alloying recipes - registerTinkerMaterials(); // Registers materials and associated fluids and stats into tconstruct + registerTinkerMaterials(); } @EventHandler public void init(FMLInitializationEvent e) { proxy.registerModels(); // Registers models on the client side + + Fluids.registerfromItem(); // Registers some special smeltery recipes (not alloying) GameRegistry.registerWorldGenerator(WorldGen.getInstance(), 100); // Generates ores // GameRegistry.registerFuelHandler(new FuelHandler()); Registeres fuels' burn times - SmeltingRegistry.register(); // Registers smelting recipes - CraftingRegistry.register(); // Registers crafting recipes // Adds new harvest levels' names harvestLevelNames.put(DURANITE, TextFormatting.DARK_GREEN + "Duranite"); harvestLevelNames.put(VALYRIUM, TextFormatting.GOLD + "Valyrium"); harvestLevelNames.put(VIBRANIUM, TextFormatting.DARK_PURPLE + "Vibranium"); + Blocks.register(true); + + Alloys.register(); // Registers alloying recipes + registerTinkerMaterials(); // Registers materials and associated fluids and stats into tconstruct + + SmeltingRegistry.register(); // Registers smelting recipes + CraftingRegistry.register(); // Registers crafting recipes for (MaterialIntegration m : integrateList) { - m.integrateRecipes(); + m.integrate(); } } @@ -88,26 +98,35 @@ public class TAIGA { private void registerTinkerMaterials() { BowMaterialStats shitty = new BowMaterialStats(0.2f, 0.4f, -1f); - integrateMaterial("Tiberium", tiberium, tiberiumFluid, 80, 3.3f, 4f, 0.7f, -25, 50, DIAMOND, shitty, true, false); + integrateMaterial("Tiberium", tiberium, tiberiumFluid, 80, 3.3f, 4f, 0.7f, -25, 50, DIAMOND, shitty, true, + false); integrateMaterial("Aurorium", aurorium, auroriumFluid, 750, 3.6f, 3.78f, 0.77f, 25, 130, COBALT, 0.45f, 1f, 1); - integrateMaterial("Prometheum", prometheum, prometheumFluid, 844, 4.75f, 6.6f, 1.2f, 25, 50, DURANITE, 0.2f, 0.6f, 3); - integrateMaterial("Duranite", duranite, duraniteFluid, 1550, 3.2f, 3.2f, 1.16f, 100, 100, DURANITE, 0.3f, 1.4f, 2); - integrateMaterial("Valyrium", valyrium, valyriumFluid, 1111, 5.37f, 4.8f, 1.30f, 100, 100, VALYRIUM, 1.1f, 1.2f, 4); - integrateMaterial("Vibranium", vibranium, vibraniumFluid, 1235, 7.62f, 8.1f, 1.3f, 100, 100, VIBRANIUM, 1.1f, 1.8f, 4); + integrateMaterial("Prometheum", prometheum, prometheumFluid, 844, 4.75f, 6.6f, 1.2f, 25, 50, DURANITE, 0.2f, + 0.6f, 3); + integrateMaterial("Duranite", duranite, duraniteFluid, 1550, 3.2f, 3.2f, 1.16f, 100, 100, DURANITE, 0.3f, + 1.4f, 2); + integrateMaterial("Valyrium", valyrium, valyriumFluid, 1111, 5.37f, 4.8f, 1.30f, 100, 100, VALYRIUM, 1.1f, + 1.2f, 4); + integrateMaterial("Vibranium", vibranium, vibraniumFluid, 1235, 7.62f, 8.1f, 1.3f, 100, 100, VIBRANIUM, 1.1f, + 1.8f, 4); integrateMaterial("Terrax", terrax, terraxFluid, 444, 4.77f, 2.9f, 0.8f, 100, 50, COBALT, shitty, true, true); - integrateMaterial("Palladium", palladium, palladiumFluid, 797, 4.35f, 6.8f, 1.3f, 130, -50, DURANITE, .5f, .2f, 3); + integrateMaterial("Palladium", palladium, palladiumFluid, 797, 4.35f, 6.8f, 1.3f, 130, -50, DURANITE, .5f, + .2f, 3); integrateMaterial("Uru", uru, uruFluid, 877, 2f, 7.2f, 1.5f, -50, 175, VALYRIUM, 1.3f, 0.8f, 6); integrateMaterial("Eezo", eezo, eezoFluid, 50, 23f, 3.5f, .1f, 10, 10, COBALT, shitty, true, false); integrateMaterial("Basalt", basalt, basaltFluid, 200, 3, 2.5f, 0.5f, -25, 25, STONE, shitty, true, false); - integrateMaterial("Triberium", triberium, triberiumFluid, 223, 6.2f, 8.35f, 0.63f, 50, 50, DIAMOND, shitty, true, true); + integrateMaterial("Triberium", triberium, triberiumFluid, 223, 6.2f, 8.35f, 0.63f, 50, 50, DIAMOND, shitty, + true, true); integrateMaterial("Fractum", fractum, fractumFluid, 538, 5.71f, 6.93f, 0.88f, 58, 117, DIAMOND, shitty); integrateMaterial("Violium", violium, violiumFluid, 925, 3.8f, 3.75f, .90f, 175, 50, COBALT, .45f, .95f, 1); integrateMaterial("Proxii", proxii, proxiiFluid, 625, 6.8f, 4.21f, 1.25f, 80, 25, DURANITE, .35f, .5f, 3); integrateMaterial("Tritonite", tritonite, tritoniteFluid, 780, 8f, 3.3f, 1.45f, -25, 150, COBALT, shitty); integrateMaterial("Ignitz", ignitz, ignitzFluid, 350, 2f, 6.66f, .85f, 150, 250, COBALT, .8f, .8f, 3); - integrateMaterial("Imperomite", imperomite, imperomiteFluid, 1350, 4.65f, 5.9f, 1.15f, -100, 150, DURANITE, 1.2f, 1.8f, 2); + integrateMaterial("Imperomite", imperomite, imperomiteFluid, 1350, 4.65f, 5.9f, 1.15f, -100, 150, DURANITE, + 1.2f, 1.8f, 2); integrateMaterial("Solarium", solarium, solariumFluid, 1100, 24f, 7f, 1.25f, 150, 150, VIBRANIUM, .8f, 1.5f, 5); - integrateMaterial("Nihilite", nihilite, nihiliteFluid, 400, 2.8f, 4.50f, .77f, 350, 155, VALYRIUM, 1.5f, .8f, 3); + integrateMaterial("Nihilite", nihilite, nihiliteFluid, 400, 2.8f, 4.50f, .77f, 350, 155, VALYRIUM, 1.5f, .8f, + 3); integrateMaterial("Adamant", adamant, adamantFluid, 1750, 6f, 6f, 2f, 0, 0, VIBRANIUM, .35f, 1.85f, 8); integrateMaterial("Dyonite", dyonite, dyoniteFluid, 900, 6.45f, 5f, 0.66f, -50, 250, DURANITE, 2, .9f, -1); integrateMaterial("Nucleum", nucleum, nucleumFluid, 505, 17.5f, 9.5f, 1.05f, 100, 125, VALYRIUM, shitty); -- cgit v1.2.3