fallout thunderstorm, more configs and order, recipes

HbmMods · Feb 12, 2019 · 82b5203 · 82b5203
1 parent 75799a7
commit 82b5203
Show file tree

Hide file tree

Showing 13 changed files with 314 additions and 93 deletions.
diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang
@@ -340,6 +340,7 @@ container.generator=Atomreaktor
 tile.red_wire_coated.name=Geschirmtes rotes Kupferkabel
 tile.machine_deuterium.name=Deuteriumextraktor
 container.machine_deuterium=Deuteriumextraktor
+tile.machine_battery_potato.name=Kartoffelbatterieblock
 tile.machine_battery.name=Energiespeicherblock
 tile.machine_lithium_battery.name=Li-Ion-Energiespeicherblock
 tile.machine_schrabidium_battery.name=Schrabidium-Energiespeicherblock

diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang
@@ -340,6 +340,7 @@ container.generator=Nuclear Reactor
 tile.red_wire_coated.name=Coated Red Copper Cable
 tile.machine_deuterium.name=Deuterium Extractor
 container.machine_deuterium=Deuterium Extractor
+tile.machine_battery_potato.name=Potato Battery Block
 tile.machine_battery.name=Energy Storage Block
 tile.machine_lithium_battery.name=Li-Ion Energy Storage Block
 tile.machine_schrabidium_battery.name=Schrabidium Energy Storage Block

diff --git a/com/hbm/blocks/test/TestEventTester.java b/com/hbm/blocks/test/TestEventTester.java
@@ -201,6 +201,7 @@ public void onNeighborBlockChange(World p_149695_1_, int x1, int y1, int z1, Blo
         	//RED FLUSHES ALL RAD
         	//STE PRINTS RAD CHUNKS
         	//URA PRINTS TOTAL RAD
+        	//THO SETS RAD TO 1000000
 
         	if(worldObj.getBlock(x1, y1 - 1, z1) == ModBlocks.block_aluminium) {
 
@@ -245,6 +246,15 @@ public void onNeighborBlockChange(World p_149695_1_, int x1, int y1, int z1, Blo
 				System.out.println(r);
         	}
 
+        	if(worldObj.getBlock(x1, y1 - 1, z1) == ModBlocks.block_thorium) {
+
+				Chunk chunk = worldObj.getChunkFromBlockCoords(x1, z1);
+
+				data.setRadForCoord(chunk.xPosition, chunk.zPosition, 1000000);
+
+				System.out.println(data.getRadNumFromCoord(chunk.xPosition, chunk.zPosition));
+        	}
+
         }
     }
 

diff --git a/com/hbm/entity/effect/EntityFalloutRain.java b/com/hbm/entity/effect/EntityFalloutRain.java
@@ -5,7 +5,9 @@
 import com.hbm.blocks.ModBlocks;
 import com.hbm.explosion.NukeEnvironmentalEffect;
 import com.hbm.lib.Library;
+import com.hbm.main.MainRegistry;
 import com.hbm.potion.HbmPotion;
