From 087fb28fad8ba7c20a84be63b2115f50c992b4e1 Mon Sep 17 00:00:00 2001 From: OneLemonyBoi <50998649+OneLemonyBoi@users.noreply.github.com> Date: Thu, 4 Mar 2021 15:44:24 -0800 Subject: [PATCH 1/2] Adds values --- .../immersiveengineering/common/IEContent.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/blusunrize/immersiveengineering/common/IEContent.java b/src/main/java/blusunrize/immersiveengineering/common/IEContent.java index 6136845961..efbe3ebbcd 100644 --- a/src/main/java/blusunrize/immersiveengineering/common/IEContent.java +++ b/src/main/java/blusunrize/immersiveengineering/common/IEContent.java @@ -23,6 +23,7 @@ import blusunrize.immersiveengineering.api.tool.ConveyorHandler; import blusunrize.immersiveengineering.api.tool.ExternalHeaterHandler; import blusunrize.immersiveengineering.api.tool.ExternalHeaterHandler.DefaultFurnaceAdapter; +import blusunrize.immersiveengineering.api.utils.TagUtils; import blusunrize.immersiveengineering.api.wires.NetHandlerCapability; import blusunrize.immersiveengineering.api.wires.WireType; import blusunrize.immersiveengineering.api.wires.localhandlers.EnergyTransferHandler; @@ -91,6 +92,7 @@ import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.DeferredWorkQueue; +import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; @@ -792,6 +794,19 @@ public static void init() ThermoelectricHandler.registerSourceInKelvin(Blocks.PACKED_ICE, 240); ThermoelectricHandler.registerSourceInKelvin(Blocks.BLUE_ICE, 200); ThermoelectricHandler.registerSourceInKelvin(IETags.getTagsFor(EnumMetals.URANIUM).storage, 2000); + + if (ModList.get().isLoaded("biggerreactors")){ + ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/cyanite")), 1500); + ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/yellorium")), 2000); + ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/blutonium")), 3000); + ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/ludicrite")), 6000); + } + if (ModList.get().isLoaded("bigreactors")){ + ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/cyanite")), 1500); + ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/yellorium")), 2000); + } + + //ThermoelectricHandler.registerSourceInKelvin(new ResourceLocation("forge:storage_blocks/yellorium"), 2000); //ThermoelectricHandler.registerSourceInKelvin(new ResourceLocation("forge:storage_blocks/plutonium"), 4000); //ThermoelectricHandler.registerSourceInKelvin(new ResourceLocation("forge:storage_blocks/blutonium"), 4000); From 4931754149e88194c7f941b7464788da7bf12df6 Mon Sep 17 00:00:00 2001 From: OneLemonyBoi <50998649+OneLemonyBoi@users.noreply.github.com> Date: Sat, 6 Mar 2021 11:27:06 -0800 Subject: [PATCH 2/2] Makes new Module --- .../common/IEContent.java | 14 +-------- .../compat/BiggerReactorsCompatModule.java | 30 +++++++++++++++++++ .../compat/ExtremeReactorsCompatModule.java | 29 ++++++++++++++++++ .../common/util/compat/IECompatModule.java | 2 ++ 4 files changed, 62 insertions(+), 13 deletions(-) create mode 100644 src/main/java/blusunrize/immersiveengineering/common/util/compat/BiggerReactorsCompatModule.java create mode 100644 src/main/java/blusunrize/immersiveengineering/common/util/compat/ExtremeReactorsCompatModule.java diff --git a/src/main/java/blusunrize/immersiveengineering/common/IEContent.java b/src/main/java/blusunrize/immersiveengineering/common/IEContent.java index efbe3ebbcd..2b34206274 100644 --- a/src/main/java/blusunrize/immersiveengineering/common/IEContent.java +++ b/src/main/java/blusunrize/immersiveengineering/common/IEContent.java @@ -794,19 +794,7 @@ public static void init() ThermoelectricHandler.registerSourceInKelvin(Blocks.PACKED_ICE, 240); ThermoelectricHandler.registerSourceInKelvin(Blocks.BLUE_ICE, 200); ThermoelectricHandler.registerSourceInKelvin(IETags.getTagsFor(EnumMetals.URANIUM).storage, 2000); - - if (ModList.get().isLoaded("biggerreactors")){ - ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/cyanite")), 1500); - ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/yellorium")), 2000); - ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/blutonium")), 3000); - ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/ludicrite")), 6000); - } - if (ModList.get().isLoaded("bigreactors")){ - ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/cyanite")), 1500); - ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/yellorium")), 2000); - } - - + //ThermoelectricHandler.registerSourceInKelvin(new ResourceLocation("forge:storage_blocks/yellorium"), 2000); //ThermoelectricHandler.registerSourceInKelvin(new ResourceLocation("forge:storage_blocks/plutonium"), 4000); //ThermoelectricHandler.registerSourceInKelvin(new ResourceLocation("forge:storage_blocks/blutonium"), 4000); diff --git a/src/main/java/blusunrize/immersiveengineering/common/util/compat/BiggerReactorsCompatModule.java b/src/main/java/blusunrize/immersiveengineering/common/util/compat/BiggerReactorsCompatModule.java new file mode 100644 index 0000000000..35acc3569d --- /dev/null +++ b/src/main/java/blusunrize/immersiveengineering/common/util/compat/BiggerReactorsCompatModule.java @@ -0,0 +1,30 @@ +package blusunrize.immersiveengineering.common.util.compat; + +import blusunrize.immersiveengineering.api.energy.ThermoelectricHandler; +import blusunrize.immersiveengineering.api.utils.TagUtils; +import net.minecraft.util.ResourceLocation; + +public class BiggerReactorsCompatModule extends IECompatModule{ + @Override + public void preInit() { + + } + + @Override + public void registerRecipes() { + + } + + @Override + public void init() { + ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/cyanite")), 1500); + ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/yellorium")), 2000); + ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/blutonium")), 3000); + ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/ludicrite")), 6000); + } + + @Override + public void postInit() { + + } +} diff --git a/src/main/java/blusunrize/immersiveengineering/common/util/compat/ExtremeReactorsCompatModule.java b/src/main/java/blusunrize/immersiveengineering/common/util/compat/ExtremeReactorsCompatModule.java new file mode 100644 index 0000000000..234ea0b5f7 --- /dev/null +++ b/src/main/java/blusunrize/immersiveengineering/common/util/compat/ExtremeReactorsCompatModule.java @@ -0,0 +1,29 @@ +package blusunrize.immersiveengineering.common.util.compat; + +import blusunrize.immersiveengineering.api.energy.ThermoelectricHandler; +import blusunrize.immersiveengineering.api.utils.TagUtils; +import net.minecraft.util.ResourceLocation; + +public class ExtremeReactorsCompatModule extends IECompatModule{ + + @Override + public void preInit() { + + } + + @Override + public void registerRecipes() { + + } + + @Override + public void init() { + ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/cyanite")), 1500); + ThermoelectricHandler.registerSourceInKelvin(TagUtils.createBlockWrapper(new ResourceLocation("forge:storage_blocks/yellorium")), 2000); + } + + @Override + public void postInit() { + + } +} diff --git a/src/main/java/blusunrize/immersiveengineering/common/util/compat/IECompatModule.java b/src/main/java/blusunrize/immersiveengineering/common/util/compat/IECompatModule.java index c4bb998c15..5d2a15c325 100644 --- a/src/main/java/blusunrize/immersiveengineering/common/util/compat/IECompatModule.java +++ b/src/main/java/blusunrize/immersiveengineering/common/util/compat/IECompatModule.java @@ -32,6 +32,8 @@ public abstract class IECompatModule moduleClasses.put("crafttweaker", CraftTweakerCompatModule.class); moduleClasses.put("theoneprobe", OneProbeCompatModule.class); moduleClasses.put("curios", CuriosCompatModule.class); + moduleClasses.put("bigreactors", ExtremeReactorsCompatModule.class); + moduleClasses.put("biggerreactors", BiggerReactorsCompatModule.class); } public static void doModulesPreInit()