diff --git a/src/main/java/forestry/api/core/ICamouflageAccess.java b/src/main/java/forestry/api/core/ICamouflageAccess.java index ffdf05b3e..28b1fa23d 100644 --- a/src/main/java/forestry/api/core/ICamouflageAccess.java +++ b/src/main/java/forestry/api/core/ICamouflageAccess.java @@ -28,6 +28,8 @@ public interface ICamouflageAccess { void addItemToBlackList(@Nonnull String type, @Nonnull ItemStack camouflageBlock); + void addModIdToBlackList(@Nonnull String type, @Nonnull String modID); + boolean isItemBlackListed(@Nonnull String type, @Nonnull ItemStack camouflageBlock); ICamouflageItemHandler getHandlerFromItem(ItemStack stack); diff --git a/src/main/java/forestry/core/CamouflageAccess.java b/src/main/java/forestry/core/CamouflageAccess.java index f67efedab..fe459a955 100644 --- a/src/main/java/forestry/core/CamouflageAccess.java +++ b/src/main/java/forestry/core/CamouflageAccess.java @@ -27,6 +27,7 @@ public class CamouflageAccess implements ICamouflageAccess { private static final Map> camouflageItemHandlers = new HashMap<>(); private static final Map> camouflageItemBlacklist = new HashMap<>(); + private static final Map> blacklistedMods = new HashMap<>(); @Override public void registerCamouflageItemHandler(@Nonnull ICamouflageItemHandler itemHandler) { @@ -60,6 +61,16 @@ public class CamouflageAccess implements ICamouflageAccess { return camouflageItemHandlers.get(type); } + @Override + public void addModIdToBlackList(String type, String modID) { + if(!blacklistedMods.containsKey(type)){ + blacklistedMods.put(type, new ArrayList<>()); + } + if(!blacklistedMods.get(type).contains(modID)){ + blacklistedMods.get(type).add(modID); + } + } + @Override public void addItemToBlackList(String type, ItemStack camouflageBlock) { if (camouflageBlock == null || camouflageBlock.getItem() == null) { @@ -77,6 +88,9 @@ public class CamouflageAccess implements ICamouflageAccess { return; } } + if(!camouflageItemBlacklist.containsKey(type)){ + camouflageItemBlacklist.put(type, new ArrayList<>()); + } camouflageItemBlacklist.get(type).add(camouflageBlock); } @@ -85,6 +99,10 @@ public class CamouflageAccess implements ICamouflageAccess { if (camouflageBlock == null || camouflageBlock.getItem() == null || Block.getBlockFromItem(camouflageBlock.getItem()) == null || type != null && !camouflageItemBlacklist.containsKey(type)) { return false; } + String modId = camouflageBlock.getItem().getRegistryName().getResourceDomain(); + if(blacklistedMods.get(type) != null && blacklistedMods.get(type).contains(modId)){ + return true; + } List camouflageItemBlacklisted; if(type == null){ camouflageItemBlacklisted = new ArrayList<>(); @@ -99,6 +117,7 @@ public class CamouflageAccess implements ICamouflageAccess { return true; } } + return false; } diff --git a/src/main/java/forestry/core/gui/GuiCamouflageSprayCan.java b/src/main/java/forestry/core/gui/GuiCamouflageSprayCan.java index 244ef75de..a8cef7122 100644 --- a/src/main/java/forestry/core/gui/GuiCamouflageSprayCan.java +++ b/src/main/java/forestry/core/gui/GuiCamouflageSprayCan.java @@ -3,6 +3,7 @@ package forestry.core.gui; import forestry.core.config.Constants; import forestry.core.gui.widgets.WidgetCamouflageSlot; import forestry.core.inventory.ItemInventoryCamouflageSprayCan; +import forestry.core.render.ColourProperties; import forestry.core.utils.Translator; import net.minecraft.entity.player.EntityPlayer; @@ -20,7 +21,7 @@ public class GuiCamouflageSprayCan extends GuiForestry { @@ -65,7 +66,7 @@ public class GuiNaturalistInventory extends GuiForestry { @@ -72,7 +73,7 @@ public class GuiCatalogue extends GuiForestry { protected void drawGuiContainerBackgroundLayer(float var1, int mouseX, int mouseY) { super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); - fontRendererObj.drawString(String.format("%s / %s", container.getPageNumber(), container.getPageCount()), guiLeft + xSize - 72, guiTop + 12, fontColor.get("gui.book")); + fontRendererObj.drawString(String.format("%s / %s", container.getPageNumber(), container.getPageCount()), guiLeft + xSize - 72, guiTop + 12, ColourProperties.INSTANCE.get("gui.book")); clearTradeInfoWidgets(); @@ -90,18 +91,18 @@ public class GuiCatalogue extends GuiForestry { } private void drawNoTrade(int x, int y) { - fontRendererObj.drawSplitString(Translator.translateToLocal("for.gui.mail.notrades"), x, y + 18, 119, fontColor.get("gui.book")); + fontRendererObj.drawSplitString(Translator.translateToLocal("for.gui.mail.notrades"), x, y + 18, 119, ColourProperties.INSTANCE.get("gui.book")); } private void drawTradePreview(ITradeStationInfo tradeInfo, int x, int y) { - fontRendererObj.drawString(boldUnderline + tradeInfo.getAddress().getName(), x, y, fontColor.get("gui.book")); + fontRendererObj.drawString(boldUnderline + tradeInfo.getAddress().getName(), x, y, ColourProperties.INSTANCE.get("gui.book")); - fontRendererObj.drawString(String.format(Translator.translateToLocal("for.gui.mail.willtrade"), tradeInfo.getOwner().getName()), x, y + 18, fontColor.get("gui.book")); + fontRendererObj.drawString(String.format(Translator.translateToLocal("for.gui.mail.willtrade"), tradeInfo.getOwner().getName()), x, y + 18, ColourProperties.INSTANCE.get("gui.book")); addTradeInfoWidget(new ItemStackWidget(widgetManager, x - guiLeft, y - guiTop + 28, tradeInfo.getTradegood())); - fontRendererObj.drawString(Translator.translateToLocal("for.gui.mail.tradefor"), x, y + 46, fontColor.get("gui.book")); + fontRendererObj.drawString(Translator.translateToLocal("for.gui.mail.tradefor"), x, y + 46, ColourProperties.INSTANCE.get("gui.book")); for (int i = 0; i < tradeInfo.getRequired().length; i++) { ItemStack itemStack = tradeInfo.getRequired()[i]; @@ -109,9 +110,9 @@ public class GuiCatalogue extends GuiForestry { } if (tradeInfo.getState().isOk()) { - fontRendererObj.drawSplitString(TextFormatting.DARK_GREEN + tradeInfo.getState().getDescription(), x, y + 82, 119, fontColor.get("gui.book")); + fontRendererObj.drawSplitString(TextFormatting.DARK_GREEN + tradeInfo.getState().getDescription(), x, y + 82, 119, ColourProperties.INSTANCE.get("gui.book")); } else { - fontRendererObj.drawSplitString(TextFormatting.DARK_RED + tradeInfo.getState().getDescription(), x, y + 82, 119, fontColor.get("gui.book")); + fontRendererObj.drawSplitString(TextFormatting.DARK_RED + tradeInfo.getState().getDescription(), x, y + 82, 119, ColourProperties.INSTANCE.get("gui.book")); } } diff --git a/src/main/java/forestry/mail/gui/GuiLetter.java b/src/main/java/forestry/mail/gui/GuiLetter.java index 1715572b0..9c1a5c8aa 100755 --- a/src/main/java/forestry/mail/gui/GuiLetter.java +++ b/src/main/java/forestry/mail/gui/GuiLetter.java @@ -29,6 +29,7 @@ import forestry.core.gui.GuiTextBox; import forestry.core.gui.widgets.ItemStackWidget; import forestry.core.gui.widgets.Widget; import forestry.core.proxy.Proxies; +import forestry.core.render.ColourProperties; import forestry.core.utils.Translator; import forestry.mail.gui.widgets.AddresseeSlot; import forestry.mail.inventory.ItemInventoryLetter; @@ -146,8 +147,8 @@ public class GuiLetter extends GuiForestry super.drawGuiContainerBackgroundLayer(var1, mouseX, mouseY); if (this.isProcessedLetter) { - fontRendererObj.drawString(address.getText(), guiLeft + 49, guiTop + 16, fontColor.get("gui.mail.lettertext")); - fontRendererObj.drawSplitString(text.getText(), guiLeft + 20, guiTop + 34, 119, fontColor.get("gui.mail.lettertext")); + fontRendererObj.drawString(address.getText(), guiLeft + 49, guiTop + 16, ColourProperties.INSTANCE.get("gui.mail.lettertext")); + fontRendererObj.drawSplitString(text.getText(), guiLeft + 20, guiTop + 34, 119, ColourProperties.INSTANCE.get("gui.mail.lettertext")); } else { clearTradeInfoWidgets(); address.drawTextBox(); @@ -171,15 +172,15 @@ public class GuiLetter extends GuiForestry } if (infoString != null) { - fontRendererObj.drawSplitString(infoString, guiLeft + x, guiTop + y, 119, fontColor.get("gui.mail.lettertext")); + fontRendererObj.drawSplitString(infoString, guiLeft + x, guiTop + y, 119, ColourProperties.INSTANCE.get("gui.mail.lettertext")); return; } - fontRendererObj.drawString(Translator.translateToLocal("for.gui.mail.pleasesend"), guiLeft + x, guiTop + y, fontColor.get("gui.mail.lettertext")); + fontRendererObj.drawString(Translator.translateToLocal("for.gui.mail.pleasesend"), guiLeft + x, guiTop + y, ColourProperties.INSTANCE.get("gui.mail.lettertext")); addTradeInfoWidget(new ItemStackWidget(widgetManager, x, y + 10, container.getTradeInfo().getTradegood())); - fontRendererObj.drawString(Translator.translateToLocal("for.gui.mail.foreveryattached"), guiLeft + x, guiTop + y + 28, fontColor.get("gui.mail.lettertext")); + fontRendererObj.drawString(Translator.translateToLocal("for.gui.mail.foreveryattached"), guiLeft + x, guiTop + y + 28, ColourProperties.INSTANCE.get("gui.mail.lettertext")); for (int i = 0; i < container.getTradeInfo().getRequired().length; i++) { addTradeInfoWidget(new ItemStackWidget(widgetManager, x + i * 18, y + 38, container.getTradeInfo().getRequired()[i])); diff --git a/src/main/java/forestry/plugins/ForestryPluginUids.java b/src/main/java/forestry/plugins/ForestryPluginUids.java index be5b6bf07..37317fa33 100644 --- a/src/main/java/forestry/plugins/ForestryPluginUids.java +++ b/src/main/java/forestry/plugins/ForestryPluginUids.java @@ -21,6 +21,7 @@ public class ForestryPluginUids { public static final String BUILDCRAFT_TRANSPORT = "forestry.buildcraft.transport"; public static final String CHISEL = "forestry.chisel"; public static final String ENDER_IO = "forestry.ender.io"; + public static final String MALISIS_DOORES = "forestry.malisis.doors"; public static final String EXTRA_UTILITIES = "forestry.extra.utilities"; public static final String NATURA = "forestry.natura"; public static final String INDUSTRIALCRAFT2 = "forestry.industrialcraft2"; diff --git a/src/main/java/forestry/plugins/compat/PluginMalisisDoors.java b/src/main/java/forestry/plugins/compat/PluginMalisisDoors.java new file mode 100644 index 000000000..561f429fc --- /dev/null +++ b/src/main/java/forestry/plugins/compat/PluginMalisisDoors.java @@ -0,0 +1,29 @@ +package forestry.plugins.compat; + +import forestry.api.core.CamouflageManager; +import forestry.core.config.Constants; +import forestry.core.utils.ModUtil; +import forestry.plugins.BlankForestryPlugin; +import forestry.plugins.ForestryPlugin; +import forestry.plugins.ForestryPluginUids; +import net.minecraft.item.ItemStack; + +@ForestryPlugin(pluginID = ForestryPluginUids.MALISIS_DOORES, name = "malisisdoors", author = "nedelosk", url = Constants.URL, unlocalizedDescription = "for.plugin.malisisDoors.description") +public class PluginMalisisDoors extends BlankForestryPlugin { + + @Override + public boolean isAvailable() { + return ModUtil.isModLoaded("malisisdoors"); + } + + @Override + public String getFailMessage() { + return "Malisis Door's not found"; + } + + @Override + public void preInit() { + CamouflageManager.camouflageAccess.addModIdToBlackList("door", "malisisdoors"); + } + +}