Skip to content

Commit 8b93256

Browse files
authored
Fix farming NPE (#18)
1 parent cf028b3 commit 8b93256

2 files changed

Lines changed: 3 additions & 0 deletions

File tree

src/main/java/com/github/gtexpert/gtbm/integration/forestry/loaders/FFMFarmingLoader.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ public class FFMFarmingLoader {
1818

1919
public static void init() {
2020
IFarmRegistry farmRegistry = ForestryAPI.farmRegistry;
21+
if (farmRegistry == null) return;
2122

2223
// GregTech Rubber tree farm
2324
IFarmProperties ceuFarm = ForestryFarmHelper.registerFarmType("farmCEu", FarmLogicCEu::new,

src/main/java/com/github/gtexpert/gtbm/integration/forestry/util/ForestryFarmHelper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818

1919
public class ForestryFarmHelper {
2020

21+
@javax.annotation.Nullable
2122
public static IFarmProperties registerFarmType(String farmId,
2223
BiFunction<IFarmProperties, Boolean, IFarmLogic> logicFactory,
2324
EnumElectronTube tube) {
25+
if (ForestryAPI.farmRegistry == null) return null;
2426
IFarmProperties farm = ForestryAPI.farmRegistry.registerLogic(farmId, logicFactory);
2527
farm.registerSoil(new ItemStack(Blocks.DIRT),
2628
Block.getBlockFromItem(Mods.Forestry.getItem("humus").getItem()).getDefaultState());

0 commit comments

Comments
 (0)