Removed unused ItemPredicate
This commit is contained in:
@@ -45,7 +45,6 @@ import net.minecraftforge.api.distmarker.OnlyIn;
|
|||||||
import net.minecraftforge.client.event.*;
|
import net.minecraftforge.client.event.*;
|
||||||
import net.minecraftforge.client.model.ModelLoader;
|
import net.minecraftforge.client.model.ModelLoader;
|
||||||
import net.minecraftforge.common.ModDimension;
|
import net.minecraftforge.common.ModDimension;
|
||||||
import net.minecraftforge.common.crafting.CraftingHelper;
|
|
||||||
import net.minecraftforge.common.extensions.IForgeContainerType;
|
import net.minecraftforge.common.extensions.IForgeContainerType;
|
||||||
import net.minecraftforge.event.RegistryEvent;
|
import net.minecraftforge.event.RegistryEvent;
|
||||||
import net.minecraftforge.eventbus.api.IEventBus;
|
import net.minecraftforge.eventbus.api.IEventBus;
|
||||||
@@ -94,7 +93,6 @@ import appeng.core.features.registries.cell.BasicItemCellGuiHandler;
|
|||||||
import appeng.core.features.registries.cell.CreativeCellHandler;
|
import appeng.core.features.registries.cell.CreativeCellHandler;
|
||||||
import appeng.core.stats.AdvancementTriggers;
|
import appeng.core.stats.AdvancementTriggers;
|
||||||
import appeng.core.stats.AeStats;
|
import appeng.core.stats.AeStats;
|
||||||
import appeng.core.stats.PartItemPredicate;
|
|
||||||
import appeng.fluids.client.gui.*;
|
import appeng.fluids.client.gui.*;
|
||||||
import appeng.fluids.container.*;
|
import appeng.fluids.container.*;
|
||||||
import appeng.fluids.registries.BasicFluidCellGuiHandler;
|
import appeng.fluids.registries.BasicFluidCellGuiHandler;
|
||||||
@@ -145,8 +143,6 @@ final class Registration {
|
|||||||
registries.cell().addCellGuiHandler(new BasicFluidCellGuiHandler());
|
registries.cell().addCellGuiHandler(new BasicFluidCellGuiHandler());
|
||||||
|
|
||||||
registries.matterCannon().registerAmmoItem(api.definitions().materials().matterBall().item(), 32);
|
registries.matterCannon().registerAmmoItem(api.definitions().materials().matterBall().item(), 32);
|
||||||
|
|
||||||
PartItemPredicate.register();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
|||||||
@@ -1,59 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of Applied Energistics 2.
|
|
||||||
* Copyright (c) 2013 - 2017, AlgorithmX2, All rights reserved.
|
|
||||||
*
|
|
||||||
* Applied Energistics 2 is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Lesser General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Applied Energistics 2 is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public License
|
|
||||||
* along with Applied Energistics 2. If not, see <http://www.gnu.org/licenses/lgpl>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package appeng.core.stats;
|
|
||||||
|
|
||||||
import com.google.gson.JsonObject;
|
|
||||||
|
|
||||||
import net.minecraft.advancements.criterion.ItemPredicate;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraft.util.JSONUtils;
|
|
||||||
import net.minecraft.util.ResourceLocation;
|
|
||||||
|
|
||||||
import appeng.core.AppEng;
|
|
||||||
import appeng.items.parts.PartItem;
|
|
||||||
import appeng.items.parts.PartType;
|
|
||||||
|
|
||||||
public class PartItemPredicate extends ItemPredicate {
|
|
||||||
private final PartType partType;
|
|
||||||
|
|
||||||
public PartItemPredicate(String partName) {
|
|
||||||
this.partType = PartType.valueOf(partName.toUpperCase());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean test(ItemStack item) {
|
|
||||||
if (item.getItem() instanceof PartItem) {
|
|
||||||
PartItem<?> itemPart = (PartItem<?>) item.getItem();
|
|
||||||
return itemPart.getType() == partType;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ItemPredicate deserialize(JsonObject jsonobject) {
|
|
||||||
if (jsonobject.has("part")) {
|
|
||||||
return new PartItemPredicate(JSONUtils.getString(jsonobject, "part"));
|
|
||||||
} else {
|
|
||||||
return ItemPredicate.ANY;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void register() {
|
|
||||||
ItemPredicate.register(new ResourceLocation(AppEng.MOD_ID, "part"), PartItemPredicate::deserialize);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user