Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-07-05 20:36:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Metrics injection

Browse Source
This commit is contained in:
gamerforEA
2018-12-24 16:02:13 +04:00
committed by IronApollo
parent 26d4ea101e
commit ea0ca470f1
4 changed files with 4 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledItemRegistry.java
View File

@ -19,7 +19,6 @@
package com.sk89q.worldedit.world.registry;
<<<<<<< HEAD
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.world.item.ItemType;
import com.sk89q.worldedit.world.item.ItemTypes;
@ -27,11 +26,6 @@ import com.sk89q.worldedit.world.item.ItemTypes;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Collections;
=======
import com.sk89q.worldedit.world.item.ItemType;
import javax.annotation.Nullable;
>>>>>>> b75d5149... Fixed the bundle being directly used outside of the registry system.
/**
* A item registry that uses {@link BundledItemRegistry} to serve information
@ -41,7 +35,6 @@ public class BundledItemRegistry implements ItemRegistry {
@Nullable
@Override
<<<<<<< HEAD
public BaseItem createFromId(String id) {
ItemType itemType = ItemTypes.get(id);
return itemType == null ? null : new BaseItem(itemType);
@ -54,8 +47,6 @@ public class BundledItemRegistry implements ItemRegistry {
@Nullable
@Override
=======
>>>>>>> b75d5149... Fixed the bundle being directly used outside of the registry system.
public String getName(ItemType itemType) {
BundledItemData.ItemEntry itemEntry = BundledItemData.getInstance().findById(itemType.getId());
return itemEntry != null ? itemEntry.localizedName : null;

9
worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/ItemRegistry.java
View File

@ -19,23 +19,16 @@
package com.sk89q.worldedit.world.registry;
<<<<<<< HEAD
import com.sk89q.worldedit.blocks.BaseItem;
import com.sk89q.worldedit.world.item.ItemType;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Collections;
=======
import com.sk89q.worldedit.world.item.ItemType;
import javax.annotation.Nullable;
>>>>>>> b75d5149... Fixed the bundle being directly used outside of the registry system.
public interface ItemRegistry {
/**
<<<<<<< HEAD
* Create a new item using its ID.
*
* @param id the id
@ -52,8 +45,6 @@ public interface ItemRegistry {
}
/**
=======
>>>>>>> b75d5149... Fixed the bundle being directly used outside of the registry system.
* Gets the name for the given item.
*
* @param itemType the item