diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index b077213d41..853f3462d2 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,8 +3,8 @@ public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech - Extended Edition"; - public static final String VERSION = "NTM-Extended-1.12.2-2.0.1"; - public static final String CHANGELOG = "§aAdded Emissive textures$§aAdded contaminated snow and ice$§aAdded chemplant CT support$§aAdded OC support to radsensor/battery$§bChanged Nuke calculations to be faster$§bChanged Fallout to only spawn from nukes$§cRemoved lanthanium from fracturing tower recipe$§eFixed Osmiridium balance$§eFixed translation issues$§eFixed missing textures$§eFixed gas masks$§eFixed server crash$§eFixed IO for RBMK$§eFixed armor on mobs$§eFixed RF crash$§eFixed spinning lights"; + public static final String VERSION = "NTM-Extended-1.12.2-2.0.2"; + public static final String CHANGELOG = "§aAdded more Conveyor stuff$§aAdded 1.7 Gerald Crater$§aAdded RBMK Fuel Uncrafting JEI Tab$§aAdded onArmor Jetpack fueling$§aAdded rare earth ore chunk$§dOptimized Nuke TPS/Speed/FPS$§bChanged Desh and Saturnite battery balance$§bChanged DFC to explode after overheating 60s even with jamming$§eFixed Meteor Dungeons$§eFixed HE-RF Converters$§eFixed MKU and 40 more bugs$§cRemoved chemplant oil processing by default"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java index a1ca11c194..7c25900bba 100644 --- a/src/main/java/com/hbm/main/ModEventHandler.java +++ b/src/main/java/com/hbm/main/ModEventHandler.java @@ -1032,7 +1032,7 @@ public void clientJoinServer(PlayerLoggedInEvent e) { if(HTTPHandler.changes != ""){ String[] lines = HTTPHandler.changes.split("\\$"); - e.player.sendMessage(new TextComponentString("§6[New Features]§r"));//RefStrings.CHANGELOG + e.player.sendMessage(new TextComponentString("§6[Some of the new Features]§r"));//RefStrings.CHANGELOG for(String w: lines){ e.player.sendMessage(new TextComponentString(w));//RefStrings.CHANGELOG } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCore.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCore.java index 874cdbbad9..ba02ed5c9e 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCore.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCore.java @@ -56,27 +56,27 @@ public String getName() { public void update() { if(!world.isRemote) { if(heat > 0 && heat >= field) { - - int fill = tanks[0].getFluidAmount() + tanks[1].getFluidAmount(); - int max = tanks[0].getCapacity() + tanks[1].getCapacity(); - int mod = heat * 10; - - int size = Math.max(Math.min(fill * mod / max, 1000), 50); - - //System.out.println(fill + " * " + mod + " / " + max + " = " + size); + if(safeTimer > 20){ + int fill = tanks[0].getFluidAmount() + tanks[1].getFluidAmount(); + int max = tanks[0].getCapacity() + tanks[1].getCapacity(); + int mod = heat * 10; + + int size = Math.max(Math.min(fill * mod / max, 1000), 50); + + //System.out.println(fill + " * " + mod + " / " + max + " = " + size); - world.playSound(null, pos.getX(), pos.getY(), pos.getZ(), SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 100000.0F, 1.0F); + world.playSound(null, pos.getX(), pos.getY(), pos.getZ(), SoundEvents.ENTITY_GENERIC_EXPLODE, SoundCategory.BLOCKS, 100000.0F, 1.0F); - EntityNukeExplosionMK3 exp = new EntityNukeExplosionMK3(world); - exp.posX = pos.getX(); - exp.posY = pos.getY(); - exp.posZ = pos.getZ(); - exp.destructionRange = size; - exp.speed = 25; - exp.coefficient = 1.0F; - exp.waste = false; - if(safeTimer > 60){ - if(!EntityNukeExplosionMK3.isJammed(this.world, exp) || safeTimer > 1200){ + EntityNukeExplosionMK3 exp = new EntityNukeExplosionMK3(world); + exp.posX = pos.getX(); + exp.posY = pos.getY(); + exp.posZ = pos.getZ(); + exp.destructionRange = size; + exp.speed = 25; + exp.coefficient = 1.0F; + exp.waste = false; + + if(safeTimer > 1200 || !EntityNukeExplosionMK3.isJammed(this.world, exp)){ world.spawnEntity(exp); EntityCloudFleijaRainbow cloud = new EntityCloudFleijaRainbow(world, size); @@ -84,6 +84,7 @@ public void update() { cloud.posY = pos.getY(); cloud.posZ = pos.getZ(); world.spawnEntity(cloud); + world.setBlockToAir(pos); } } safeTimer++; diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 2dc2cf25c5..97799ca606 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "hbm", "name": "HBM's Nuclear Tech - Extended Edition", "description": "A mod that adds all kinds of nukes and other things", - "version": "2.0.1", + "version": "2.0.2", "credits": "\n\nHBMMods: creator\nDrillgon200: original 1.12.2 port\nTheOriginalGolem: 1.12.2 bug fixing\nAlcater: Custom 1.12.2 version, updating and texturing\n\nSten89: bug tester\nGB_Doge_9000: bug tester\nHoboy: textures and models\nDoctor17: Russian translations\ngrangerave\nrodolphito\nmexikoedi: log spam fix\nCrowbar Collective: gluon gun sounds\n70000HP: MIRV and configs\n", "logoFile": "assets/hbm/textures/logo.png", "mcversion": "${mcversion}",