mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 19:49:54 +00:00
Remove redundant leaf speciesUID NBT
This commit is contained in:
1 parent
558d78bc63
commit
c780ec6aaf
3 files changed
+5
-16
No files matched your search
@@ -67,7 +67,6 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru
|
||||
|
||||
private int colourLeaves;
|
||||
private int colourFruits;
|
||||
private String speciesUID;
|
||||
|
||||
private short textureIndexFancy = 48;
|
||||
private short textureIndexPlain = 64;
|
||||
@@ -114,15 +113,9 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru
|
||||
isDecorative = nbttagcompound.getBoolean("DEC");
|
||||
}
|
||||
|
||||
if (nbttagcompound.hasKey("UID")) {
|
||||
speciesUID = "forestry." + nbttagcompound.getString("UID");
|
||||
}
|
||||
|
||||
ITree tree = getTree();
|
||||
if (tree != null) {
|
||||
setTree(tree);
|
||||
} else if (speciesUID != null) {
|
||||
setTree(speciesUID, false, null);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -141,11 +134,6 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru
|
||||
nbttagcompound.setTag("CATER", subcompound);
|
||||
}
|
||||
nbttagcompound.setBoolean("DEC", isDecorative);
|
||||
|
||||
if (speciesUID != null) {
|
||||
String strippedUID = speciesUID.replace("forestry.", "");
|
||||
nbttagcompound.setString("UID", strippedUID);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -252,8 +240,6 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru
|
||||
} else if (caterpillar != null) {
|
||||
colourLeaves = Utils.multiplyRGBComponents(colourLeaves, 1.5f);
|
||||
}
|
||||
|
||||
speciesUID = tree.getIdent();
|
||||
}
|
||||
|
||||
/* INFORMATION */
|
||||
@@ -397,7 +383,7 @@ public class TileLeaves extends TileTreeContainer implements IPollinatable, IFru
|
||||
colourFruits = packet.getColourFruits();
|
||||
String fruitAlleleUID = packet.getFruitAlleleUID();
|
||||
|
||||
speciesUID = packet.getSpeciesUID();
|
||||
String speciesUID = packet.getSpeciesUID();
|
||||
setTree(speciesUID, isPollinatedState, fruitAlleleUID);
|
||||
|
||||
worldObj.func_147479_m(xCoord, yCoord, zCoord);
|
||||
|
||||
@@ -89,7 +89,7 @@ public class PacketLeafUpdate extends ForestryPacket implements ILocatedPacket {
|
||||
colourFruits = data.readInt();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public boolean isFruitLeaf() {
|
||||
return (leafState & hasFruitFlag) > 0;
|
||||
}
|
||||
|
||||
@@ -63,6 +63,9 @@ public abstract class SpeciesRoot implements ISpeciesRoot {
|
||||
@Override
|
||||
public IAllele[] getTemplate(String identifier) {
|
||||
IAllele[] template = speciesTemplates.get(identifier);
|
||||
if (template == null) {
|
||||
return null;
|
||||
}
|
||||
return Arrays.copyOf(template, template.length);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user