Permalink
Browse files

Minor fixes

(NEI) Check if item is in default
Confiscating items now only remove if the item is specifically INVENTORY
type
  • Loading branch information...
jimnordb committed Sep 4, 2014
1 parent 5440385 commit ac3e866c5115afbb8be57fd974020ff57683947b
@@ -10,7 +10,6 @@
import mods.recipear.api.RecipearEvent;
import mods.recipear.api.RecipearListener;
import mods.recipear.modules.RecipearVanilla;
import net.minecraft.command.ServerCommandManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.server.MinecraftServer;
@@ -19,7 +18,6 @@
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.common.network.NetworkMod;
@@ -65,7 +65,7 @@ public static void RemoveBannedItemsFromInventory(EntityPlayer player) {
{
String DISPLAYNAME = RecipearUtil.getLanguageRegistryEntry(ITEM);
if (BannedRecipes.Check(ITEM.itemID, ITEM.getItemDamage(), "INVENTORY") || BannedRecipes.Check(DISPLAYNAME, "INVENTORY"))
if (BannedRecipes.CheckSpecifically(ITEM.itemID, ITEM.getItemDamage(), "INVENTORY") || BannedRecipes.CheckSpecifically(DISPLAYNAME, "INVENTORY"))
{
player.inventory.clearInventory(ITEM.itemID, ITEM.getItemDamage());
msgPlayer(player, String.format(RecipearConfig.removeIngameMsg.replace("$", "\u00A7"), DISPLAYNAME));
@@ -31,7 +31,7 @@ public void trigger(RecipearEvent event) {
if(BannedRecipes.GetBannedRecipeAmount() > 0)
{
for(BannedRecipe recipe : BannedRecipes.getBannedRecipes()) {
if(recipe.type.equals("NEI")) {
if(recipe.type.equals("NEI") || recipe.type.equals("DEFAULT")) {
codechicken.nei.api.API.hideItem(recipe.id);
for(ItemStack itemstack : RecipearUtil.getitem(recipe.id)) {
@@ -12,41 +12,21 @@
{
"modid": "Recipear2|IC2",
"name": "RecipearIC2",
"url": "silentspy.net/recipear",
"authors": ["Silentspy"],
"parent":"Recipear2",
"dependencies": [
"Recipear2"
]
"parent":"Recipear2"
},
{
"modid": "Recipear2|NEI",
"name": "RecipearNEI",
"url": "silentspy.net/recipear",
"authors": ["Silentspy"],
"parent":"Recipear2",
"dependencies": [
"Recipear2"
]
"parent":"Recipear2"
},
{
"modid": "Recipear2|TC4",
"name": "RecipearTC4",
"url": "silentspy.net/recipear",
"authors": ["Silentspy"],
"parent":"Recipear2",
"dependencies": [
"Recipear2"
]
"parent":"Recipear2"
},
{
"modid": "Recipear2|Vanilla",
"name": "RecipearVanilla",
"url": "silentspy.net/recipear",
"authors": ["Silentspy"],
"parent":"Recipear2",
"dependencies": [
"Recipear2"
]
"parent":"Recipear2"
}
]

0 comments on commit ac3e866

Please sign in to comment.