mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-22 12:59:44 +00:00
Add IMC messages for mods to blacklist dimensions in
This commit is contained in:
1 parent
4c874fcf7d
commit
e30e9f4ab9
5 files changed
+42
-1
No files matched your search
@@ -65,4 +65,8 @@ public class HiveConfig {
|
||||
public static boolean isDimBlacklisted(int dimId) {
|
||||
return blacklistedDims.contains(dimId);
|
||||
}
|
||||
|
||||
public static void addBlacklistedDim(int dimId) {
|
||||
blacklistedDims.add(dimId);
|
||||
}
|
||||
}
|
||||
@@ -29,6 +29,7 @@ import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.init.PotionTypes;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.potion.PotionUtils;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -951,6 +952,12 @@ public class ModuleApiculture extends BlankForestryModule {
|
||||
String messageString = String.format("Received a '%s' request from mod '%s'. This IMC message has been replaced with the oreDictionary for 'slabWood'. Please contact the author and report this issue.", message.key, message.getSender());
|
||||
Log.warning(messageString);
|
||||
return true;
|
||||
} else if (message.key.equals("blacklist-hives-dimension")) {
|
||||
int[] dims = message.getNBTValue().getIntArray("dimensions");
|
||||
for(int dim : dims) {
|
||||
HiveConfig.addBlacklistedDim(dim);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
@@ -70,6 +70,7 @@ import forestry.api.modules.ForestryModule;
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
import forestry.api.storage.ICrateRegistry;
|
||||
import forestry.api.storage.StorageManager;
|
||||
import forestry.apiculture.HiveConfig;
|
||||
import forestry.arboriculture.blocks.BlockArbLog;
|
||||
import forestry.arboriculture.blocks.BlockDefaultLeaves;
|
||||
import forestry.arboriculture.blocks.BlockForestryLeaves;
|
||||
@@ -540,6 +541,12 @@ public class ModuleArboriculture extends BlankForestryModule {
|
||||
IMCUtil.logInvalidIMCMessage(message);
|
||||
}
|
||||
return true;
|
||||
} else if (message.key.equals("blacklist-trees-dimension")) {
|
||||
int[] dims = message.getNBTValue().getIntArray("dimensions");
|
||||
for(int dim : dims) {
|
||||
Config.blacklistTreeDim(dim);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -18,6 +18,7 @@ import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.command.ICommand;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
@@ -31,7 +32,7 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
@@ -72,6 +73,8 @@ import forestry.core.recipes.RecipeUtil;
|
||||
import forestry.core.render.TextureManagerForestry;
|
||||
import forestry.core.utils.ClimateUtil;
|
||||
import forestry.core.utils.ForestryModEnvWarningCallable;
|
||||
import forestry.core.utils.IMCUtil;
|
||||
import forestry.core.utils.ItemStackUtil;
|
||||
import forestry.core.utils.OreDictUtil;
|
||||
import forestry.core.utils.World2ObjectMap;
|
||||
import forestry.modules.BlankForestryModule;
|
||||
@@ -461,6 +464,18 @@ public class ModuleCore extends BlankForestryModule {
|
||||
return new PacketRegistryCore();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean processIMCMessage(IMCMessage message) {
|
||||
if (message.key.equals("blacklist-ores-dimension")) {
|
||||
int[] dims = message.getNBTValue().getIntArray("dimensions");
|
||||
for(int dim : dims) {
|
||||
Config.blacklistOreDim(dim);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IPickupHandler getPickupHandler() {
|
||||
return new PickupHandlerCore();
|
||||
|
||||
@@ -152,6 +152,14 @@ public class Config {
|
||||
public static boolean isMagicalCropsSupportEnabled() {
|
||||
return enableMagicalCropsSupport;
|
||||
}
|
||||
|
||||
public static void blacklistTreeDim(int dimID) {
|
||||
blacklistedTreeDims.add(dimID);
|
||||
}
|
||||
|
||||
public static void blacklistOreDim(int dimID) {
|
||||
blacklistedOreDims.add(dimID);
|
||||
}
|
||||
|
||||
public static void load(Side side) {
|
||||
File configCommonFile = new File(Forestry.instance.getConfigFolder(), CATEGORY_COMMON + ".cfg");
|
||||
|
||||
Reference in new issue
Block a user