+import com.hbm.saveddata.AuxSavedData;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -17,6 +19,7 @@
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
 public class EntityFalloutRain extends Entity {
 
@@ -41,7 +44,7 @@ public void onUpdate() {
 
         if(!worldObj.isRemote) {
 
-        	for(int i = 0; i < 256; i++) {
+        	for(int i = 0; i < MainRegistry.fSpeed; i++) {
 
 	        	Vec3 vec = Vec3.createVectorHelper(radProgress, 0, 0);
 	        	double circum = radProgress * 2 * Math.PI * 2;
@@ -66,8 +69,19 @@ public void onUpdate() {
 	        		radProgress++;
 	        	}
 
-	        	if(radProgress > getScale())
+	        	if(radProgress > getScale()) {
 	        		this.setDead();
+	        	}
+        	}
+
+        	if(this.isDead) {
+        		if(MainRegistry.rain > 0 && getScale() > 150) {
+        			worldObj.getWorldInfo().setRaining(true);
+    				worldObj.getWorldInfo().setThundering(true);
+    				worldObj.getWorldInfo().setRainTime(MainRegistry.rain);
+    				worldObj.getWorldInfo().setThunderTime(MainRegistry.rain);
+    				AuxSavedData.setThunder(worldObj, MainRegistry.rain);
+        		}
         	}
         }
     }
@@ -82,6 +96,11 @@ private void stomp(int x, int z) {
     		if(b.getMaterial() == Material.air)
     			continue;
 
+    		if(b.isFlammable(worldObj, x, y, z, ForgeDirection.UP)) {
+    			if(rand.nextInt(5) == 0)
+    				worldObj.setBlock(x, y + 1, z, Blocks.fire);
+    		}
+
 			if (b == Blocks.leaves || b == Blocks.leaves2) {
 				worldObj.setBlock(x, y, z, Blocks.air);
 			}

diff --git a/com/hbm/entity/logic/EntityNukeExplosionMK4.java b/com/hbm/entity/logic/EntityNukeExplosionMK4.java
@@ -65,7 +65,7 @@ public void onUpdate() {
 		if(explosion == null) {
 			explosion = new ExplosionNukeRay(worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, this.strength, this.count, this.speed, this.length);
 
-			MainRegistry.logger.info("START: " + System.currentTimeMillis());
+			//MainRegistry.logger.info("START: " + System.currentTimeMillis());
 
 			/*if(!worldObj.isRemote)
 				for(int x = (int) (posX - 1); x <= (int) (posX + 1); x++)
@@ -83,12 +83,12 @@ public void onUpdate() {
 		} else if(explosion.getStoredSize() > 0) {
 			//if(!worldObj.isRemote)
 			//MainRegistry.logger.info(explosion.getProgress() + " / " + count / length);
-				explosion.processTip(1024);
+				explosion.processTip(MainRegistry.mk4);
 		} else if(fallout) {
 
-			MainRegistry.logger.info("STOP: " + System.currentTimeMillis());
+			//MainRegistry.logger.info("STOP: " + System.currentTimeMillis());
 
-			EntityFalloutRain fallout = new EntityFalloutRain(this.worldObj, (int)(this.length * 0.9) * 2 * MainRegistry.falloutDura / 10);
+			EntityFalloutRain fallout = new EntityFalloutRain(this.worldObj);
 			fallout.posX = this.posX;
 			fallout.posY = this.posY;
 			fallout.posZ = this.posZ;

diff --git a/com/hbm/items/weapon/ItemAmmo.java b/com/hbm/items/weapon/ItemAmmo.java
@@ -152,6 +152,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool
 		if(this == ModItems.ammo_rocket_nuclear) {
 			list.add(EnumChatFormatting.BLUE + "+ Nuclear");
 			list.add(EnumChatFormatting.RED + "- Very highly increased wear");
+			list.add(EnumChatFormatting.RED + "- Decreased projectile speed");
 		}
 
 		//40mm GRENADES

diff --git a/com/hbm/lib/RefStrings.java b/com/hbm/lib/RefStrings.java
@@ -3,7 +3,7 @@
 public class RefStrings {
 	public static final String MODID = "hbm";
 	public static final String NAME = "Hbm's Nuclear Tech Mod";
-	public static final String VERSION = "1.0.27 BETA (3043)";
+	public static final String VERSION = "1.0.27 BETA (3048)";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version

diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java
@@ -588,6 +588,7 @@ public static void AddCraftingRec()
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.gas_duct), 16), new Object[] { "SIS", "   ", "SIS", 'S', "plateSteel", 'I', "plateCopper" }));
 		//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_deuterium), 1), new Object[] { "TIT", "RFR", "CCC", 'T', ModItems.tank_steel, 'I', "ingotTitanium", 'R', ModItems.wire_red_copper, 'F', Item.getItemFromBlock(ModBlocks.machine_difurnace_off), 'C', ModItems.coil_tungsten }));
 		//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_battery), 1), new Object[] { "TST", "RIR", "TLT", 'T', "ingotTungsten", 'I', "ingotRedstoneAlloy", 'R', ModItems.wire_red_copper, 'S', "blockSulfur", 'L', "blockLead" }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_battery_potato, 1), new Object[] { "PCP", "WRW", "PCP", 'P', ItemBattery.getEmptyBattery(ModItems.battery_potato), 'C', "ingotCopper", 'R', Blocks.redstone_block, 'W', "plankWood" }));
 		//GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_battery), 1), new Object[] { "TLT", "RIR", "TST", 'T', "ingotTungsten", 'I', "ingotRedstoneAlloy", 'R', ModItems.wire_red_copper, 'S', "blockSulfur", 'L', "blockLead" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_coal_off, 1), new Object[] { "STS", "SCS", "SFS", 'S', "ingotSteel", 'T', ModItems.tank_steel, 'C', "ingotRedstoneAlloy", 'F', Blocks.furnace }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_boiler_off, 1), new Object[] { "SPS", "TFT", "SPS", 'S', "ingotSteel", 'P', ModItems.board_copper, 'T', ModItems.tank_steel, 'F', Blocks.furnace }));
@@ -903,6 +904,7 @@ public static void reg2() {
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_rocket_emp, 1), new Object[] { "G", "R", 'G', "dustDiamond", 'R', ModItems.ammo_rocket }));
 		GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket_shrapnel, 1), new Object[] { "G", "R", 'G', ModItems.pellet_buckshot, 'R', ModItems.ammo_rocket });
 		GameRegistry.addRecipe(new ItemStack(ModItems.ammo_rocket_glare, 1), new Object[] { "GGG", "GRG", "GGG", 'G', Items.redstone, 'R', ModItems.ammo_rocket });
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_rocket_nuclear, 1), new Object[] { " P ", "NRN", " P ", 'P', ModItems.nugget_pu239, 'N', "plateDenseLead", 'R', ModItems.ammo_rocket }));
 
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ammo_grenade, 2), new Object[] { " T ", "GCI", " P ", 'T', Items.gunpowder, 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50, 'I', "plateIron" }));
 		GameRegistry.addRecipe(new ItemStack(ModItems.ammo_grenade_he, 2), new Object[] { "GIG", 'G', ModItems.ammo_grenade, 'I', Blocks.tnt });