mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-21 04:22:32 +00:00
small fix for a JEI log error (#2110)
This commit is contained in:
1 parent
b19809bd3c
commit
aa642a3ee8
5 files changed
+16
-22
No files matched your search
@@ -2,17 +2,14 @@ package forestry.apiculture.compat;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.core.ForestryAPI;
|
||||
import forestry.api.genetics.IAlleleSpecies;
|
||||
import forestry.apiculture.ModuleApiculture;
|
||||
import forestry.apiculture.items.ItemRegistryApiculture;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.genetics.Genome;
|
||||
import forestry.core.utils.JeiUtil;
|
||||
import forestry.modules.ForestryModuleUids;
|
||||
import forestry.modules.ModuleHelper;
|
||||
|
||||
import mezz.jei.api.IModPlugin;
|
||||
import mezz.jei.api.IModRegistry;
|
||||
@@ -23,7 +20,7 @@ import mezz.jei.api.JEIPlugin;
|
||||
public class ApicultureJeiPlugin implements IModPlugin {
|
||||
@Override
|
||||
public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) {
|
||||
if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) {
|
||||
if (!ModuleHelper.isEnabled(ForestryModuleUids.APICULTURE)) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -42,7 +39,7 @@ public class ApicultureJeiPlugin implements IModPlugin {
|
||||
|
||||
@Override
|
||||
public void register(IModRegistry registry) {
|
||||
if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.APICULTURE))) {
|
||||
if (!ModuleHelper.isEnabled(ForestryModuleUids.APICULTURE)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -10,6 +10,7 @@ import forestry.arboriculture.items.ItemRegistryArboriculture;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.utils.JeiUtil;
|
||||
import forestry.modules.ForestryModuleUids;
|
||||
import forestry.modules.ModuleHelper;
|
||||
|
||||
import mezz.jei.api.IModPlugin;
|
||||
import mezz.jei.api.IModRegistry;
|
||||
@@ -19,7 +20,7 @@ import mezz.jei.api.JEIPlugin;
|
||||
public class ArboricultureJeiPlugin implements IModPlugin {
|
||||
@Override
|
||||
public void register(IModRegistry registry) {
|
||||
if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.ARBORICULTURE))) {
|
||||
if (!ModuleHelper.isEnabled(ForestryModuleUids.ARBORICULTURE)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
package forestry.mail.compat;
|
||||
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import forestry.api.core.ForestryAPI;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.utils.JeiUtil;
|
||||
import forestry.mail.ModuleMail;
|
||||
import forestry.mail.blocks.BlockRegistryMail;
|
||||
import forestry.modules.ForestryModuleUids;
|
||||
import forestry.modules.ModuleHelper;
|
||||
|
||||
import mezz.jei.api.IModPlugin;
|
||||
import mezz.jei.api.IModRegistry;
|
||||
@@ -17,7 +14,7 @@ import mezz.jei.api.JEIPlugin;
|
||||
public class MailJeiPlugin implements IModPlugin {
|
||||
@Override
|
||||
public void register(IModRegistry registry) {
|
||||
if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.MAIL))) {
|
||||
if (!ModuleHelper.isEnabled(ForestryModuleUids.MAIL)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
package forestry.storage.compat;
|
||||
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import forestry.api.core.ForestryAPI;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.utils.JeiUtil;
|
||||
import forestry.modules.ForestryModuleUids;
|
||||
import forestry.modules.ModuleHelper;
|
||||
import forestry.storage.ModuleBackpacks;
|
||||
import forestry.storage.items.ItemRegistryBackpacks;
|
||||
|
||||
@@ -17,7 +14,7 @@ import mezz.jei.api.JEIPlugin;
|
||||
public class StorageJeiPlugin implements IModPlugin {
|
||||
@Override
|
||||
public void register(IModRegistry registry) {
|
||||
if (!ForestryAPI.enabledModules.contains(new ResourceLocation(Constants.MOD_ID, ForestryModuleUids.BACKPACKS))) {
|
||||
if (!ModuleHelper.isEnabled(ForestryModuleUids.BACKPACKS)) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -47,9 +44,11 @@ public class StorageJeiPlugin implements IModPlugin {
|
||||
items.builderBackpack,
|
||||
items.builderBackpackT2
|
||||
);
|
||||
JeiUtil.addDescription(registry,
|
||||
items.apiaristBackpack,
|
||||
items.lepidopteristBackpack
|
||||
);
|
||||
if (ModuleHelper.isEnabled(ForestryModuleUids.APICULTURE)) {
|
||||
JeiUtil.addDescription(registry, items.apiaristBackpack);
|
||||
}
|
||||
if (ModuleHelper.isEnabled(ForestryModuleUids.LEPIDOPTEROLOGY)) {
|
||||
JeiUtil.addDescription(registry, items.lepidopteristBackpack);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -25,7 +25,7 @@ public class WorktableJeiPlugin implements IModPlugin {
|
||||
|
||||
@Override
|
||||
public void register(IModRegistry registry) {
|
||||
if(!ModuleHelper.isEnabled(ForestryModuleUids.WORKTABLE)){
|
||||
if (!ModuleHelper.isEnabled(ForestryModuleUids.WORKTABLE)) {
|
||||
return;
|
||||
}
|
||||
BlockRegistryWorktable blocks = ModuleWorktable.getBlocks();
|
||||
|
||||
Reference in new issue
Block a user