Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finished OrbShell implementation

Browse source 
Not the most memory efficient way, but very fast when deploying
This commit is contained in:
Francesco Macagno 2015-08-08 19:56:23 -07:00
parent 3d24dbce7a
commit 372a98d620
3 changed files with 112 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/cr0s/warpdrive/conf/InvalidXmlException.java Normal file
View file

@ -0,0 +1,29 @@
package cr0s.warpdrive.conf;
public class InvalidXmlException extends Exception {
public InvalidXmlException() {
super("An unknown xml error occured");
}
public InvalidXmlException(String arg0) {
super(arg0);
// TODO Auto-generated constructor stub
}
public InvalidXmlException(Throwable arg0) {
super(arg0);
// TODO Auto-generated constructor stub
}
public InvalidXmlException(String arg0, Throwable arg1) {
super(arg0, arg1);
// TODO Auto-generated constructor stub
}
public InvalidXmlException(String arg0, Throwable arg1, boolean arg2, boolean arg3) {
super(arg0, arg1, arg2, arg3);
// TODO Auto-generated constructor stub
}
}

84
src/main/java/cr0s/warpdrive/conf/Orb.java
View file

@ -1,14 +1,18 @@
package cr0s.warpdrive.conf;
import java.util.HashMap;
import java.util.Map.Entry;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import cr0s.warpdrive.WarpDrive;
public abstract class Orb extends DeployableStructure implements XmlRepresentable {
public Orb(int diameter) {
@ -22,7 +26,7 @@ public abstract class Orb extends DeployableStructure implements XmlRepresentabl
}
@Override
public void saveToXmlElement(Element e) {
public void saveToXmlElement(Element e, Document d) {
// TODO Auto-generated method stub
}
@ -37,15 +41,22 @@ public abstract class Orb extends DeployableStructure implements XmlRepresentabl
private int radiusInner, radiusOuter;
private HashMap<Integer, String> compositionBlocks;
private HashMap<String, Integer> compositionBlocks;
private Block[] blockWeights;
private String name;
private int totalWeight;
public OrbShell() {
compositionBlocks = new HashMap<Integer, String>();
compositionBlocks = new HashMap<String, Integer>();
totalWeight = 1;
blockWeights = new Block[0];
}
public Block getNextBlock() {
return null;
public Block getNextBlock(Random r) {
return blockWeights[r.nextInt(totalWeight)];
}
public int getRadiusInner() {
@ -53,6 +64,7 @@ public abstract class Orb extends DeployableStructure implements XmlRepresentabl
}
public void setRadiusInner(int radiusInner) {
this.radiusInner = radiusInner;
}
@ -65,27 +77,79 @@ public abstract class Orb extends DeployableStructure implements XmlRepresentabl
}
@Override
public void loadFromXmlElement(Element e) {
public void loadFromXmlElement(Element e) throws InvalidXmlException {
WarpDrive.logger.info("Loading shell " + e.getAttribute("name"));
name = e.getAttribute("name");
totalWeight = 0;
try {
radiusInner = Integer.parseInt(e.getAttribute("radiusInner"));
radiusOuter = Integer.parseInt(e.getAttribute("radiusOuter"));
if (radiusInner < 1 || radiusInner > radiusOuter)
throw new IllegalArgumentException("Orb creation arguments are incorrect!");
throw new InvalidXmlException("Orb creation arguments are incorrect!");
NodeList compBlocks = e.getElementsByTagName("CompositionBlock");
for (int i = 0; i < compBlocks.getLength(); i++) {
Element tmp = (Element) compBlocks.item(i);
compositionBlocks.put(Integer.parseInt(tmp.getAttribute("weight")), tmp.getAttribute("block"));
if (!tmp.hasAttribute("weight"))
throw new InvalidXmlException("Shell is missing weight at place " + i + "!");
if (!tmp.hasAttribute("block"))
throw new InvalidXmlException("Shell is missing block at place " + i + "!");
int tmpWeight = Integer.parseInt(tmp.getAttribute("weight"));
if (tmpWeight < 1)
throw new InvalidXmlException("Weight is less than 1 at place " + i + "!");
String tmpBlock = tmp.getAttribute("block");
if (Block.getBlockFromName(tmpBlock) == null)
throw new InvalidXmlException("Shell has unknown block at place " + i + "!");
totalWeight += tmpWeight;
compositionBlocks.put(tmpBlock, tmpWeight);
}
int index = 0;
blockWeights = new Block[totalWeight];
for (Entry<String, Integer> compBlock : compositionBlocks.entrySet()) {
Block bl = Block.getBlockFromName(compBlock.getKey());
for (int i = 0; i < compBlock.getValue(); i++) {
blockWeights[index++] = bl;
}
}
} catch (NumberFormatException ex) {
throw new InvalidXmlException("Invalid integer in shell " + name + "!");
}
}
@Override
public void saveToXmlElement(Element e) {
public void saveToXmlElement(Element e, Document d) {
WarpDrive.logger.info("Saving shell " + e.getAttribute("name"));
e.setAttribute("name", name);
e.setAttribute("radiusInner", "" + radiusInner);
e.setAttribute("radiusOuter", "" + radiusOuter);
for (Entry<String, Integer> compBlock : compositionBlocks.entrySet()) {
Element child = d.createElement("CompositionBlock");
child.setAttribute("weight", compBlock.getValue() + "");
child.setAttribute("block", compBlock.getKey());
e.appendChild(child);
}
}
}

5
src/main/java/cr0s/warpdrive/conf/XmlRepresentable.java
View file

@ -1,11 +1,12 @@
package cr0s.warpdrive.conf;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
public interface XmlRepresentable {
public void loadFromXmlElement(Element e);
public void loadFromXmlElement(Element e) throws InvalidXmlException;
public void saveToXmlElement(Element e);
public void saveToXmlElement(Element e, Document d) throws InvalidXmlException;
}