Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

move ItemBucketList registration to postload #981

Merged
merged 1 commit into from
Sep 8, 2024
Merged

move ItemBucketList registration to postload #981

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions src/main/java/com/dreammaster/main/MainRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,26 +274,6 @@ public void PreLoad(FMLPreInitializationEvent PreEvent) {
Logger.warn("Some fluids failed to register. Check the logfile for details");
AddLoginError("[CoreMod-Fluids] Some fluids failed to register. Check the logfile for details");
}
ItemBucketList.SodiumPotassium.set(
FluidContainerRegistry
.fillFluidContainer(FluidList.SodiumPotassium.getFluidStack(), new ItemStack(Items.bucket)));
ItemBucketList.NitricAcid.set(
FluidContainerRegistry
.fillFluidContainer(FluidList.NitricAcid.getFluidStack(), new ItemStack(Items.bucket)));
ItemBucketList.RadioactiveBacterialSludge.set(
FluidContainerRegistry.fillFluidContainer(
FluidList.EnrichedBacterialSludge.getFluidStack(),
new ItemStack(Items.bucket)));
ItemBucketList.FermentedBacterialSludge.set(
FluidContainerRegistry.fillFluidContainer(
FluidList.FermentedBacterialSludge.getFluidStack(),
new ItemStack(Items.bucket)));
ItemBucketList.Concrete.set(
FluidContainerRegistry
.fillFluidContainer(FluidList.Concrete.getFluidStack(), new ItemStack(Items.bucket)));
ItemBucketList.Pollution.set(
FluidContainerRegistry
.fillFluidContainer(FluidList.Pollution.getFluidStack(), new ItemStack(Items.bucket)));
// ------------------------------------------------------------

// register final list with valid items to forge
Expand Down Expand Up @@ -437,6 +417,26 @@ private void RegisterModuleEvents() {

@Mod.EventHandler
public void PostLoad(FMLPostInitializationEvent PostEvent) {
ItemBucketList.SodiumPotassium.set(
FluidContainerRegistry
.fillFluidContainer(FluidList.SodiumPotassium.getFluidStack(), new ItemStack(Items.bucket)));
ItemBucketList.NitricAcid.set(
FluidContainerRegistry
.fillFluidContainer(FluidList.NitricAcid.getFluidStack(), new ItemStack(Items.bucket)));
ItemBucketList.RadioactiveBacterialSludge.set(
FluidContainerRegistry.fillFluidContainer(
FluidList.EnrichedBacterialSludge.getFluidStack(),
new ItemStack(Items.bucket)));
ItemBucketList.FermentedBacterialSludge.set(
FluidContainerRegistry.fillFluidContainer(
FluidList.FermentedBacterialSludge.getFluidStack(),
new ItemStack(Items.bucket)));
ItemBucketList.Concrete.set(
FluidContainerRegistry
.fillFluidContainer(FluidList.Concrete.getFluidStack(), new ItemStack(Items.bucket)));
ItemBucketList.Pollution.set(
FluidContainerRegistry
.fillFluidContainer(FluidList.Pollution.getFluidStack(), new ItemStack(Items.bucket)));

if (CoreConfig.ModHazardousItems_Enabled) {
Module_HazardousItems.LoadConfig();
Expand Down