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

make sure to init fluids in preinit #77

Merged
merged 4 commits into from
Sep 8, 2024
Merged

make sure to init fluids in preinit #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
baddb4c
make sure to init fluids in preinit
chochem Sep 8, 2024
3fbc2d7
change to empty init method (tested with latest nightly pack)
Caedis Sep 8, 2024
b999893
spotless
Caedis Sep 8, 2024
a55588a
update deps while i am at it
Caedis Sep 8, 2024
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
4 changes: 2 additions & 2 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {
compileOnly("com.github.GTNewHorizons:Natura:2.7.1:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.6.22:dev") {
compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.6.23:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:Galacticraft:3.2.4-GTNH:dev") {
Expand All @@ -26,6 +26,6 @@ dependencies {
//runtimeOnly("com.github.GTNewHorizons:twilightforest:2.6.33:dev")
//runtimeOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.9-GTNH:dev")
//runtimeOnly("com.github.GTNewHorizons:Natura:2.7.1:dev")
//runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.6.22:dev")
//runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.6.23:dev")
//runtimeOnly("com.github.GTNewHorizons:Galacticraft:3.2.4-GTNH:dev")
}
3 changes: 3 additions & 0 deletions src/main/java/com/github/bartimaeusnek/cropspp/Cropspp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import com.github.bartimaeusnek.cropspp.GTHandler.machines.CropWeedPicker;
import com.github.bartimaeusnek.cropspp.commands.EnableDebug;
import com.github.bartimaeusnek.cropspp.croploader.CropLoader;
import com.github.bartimaeusnek.cropspp.fluids.CppFluids;
import com.github.bartimaeusnek.cropspp.items.CppItems;

import cpw.mods.fml.common.Mod;
Expand Down Expand Up @@ -227,8 +228,10 @@ public void preInit(FMLPreInitializationEvent preinit) {
CropItemList.cropWeedPicker
.set(new CropWeedPicker(12528, "Basic CropWeedPicker", "Basic CropWeedPicker", 1).getStackForm(1));

CppFluids.register_Fluids();
CppItems.register_Items();
CppItems.OreDictItems();

}

@EventHandler
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/github/bartimaeusnek/cropspp/fluids/CppFluids.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ public class CppFluids {
public static final AlkoholImpure GHP = new AlkoholImpure("potion.GHP", 700, "potion.vodka");
public static final AlkoholImpure jagi = new AlkoholImpure("potion.jagi", 100000, "potion.alcopops");
public static final AlkoholImpure njagi = new AlkoholImpure("potion.njagi", 350, "potion.alcopops");

/// This method intentionally left blank to instantiate the static fields
public static void register_Fluids() {}
}