Rearranged filler files

This commit is contained in:
Francesco Macagno 2015-08-22 22:08:42 -07:00
parent c61a12ab22
commit e8ef384681
4 changed files with 19 additions and 9 deletions

View file

@ -23,6 +23,7 @@ import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.registry.GameRegistry;
import cr0s.warpdrive.WarpDrive;
import cr0s.warpdrive.conf.filler.FillerManager;
import cr0s.warpdrive.conf.structures.StructureManager;
import cr0s.warpdrive.data.TransitionPlane;

View file

@ -1,4 +1,4 @@
package cr0s.warpdrive.conf;
package cr0s.warpdrive.conf.filler;
import java.io.File;
import java.io.FilenameFilter;
@ -17,6 +17,9 @@ import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
import cr0s.warpdrive.WarpDrive;
import cr0s.warpdrive.conf.InvalidXmlException;
import cr0s.warpdrive.conf.ModRequirementChecker;
import cr0s.warpdrive.conf.WarpDriveConfig;
public class FillerManager {

View file

@ -1,4 +1,4 @@
package cr0s.warpdrive.conf.structures;
package cr0s.warpdrive.conf.filler;
import java.util.Random;
@ -13,6 +13,10 @@ public class FillerSet implements XmlRepresentable {
private MetaBlock[] weightedFillerBlocks;
public FillerSet(MetaBlock[] blocks) {
weightedFillerBlocks = blocks;
}
public FillerSet() {
//To prevent getting rand.nextInt(0)
weightedFillerBlocks = new MetaBlock[1];
@ -24,15 +28,15 @@ public class FillerSet implements XmlRepresentable {
@Override
public void loadFromXmlElement(Element e) throws InvalidXmlException {
// TODO Auto-generated method stub
}
FillerFactory fact = new FillerFactory();
@Override
public void saveToXmlElement(Element e, Document d) throws InvalidXmlException {
// TODO Not really needed
}
@Override
public void saveToXmlElement(Element e, Document d) throws InvalidXmlException {
// Unneded
}
}

View file

@ -13,8 +13,8 @@ import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import cr0s.warpdrive.WarpDrive;
import cr0s.warpdrive.conf.filler.FillerManager.FillerCategory;
import cr0s.warpdrive.conf.InvalidXmlException;
import cr0s.warpdrive.conf.FillerManager.FillerCategory;
import cr0s.warpdrive.conf.XmlRepresentable;
import cr0s.warpdrive.world.EntitySphereGen;
@ -53,6 +53,7 @@ public abstract class Orb extends DeployableStructure implements XmlRepresentabl
}
}
@Override
@ -71,6 +72,7 @@ public abstract class Orb extends DeployableStructure implements XmlRepresentabl
world.spawnEntityInWorld(entitySphereGen);
return false;
}
public boolean generate(World world, Random p_76484_2_, int x, int y, int z, final int radius) {
EntitySphereGen entitySphereGen = new EntitySphereGen(world, x, y, z, radius, this, true);
world.spawnEntityInWorld(entitySphereGen);