mirror of
https://github.com/chylex/Hardcore-Ender-Expansion.git
synced 2025-04-10 20:15:42 +02:00
Small tweaks from PMD & FindBugs
This commit is contained in:
parent
61b43708cf
commit
a0812360ef
src/main/java/chylex/hee/mechanics/compendium
@ -5,7 +5,7 @@ import chylex.hee.block.BlockList;
|
||||
import chylex.hee.mechanics.compendium.content.KnowledgeCategory;
|
||||
|
||||
public class KnowledgeCategories{
|
||||
public static KnowledgeCategory OVERWORLD, DRAGON_LAIR, ENDSTONE_BLOBS, DUNGEON_TOWER, METEOROIDS, BIOME_ISLAND_FOREST, BIOME_ISLAND_MOUNTAINS, BIOME_ISLAND_ENCHISLAND;
|
||||
public static final KnowledgeCategory OVERWORLD, DRAGON_LAIR, ENDSTONE_BLOBS, DUNGEON_TOWER, METEOROIDS, BIOME_ISLAND_FOREST, BIOME_ISLAND_MOUNTAINS, BIOME_ISLAND_ENCHISLAND;
|
||||
|
||||
public static final KnowledgeCategory[] categoryList = new KnowledgeCategory[]{
|
||||
OVERWORLD = new KnowledgeCategory(0, -2, 0, "Overworld", new ItemStack(Blocks.stonebrick)),
|
||||
|
@ -20,8 +20,8 @@ public abstract class KnowledgeFragment{
|
||||
}
|
||||
|
||||
public final int globalID;
|
||||
private int price = 10;
|
||||
private boolean unlockOnDiscovery = false;
|
||||
private int price;
|
||||
private boolean unlockOnDiscovery;
|
||||
private int[] unlockRequirements = ArrayUtils.EMPTY_INT_ARRAY;
|
||||
private int[] unlockCascade = ArrayUtils.EMPTY_INT_ARRAY;
|
||||
|
||||
|
@ -72,7 +72,7 @@ public final class CompendiumEvents{
|
||||
if (obj != null)getPlayerData(player).tryDiscoverMob(obj,true);
|
||||
}
|
||||
|
||||
private TObjectByteHashMap<UUID> playerTickLimiter = new TObjectByteHashMap<>();
|
||||
private final TObjectByteHashMap<UUID> playerTickLimiter = new TObjectByteHashMap<>();
|
||||
|
||||
private CompendiumEvents(){}
|
||||
|
||||
|
@ -27,7 +27,7 @@ public final class CompendiumEventsClient{
|
||||
}
|
||||
}
|
||||
|
||||
private KeyBinding keyOpenCompendium;
|
||||
private final KeyBinding keyOpenCompendium;
|
||||
private PlayerCompendiumData data;
|
||||
|
||||
private CompendiumEventsClient(){
|
||||
|
@ -2,7 +2,7 @@ package chylex.hee.mechanics.compendium.objects;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public interface IKnowledgeObjectInstance<T>{
|
||||
public T getUnderlyingObject();
|
||||
public ItemStack createItemStackToRender();
|
||||
public boolean checkEquality(Object obj);
|
||||
T getUnderlyingObject();
|
||||
ItemStack createItemStackToRender();
|
||||
boolean checkEquality(Object obj);
|
||||
}
|
||||
|
@ -44,7 +44,7 @@ public class ObjectBlock implements IKnowledgeObjectInstance<BlockMetaWrapper>{
|
||||
|
||||
@Override
|
||||
public boolean equals(Object o){
|
||||
return o.getClass() == BlockMetaWrapper.class && ((BlockMetaWrapper)o).block == block;
|
||||
return o != null && o.getClass() == BlockMetaWrapper.class && ((BlockMetaWrapper)o).block == block;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -29,12 +29,12 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
public class PlayerCompendiumData implements IExtendedEntityProperties{
|
||||
private int pointAmount;
|
||||
|
||||
private PlayerDiscoveryList<ObjectBlock,BlockMetaWrapper> discoveredBlocks = new PlayerDiscoveryList<>(new DiscoveryBlockSerializer());
|
||||
private PlayerDiscoveryList<ObjectItem,Item> discoveredItems = new PlayerDiscoveryList<>(new DiscoveryItemSerializer());
|
||||
private PlayerDiscoveryList<ObjectMob,Class<? extends EntityLivingBase>> discoveredMobs = new PlayerDiscoveryList<>(new DiscoveryMobSerializer());
|
||||
private PlayerDiscoveryList<ObjectDummy,String> discoveredMisc = new PlayerDiscoveryList<>(new DiscoveryStringSerializer());
|
||||
private final PlayerDiscoveryList<ObjectBlock,BlockMetaWrapper> discoveredBlocks = new PlayerDiscoveryList<>(new DiscoveryBlockSerializer());
|
||||
private final PlayerDiscoveryList<ObjectItem,Item> discoveredItems = new PlayerDiscoveryList<>(new DiscoveryItemSerializer());
|
||||
private final PlayerDiscoveryList<ObjectMob,Class<? extends EntityLivingBase>> discoveredMobs = new PlayerDiscoveryList<>(new DiscoveryMobSerializer());
|
||||
private final PlayerDiscoveryList<ObjectDummy,String> discoveredMisc = new PlayerDiscoveryList<>(new DiscoveryStringSerializer());
|
||||
|
||||
private TIntHashSet unlockedFragments = new TIntHashSet();
|
||||
private final TIntHashSet unlockedFragments = new TIntHashSet();
|
||||
|
||||
public PlayerCompendiumData(){}
|
||||
|
||||
|
@ -29,6 +29,8 @@ public class PlayerDiscoveryList<P extends IKnowledgeObjectInstance<T>,T>{
|
||||
}
|
||||
|
||||
public void loadFromNBTList(NBTTagList list){
|
||||
discoveredObjects.clear();
|
||||
|
||||
for(int a = 0, count = list.tagCount(); a < count; a++){
|
||||
T object = serializer.deserialize(list.getStringTagAt(a));
|
||||
if (object != null)discoveredObjects.add((T)KnowledgeObject.getObject(object).getObject().getUnderlyingObject());
|
||||
@ -36,7 +38,7 @@ public class PlayerDiscoveryList<P extends IKnowledgeObjectInstance<T>,T>{
|
||||
}
|
||||
|
||||
public interface IObjectSerializer<T>{
|
||||
public String serialize(T object);
|
||||
public T deserialize(String data);
|
||||
String serialize(T object);
|
||||
T deserialize(String data);
|
||||
}
|
||||
}
|
||||
|
@ -41,7 +41,7 @@ public class PurchaseDisplayElement{
|
||||
GuiEnderCompendium.renderItem.renderItemIntoGUI(gui.mc.fontRenderer,gui.mc.getTextureManager(),GuiEnderCompendium.knowledgeFragmentIS,pageCenterX-22,y-10);
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
|
||||
String price = String.valueOf(this.price);
|
||||
String price = String.valueOf(this.price); // TODO canAfford
|
||||
gui.mc.fontRenderer.drawString(price,pageCenterX-gui.mc.fontRenderer.getStringWidth(price)+20,y-5,4210752);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user