Improved satellite loot system again so lunar loot is in lunar satellite and not in random class

src/main/java/com/hbm/entity/missile/EntityMinerRocket.java

@@ -10,11 +10,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
 
 public class EntityMinerRocket extends Entity {
-	
 	//0 landing, 1 unloading, 2 lifting
 	public int timer = 0;
-	//0 asteroid, 1 moon
-	public String satelliteClassName = "com.hbm.saveddata.satellites.SatelliteMiner";
 
 	public EntityMinerRocket(World p_i1582_1_) {
 		super(p_i1582_1_);
@@ -24,13 +21,12 @@ public class EntityMinerRocket extends Entity {
 
 	@Override
 	protected void entityInit() {
-		this.dataWatcher.addObject(16, Integer.valueOf(0));
+		this.dataWatcher.addObject(16, 0);
-		this.dataWatcher.addObject(17, Integer.valueOf(0));
+		this.dataWatcher.addObject(17, 0);
 	}
 	
 	@Override
 	public void onUpdate() {
-		
 		if(dataWatcher.getWatchableObjectInt(16) == 0)
 			motionY = -0.75;
 		if(dataWatcher.getWatchableObjectInt(16) == 1)
@@ -43,7 +39,6 @@ public class EntityMinerRocket extends Entity {
 		
 		this.setPositionAndRotation(posX + motionX, posY + motionY, posZ + motionZ, 0.0F, 0.0F);
 
-		
 		if(dataWatcher.getWatchableObjectInt(16) == 0 && worldObj.getBlock((int)(posX - 0.5), (int)(posY - 0.5), (int)(posZ - 0.5)) == ModBlocks.sat_dock) {
 			dataWatcher.updateObject(16, 1);
 			motionY = 0;
@@ -55,7 +50,6 @@ public class EntityMinerRocket extends Entity {
 		}
 		
 		if(dataWatcher.getWatchableObjectInt(16) == 1) {
-			
 			if(!worldObj.isRemote && ticksExisted % 4 == 0)
 				ExplosionLarge.spawnShock(worldObj, posX, posY, posZ, 1 + rand.nextInt(3), 1 + rand.nextGaussian());
 			
@@ -79,7 +73,6 @@ public class EntityMinerRocket extends Entity {
 		dataWatcher.updateObject(16, nbt.getInteger("mode"));
 		dataWatcher.updateObject(17, nbt.getInteger("sat"));
 		timer = nbt.getInteger("timer");
-		satelliteClassName = nbt.getString("type");
 	}
 
 	@Override
@@ -87,7 +80,5 @@ public class EntityMinerRocket extends Entity {
 		nbt.setInteger("mode", dataWatcher.getWatchableObjectInt(16));
 		nbt.setInteger("sat", dataWatcher.getWatchableObjectInt(17));
 		nbt.setInteger("timer", timer);
-		nbt.setString("type", satelliteClassName);
 	}
-
 }

src/main/java/com/hbm/saveddata/satellites/SatelliteLunarMiner.java

@@ -1,3 +1,20 @@
 package com.hbm.saveddata.satellites;
 
-public class SatelliteLunarMiner extends SatelliteMiner { }
+import com.hbm.blocks.ModBlocks;
+import com.hbm.items.ModItems;
+import com.hbm.util.WeightedRandomObject;
+import net.minecraft.item.ItemStack;
+
+public class SatelliteLunarMiner extends SatelliteMiner {
+    static {
+        registerCargo(new WeightedRandomObject[] {
+                new WeightedRandomObject(new ItemStack(ModBlocks.moon_turf, 48), 5),
+                new WeightedRandomObject(new ItemStack(ModBlocks.moon_turf, 32), 7),
+                new WeightedRandomObject(new ItemStack(ModBlocks.moon_turf, 16), 5),
+                new WeightedRandomObject(new ItemStack(ModItems.powder_lithium, 3), 5),
+                new WeightedRandomObject(new ItemStack(ModItems.powder_iron, 3), 5),
+                new WeightedRandomObject(new ItemStack(ModItems.crystal_iron, 1), 1),
+                new WeightedRandomObject(new ItemStack(ModItems.crystal_lithium, 1), 1)
+        });
+    }
+}

src/main/java/com/hbm/saveddata/satellites/SatelliteMiner.java

@@ -1,8 +1,45 @@
 package com.hbm.saveddata.satellites;
 
+import com.hbm.blocks.ModBlocks;
+import com.hbm.items.ModItems;
+import com.hbm.util.WeightedRandomObject;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
 public class SatelliteMiner extends Satellite {
+	/**
+	 * {@link WeightedRandomObject} array with loot the satellite will deliver.
+	 */
+	private static WeightedRandomObject[] CARGO = new WeightedRandomObject[] {
+			new WeightedRandomObject(new ItemStack(ModItems.powder_aluminium, 3), 10),
+			new WeightedRandomObject(new ItemStack(ModItems.powder_iron, 3), 10),
+			new WeightedRandomObject(new ItemStack(ModItems.powder_titanium, 2), 8),
+			new WeightedRandomObject(new ItemStack(ModItems.crystal_tungsten, 2), 7),
+			new WeightedRandomObject(new ItemStack(ModItems.powder_coal, 4), 15),
+			new WeightedRandomObject(new ItemStack(ModItems.powder_uranium, 2), 5),
+			new WeightedRandomObject(new ItemStack(ModItems.powder_plutonium, 1), 5),
+			new WeightedRandomObject(new ItemStack(ModItems.powder_thorium, 2), 7),
+			new WeightedRandomObject(new ItemStack(ModItems.powder_desh_mix, 3), 5),
+			new WeightedRandomObject(new ItemStack(ModItems.powder_diamond, 2), 7),
+			new WeightedRandomObject(new ItemStack(Items.redstone, 5), 15),
+			new WeightedRandomObject(new ItemStack(ModItems.powder_nitan_mix, 2), 5),
+			new WeightedRandomObject(new ItemStack(ModItems.powder_power, 2), 5),
+			new WeightedRandomObject(new ItemStack(ModItems.powder_copper, 5), 15),
+			new WeightedRandomObject(new ItemStack(ModItems.powder_lead, 3), 10),
+			new WeightedRandomObject(new ItemStack(ModItems.fluorite, 4), 15),
+			new WeightedRandomObject(new ItemStack(ModItems.powder_lapis, 4), 10),
+			new WeightedRandomObject(new ItemStack(ModItems.powder_combine_steel, 1), 1),
+			new WeightedRandomObject(new ItemStack(ModItems.crystal_aluminium, 1), 5),
+			new WeightedRandomObject(new ItemStack(ModItems.crystal_gold, 1), 5),
+			new WeightedRandomObject(new ItemStack(ModItems.crystal_phosphorus, 1), 10),
+			new WeightedRandomObject(new ItemStack(ModBlocks.gravel_diamond, 1), 3),
+			new WeightedRandomObject(new ItemStack(ModItems.crystal_uranium, 1), 3),
+			new WeightedRandomObject(new ItemStack(ModItems.crystal_plutonium, 1), 3),
+			new WeightedRandomObject(new ItemStack(ModItems.crystal_trixite, 1), 1),
+			new WeightedRandomObject(new ItemStack(ModItems.crystal_starmetal, 1), 1),
+			new WeightedRandomObject(new ItemStack(ModItems.crystal_lithium, 2), 4)
+	};
 
 	public long lastOp;
 	
@@ -17,4 +54,20 @@ public class SatelliteMiner extends Satellite {
 	public void readFromNBT(NBTTagCompound nbt) {
 		lastOp = nbt.getLong("lastOp");
 	}
+
+	/**
+	 * Replaces cargo of the satellite.
+	 * @param cargo - Array of {@link WeightedRandomObject} representing the loot that will be delivered.
+	 */
+	public static void registerCargo(WeightedRandomObject[] cargo) {
+		CARGO = cargo;
+	}
+
+	/**
+	 * Gets items the satellite can deliver.
+	 * @return - Array of {@link WeightedRandomObject} of satellite loot.
+	 */
+	public WeightedRandomObject[] getCargo() {
+		return CARGO;
+	}
 }

src/main/java/com/hbm/saveddata/satellites/SatelliteMinerCargoRegistry.java

@@ -1,82 +0,0 @@
-package com.hbm.saveddata.satellites;
-
-import com.hbm.blocks.ModBlocks;
-import com.hbm.items.ModItems;
-import com.hbm.util.WeightedRandomObject;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-
-import java.util.HashMap;
-
-public class SatelliteMinerCargoRegistry {
-	private static final HashMap<String, WeightedRandomObject[]> cargo = new HashMap<String, WeightedRandomObject[]>() {{
-		put(SatelliteMiner.class.getName(), new WeightedRandomObject[] {
-			new WeightedRandomObject(new ItemStack(ModItems.powder_aluminium, 3), 10),
-			new WeightedRandomObject(new ItemStack(ModItems.powder_iron, 3), 10),
-			new WeightedRandomObject(new ItemStack(ModItems.powder_titanium, 2), 8),
-			new WeightedRandomObject(new ItemStack(ModItems.crystal_tungsten, 2), 7),
-			new WeightedRandomObject(new ItemStack(ModItems.powder_coal, 4), 15),
-			new WeightedRandomObject(new ItemStack(ModItems.powder_uranium, 2), 5),
-			new WeightedRandomObject(new ItemStack(ModItems.powder_plutonium, 1), 5),
-			new WeightedRandomObject(new ItemStack(ModItems.powder_thorium, 2), 7),
-			new WeightedRandomObject(new ItemStack(ModItems.powder_desh_mix, 3), 5),
-			new WeightedRandomObject(new ItemStack(ModItems.powder_diamond, 2), 7),
-			new WeightedRandomObject(new ItemStack(Items.redstone, 5), 15),
-			new WeightedRandomObject(new ItemStack(ModItems.powder_nitan_mix, 2), 5),
-			new WeightedRandomObject(new ItemStack(ModItems.powder_power, 2), 5),
-			new WeightedRandomObject(new ItemStack(ModItems.powder_copper, 5), 15),
-			new WeightedRandomObject(new ItemStack(ModItems.powder_lead, 3), 10),
-			new WeightedRandomObject(new ItemStack(ModItems.fluorite, 4), 15),
-			new WeightedRandomObject(new ItemStack(ModItems.powder_lapis, 4), 10),
-			new WeightedRandomObject(new ItemStack(ModItems.powder_combine_steel, 1), 1),
-			new WeightedRandomObject(new ItemStack(ModItems.crystal_aluminium, 1), 5),
-			new WeightedRandomObject(new ItemStack(ModItems.crystal_gold, 1), 5),
-			new WeightedRandomObject(new ItemStack(ModItems.crystal_phosphorus, 1), 10),
-			new WeightedRandomObject(new ItemStack(ModBlocks.gravel_diamond, 1), 3),
-			new WeightedRandomObject(new ItemStack(ModItems.crystal_uranium, 1), 3),
-			new WeightedRandomObject(new ItemStack(ModItems.crystal_plutonium, 1), 3),
-			new WeightedRandomObject(new ItemStack(ModItems.crystal_trixite, 1), 1),
-			new WeightedRandomObject(new ItemStack(ModItems.crystal_starmetal, 1), 1),
-			new WeightedRandomObject(new ItemStack(ModItems.crystal_lithium, 2), 4)
-		});
-		put(SatelliteLunarMiner.class.getName(), new WeightedRandomObject[] {
-			new WeightedRandomObject(new ItemStack(ModBlocks.moon_turf, 48), 5),
-			new WeightedRandomObject(new ItemStack(ModBlocks.moon_turf, 32), 7),
-			new WeightedRandomObject(new ItemStack(ModBlocks.moon_turf, 16), 5),
-			new WeightedRandomObject(new ItemStack(ModItems.powder_lithium, 3), 5),
-			new WeightedRandomObject(new ItemStack(ModItems.powder_iron, 3), 5),
-			new WeightedRandomObject(new ItemStack(ModItems.crystal_iron, 1), 1),
-			new WeightedRandomObject(new ItemStack(ModItems.crystal_lithium, 1), 1),
-		});
-	}};
-
-	/**
-	 * Register cargo for specified satellite object
-	 * @param o - Satellite object
-	 * @param cargo - WeightedRandomObject array with loot
-	 */
-	public static void register(Object o, WeightedRandomObject[] cargo) {
-		SatelliteMinerCargoRegistry.cargo.put(o.getClass().getName(), cargo);
-	}
-
-	/**
-	 * Register cargo for specified satellite class
-	 * @param c - Satellite class
-	 * @param cargo - WeightedRandomObject array with loot
-	 */
-	public static void register(Class<?> c, WeightedRandomObject[] cargo) {
-		SatelliteMinerCargoRegistry.cargo.put(c.getName(), cargo);
-	}
-
-	/**
-	 * Get loot by satellite class name
-	 * @param satelliteName - Satellite class name, like com.hbm.saveddata.satellites.SatelliteMiner
-	 * @return - WeightedRandomObject array with loot
-	 */
-	public static WeightedRandomObject[] getCargo(String satelliteName) {
-		if(cargo.containsKey(satelliteName)) {
-			return cargo.get(satelliteName);
-		}
-		return new WeightedRandomObject[0];
-	}
-}

src/main/java/com/hbm/tileentity/machine/TileEntityMachineSatDock.java

@@ -1,8 +1,5 @@
 package com.hbm.tileentity.machine;
 
-import java.util.List;
-import java.util.Random;
-
 import com.hbm.entity.missile.EntityMinerRocket;
 import com.hbm.explosion.ExplosionNukeSmall;
 import com.hbm.inventory.container.ContainerSatDock;
@@ -11,10 +8,8 @@ import com.hbm.items.ISatChip;
 import com.hbm.saveddata.SatelliteSavedData;
 import com.hbm.saveddata.satellites.Satellite;
 import com.hbm.saveddata.satellites.SatelliteMiner;
-import com.hbm.saveddata.satellites.SatelliteMinerCargoRegistry;
 import com.hbm.tileentity.IGUIProvider;
 import com.hbm.util.WeightedRandomObject;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.gui.GuiScreen;
@@ -31,8 +26,10 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.WeightedRandom;
 import net.minecraft.world.World;
 
-public class TileEntityMachineSatDock extends TileEntity implements ISidedInventory, IGUIProvider {
+import java.util.List;
+import java.util.Random;
 
+public class TileEntityMachineSatDock extends TileEntity implements ISidedInventory, IGUIProvider {
     private ItemStack[] slots;
 
     private static final int[] access = new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14};
@@ -102,17 +99,16 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
 
     //You scrubs aren't needed for anything (right now)
     @Override
-	public void openInventory() {}
+    public void openInventory() {
+    }
+
     @Override
-	public void closeInventory() {}
+    public void closeInventory() {
+    }
 
     @Override
     public boolean isItemValidForSlot(int i, ItemStack itemStack) {
-		if(i == 2 || i == 3 || i == 4 || i == 5) {
+		return i != 2 && i != 3 && i != 4 && i != 5;
-			return false;
-		}
-
-		return true;
 	}
 
     @Override
@@ -185,9 +181,7 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
 
     @Override
     public void updateEntity() {
-
         if (!worldObj.isRemote) {
-
             if (data == null)
                 data = (SatelliteSavedData) worldObj.perWorldStorage.loadData(SatelliteSavedData.class, "satellites");
 
@@ -205,18 +199,14 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
                 int delay = 10 * 60 * 1000;
 
                 if (sat instanceof SatelliteMiner) {
-
                     SatelliteMiner miner = (SatelliteMiner) sat;
 
                     if (miner.lastOp + delay < System.currentTimeMillis()) {
-
                         EntityMinerRocket rocket = new EntityMinerRocket(worldObj);
                         rocket.posX = xCoord + 0.5;
                         rocket.posY = 300;
                         rocket.posZ = zCoord + 0.5;
 
-						rocket.satelliteClassName = miner.getClass().getName();
-
                         rocket.getDataWatcher().updateObject(17, freq);
                         worldObj.spawnEntityInWorld(rocket);
                         miner.lastOp = System.currentTimeMillis();
@@ -228,9 +218,7 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
             List<Entity> list = worldObj.getEntitiesWithinAABBExcludingEntity(null, AxisAlignedBB.getBoundingBox(xCoord - 0.25 + 0.5, yCoord + 0.75, zCoord - 0.25 + 0.5, xCoord + 0.25 + 0.5, yCoord + 2, zCoord + 0.25 + 0.5));
 
             for (Entity e : list) {
-
                 if (e instanceof EntityMinerRocket) {
-
                     EntityMinerRocket rocket = (EntityMinerRocket) e;
 
                     if (slots[15] != null && ISatChip.getFreqS(slots[15]) != rocket.getDataWatcher().getWatchableObjectInt(17)) {
@@ -240,7 +228,8 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
                     }
 
                     if (rocket.getDataWatcher().getWatchableObjectInt(16) == 1 && rocket.timer == 50) {
-						unloadCargo(rocket.satelliteClassName);
+                        Satellite sat = data.getSatFromFreq(ISatChip.getFreqS(slots[15]));
+                        unloadCargo((SatelliteMiner) sat);
                     }
                 }
             }
@@ -252,26 +241,22 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
         }
     }
 
-	static Random rand = new Random();
+    static final Random rand = new Random();
 
-	private void unloadCargo(String satelliteClassName) {
+    private void unloadCargo(SatelliteMiner satellite) {
         int items = rand.nextInt(6) + 10;
 
-		WeightedRandomObject[] cargo = SatelliteMinerCargoRegistry.getCargo(satelliteClassName);
+        WeightedRandomObject[] cargo = satellite.getCargo();
 
         for (int i = 0; i < items; i++) {
-
             ItemStack stack = ((WeightedRandomObject) WeightedRandom.getRandomItem(rand, cargo)).asStack();
             addToInv(stack.copy());
         }
     }
 
     private void addToInv(ItemStack stack) {
-		
         for (int i = 0; i < 15; i++) {
-			
             if (slots[i] != null && slots[i].getItem() == stack.getItem() && slots[i].getItemDamage() == stack.getItemDamage() && slots[i].stackSize < slots[i].getMaxStackSize()) {
-				
                 int toAdd = Math.min(slots[i].getMaxStackSize() - slots[i].stackSize, stack.stackSize);
 
                 slots[i].stackSize += toAdd;
@@ -282,7 +267,6 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
         }
 
         for (int i = 0; i < 15; i++) {
-			
             if (slots[i] == null) {
                 slots[i] = new ItemStack(stack.getItem(), 1, stack.getItemDamage());
                 return;
@@ -291,19 +275,14 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
     }
 
     private void ejectInto(int x, int y, int z) {
-
         TileEntity te = worldObj.getTileEntity(x, y, z);
 
         if (te instanceof IInventory) {
-			
             IInventory chest = (IInventory) te;
 
             for (int i = 0; i < 15; i++) {
-				
                 if (slots[i] != null) {
-					
                     for (int j = 0; j < chest.getSizeInventory(); j++) {
-						
                         ItemStack sta = slots[i].copy();
                         sta.stackSize = 1;
 
@@ -323,16 +302,12 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
             }
 
             for (int i = 0; i < 15; i++) {
-				
                 if (slots[i] != null) {
-					
                     for (int j = 0; j < chest.getSizeInventory(); j++) {
-						
                         ItemStack sta = slots[i].copy();
                         sta.stackSize = 1;
 
                         if (chest.getStackInSlot(j) == null && chest.isItemValidForSlot(j, sta)) {
-							
                             slots[i].stackSize--;
 
                             if (slots[i].stackSize <= 0)
@@ -351,7 +326,6 @@ public class TileEntityMachineSatDock extends TileEntity implements ISidedInvent
 
     @Override
     public AxisAlignedBB getRenderBoundingBox() {
-		
         if (bb == null) {
             bb = AxisAlignedBB.getBoundingBox(
                     xCoord - 1,