Merge remote-tracking branch 'origin/master'

.editorconfig

@@ -0,0 +1,16 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = crlf
+indent_style = tab
+indent_size = tab
+insert_final_newline = true
+trim_trailing_whitespace = true
+max_line_length = off
+
+[{*.info,*.json,*.mcmeta,*.md,*.cfg,*.yml,*.toml}]
+tab_width = 2
+
+[{*.info,*.mcmeta,*.cfg}]
+end_of_line = lf

.github/workflows/build.yml

@@ -0,0 +1,45 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+
+# Yes this is a mostly untouched Github actions template
+
+name: Java CI with Gradle
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 8
+      uses: actions/setup-java@v4
+      with:
+        java-version: '8'
+        distribution: 'temurin' # Temurin because it's default :P
+
+    # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+    # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
+
+    - name: Build with Gradle Wrapper
+      run: ./gradlew build
+
+    - name: Upload a Build Artifact
+      uses: actions/upload-artifact@v4.6.0
+      with:
+        # A file, directory or wildcard pattern that describes what to upload
+        path: ./build/libs
+          
+    

.gitignore

@@ -1,25 +1,28 @@
 # eclipse
-eclipse
+/eclipse
-bin
+/bin
-*.launch
+/*.launch
-.settings
+/.settings
-.metadata
+/.metadata
-.classpath
+/.classpath
-.project
+/.project
 
 # idea
-out
+/out
-*.ipr
+/*.ipr
-*.iws
+/*.iws
-*.iml
+/*.iml
-.idea
+/.idea
 
 # gradle
-build
+/build
-.gradle
+/.gradle
+
+# vscode
+/.vscode
 
 # other
-run
+/run
 
 # CurseForge configuration
 /curseforge.properties

CONTRIBUTING.md

@@ -13,6 +13,8 @@ Things you should also avoid include:
 * duplicate util functions (just use what we have, man)
 * unused or half finished util functions (for obvious reasons)
 * half finished or obviously broken features (à la "bob will fix it, i'm sure of it", please don't do that)
+* updating the changelog (you're guaranteed to cause a merge conflict with that)
+* any use of `I18n`, use `I18nUtil` instead
 
 ## Test your code
 
@@ -20,6 +22,9 @@ This should go without saying, but please don't PR code that was never actually
 
 **Addendum:** Because apparently some people think that testing is somehow optional, it is now **mandatory** to test the code both on a client and on a server. If the PR contains compat code, the game has to work **with and without** the mod that the compat is for.
 
+## No refactor PRs
+Your refactors suck ass and usually something ends up breaking.
+
 ## Communication
 
 If you're planning on adding some new thing or doing a grand change, it's best to ask whether that's a good idea before spending 50 hours on a project that won't end up getting merged, due to issues that could have been entirely avoidable with communication.

README.md

@@ -6,10 +6,13 @@
 
 [Official NTM Wiki](https://nucleartech.wiki/wiki/Main_Page)
 
+[Bobcat's Blog (the blag)](https://hbmmods.github.io/), you can find lengthy yapping, upcoming features and some secrets here.
+
 **This is for 1.7.10!** For 1.12, check out these projects:
 
 * NTM Reloaded: https://github.com/TheOriginalGolem/Hbm-s-Nuclear-Tech-GIT/releases
 * NTM Extended Edition (Alcater): https://github.com/Alcatergit/Hbm-s-Nuclear-Tech-GIT/releases
+* NTM Community Edition (WarFactory): https://github.com/MisterNorwood/Hbm-s-Nuclear-Tech-CE
 
 For 1.18, try Martin's remake: https://codeberg.org/MartinTheDragon/Nuclear-Tech-Mod-Remake/releases
 
@@ -93,12 +96,18 @@ If you want to make some changes to the mod, follow this guide:
       * Click **Add Standard VM**; in the JRE home, navigate to the directory where the JDK is installed, then click finish and select it.
 10. Code!
 
+## Contributing animations
+Weapon animations in NTM are stored in JSON files, which are used alongside OBJ models to produce high quality animations with reasonable filesizes. Import/Export Blender addons are available for versions 2.79, 3.2, and 4.0 in `tools`, and they should function reasonably well in newer versions as well. See the comments in the header of the export scripts for usage instructions.
+
 ## Compatibility notice
 NTM has certain behaviors intended to fix vanilla code or to increase compatibility in certain cases where it otherwise would not be possible. These behaviors have the potential of not playing well with other mods, and while no such cases are currently known, here's a list of them.
 
 ### Thermos
 Thermos servers (along with its forks such as Crucible) have a "performance" feature that causes all tile entity ticking to slow down if there's no player present in the same chunk. For obvious reasons, this will heavily impact machines and cause phantom issues that, not having knowledge of this "performance" feature, are near impossible to diagnose. By default, NTM will crash on servers running the Thermos base code and print a lengthy message informing server owners about this "performance" feature as well as how to fix the issues it causes. The error message is printed in plain English on the top of the crash log, failure to read (as well as understand) it will leave the server inoperable.
 
+### Shaders
+Shaders (loaded by either Optifine, Iris or otherwise) will in all likelihood break when a gun is held. This is because guns need to skip vanilla's first person item setup for the rendering, however shaders apparently use the setup step for setting certain GL states, and skipping that will break rendering. [Shader Fixer](https://modrinth.com/mod/shader-fixer) is a mod with various fixes, among which is explicit compatibility for NTM's guns.
+
 ### Optifine
 One of the most common "performance" mods on 1.7.10, Optifine, achieves an increase in performance by breaking small things in spots that are usually hard to notice, although this can cause severe issues with NTM. A short list of problems, along with some solutions, follows:
 * Get rid of Optifine and use one of the many [other, less intrusive performance mods](https://gist.github.com/makamys/7cb74cd71d93a4332d2891db2624e17c).
@@ -108,7 +117,7 @@ One of the most common "performance" mods on 1.7.10, Optifine, achieves an incre
 ### Angelica
 In older versions, Angelica caused issues regarding model rendering, often times making 3D models transparent. Ever since the switch to VBOs, models work fine. Another issue was blocks with connected textures not rendering at all, but this too was fixed, meaning as of time of writing there are no major incompatibilities known with Angelica. However there a few minor issues that persist, but those can be fixed:
 * Often times when making a new world, all items appear as white squares. Somehow, scrolling though the NEI pages fixes this permanently
-* Reeds will render weirdly, this is an incompatibility with the "Compact Vertex Format" feature. Disabling it will make reeds look normal
+* Reeds will render weirdly, this is an incompatibility with the "Compact Vertex Format" feature. Disabling it will make reeds look normal. Alternatively, reed rendering can be disabled by using `/ntmclient set RENDER_REEDS false`, which works around the issue by not rendering the underwater portion of reeds at all.
 
 ### Skybox chainloader
 NTM adds a few small things to the skybox using a custom skybox renderer. Minecraft can only have a single skybox renderer loaded, so setting the skybox to the NTM custom one would break compatibility with other mods' skyboxes. To mend this, NTM employs a **chainloader**. This chainloader will detect if a different skybox is loaded, save a reference to that skybox and then use NTM's skybox, which when used will also make sure to run the previous modded skybox renderer. In the event that NTM's skybox were to cause trouble, it can be disabled with the config option `1.31_enableSkyboxes`.

build.gradle

@@ -79,6 +79,18 @@ repositories {
 	//	name = "CurseForge"
 	//	url = "https://minecraft.curseforge.com/api/maven/"
 	//}
+	maven {
+		name = "Jitpack"
+		url = "https://jitpack.io"
+	}
+	maven {
+		name = "CurseMaven"
+		url = "https://cursemaven.com"
+	}
+	maven {
+        name = "OpenComputers"
+        url = "https://maven.cil.li/"
+    }
 }
 
 dependencies {
@@ -94,6 +106,8 @@ dependencies {
 	compileOnly "inventorytweaks:InventoryTweaks:1.59-dev:deobf"
 
 	implementation "li.cil.oc:OpenComputers:MC1.7.10-1.5.+:api"
+
+	compileOnly "com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta.56-GTNH:dev"
 }
 
 processResources {

changelog

@@ -1,12 +1,19 @@
+## Added
+* New assembler
+  * Features a brand new animated model, GUI and the new recipe selection system
+  * Many recipes have been reworked, with the microcrafting complexity reduced
+  * The redcoil didn't get a recipe. It's gonna die soon.
+
 ## Changed
-* Changed the multi fluid ID recipe, they now use analog circuits instead of silicon based ones, no longer requiring plastic to make
+* Removed levitation unit
-* Decreased the connection speed for all battery blocks, a full discharge now takes 30 seconds instead of 1 second, and charging now takes 10 seconds
+* Many of NTM's regular building blocks now have forge microblock support
-  * Capacitors have also been nerfed but they are twice as fast as battery blocks, 5 seconds for charging and 15 seconds for discharging
+* RBMK crane models now conform to the dimensions of the room they're in
-* Removed forgotten bricks
+* Projectile resistance for armor has been renamed to "physical" and now also extends to all direct forms of attack by other entities that don't fall into any other categories (mostly melee attacks)
-* Updated CMB brick texture
+  * This should fix the issue where most armors are quite weak against swords
-* The ICF machine block now renders with its 3d model in the creative inventory
+* Electric attacks (i.e. tesla cannon) are now in the "energy damage" category
+  * This means that armors that have energy resistance actually properly work against the tesla cannon
 
 ## Fixed
-* Fixed pumpjack gauges not syncing properly
+* Fixed gas centrifuge sound persisting when broken or when unloaded
-* Fixed some concrete variants not being revertable into uncolored concrete
+* Fixed all centrifuge sounds trying to play even when the player is far away, using up audio slots
-* Fixed the ore density scanner not using proper translations for the HUD
+* Fixed guns that don't have durability always displaying a condition of 0%

gradle.properties

@@ -1,6 +1,6 @@
 mod_version=1.0.27
 # Empty build number makes a release type
-mod_build_number=5061
+mod_build_number=5383
 
 credits=HbMinecraft,\
   \ rodolphito (explosion algorithms),\
@@ -9,27 +9,44 @@ credits=HbMinecraft,\
   \ Drillgon200 (effects, models, porting),\
   \ MartinTheDragon (calculator, chunk-based fallout, bendable cranes, pipe improvements, PWR sounds),\
   \ Alcater (GUI textures, porting),\
-  \ MellowArpeggiation (new animation system, turbine sounds, sound fixes, industrial lights, better particle diodes),\
+  \ MellowArpeggiation (new animation system, turbine sounds, sound fixes, industrial lights, conveyor wand, NBT structures),\
   \ Pheo (textures, various machines, models, weapons),\
-  \ Vær (gas centrifuges, better worldgen, ZIRNOX, CP-1 parts, starter guide, new cyclotron),\
+  \ Vær (gas centrifuges, better worldgen, ZIRNOX, CP-1 parts, starter guide, new cyclotron, weapon animations),\
+  \ UFFR (RTG pellets, guns, casings, euphemium capacitor, nucleartech.wiki),\
   \ LePeep (coilgun model, BDCL QC),\
   \ Adam29 (liquid petroleum, ethanol, electric furnace),\
   \ Pvndols (thorium fuel recipe, gas turbine),\
   \ JamesH2 (blood mechanics, nitric acid, particle emitter),\
+  \ Lazzzycat (structures, mob gear),\
+  \ PastaBaguette (coal horse decal),\
   \ Doctor17 (russian localization)),\
   \ Pashtet (russian localization),\
+  \ 7H40 (russian localization),\
   \ Bismarck (chinese localization),\
   \ Creeper-banner (chinese localization),\
+  \ 5467864  (chinese localization),\
+  \ eeeeee0a (chinese localization),\
+  \ hz0909adc (chinese localization),\
+  \ LSKLW (chinese localization),\
+  \ R-Kaenbyou (chinese localization),\
+  \ scp-000000000 (chinese localization),\
+  \ UnnameTokiko (chinese localization),\
+  \ Herobrine 457985 (chinese localization),\
+  \ xxwinhere (chinese localization),\
+  \ Nycticoraxnightheron (chinese localization),\
   \ Maksymisio (polish localization)\
   \ el3ctro4ndre (italian localization),\
   \ Pu-238 (Tom impact effects),\
-  \ UFFR (RTG pellets, guns, casings, euphemium capacitor),\
   \ Frooz (gun models),\
   \ VT-6/24 (models, textures),\
   \ Nos (models),\
+  \ WushiThe (models),\
   \ Minecreep (models),\
-  \ 70k (textures, glyphid AI, strand caster, electrolyzer changes),\
+  \ ackbarcrowbars (models),\
   \ haru315 (spiral point algorithm),\
+  \ mlbv (threaded MK5),\
+  \ 70k (textures, glyphid AI, strand caster, electrolyzer changes, cryolite),\
+  \ instantnootles (concept artist),\
   \ Sten89 (models),\
   \ Pixelguru26 (textures),\
   \ TheBlueHat (textures),\
@@ -37,15 +54,20 @@ credits=HbMinecraft,\
   \ TehTemmie (reacher radiation function),\
   \ Silly541 (config for safe ME drives),\
   \ Voxelstice (OpenComputers integration, turbine spinup),\
-  \ BallOfEnergy1 (OpenComputers integration),\
+  \ BallOfEnergy1 (OpenComputers integration, RBMK and packet optimization, crate backpacks),\
   \ sdddddf80 (recipe configs, chinese localization, custom machine holograms),\
+  \ Abel1502 (abilities GUI, optimization, crate upgrade recipes, strand caster improvements, varous tweaks),\
+  \ Darek505 (armor rendering compatibility fix),\
   \ SuperCraftAlex (tooltips)\
   \ Ice-Arrow (research reactor tweaks),\
   \ 245tt (anvil GUI improvements),\
   \ KoblizekXD (doors),\
   \ FOlkvangrField (custom machine parts),\
   \ RosaTryp (centrifuge config),\
-  \ Toshayo (satellite loot system, project settings, gradle curse task),\
+  \ Toshayo (satellite loot system, project settings, gradle curse task, OpenComputers integration),\
+  \ Dash (PA particle serialization fix),\
+  \ archiecarrot123 (armor rendering compatibility fix),\
+  \ icomet (refactoring),\
   \ martemen (project settings),\
   \ OvermindDL1 (project settings),\
   \ impbk2002 (project settings)\

src/main/java/api/hbm/energymk2/IEnergyProviderMK2.java

@@ -1,7 +1,7 @@
 package api.hbm.energymk2;
 
-import com.hbm.packet.AuxParticlePacketNT;
+import com.hbm.handler.threading.PacketThreading;
-import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.util.Compat;
 
 import api.hbm.energymk2.Nodespace.PowerNode;
@@ -62,7 +62,7 @@ public interface IEnergyProviderMK2 extends IEnergyHandlerMK2 {
 			data.setDouble("mX", dir.offsetX * (red ? 0.025 : 0.1));
 			data.setDouble("mY", dir.offsetY * (red ? 0.025 : 0.1));
 			data.setDouble("mZ", dir.offsetZ * (red ? 0.025 : 0.1));
-			PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, posX, posY, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 25));
+			PacketThreading.createAllAroundThreadedPacket(new AuxParticlePacketNT(data, posX, posY, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 25));
 		}
 	}
 }

src/main/java/api/hbm/energymk2/IEnergyReceiverMK2.java

@@ -1,8 +1,10 @@
 package api.hbm.energymk2;
 
-import com.hbm.packet.AuxParticlePacketNT;
+import com.hbm.handler.threading.PacketThreading;
-import com.hbm.packet.PacketDispatcher;
+import com.hbm.interfaces.NotableComments;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.util.Compat;
+import com.hbm.util.fauxpointtwelve.DirPos;
 
 import api.hbm.energymk2.Nodespace.PowerNode;
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
@@ -12,6 +14,7 @@ import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
 /** If it receives energy, use this */
+@NotableComments
 public interface IEnergyReceiverMK2 extends IEnergyHandlerMK2 {
 
 	public default long transferPower(long power) {
@@ -29,6 +32,8 @@ public interface IEnergyReceiverMK2 extends IEnergyHandlerMK2 {
 		return this.getMaxPower();
 	}
 
+	public default void trySubscribe(World world, DirPos pos) { trySubscribe(world, pos.getX(), pos.getY(), pos.getZ(), pos.getDir()); }
+
 	public default void trySubscribe(World world, int x, int y, int z, ForgeDirection dir) {
 
 		TileEntity te = Compat.getTileStandard(world, x, y, z);
@@ -56,7 +61,7 @@ public interface IEnergyReceiverMK2 extends IEnergyHandlerMK2 {
 			data.setDouble("mX", -dir.offsetX * (red ? 0.025 : 0.1));
 			data.setDouble("mY", -dir.offsetY * (red ? 0.025 : 0.1));
 			data.setDouble("mZ", -dir.offsetZ * (red ? 0.025 : 0.1));
-			PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, posX, posY, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 25));
+			PacketThreading.createAllAroundThreadedPacket(new AuxParticlePacketNT(data, posX, posY, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 25));
 		}
 	}
 
@@ -74,31 +79,6 @@ public interface IEnergyReceiverMK2 extends IEnergyHandlerMK2 {
 		}
 	}
 
-	/**
-	 * Project MKUltra was an illegal human experiments program designed and undertaken by the U.S. Central Intelligence Agency (CIA)
-	 * to develop procedures and identify drugs that could be used during interrogations to weaken people and force confessions through
-	 * brainwashing and psychological torture. It began in 1953 and was halted in 1973. MKUltra used numerous methods to manipulate
-	 * its subjects' mental states and brain functions, such as the covert administration of high doses of psychoactive drugs (especially LSD)
-	 * and other chemicals without the subjects' consent, electroshocks, hypnosis, sensory deprivation, isolation, verbal and sexual
-	 * abuse, and other forms of torture.
-	 * MKUltra was preceded by Project Artichoke. It was organized through the CIA's Office of Scientific Intelligence and coordinated
-	 * with the United States Army Biological Warfare Laboratories. The program engaged in illegal activities, including the
-	 * use of U.S. and Canadian citizens as unwitting test subjects. MKUltra's scope was broad, with activities carried
-	 * out under the guise of research at more than 80 institutions aside from the military, including colleges and universities,
-	 * hospitals, prisons, and pharmaceutical companies. The CIA operated using front organizations, although some top officials at these
-	 * institutions were aware of the CIA's involvement.
-	 * MKUltra was revealed to the public in 1975 by the Church Committee of the United States Congress and Gerald Ford's United States
-	 * President's Commission on CIA activities within the United States (the Rockefeller Commission). Investigative efforts were hampered
-	 * by CIA Director Richard Helms's order that all MKUltra files be destroyed in 1973; the Church Committee and Rockefeller Commission
-	 * investigations relied on the sworn testimony of direct participants and on the small number of documents that survived Helms's order.
-	 * In 1977, a Freedom of Information Act request uncovered a cache of 20,000 documents relating to MKUltra, which led to Senate hearings.
-	 * Some surviving information about MKUltra was declassified in 2001. 
-	 * */
-	public default ConnectionPriority getPriority() {
-		return ConnectionPriority.NORMAL;
-	}
-	
-	/** More is better-er */
 	public enum ConnectionPriority {
 		LOWEST,
 		LOW,
@@ -106,4 +86,8 @@ public interface IEnergyReceiverMK2 extends IEnergyHandlerMK2 {
 		HIGH,
 		HIGHEST
 	}
+	
+	public default ConnectionPriority getPriority() {
+		return ConnectionPriority.NORMAL;
+	}
 }

src/main/java/api/hbm/energymk2/Nodespace.java

@@ -1,159 +1,40 @@
 package api.hbm.energymk2;
 
-import java.util.HashMap;
+import com.hbm.interfaces.NotableComments;
-import java.util.HashSet;
+import com.hbm.uninos.GenNode;
-import java.util.Map.Entry;
+import com.hbm.uninos.UniNodespace;
-import java.util.Set;
+import com.hbm.uninos.networkproviders.PowerNetProvider;
-
 import com.hbm.util.fauxpointtwelve.BlockPos;
 import com.hbm.util.fauxpointtwelve.DirPos;
 
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.World;
 
 /**
- * The "Nodespace" is an intermediate, "ethereal" layer of abstraction that tracks nodes (i.e. cables) even when they are no longer loaded, allowing continued operation even when unloaded
+ * The dead fucking corpse of nodespace MK1.
- * @author hbm
+ * A fantastic proof of concept, but ultimately it was killed for being just not that versatile.
+ * This class is mostly just a compatibility husk that should allow uninodespace to slide into the mod with as much lubrication as it deserves.
  * 
+ * @author hbm
  */
 public class Nodespace {
 	
-	/** Contains all "NodeWorld" instances, i.e. lists of nodes existing per world */
+	public static final PowerNetProvider THE_POWER_PROVIDER = new PowerNetProvider();
-	public static HashMap<World, NodeWorld> worlds = new HashMap<>();
-	public static Set<PowerNetMK2> activePowerNets = new HashSet<>();
 	
-	public static PowerNode getNode(World world, int x, int y, int z) {
+	@Deprecated public static PowerNode getNode(World world, int x, int y, int z) {
-		NodeWorld nodeWorld = worlds.get(world);
+		return (PowerNode) UniNodespace.getNode(world, x, y, z, THE_POWER_PROVIDER);
-		if(nodeWorld != null) return nodeWorld.nodes.get(new BlockPos(x, y, z));
-		return null;
 	}
 	
-	public static void createNode(World world, PowerNode node) {
+	@Deprecated public static void createNode(World world, PowerNode node) {
-		NodeWorld nodeWorld = worlds.get(world);
+		UniNodespace.createNode(world, node);
-		if(nodeWorld == null) {
-			nodeWorld = new NodeWorld();
-			worlds.put(world, nodeWorld);
-		}
-		nodeWorld.pushNode(node);
 	}
 	
-	public static void destroyNode(World world, int x, int y, int z) {
+	@Deprecated public static void destroyNode(World world, int x, int y, int z) {
-		PowerNode node = getNode(world, x, y, z);
+		UniNodespace.destroyNode(world, x, y, z, THE_POWER_PROVIDER);
-		if(node != null) {
-			worlds.get(world).popNode(node);
-		}
 	}
 
-	/** Goes over each node and manages connections */
+	@NotableComments
-	public static void updateNodespace() {
+	public static class PowerNode extends GenNode<PowerNetMK2> {
 		
-		for(World world : MinecraftServer.getServer().worldServers) {
-			NodeWorld nodes = worlds.get(world);
-
-			if(nodes == null)
-				continue;
-			
-			for(Entry<BlockPos, PowerNode> entry : nodes.nodes.entrySet()) {
-				PowerNode node = entry.getValue();
-				if(!node.hasValidNet() || node.recentlyChanged) {
-					checkNodeConnection(world, node);
-					node.recentlyChanged = false;
-				}
-			}
-		}
-		
-		updatePowerNets();
-	}
-	
-	private static void updatePowerNets() {
-
-		for(PowerNetMK2 net : activePowerNets) net.resetEnergyTracker(); //reset has to be done before everything else
-		for(PowerNetMK2 net : activePowerNets) net.transferPower();
-	}
-	
-	/** Goes over each connection point of the given node, tries to find neighbor nodes and to join networks with them */
-	private static void checkNodeConnection(World world, PowerNode node) {
-		
-		for(DirPos con : node.connections) {
-			
-			PowerNode conNode = getNode(world, con.getX(), con.getY(), con.getZ()); // get whatever neighbor node intersects with that connection
-			
-			if(conNode != null) { // if there is a node at that place
-				
-				if(conNode.hasValidNet() && conNode.net == node.net) continue; // if the net is valid and both nodes have the same net, skip
-				
-				if(checkConnection(conNode, con, false)) {
-					connectToNode(node, conNode);
-				}
-			}
-		}
-		
-		if(node.net == null || !node.net.isValid()) new PowerNetMK2().joinLink(node);
-	}
-	
-	public static boolean checkConnection(PowerNode connectsTo, DirPos connectFrom, boolean skipSideCheck) {
-		
-		for(DirPos revCon : connectsTo.connections) {
-			
-			if(revCon.getX() - revCon.getDir().offsetX == connectFrom.getX() && revCon.getY() - revCon.getDir().offsetY == connectFrom.getY() && revCon.getZ() - revCon.getDir().offsetZ == connectFrom.getZ() && (revCon.getDir() == connectFrom.getDir().getOpposite() || skipSideCheck)) {
-				return true;
-			}
-		}
-		
-		return false;
-	}
-	
-	/** Links two nodes with different or potentially no networks */
-	private static void connectToNode(PowerNode origin, PowerNode connection) {
-		
-		if(origin.hasValidNet() && connection.hasValidNet()) { // both nodes have nets, but the nets are different (previous assumption), join networks
-			if(origin.net.links.size() > connection.net.links.size()) {
-				origin.net.joinNetworks(connection.net);
-			} else {
-				connection.net.joinNetworks(origin.net);
-			}
-		} else if(!origin.hasValidNet() && connection.hasValidNet()) { // origin has no net, connection does, have origin join connection's net
-			connection.net.joinLink(origin);
-		} else if(origin.hasValidNet() && !connection.hasValidNet()) { // ...and vice versa
-			origin.net.joinLink(connection);
-		}
-	}
-	
-	public static class NodeWorld {
-
-		/** Contains a map showing where each node is, a node is every spot that a cable exists at.
-		 * Instead of the old proxy system, things like substation now create multiple nodes at their connection points */
-		public HashMap<BlockPos, PowerNode> nodes = new HashMap<>();
-		
-		/** Adds a node at all its positions to the nodespace */
-		public void pushNode(PowerNode node) {
-			for(BlockPos pos : node.positions) {
-				nodes.put(pos, node);
-			}
-		}
-		
-		/** Removes the specified node from all positions from nodespace */
-		public void popNode(PowerNode node) {
-			if(node.net != null) node.net.destroy();
-			for(BlockPos pos : node.positions) {
-				nodes.remove(pos);
-				node.expired = true;
-			}
-		}
-		
-		/** Grabs the node at one position, then removes it from all positions it occupies */
-		public void popNode(BlockPos pos) {
-			PowerNode node = nodes.get(pos);
-			if(node != null) popNode(node);
-		}
-	}
-	
-	public static class PowerNode {
-		
-		public BlockPos[] positions;
-		public DirPos[] connections;
-		public PowerNetMK2 net;
-		public boolean expired = false;
 		/**
 		 * Okay so here's the deal: The code has shit idiot brain fungus. I don't know why. I re-tested every part involved several times.
 		 * I don't know why. But for some reason, during neighbor checks, on certain arbitrary fucking places, the joining operation just fails.
@@ -165,32 +46,16 @@ public class Nodespace {
 		 * breaking, but it seems to allow those parts to connect back to their neighbor nets as they are supposed to. I am not proud of this solution,
 		 * this issue shouldn't exist to begin with and I am going fucking insane but it is what it is.
 		 */
-		public boolean recentlyChanged = true;
 		
 		public PowerNode(BlockPos... positions) {
+			super(THE_POWER_PROVIDER, positions);
 			this.positions = positions;
 		}
 		
+		@Override
 		public PowerNode setConnections(DirPos... connections) {
-			this.connections = connections;
+			super.setConnections(connections);
 			return this;
 		}
-		
-		public PowerNode addConnection(DirPos connection) {
-			DirPos[] newCons = new DirPos[this.connections.length + 1];
-			for(int i = 0; i < this.connections.length; i++) newCons[i] = this.connections[i];
-			newCons[newCons.length - 1] = connection;
-			this.connections = newCons;
-			return this;
-		}
-		
-		public boolean hasValidNet() {
-			return this.net != null && this.net.isValid();
-		}
-		
-		public void setNet(PowerNetMK2 net) {
-			this.net = net;
-			this.recentlyChanged = true;
-		}
 	}
 }

src/main/java/api/hbm/energymk2/PowerNetMK2.java

@@ -1,125 +1,32 @@
 package api.hbm.energymk2;
 
 import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 
+import com.hbm.uninos.NodeNet;
 import com.hbm.util.Tuple.Pair;
 
 import java.util.Map.Entry;
-import java.util.Random;
 
 import api.hbm.energymk2.IEnergyReceiverMK2.ConnectionPriority;
 import api.hbm.energymk2.Nodespace.PowerNode;
 
-public class PowerNetMK2 {
+/**
-	
+ * Technically MK3 since it's now UNINOS compatible, although UNINOS was build out of 95% nodespace code
-	public static Random rand = new Random();
+ * 
-	public boolean valid = true;
+ * @author hbm
-	public Set<PowerNode> links = new HashSet();
+ */
-
+public class PowerNetMK2 extends NodeNet<IEnergyReceiverMK2, IEnergyProviderMK2, PowerNode> {
-	/** Maps all active subscribers to a timestamp, handy for handling timeouts. In a good system this shouldn't be necessary, but the previous system taught me to be cautious anyway */
-	public HashMap<IEnergyReceiverMK2, Long> receiverEntries = new HashMap();
-	public HashMap<IEnergyProviderMK2, Long> providerEntries = new HashMap();
 	
 	public long energyTracker = 0L;
 	
-	public PowerNetMK2() {
-		Nodespace.activePowerNets.add(this);
-	}
-
-	/// SUBSCRIBER HANDLING ///
-	public boolean isSubscribed(IEnergyReceiverMK2 receiver) {
-		return this.receiverEntries.containsKey(receiver);
-	}
-
-	public void addReceiver(IEnergyReceiverMK2 receiver) {
-		this.receiverEntries.put(receiver, System.currentTimeMillis());
-	}
-
-	public void removeReceiver(IEnergyReceiverMK2 receiver) {
-		this.receiverEntries.remove(receiver);
-	}
-
-	/// PROVIDER HANDLING ///
-	public boolean isProvider(IEnergyProviderMK2 provider) {
-		return this.providerEntries.containsKey(provider);
-	}
-
-	public void addProvider(IEnergyProviderMK2 provider) {
-		this.providerEntries.put(provider, System.currentTimeMillis());
-	}
-
-	public void removeProvider(IEnergyProviderMK2 provider) {
-		this.providerEntries.remove(provider);
-	}
-	
-	/// LINK JOINING ///
-	
-	/** Combines two networks into one */
-	public void joinNetworks(PowerNetMK2 network) {
-		
-		if(network == this) return; //wtf?!
-
-		List<PowerNode> oldNodes = new ArrayList(network.links.size());
-		oldNodes.addAll(network.links); // might prevent oddities related to joining - nvm it does nothing
-		
-		for(PowerNode conductor : oldNodes) forceJoinLink(conductor);
-		network.links.clear();
-
-		for(IEnergyReceiverMK2 connector : network.receiverEntries.keySet()) this.addReceiver(connector);
-		for(IEnergyProviderMK2 connector : network.providerEntries.keySet()) this.addProvider(connector);
-		network.destroy();
-	}
-
-	/** Adds the power node as part of this network's links */
-	public PowerNetMK2 joinLink(PowerNode node) {
-		if(node.net != null) node.net.leaveLink(node);
-		return forceJoinLink(node);
-	}
-
-	/** Adds the power node as part of this network's links, skips the part about removing it from existing networks */
-	public PowerNetMK2 forceJoinLink(PowerNode node) {
-		this.links.add(node);
-		node.setNet(this);
-		return this;
-	}
-
-	/** Removes the specified power node */
-	public void leaveLink(PowerNode node) {
-		node.setNet(null);
-		this.links.remove(node);
-	}
-	
-	/// GENERAL POWER NET CONTROL ///
-	public void invalidate() {
-		this.valid = false;
-		Nodespace.activePowerNets.remove(this);
-	}
-	
-	public boolean isValid() {
-		return this.valid;
-	}
-	
-	public void destroy() {
-		this.invalidate();
-		for(PowerNode link : this.links) if(link.net == this) link.setNet(null);
-		this.links.clear();
-		this.receiverEntries.clear();
-		this.providerEntries.clear();
-	}
-	
-	public void resetEnergyTracker() {
-		this.energyTracker = 0;
-	}
-	
 	protected static int timeout = 3_000;
 	
-	public void transferPower() {
+	@Override public void resetTrackers() { this.energyTracker = 0; }
+	
+	@Override
+	public void update() {
 		
 		if(providerEntries.isEmpty()) return;
 		if(receiverEntries.isEmpty()) return;
@@ -129,15 +36,19 @@ public class PowerNetMK2 {
 		List<Pair<IEnergyProviderMK2, Long>> providers = new ArrayList();
 		long powerAvailable = 0;
 		
+		// sum up available power
 		Iterator<Entry<IEnergyProviderMK2, Long>> provIt = providerEntries.entrySet().iterator();
 		while(provIt.hasNext()) {
 			Entry<IEnergyProviderMK2, Long> entry = provIt.next();
-			if(timestamp - entry.getValue() > timeout) { provIt.remove(); continue; }
+			if(timestamp - entry.getValue() > timeout || isBadLink(entry.getKey())) { provIt.remove(); continue; }
 			long src = Math.min(entry.getKey().getPower(), entry.getKey().getProviderSpeed());
+			if(src > 0) {
 				providers.add(new Pair(entry.getKey(), src));
 				powerAvailable += src;
 			}
+		}
 		
+		// sum up total demand, categorized by priority
 		List<Pair<IEnergyReceiverMK2, Long>>[] receivers = new ArrayList[ConnectionPriority.values().length];
 		for(int i = 0; i < receivers.length; i++) receivers[i] = new ArrayList();
 		long[] demand = new long[ConnectionPriority.values().length];
@@ -147,17 +58,20 @@ public class PowerNetMK2 {
 		
 		while(recIt.hasNext()) {
 			Entry<IEnergyReceiverMK2, Long> entry = recIt.next();
-			if(timestamp - entry.getValue() > timeout) { recIt.remove(); continue; }
+			if(timestamp - entry.getValue() > timeout || isBadLink(entry.getKey())) { recIt.remove(); continue; }
 			long rec = Math.min(entry.getKey().getMaxPower() - entry.getKey().getPower(), entry.getKey().getReceiverSpeed());
+			if(rec > 0) {
 				int p = entry.getKey().getPriority().ordinal();
 				receivers[p].add(new Pair(entry.getKey(), rec));
 				demand[p] += rec;
 				totalDemand += rec;
 			}
+		}
 
 		long toTransfer = Math.min(powerAvailable, totalDemand);
 		long energyUsed = 0;
 		
+		// add power to receivers, ordered by priority
 		for(int i = ConnectionPriority.values().length - 1; i >= 0; i--) {
 			List<Pair<IEnergyReceiverMK2, Long>> list = receivers[i];
 			long priorityDemand = demand[i];
@@ -174,6 +88,7 @@ public class PowerNetMK2 {
 		this.energyTracker += energyUsed;
 		long leftover = energyUsed;
 
+		// remove power from providers
 		for(Pair<IEnergyProviderMK2, Long> entry : providers) {
 			double weight = (double) entry.getValue() / (double) powerAvailable;
 			long toUse = (long) Math.max(energyUsed * weight, 0D);
@@ -181,7 +96,7 @@ public class PowerNetMK2 {
 			leftover -= toUse;
 		}
 		
-		//rounding error compensation, detects surplus that hasn't been used and removes it from random providers
+		// rounding error compensation, detects surplus that hasn't been used and removes it from random providers
 		int iterationsLeft = 100; // whiles without emergency brakes are a bad idea
 		while(iterationsLeft > 0 && leftover > 0 && providers.size() > 0) {
 			iterationsLeft--;
@@ -195,118 +110,6 @@ public class PowerNetMK2 {
 		}
 	}
 	
-	@Deprecated public void transferPowerOld() {
-		
-		if(providerEntries.isEmpty()) return;
-		if(receiverEntries.isEmpty()) return;
-		
-		long timestamp = System.currentTimeMillis();
-		long transferCap = 100_000_000_000_000_00L; // that ought to be enough
-
-		long supply = 0;
-		long demand = 0;
-		long[] priorityDemand = new long[ConnectionPriority.values().length];
-		
-		Iterator<Entry<IEnergyProviderMK2, Long>> provIt = providerEntries.entrySet().iterator();
-		while(provIt.hasNext()) {
-			Entry<IEnergyProviderMK2, Long> entry = provIt.next();
-			if(timestamp - entry.getValue() > timeout) { provIt.remove(); continue; }
-			supply += Math.min(entry.getKey().getPower(), entry.getKey().getProviderSpeed());
-		}
-		
-		if(supply <= 0) return;
-
-		Iterator<Entry<IEnergyReceiverMK2, Long>> recIt = receiverEntries.entrySet().iterator();
-		while(recIt.hasNext()) {
-			Entry<IEnergyReceiverMK2, Long> entry = recIt.next();
-			if(timestamp - entry.getValue() > timeout) { recIt.remove(); continue; }
-			long rec = Math.min(entry.getKey().getMaxPower() - entry.getKey().getPower(), entry.getKey().getReceiverSpeed());
-			demand += rec;
-			for(int i = 0; i <= entry.getKey().getPriority().ordinal(); i++) priorityDemand[i] += rec;
-		}
-		
-		if(demand <= 0) return;
-		
-		long toTransfer = Math.min(supply, demand);
-		if(toTransfer > transferCap) toTransfer = transferCap;
-		if(toTransfer <= 0) return;
-		
-		List<IEnergyProviderMK2> buffers = new ArrayList();
-		List<IEnergyProviderMK2> providers = new ArrayList();
-		Set<IEnergyReceiverMK2> receiverSet = receiverEntries.keySet();
-		for(IEnergyProviderMK2 provider : providerEntries.keySet()) {
-			if(receiverSet.contains(provider)) {
-				buffers.add(provider);
-			} else {
-				providers.add(provider);
-			}
-		}
-		providers.addAll(buffers); //makes buffers go last
-		List<IEnergyReceiverMK2> receivers = new ArrayList() {{ addAll(receiverSet); }};
-		
-		receivers.sort(COMP);
-		
-		int maxIteration = 1000;
-		
-		//how much the current sender/receiver have already sent/received
-		long prevSrc = 0;
-		long prevDest = 0;
-		
-		while(!receivers.isEmpty() && !providers.isEmpty() && maxIteration > 0) {
-			maxIteration--;
-			
-			IEnergyProviderMK2 src = providers.get(0);
-			IEnergyReceiverMK2 dest = receivers.get(0);
-
-			if(src.getPower() <= 0) { providers.remove(0); prevSrc = 0; continue; }
-			
-			if(src == dest) { // STALEMATE DETECTED
-				//if this happens, a buffer will waste both its share of transfer and receiving potential and do effectively nothing, essentially breaking
-				
-				//try if placing the conflicting provider at the end of the list does anything
-				//we do this first because providers have no priority, so we may shuffle those around as much as we want
-				if(providers.size() > 1) {
-					providers.add(providers.get(0));
-					providers.remove(0);
-					prevSrc = 0; //this might cause slight issues due to the tracking being effectively lost while there still might be pending operations
-					continue;
-				}
-				//if that didn't work, try shifting the receiver by one place (to minimize priority breakage)
-				if(receivers.size() > 1) {
-					receivers.add(2, receivers.get(0));
-					receivers.remove(0);
-					prevDest = 0; //ditto
-					continue;
-				}
-				
-				//if neither option could be performed, the only conclusion is that this buffer mode battery is alone in the power net, in which case: not my provlem
-			}
-			
-			long pd = priorityDemand[dest.getPriority().ordinal()];
-			
-			long receiverShare = Math.min((long) Math.ceil((double) Math.min(dest.getMaxPower() - dest.getPower(), dest.getReceiverSpeed()) * (double) supply / (double) pd), dest.getReceiverSpeed()) - prevDest;
-			long providerShare = Math.min((long) Math.ceil((double) Math.min(src.getPower(), src.getProviderSpeed()) * (double) demand / (double) supply), src.getProviderSpeed()) - prevSrc;
-			
-			long toDrain = Math.min((long) (src.getPower()), providerShare);
-			long toFill = Math.min(dest.getMaxPower() - dest.getPower(), receiverShare);
-			
-			long finalTransfer = Math.min(toDrain, toFill);
-			if(toFill <= 0) { receivers.remove(0); prevDest = 0; continue; }
-			
-			finalTransfer -= dest.transferPower(finalTransfer);
-			src.usePower(finalTransfer);
-			
-			prevSrc += finalTransfer;
-			prevDest += finalTransfer;
-
-			if(prevSrc >= src.getProviderSpeed()) { providers.remove(0); prevSrc = 0; continue; }
-			if(prevDest >= dest.getReceiverSpeed()) { receivers.remove(0); prevDest = 0; continue; }
-			
-			toTransfer -= finalTransfer;
-			this.energyTracker += finalTransfer;
-		}
-	}
-	
 	public long sendPowerDiode(long power) {
 		
 		if(receiverEntries.isEmpty()) return power;
@@ -350,14 +153,4 @@ public class PowerNetMK2 {
 		
 		return power - energyUsed;
 	}
-	
-	public static final ReceiverComparator COMP = new ReceiverComparator();
-	
-	public static class ReceiverComparator implements Comparator<IEnergyReceiverMK2> {
-
-		@Override
-		public int compare(IEnergyReceiverMK2 o1, IEnergyReceiverMK2 o2) {
-			return o2.getPriority().ordinal() - o1.getPriority().ordinal();
-		}
-	}
 }

src/main/java/api/hbm/entity/IResistanceProvider.java

@@ -0,0 +1,16 @@
+package api.hbm.entity;
+
+import net.minecraft.util.DamageSource;
+
+/**
+ * Allows custom entities to specify threshold and resistance values based on incoming damage, type and piercing values, along with whatever other internal stats
+ * the entity has (like glyphid armor). Obviously only works for our own custom entities implementing this, everything else will have to work with the less powerful
+ * (but still very useful) entity stats in the DamageResistanceHandler.
+ * 
+ * @author hbm
+ */
+public interface IResistanceProvider {
+
+	public float[] getCurrentDTDR(DamageSource damage, float amount, float pierceDT, float pierce);
+	public void onDamageDealt(DamageSource damage, float amount);
+}

src/main/java/api/hbm/fluid/IFluidConductor.java

@@ -1,19 +0,0 @@
-package api.hbm.fluid;
-
-import com.hbm.inventory.fluid.FluidType;
-
-public interface IFluidConductor extends IFluidConnector {
-
-	public IPipeNet getPipeNet(FluidType type);
-	
-	public void setPipeNet(FluidType type, IPipeNet network);
-	
-	@Override
-	public default long transferFluid(FluidType type, int pressure, long amount) {
-		
-		if(this.getPipeNet(type) == null)
-			return amount;
-
-		return this.getPipeNet(type).transferFluid(amount, pressure);
-	}
-}

src/main/java/api/hbm/fluid/IFluidConnector.java

@@ -1,93 +1,6 @@
 package api.hbm.fluid;
 
-import com.hbm.inventory.fluid.FluidType;
+import api.hbm.fluidmk2.IFluidConnectorMK2;
-import com.hbm.packet.AuxParticlePacketNT;
-import com.hbm.packet.PacketDispatcher;
-import com.hbm.util.Compat;
 
-import api.hbm.tile.ILoadedTile;
+@Deprecated
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
+public interface IFluidConnector extends IFluidConnectorMK2 { }
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-
-public interface IFluidConnector extends ILoadedTile {
-	
-	/**
-	 * Returns the amount of fluid that remains
-	 * @param power
-	 * @return
-	 */
-	public long transferFluid(FluidType type, int pressure, long fluid);
-	
-	/**
-	 * Whether the given side can be connected to
-	 * @param dir
-	 * @return
-	 */
-	public default boolean canConnect(FluidType type, ForgeDirection dir) {
-		return dir != ForgeDirection.UNKNOWN;
-	}
-	
-	/**
-	 * Returns the amount of fluid that this machine is able to receive
-	 * @param type
-	 * @return
-	 */
-	public long getDemand(FluidType type, int pressure);
-	
-	/**
-	 * Basic implementation of subscribing to a nearby power grid
-	 * @param world
-	 * @param x
-	 * @param y
-	 * @param z
-	 */
-	public default void trySubscribe(FluidType type, World world, int x, int y, int z, ForgeDirection dir) {
-
-		TileEntity te = Compat.getTileStandard(world, x, y, z);
-		boolean red = false;
-		
-		if(te instanceof IFluidConductor) {
-			IFluidConductor con = (IFluidConductor) te;
-			
-			if(!con.canConnect(type, dir))
-				return;
-			
-			if(con.getPipeNet(type) != null && !con.getPipeNet(type).isSubscribed(this))
-				con.getPipeNet(type).subscribe(this);
-			
-			if(con.getPipeNet(type) != null)
-				red = true;
-		}
-		
-		if(particleDebug) {
-			NBTTagCompound data = new NBTTagCompound();
-			data.setString("type", "network");
-			data.setString("mode", "fluid");
-			data.setInteger("color", type.getColor());
-			double posX = x + 0.5 + dir.offsetX * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
-			double posY = y + 0.5 + dir.offsetY * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
-			double posZ = z + 0.5 + dir.offsetZ * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
-			data.setDouble("mX", -dir.offsetX * (red ? 0.025 : 0.1));
-			data.setDouble("mY", -dir.offsetY * (red ? 0.025 : 0.1));
-			data.setDouble("mZ", -dir.offsetZ * (red ? 0.025 : 0.1));
-			PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, posX, posY, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 25));
-		}
-	}
-	
-	public default void tryUnsubscribe(FluidType type, World world, int x, int y, int z) {
-
-		TileEntity te = world.getTileEntity(x, y, z);
-		
-		if(te instanceof IFluidConductor) {
-			IFluidConductor con = (IFluidConductor) te;
-			
-			if(con.getPipeNet(type) != null && con.getPipeNet(type).isSubscribed(this))
-				con.getPipeNet(type).unsubscribe(this);
-		}
-	}
-	
-	public static final boolean particleDebug = false;
-}

src/main/java/api/hbm/fluid/IFluidConnectorBlock.java

@@ -1,12 +1,6 @@
 package api.hbm.fluid;
 
-import com.hbm.inventory.fluid.FluidType;
+import api.hbm.fluidmk2.IFluidConnectorBlockMK2;
 
-import net.minecraft.world.IBlockAccess;
+@Deprecated
-import net.minecraftforge.common.util.ForgeDirection;
+public interface IFluidConnectorBlock extends IFluidConnectorBlockMK2 { }
-
-public interface IFluidConnectorBlock {
-
-	/** dir is the face that is connected to, the direction going outwards from the block */
-	public boolean canConnect(FluidType type, IBlockAccess world, int x, int y, int z, ForgeDirection dir);
-}

src/main/java/api/hbm/fluid/IFluidStandardReceiver.java

@@ -1,49 +1,35 @@
 package api.hbm.fluid;
 
 import com.hbm.inventory.fluid.FluidType;
-import com.hbm.inventory.fluid.tank.FluidTank;
+import com.hbm.uninos.GenNode;
+import com.hbm.uninos.UniNodespace;
 
-/**
+import api.hbm.fluidmk2.IFluidStandardReceiverMK2;
- * Uses default implementation to make the underlying interfaces easier to use for the most common fluid users.
+import net.minecraft.tileentity.TileEntity;
- * Only handles a single input tank of the same type.
+import net.minecraft.world.World;
- * Uses standard FluidTanks which use int32.
+import net.minecraftforge.common.util.ForgeDirection;
- * Don't use this as part of the API!
- * @author hbm
- *
- */
-public interface IFluidStandardReceiver extends IFluidUser {
 
-	@Override
+@Deprecated
-	public default long transferFluid(FluidType type, int pressure, long amount) {
+public interface IFluidStandardReceiver extends IFluidStandardReceiverMK2 {
 
-		for(FluidTank tank : getReceivingTanks()) {
+	public default void subscribeToAllAround(FluidType type, TileEntity tile) {
-			if(tank.getTankType() == type && tank.getPressure() == pressure) {
+		subscribeToAllAround(type, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord);
-				tank.setFill(tank.getFill() + (int) amount);
-				
-				if(tank.getFill() > tank.getMaxFill()) {
-					long overshoot = tank.getFill() - tank.getMaxFill();
-					tank.setFill(tank.getMaxFill());
-					return overshoot;
 	}
 
-				return 0;
+	public default void subscribeToAllAround(FluidType type, World world, int x, int y, int z) {
+		for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
+			trySubscribe(type, world, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir);
 		}
 	}
 
-		return amount;
+	public default void tryUnsubscribe(FluidType type, World world, int x, int y, int z) {
+		GenNode node = UniNodespace.getNode(world, x, y, z, type.getNetworkProvider());
+		if(node != null && node.net != null) node.net.removeReceiver(this);
 	}
 
-	public FluidTank[] getReceivingTanks();
+	public default void unsubscribeToAllAround(FluidType type, TileEntity tile) {
-
+		for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
-	@Override
+			tryUnsubscribe(type, tile.getWorldObj(), tile.xCoord + dir.offsetX, tile.yCoord + dir.offsetY, tile.zCoord + dir.offsetZ);
-	public default long getDemand(FluidType type, int pressure) {
-		
-		for(FluidTank tank : getReceivingTanks()) {
-			if(tank.getTankType() == type && tank.getPressure() == pressure) {
-				return tank.getMaxFill() - tank.getFill();
 		}
 	}
-		
-		return 0;
-	}
 }

src/main/java/api/hbm/fluid/IFluidStandardSender.java

@@ -1,50 +1,22 @@
 package api.hbm.fluid;
 
-import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.tank.FluidTank;
 
-/**
+import api.hbm.fluidmk2.IFluidStandardSenderMK2;
- * Uses default implementation to make the underlying interfaces easier to use for the most common fluid users.
+import net.minecraft.tileentity.TileEntity;
- * Only handles a single output tank of the same type.
+import net.minecraft.world.World;
- * Uses standard FluidTanks which use int32.
+import net.minecraftforge.common.util.ForgeDirection;
- * Don't use this as part of the API!
- * @author hbm
- *
- */
-public interface IFluidStandardSender extends IFluidUser {
 
-	public FluidTank[] getSendingTanks();
+@Deprecated
+public interface IFluidStandardSender extends IFluidStandardSenderMK2 {
 
-	@Override
+	public default void sendFluid(FluidTank tank, World world, int x, int y, int z, ForgeDirection dir) {
-	public default long getTotalFluidForSend(FluidType type, int pressure) {
+		tryProvide(tank, world, x, y, z, dir);
-		
-		for(FluidTank tank : getSendingTanks()) {
-			if(tank.getTankType() == type && tank.getPressure() == pressure) {
-				return tank.getFill();
-			}
 	}
 
-		return 0;
+	public default void sendFluidToAll(FluidTank tank, TileEntity tile) {
+		for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
+			tryProvide(tank, tile.getWorldObj(), tile.xCoord + dir.offsetX, tile.yCoord + dir.offsetY, tile.zCoord + dir.offsetZ, dir);
 		}
-	
-	@Override
-	public default void removeFluidForTransfer(FluidType type, int pressure, long amount) {
-		
-		for(FluidTank tank : getSendingTanks()) {
-			if(tank.getTankType() == type && tank.getPressure() == pressure) {
-				tank.setFill(tank.getFill() - (int) amount);
-				return;
-			}
-		}
-	}
-
-	@Override
-	public default long transferFluid(FluidType type, int pressure, long fluid) {
-		return fluid;
-	}
-
-	@Override
-	public default long getDemand(FluidType type, int pressure) {
-		return 0;
 	}
 }

src/main/java/api/hbm/fluid/IFluidStandardTransceiver.java

@@ -1,79 +1,4 @@
 package api.hbm.fluid;
 
-import com.hbm.inventory.fluid.FluidType;
+@Deprecated
-import com.hbm.inventory.fluid.tank.FluidTank;
+public interface IFluidStandardTransceiver extends IFluidStandardReceiver, IFluidStandardSender { }
-
-/**
- * transceiver [trăn-sē′vər], noun
- * 
- * 1. A transmitter and receiver housed together in a single unit and having some circuits in common, often for portable or mobile use.
- * 2. A combined radio transmitter and receiver.
- * 3. A device that performs transmitting and receiving functions, especially if using common components.
- * 
- * The American Heritage® Dictionary of the English Language, 5th Edition.
- * 
- * Only supports one tank per type (for in- and output separately)
- * 
- * @author hbm
- *
- */
-public interface IFluidStandardTransceiver extends IFluidUser {
-
-	public FluidTank[] getSendingTanks();
-	public FluidTank[] getReceivingTanks();
-	
-	@Override
-	public default long getTotalFluidForSend(FluidType type, int pressure) {
-		
-		for(FluidTank tank : getSendingTanks()) {
-			if(tank.getTankType() == type && tank.getPressure() == pressure) {
-				return tank.getFill();
-			}
-		}
-		
-		return 0;
-	}
-	
-	@Override
-	public default void removeFluidForTransfer(FluidType type, int pressure, long amount) {
-		
-		for(FluidTank tank : getSendingTanks()) {
-			if(tank.getTankType() == type && tank.getPressure() == pressure) {
-				tank.setFill(tank.getFill() - (int) amount);
-				return;
-			}
-		}
-	}
-
-	@Override
-	public default long getDemand(FluidType type, int pressure) {
-		
-		for(FluidTank tank : getReceivingTanks()) {
-			if(tank.getTankType() == type && tank.getPressure() == pressure) {
-				return tank.getMaxFill() - tank.getFill();
-			}
-		}
-		
-		return 0;
-	}
-	
-	@Override
-	public default long transferFluid(FluidType type, int pressure, long amount) {
-
-		for(FluidTank tank : getReceivingTanks()) {
-			if(tank.getTankType() == type && tank.getPressure() == pressure) {
-				tank.setFill(tank.getFill() + (int) amount);
-				
-				if(tank.getFill() > tank.getMaxFill()) {
-					long overshoot = tank.getFill() - tank.getMaxFill();
-					tank.setFill(tank.getMaxFill());
-					return overshoot;
-				}
-				
-				return 0;
-			}
-		}
-		
-		return amount;
-	}
-}

src/main/java/api/hbm/fluid/IFluidUser.java

@@ -1,130 +0,0 @@
-package api.hbm.fluid;
-
-import com.hbm.inventory.fluid.FluidType;
-import com.hbm.inventory.fluid.tank.FluidTank;
-import com.hbm.packet.AuxParticlePacketNT;
-import com.hbm.packet.PacketDispatcher;
-import com.hbm.util.Compat;
-
-import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-
-public interface IFluidUser extends IFluidConnector {
-	
-	public default void sendFluid(FluidTank tank, World world, int x, int y, int z, ForgeDirection dir) {
-		sendFluid(tank.getTankType(), tank.getPressure(), world, x, y, z, dir);
-	}
-	
-	public default void sendFluid(FluidType type, int pressure, World world, int x, int y, int z, ForgeDirection dir) {
-		
-		TileEntity te = world.getTileEntity(x, y, z);
-		boolean wasSubscribed = false;
-		boolean red = false;
-		
-		if(te instanceof IFluidConductor) {
-			IFluidConductor con = (IFluidConductor) te;
-			
-			if(con.getPipeNet(type) != null && con.getPipeNet(type).isSubscribed(this)) {
-				con.getPipeNet(type).unsubscribe(this);
-				wasSubscribed = true;
-			}
-		}
-		
-		if(te instanceof IFluidConnector) {
-			IFluidConnector con = (IFluidConnector) te;
-			
-			if(con.canConnect(type, dir.getOpposite())) {
-				long toSend = this.getTotalFluidForSend(type, pressure);
-				
-				if(toSend > 0) {
-					long transfer = toSend - con.transferFluid(type, pressure, toSend);
-					this.removeFluidForTransfer(type, pressure, transfer);
-				}
-				red = true;
-			}
-		}
-		
-		if(wasSubscribed && te instanceof IFluidConductor) {
-			IFluidConductor con = (IFluidConductor) te;
-			
-			if(con.getPipeNet(type) != null && !con.getPipeNet(type).isSubscribed(this)) {
-				con.getPipeNet(type).subscribe(this);
-			}
-		}
-		
-		if(particleDebug) {
-			NBTTagCompound data = new NBTTagCompound();
-			data.setString("type", "network");
-			data.setString("mode", "fluid");
-			data.setInteger("color", type.getColor());
-			double posX = x + 0.5 - dir.offsetX * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
-			double posY = y + 0.5 - dir.offsetY * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
-			double posZ = z + 0.5 - dir.offsetZ * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
-			data.setDouble("mX", dir.offsetX * (red ? 0.025 : 0.1));
-			data.setDouble("mY", dir.offsetY * (red ? 0.025 : 0.1));
-			data.setDouble("mZ", dir.offsetZ * (red ? 0.025 : 0.1));
-			PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, posX, posY, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 25));
-		}
-	}
-	
-	public static IPipeNet getPipeNet(World world, int x, int y, int z, FluidType type) {
-
-		TileEntity te = Compat.getTileStandard(world, x, y, z);
-		
-		if(te instanceof IFluidConductor) {
-			IFluidConductor con = (IFluidConductor) te;
-			
-			if(con.getPipeNet(type) != null) {
-				return con.getPipeNet(type);
-			}
-		}
-		
-		return null;
-	}
-	
-	/** Use more common conPos method instead */
-	@Deprecated public default void sendFluidToAll(FluidTank tank, TileEntity te) {
-		sendFluidToAll(tank.getTankType(), tank.getPressure(), te);
-	}
-
-	/** Use more common conPos method instead */
-	@Deprecated public default void sendFluidToAll(FluidType type, int pressure, TileEntity te) {
-		
-		for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
-			sendFluid(type, pressure, te.getWorldObj(), te.xCoord + dir.offsetX, te.yCoord + dir.offsetY, te.zCoord + dir.offsetZ, dir);
-		}
-	}
-
-	public default long getTotalFluidForSend(FluidType type, int pressure) { return 0; }
-	public default void removeFluidForTransfer(FluidType type, int pressure, long amount) { }
-	
-	public default void subscribeToAllAround(FluidType type, TileEntity te) {
-		subscribeToAllAround(type, te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord);
-	}
-	
-	public default void subscribeToAllAround(FluidType type, World world, int x, int y, int z) {
-		
-		for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
-			this.trySubscribe(type, world, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir);
-	}
-	
-	public default void unsubscribeToAllAround(FluidType type, TileEntity te) {
-		unsubscribeToAllAround(type, te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord);
-	}
-	
-	public default void unsubscribeToAllAround(FluidType type, World world, int x, int y, int z) {
-		
-		for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
-			this.tryUnsubscribe(type, world, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ);
-	}
-	
-	/**
-	 * Returns all internal tanks of this tile. Not used by the fluid network, it should only be used for display purposes or edge cases that can't be solved otherwise.
-	 * The array is either composed of the original tank or outright the original tank array, so changes done to this array will extend to the IFluidUser.
-	 * @return
-	 */
-	public FluidTank[] getAllTanks();
-}

src/main/java/api/hbm/fluid/IPipeNet.java

@@ -1,30 +0,0 @@
-package api.hbm.fluid;
-
-import java.math.BigInteger;
-import java.util.HashSet;
-import java.util.List;
-
-import com.hbm.inventory.fluid.FluidType;
-
-public interface IPipeNet {
-	
-	public void joinNetworks(IPipeNet network);
-
-	public List<IFluidConductor> getLinks();
-	public HashSet<IFluidConnector> getSubscribers();
-
-	public IPipeNet joinLink(IFluidConductor conductor);
-	public void leaveLink(IFluidConductor conductor);
-
-	public void subscribe(IFluidConnector connector);
-	public void unsubscribe(IFluidConnector connector);
-	public boolean isSubscribed(IFluidConnector connector);
-
-	public void destroy();
-	
-	public boolean isValid();
-	
-	public long transferFluid(long fill, int pressure);
-	public FluidType getType();
-	public BigInteger getTotalTransfer();
-}

src/main/java/api/hbm/fluid/PipeNet.java

@@ -1,206 +0,0 @@
-package api.hbm.fluid;
-
-import java.math.BigInteger;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.TimeZone;
-
-import com.hbm.inventory.fluid.FluidType;
-
-import net.minecraft.tileentity.TileEntity;
-
-public class PipeNet implements IPipeNet {
-
-	private boolean valid = true;
-	private FluidType type;
-	private List<IFluidConductor> links = new ArrayList();
-	private HashSet<IFluidConnector> subscribers = new HashSet();
-	
-	public static List<PipeNet> trackingInstances = null;
-	protected BigInteger totalTransfer = BigInteger.ZERO;
-	public List<String> debug = new ArrayList();
-	
-	public PipeNet(FluidType type) {
-		this.type = type;
-	}
-
-	@Override
-	public void joinNetworks(IPipeNet network) {
-		
-		if(network == this)
-			return;
-
-		for(IFluidConductor conductor : network.getLinks()) {
-			conductor.setPipeNet(type, this);
-			this.getLinks().add(conductor);
-		}
-		network.getLinks().clear();
-		
-		for(IFluidConnector connector : network.getSubscribers()) {
-			this.subscribe(connector);
-		}
-		
-		network.destroy();
-	}
-
-	@Override
-	public List<IFluidConductor> getLinks() {
-		return links;
-	}
-
-	@Override
-	public HashSet<IFluidConnector> getSubscribers() {
-		return subscribers;
-	}
-
-	@Override
-	public IPipeNet joinLink(IFluidConductor conductor) {
-		
-		if(conductor.getPipeNet(type) != null)
-			conductor.getPipeNet(type).leaveLink(conductor);
-		
-		conductor.setPipeNet(type, this);
-		this.links.add(conductor);
-		return this;
-	}
-
-	@Override
-	public void leaveLink(IFluidConductor conductor) {
-		conductor.setPipeNet(type, null);
-		this.links.remove(conductor);
-	}
-
-	@Override
-	public void subscribe(IFluidConnector connector) {
-		this.subscribers.add(connector);
-	}
-
-	@Override
-	public void unsubscribe(IFluidConnector connector) {
-		this.subscribers.remove(connector);
-	}
-
-	@Override
-	public boolean isSubscribed(IFluidConnector connector) {
-		return this.subscribers.contains(connector);
-	}
-
-	@Override
-	public long transferFluid(long fill, int pressure) {
-
-		subscribers.removeIf(x -> 
-			x == null || !(x instanceof TileEntity) || ((TileEntity)x).isInvalid() || !x.isLoaded()
-		);
-		
-		if(this.subscribers.isEmpty())
-			return fill;
-		
-		trackingInstances = new ArrayList();
-		trackingInstances.add(this);
-		List<IFluidConnector> subList = new ArrayList(subscribers);
-		return fairTransfer(subList, type, pressure, fill);
-	}
-	
-	public static long fairTransfer(List<IFluidConnector> subList, FluidType type, int pressure, long fill) {
-		
-		if(fill <= 0) return 0;
-		
-		List<Long> weight = new ArrayList();
-		long totalReq = 0;
-		
-		for(IFluidConnector con : subList) {
-			long req = con.getDemand(type, pressure);
-			weight.add(req);
-			totalReq += req;
-		}
-		
-		if(totalReq == 0)
-			return fill;
-		
-		long totalGiven = 0;
-		
-		for(int i = 0; i < subList.size(); i++) {
-			IFluidConnector con = subList.get(i);
-			long req = weight.get(i);
-			double fraction = (double)req / (double)totalReq;
-			
-			long given = (long) Math.floor(fraction * fill);
-			
-			if(given > 0) {
-				
-				totalGiven += (given - con.transferFluid(type, pressure, given));
-				
-				if(con instanceof TileEntity) {
-					TileEntity tile = (TileEntity) con;
-					tile.getWorldObj().markTileEntityChunkModified(tile.xCoord, tile.yCoord, tile.zCoord, tile);
-				}
-	
-				if(trackingInstances != null) {
-					for(int j = 0; j < trackingInstances.size(); j++) {
-						PipeNet net = trackingInstances.get(j);
-						SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss:SSS");
-						sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
-						log(net, sdf.format(new Date(System.currentTimeMillis())) + " Sending " + given + "mB to " + conToString(con));
-					}
-				}
-			}
-		}
-		
-		if(trackingInstances != null) {
-			
-			for(int i = 0; i < trackingInstances.size(); i++) {
-				PipeNet net = trackingInstances.get(i);
-				net.totalTransfer = net.totalTransfer.add(BigInteger.valueOf(totalGiven));
-			}
-		}
-		
-		return fill - totalGiven;
-	}
-
-	@Override
-	public FluidType getType() {
-		return type;
-	}
-
-	@Override
-	public void destroy() {
-		this.valid = false;
-		this.subscribers.clear();
-		
-		for(IFluidConductor con : this.links)
-			con.setPipeNet(type, null);
-		
-		this.links.clear();
-	}
-
-	@Override
-	public boolean isValid() {
-		return this.valid;
-	}
-
-	@Override
-	public BigInteger getTotalTransfer() {
-		return this.totalTransfer;
-	}
-	
-	public static void log(PipeNet net, String msg) {
-		net.debug.add(msg);
-		
-		while(net.debug.size() > 50) {
-			net.debug.remove(0);
-		}
-	}
-	
-	public static String conToString(IFluidConnector con) {
-		
-		if(con instanceof TileEntity) {
-			TileEntity tile = (TileEntity) con;
-			return tile.getClass().getSimpleName() + " @ " + tile.xCoord + "/" + tile.yCoord + "/" + tile.zCoord;
-		}
-		
-		return "" + con;
-	}
-}

src/main/java/api/hbm/fluidmk2/FluidNetMK2.java

@@ -0,0 +1,152 @@
+package api.hbm.fluidmk2;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.uninos.NodeNet;
+import com.hbm.util.Tuple.Pair;
+
+import api.hbm.energymk2.IEnergyReceiverMK2.ConnectionPriority;
+
+public class FluidNetMK2 extends NodeNet<IFluidReceiverMK2, IFluidProviderMK2, FluidNode> {
+
+	public long fluidTracker = 0L;
+	
+	protected static int timeout = 3_000;
+	protected static long currentTime = 0;
+	protected FluidType type;
+	
+	public FluidNetMK2(FluidType type) {
+		this.type = type;
+		for(int i = 0; i < IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1; i++) providers[i] = new ArrayList();
+		for(int i = 0; i < IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1; i++) for(int j = 0; j < ConnectionPriority.values().length; j++) receivers[i][j] = new ArrayList();
+	}
+	
+	@Override public void resetTrackers() { this.fluidTracker = 0; }
+	
+	@Override
+	public void update() {
+		
+		if(providerEntries.isEmpty()) return;
+		if(receiverEntries.isEmpty()) return;
+		currentTime = System.currentTimeMillis();
+
+		setupFluidProviders();
+		setupFluidReceivers();
+		transferFluid();
+		
+		cleanUp();
+	}
+	
+	//this sucks ass, but it makes the code just a smidge more structured
+	public long[] fluidAvailable = new long[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1];
+	public List<Pair<IFluidProviderMK2, Long>>[] providers = new ArrayList[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1];
+	public long[][] fluidDemand = new long[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1][ConnectionPriority.values().length];
+	public List<Pair<IFluidReceiverMK2, Long>>[][] receivers = new ArrayList[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1][ConnectionPriority.values().length];
+	public long[] transfered = new long[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1];
+	
+	public void setupFluidProviders() {
+		Iterator<Entry<IFluidProviderMK2, Long>> iterator = providerEntries.entrySet().iterator();
+		
+		while(iterator.hasNext()) {
+			Entry<IFluidProviderMK2, Long> entry = iterator.next();
+			if(currentTime - entry.getValue() > timeout || isBadLink(entry.getKey())) { iterator.remove(); continue; }
+			IFluidProviderMK2 provider = entry.getKey();
+			int[] pressureRange = provider.getProvidingPressureRange(type);
+			for(int p = pressureRange[0]; p <= pressureRange[1]; p++) {
+				long available = Math.min(provider.getFluidAvailable(type, p), provider.getProviderSpeed(type, p));
+				providers[p].add(new Pair(provider, available));
+				fluidAvailable[p] += available;
+			}
+		}
+	}
+	
+	public void setupFluidReceivers() {
+		Iterator<Entry<IFluidReceiverMK2, Long>> iterator = receiverEntries.entrySet().iterator();
+		
+		while(iterator.hasNext()) {
+			Entry<IFluidReceiverMK2, Long> entry = iterator.next();
+			if(currentTime - entry.getValue() > timeout || isBadLink(entry.getKey())) { iterator.remove(); continue; }
+			IFluidReceiverMK2 receiver = entry.getKey();
+			int[] pressureRange = receiver.getReceivingPressureRange(type);
+			for(int p = pressureRange[0]; p <= pressureRange[1]; p++) {
+				long required = Math.min(receiver.getDemand(type, p), receiver.getReceiverSpeed(type, p));
+				int priority = receiver.getFluidPriority().ordinal();
+				receivers[p][priority].add(new Pair(receiver, required));
+				fluidDemand[p][priority] += required;
+			}
+		}
+	}
+	
+	public void transferFluid() {
+
+		long[] received = new long[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1];
+		long[] notAccountedFor = new long[IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1];
+		
+		for(int p = 0; p <= IFluidUserMK2.HIGHEST_VALID_PRESSURE; p++) { // if the pressure range were ever to increase, we might have to rethink this
+			
+			long totalAvailable = fluidAvailable[p];
+			
+			for(int i = ConnectionPriority.values().length - 1; i >= 0; i--) {
+				
+				long toTransfer = Math.min(fluidDemand[p][i], totalAvailable);
+				if(toTransfer <= 0) continue;
+
+				long priorityDemand = fluidDemand[p][i];
+				
+				for(Pair<IFluidReceiverMK2, Long> entry : receivers[p][i]) {
+					double weight = (double) entry.getValue() / (double) (priorityDemand);
+					long toSend = (long) Math.max(toTransfer * weight, 0D);
+					toSend -= entry.getKey().transferFluid(type, p, toSend);
+					received[p] += toSend;
+					fluidTracker += toSend;
+				}
+				
+				totalAvailable -= received[p];
+			}
+			
+			notAccountedFor[p] = received[p];
+		}
+		
+		for(int p = 0; p <= IFluidUserMK2.HIGHEST_VALID_PRESSURE; p++) {
+
+			for(Pair<IFluidProviderMK2, Long> entry : providers[p]) {
+				double weight = (double) entry.getValue() / (double) fluidAvailable[p];
+				long toUse = (long) Math.max(received[p] * weight, 0D);
+				entry.getKey().useUpFluid(type, p, toUse);
+				notAccountedFor[p] -= toUse;
+			}
+		}
+		
+		for(int p = 0; p <= IFluidUserMK2.HIGHEST_VALID_PRESSURE; p++) {
+			
+			int iterationsLeft = 100;
+			while(iterationsLeft > 0 && notAccountedFor[p] > 0 && providers[p].size() > 0) {
+				iterationsLeft--;
+				
+				Pair<IFluidProviderMK2, Long> selected = providers[p].get(rand.nextInt(providers[p].size()));
+				IFluidProviderMK2 scapegoat = selected.getKey();
+				
+				long toUse = Math.min(notAccountedFor[p], scapegoat.getFluidAvailable(type, p));
+				scapegoat.useUpFluid(type, p, toUse);
+				notAccountedFor[p] -= toUse;
+			}
+		}
+	}
+	
+	public void cleanUp() {
+		for(int i = 0; i < IFluidUserMK2.HIGHEST_VALID_PRESSURE + 1; i++) {
+			fluidAvailable[i] = 0;
+			providers[i].clear();
+			transfered[i] = 0;
+			
+			for(int j = 0; j < ConnectionPriority.values().length; j++) {
+				fluidDemand[i][j] = 0;
+				receivers[i][j].clear();
+			}
+		}
+	}
+}

src/main/java/api/hbm/fluidmk2/FluidNode.java

@@ -0,0 +1,19 @@
+package api.hbm.fluidmk2;
+
+import com.hbm.uninos.GenNode;
+import com.hbm.uninos.INetworkProvider;
+import com.hbm.util.fauxpointtwelve.BlockPos;
+import com.hbm.util.fauxpointtwelve.DirPos;
+
+public class FluidNode extends GenNode<FluidNetMK2> {
+
+	public FluidNode(INetworkProvider<FluidNetMK2> provider, BlockPos... positions) {
+		super(provider, positions);
+	}
+	
+	@Override
+	public FluidNode setConnections(DirPos... connections) {
+		super.setConnections(connections);
+		return this;
+	}
+}

src/main/java/api/hbm/fluidmk2/IFillableItem.java

@@ -1,4 +1,4 @@
-package api.hbm.fluid;
+package api.hbm.fluidmk2;
 
 import com.hbm.inventory.fluid.FluidType;
 

src/main/java/api/hbm/fluidmk2/IFluidConnectorBlockMK2.java

@@ -0,0 +1,12 @@
+package api.hbm.fluidmk2;
+
+import com.hbm.inventory.fluid.FluidType;
+
+import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public interface IFluidConnectorBlockMK2 {
+
+	/** dir is the face that is connected to, the direction going outwards from the block */
+	public boolean canConnect(FluidType type, IBlockAccess world, int x, int y, int z, ForgeDirection dir);
+}

src/main/java/api/hbm/fluidmk2/IFluidConnectorMK2.java

@@ -0,0 +1,17 @@
+package api.hbm.fluidmk2;
+
+import com.hbm.inventory.fluid.FluidType;
+
+import net.minecraftforge.common.util.ForgeDirection;
+
+public interface IFluidConnectorMK2 {
+	
+	/**
+	 * Whether the given side can be connected to
+	 * @param dir
+	 * @return
+	 */
+	public default boolean canConnect(FluidType type, ForgeDirection dir) {
+		return dir != ForgeDirection.UNKNOWN;
+	}
+}

src/main/java/api/hbm/fluidmk2/IFluidPipeMK2.java

@@ -0,0 +1,27 @@
+package api.hbm.fluidmk2;
+
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.lib.Library;
+import com.hbm.util.fauxpointtwelve.BlockPos;
+import com.hbm.util.fauxpointtwelve.DirPos;
+
+import net.minecraft.tileentity.TileEntity;
+
+/**
+ * IFluidConductorMK2 with added node creation method
+ * @author hbm
+ */
+public interface IFluidPipeMK2 extends IFluidConnectorMK2 {
+	
+	public default FluidNode createNode(FluidType type) {
+		TileEntity tile = (TileEntity) this;
+		return new FluidNode(type.getNetworkProvider(), new BlockPos(tile.xCoord, tile.yCoord, tile.zCoord)).setConnections(
+				new DirPos(tile.xCoord + 1, tile.yCoord, tile.zCoord, Library.POS_X),
+				new DirPos(tile.xCoord - 1, tile.yCoord, tile.zCoord, Library.NEG_X),
+				new DirPos(tile.xCoord, tile.yCoord + 1, tile.zCoord, Library.POS_Y),
+				new DirPos(tile.xCoord, tile.yCoord - 1, tile.zCoord, Library.NEG_Y),
+				new DirPos(tile.xCoord, tile.yCoord, tile.zCoord + 1, Library.POS_Z),
+				new DirPos(tile.xCoord, tile.yCoord, tile.zCoord - 1, Library.NEG_Z)
+				);
+	}
+}

src/main/java/api/hbm/fluidmk2/IFluidProviderMK2.java

@@ -0,0 +1,12 @@
+package api.hbm.fluidmk2;
+
+import com.hbm.inventory.fluid.FluidType;
+
+public interface IFluidProviderMK2 extends IFluidUserMK2 {
+
+	public void useUpFluid(FluidType type, int pressure, long amount);
+	public default long getProviderSpeed(FluidType type, int pressure) { return 1_000_000_000; }
+	public long getFluidAvailable(FluidType type, int pressure);
+	
+	public default int[] getProvidingPressureRange(FluidType type) { return DEFAULT_PRESSURE_RANGE; }
+}

src/main/java/api/hbm/fluidmk2/IFluidReceiverMK2.java

@@ -0,0 +1,64 @@
+package api.hbm.fluidmk2;
+
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
+import com.hbm.uninos.GenNode;
+import com.hbm.uninos.UniNodespace;
+import com.hbm.util.Compat;
+import com.hbm.util.fauxpointtwelve.DirPos;
+
+import api.hbm.energymk2.IEnergyReceiverMK2.ConnectionPriority;
+import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public interface IFluidReceiverMK2 extends IFluidUserMK2 {
+
+	/** Sends fluid of the desired type and pressure to the receiver, returns the remainder */
+	public long transferFluid(FluidType type, int pressure, long amount);
+	public default long getReceiverSpeed(FluidType type, int pressure) { return 1_000_000_000; }
+	public long getDemand(FluidType type, int pressure);
+	
+	public default int[] getReceivingPressureRange(FluidType type) { return DEFAULT_PRESSURE_RANGE; }
+	
+	public default void trySubscribe(FluidType type, World world, DirPos pos) { trySubscribe(type, world, pos.getX(), pos.getY(), pos.getZ(), pos.getDir()); }
+	
+	public default void trySubscribe(FluidType type, World world, int x, int y, int z, ForgeDirection dir) {
+
+		TileEntity te = Compat.getTileStandard(world, x, y, z);
+		boolean red = false;
+		
+		if(te instanceof IFluidConnectorMK2) {
+			IFluidConnectorMK2 con = (IFluidConnectorMK2) te;
+			if(!con.canConnect(type, dir.getOpposite())) return;
+			
+			GenNode node = UniNodespace.getNode(world, x, y, z, type.getNetworkProvider());
+			
+			if(node != null && node.net != null) {
+				node.net.addReceiver(this);
+				red = true;
+			}
+		}
+		
+		if(particleDebug) {
+			NBTTagCompound data = new NBTTagCompound();
+			data.setString("type", "network");
+			data.setString("mode", "fluid");
+			data.setInteger("color", type.getColor());
+			double posX = x + 0.5 + dir.offsetX * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
+			double posY = y + 0.5 + dir.offsetY * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
+			double posZ = z + 0.5 + dir.offsetZ * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
+			data.setDouble("mX", -dir.offsetX * (red ? 0.025 : 0.1));
+			data.setDouble("mY", -dir.offsetY * (red ? 0.025 : 0.1));
+			data.setDouble("mZ", -dir.offsetZ * (red ? 0.025 : 0.1));
+			PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, posX, posY, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 25));
+		}
+	}
+	
+	public default ConnectionPriority getFluidPriority() {
+		return ConnectionPriority.NORMAL;
+	}
+}

src/main/java/api/hbm/fluidmk2/IFluidRegisterListener.java

@@ -0,0 +1,9 @@
+package api.hbm.fluidmk2;
+
+public interface IFluidRegisterListener {
+
+	/**
+	 * Called when the fluid registry initializes all fluids. Use CompatFluidRegistry to create new instances of FluidType, which are automatically registered.
+	 */
+	public void onFluidsLoad();
+}

src/main/java/api/hbm/fluidmk2/IFluidStandardReceiverMK2.java

@@ -0,0 +1,68 @@
+package api.hbm.fluidmk2;
+
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.tank.FluidTank;
+
+/**
+ * IFluidReceiverMK2 with standard implementation for transfer and demand getter.
+ * @author hbm
+ */
+public interface IFluidStandardReceiverMK2 extends IFluidReceiverMK2 {
+	
+	public FluidTank[] getReceivingTanks();
+
+	@Override
+	public default long getDemand(FluidType type, int pressure) {
+		long amount = 0;
+		for(FluidTank tank : getReceivingTanks()) {
+			if(tank.getTankType() == type && tank.getPressure() == pressure) amount += (tank.getMaxFill() - tank.getFill());
+		}
+		return amount;
+	}
+
+	@Override
+	public default long transferFluid(FluidType type, int pressure, long amount) {
+		int tanks = 0;
+		for(FluidTank tank : getReceivingTanks()) {
+			if(tank.getTankType() == type && tank.getPressure() == pressure) tanks++;
+		}
+		if(tanks > 1) {
+			int firstRound = (int) Math.floor((double) amount / (double) tanks);
+			for(FluidTank tank : getReceivingTanks()) {
+				if(tank.getTankType() == type && tank.getPressure() == pressure) {
+					int toAdd = Math.min(firstRound, tank.getMaxFill() - tank.getFill());
+					tank.setFill(tank.getFill() + toAdd);
+					amount -= toAdd;
+				}
+			}
+		}
+		if(amount > 0) for(FluidTank tank : getReceivingTanks()) {
+			if(tank.getTankType() == type && tank.getPressure() == pressure) {
+				int toAdd = (int) Math.min(amount, tank.getMaxFill() - tank.getFill());
+				tank.setFill(tank.getFill() + toAdd);
+				amount -= toAdd;
+			}
+		}
+		return amount;
+	}
+
+	@Override
+	public default int[] getReceivingPressureRange(FluidType type) {
+		int lowest = HIGHEST_VALID_PRESSURE;
+		int highest = 0;
+		
+		for(FluidTank tank : getReceivingTanks()) {
+			if(tank.getTankType() == type) {
+				if(tank.getPressure() < lowest) lowest = tank.getPressure();
+				if(tank.getPressure() > highest) highest = tank.getPressure();
+			}
+		}
+		
+		return lowest <= highest ? new int[] {lowest, highest} : DEFAULT_PRESSURE_RANGE;
+	}
+
+	@Override
+	public default long getReceiverSpeed(FluidType type, int pressure) {
+		return 1_000_000_000;
+	}
+}

src/main/java/api/hbm/fluidmk2/IFluidStandardSenderMK2.java

@@ -0,0 +1,130 @@
+package api.hbm.fluidmk2;
+
+import com.hbm.inventory.fluid.tank.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
+import com.hbm.uninos.GenNode;
+import com.hbm.uninos.UniNodespace;
+import com.hbm.util.Compat;
+import com.hbm.util.fauxpointtwelve.DirPos;
+
+import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+/**
+ * IFluidProviderMK2 with standard implementation for fluid provision and fluid removal.
+ * @author hbm
+ */
+public interface IFluidStandardSenderMK2 extends IFluidProviderMK2 {
+
+	public default void tryProvide(FluidTank tank, World world, DirPos pos) { tryProvide(tank.getTankType(), tank.getPressure(), world, pos.getX(), pos.getY(), pos.getZ(), pos.getDir()); }
+	public default void tryProvide(FluidType type, World world, DirPos pos) { tryProvide(type, 0, world, pos.getX(), pos.getY(), pos.getZ(), pos.getDir()); }
+	public default void tryProvide(FluidType type, int pressure, World world, DirPos pos) { tryProvide(type, pressure, world, pos.getX(), pos.getY(), pos.getZ(), pos.getDir()); }
+
+	public default void tryProvide(FluidTank tank, World world, int x, int y, int z, ForgeDirection dir) { tryProvide(tank.getTankType(), tank.getPressure(), world, x, y, z, dir); }
+	public default void tryProvide(FluidType type, World world, int x, int y, int z, ForgeDirection dir) { tryProvide(type, 0, world, x, y, z, dir); }
+
+	public default void tryProvide(FluidType type, int pressure, World world, int x, int y, int z, ForgeDirection dir) {
+
+		TileEntity te = Compat.getTileStandard(world, x, y, z);
+		boolean red = false;
+
+		if(te instanceof IFluidConnectorMK2) {
+			IFluidConnectorMK2 con = (IFluidConnectorMK2) te;
+			if(con.canConnect(type, dir.getOpposite())) {
+
+				GenNode<FluidNetMK2> node = UniNodespace.getNode(world, x, y, z, type.getNetworkProvider());
+
+				if(node != null && node.net != null) {
+					node.net.addProvider(this);
+					red = true;
+				}
+			}
+		}
+
+		if(te != this && te instanceof IFluidReceiverMK2) {
+			IFluidReceiverMK2 rec = (IFluidReceiverMK2) te;
+			if(rec.canConnect(type, dir.getOpposite())) {
+				long provides = Math.min(this.getFluidAvailable(type, pressure), this.getProviderSpeed(type, pressure));
+				long receives = Math.min(rec.getDemand(type, pressure), rec.getReceiverSpeed(type, pressure));
+				long toTransfer = Math.min(provides, receives);
+				toTransfer -= rec.transferFluid(type, pressure, toTransfer);
+				this.useUpFluid(type, pressure, toTransfer);
+			}
+		}
+
+		if(particleDebug) {
+			NBTTagCompound data = new NBTTagCompound();
+			data.setString("type", "network");
+			data.setString("mode", "fluid");
+			data.setInteger("color", type.getColor());
+			double posX = x + 0.5 - dir.offsetX * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
+			double posY = y + 0.5 - dir.offsetY * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
+			double posZ = z + 0.5 - dir.offsetZ * 0.5 + world.rand.nextDouble() * 0.5 - 0.25;
+			data.setDouble("mX", dir.offsetX * (red ? 0.025 : 0.1));
+			data.setDouble("mY", dir.offsetY * (red ? 0.025 : 0.1));
+			data.setDouble("mZ", dir.offsetZ * (red ? 0.025 : 0.1));
+			PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, posX, posY, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 25));
+		}
+	}
+
+	public FluidTank[] getSendingTanks();
+
+	@Override
+	public default long getFluidAvailable(FluidType type, int pressure) {
+		long amount = 0;
+		for(FluidTank tank : getSendingTanks()) {
+			if(tank.getTankType() == type && tank.getPressure() == pressure) amount += tank.getFill();
+		}
+		return amount;
+	}
+
+	@Override
+	public default void useUpFluid(FluidType type, int pressure, long amount) {
+		int tanks = 0;
+		for(FluidTank tank : getSendingTanks()) {
+			if(tank.getTankType() == type && tank.getPressure() == pressure) tanks++;
+		}
+		if(tanks > 1) {
+			int firstRound = (int) Math.floor((double) amount / (double) tanks);
+			for(FluidTank tank : getSendingTanks()) {
+				if(tank.getTankType() == type && tank.getPressure() == pressure) {
+					int toRem = Math.min(firstRound, tank.getFill());
+					tank.setFill(tank.getFill() - toRem);
+					amount -= toRem;
+				}
+			}
+		}
+		if(amount > 0) for(FluidTank tank : getSendingTanks()) {
+			if(tank.getTankType() == type && tank.getPressure() == pressure) {
+				int toRem = (int) Math.min(amount, tank.getFill());
+				tank.setFill(tank.getFill() - toRem);
+				amount -= toRem;
+			}
+		}
+	}
+
+	@Override
+	public default int[] getProvidingPressureRange(FluidType type) {
+		int lowest = HIGHEST_VALID_PRESSURE;
+		int highest = 0;
+
+		for(FluidTank tank : getSendingTanks()) {
+			if(tank.getTankType() == type) {
+				if(tank.getPressure() < lowest) lowest = tank.getPressure();
+				if(tank.getPressure() > highest) highest = tank.getPressure();
+			}
+		}
+
+		return lowest <= highest ? new int[] {lowest, highest} : DEFAULT_PRESSURE_RANGE;
+	}
+
+	@Override
+	public default long getProviderSpeed(FluidType type, int pressure) {
+		return 1_000_000_000;
+	}
+}

src/main/java/api/hbm/fluidmk2/IFluidStandardTransceiverMK2.java

@@ -0,0 +1,5 @@
+package api.hbm.fluidmk2;
+
+public interface IFluidStandardTransceiverMK2 extends IFluidStandardReceiverMK2, IFluidStandardSenderMK2 {
+
+}

src/main/java/api/hbm/fluidmk2/IFluidUserMK2.java

@@ -0,0 +1,15 @@
+package api.hbm.fluidmk2;
+
+import com.hbm.inventory.fluid.tank.FluidTank;
+
+import api.hbm.tile.ILoadedTile;
+
+public interface IFluidUserMK2 extends IFluidConnectorMK2, ILoadedTile {
+	
+	public static final int HIGHEST_VALID_PRESSURE = 5;
+	public static final int[] DEFAULT_PRESSURE_RANGE = new int[] {0, 0};
+	
+	public static final boolean particleDebug = false;
+	
+	public FluidTank[] getAllTanks();
+}

src/main/java/api/hbm/fluidmk2/package-info.java

@@ -0,0 +1,24 @@
+package api.hbm.fluidmk2;
+
+/*
+
+It's rather shrimple: the shiny new energy system using universal nodespace, but hit with a hammer until it works with fluids.
+Has a few extra bits and pieces for handling, but the concept is basically the same.
+Sounds good?
+
+*/
+
+/*
+
+Quick explanation for implementing new fluids via addon:
+Fluids are subject to /ntmreload so they get wiped and rebuilt using the init function in Fluids, which means that if fluids
+are simply added externally during startup, they are removed permanently until the game restarts. Same concept as with recipes, really.
+To fix this we need to make sure that externally registered fluids are re-registered during reload, for that purpose we have
+IFluidRegisterListener, a simple interface with a small method that runs whenever the fluid list is reloaded. IFluidRegisterListeners
+need to be registered with CompatExternal.registerFluidRegisterListener to be used, make sure to do this during PreInit.
+Inside the IFluidRegisterListener, fluids can be added using CompatFluidRegistry.registerFluid, which will generate a Fluid instance
+using the supplied arguments and automatically register it. Do note that like with custom fluids, fluids need numeric IDs assigned manually.
+To prevent collisions with stock fluids when NTM updates, make sure to choose a high starting ID (e.g. 10,000).
+The fluid created by registerFluid can have traits added to them, just like how NTM does it with its stock fluids.
+
+*/

src/main/java/api/hbm/item/IButtonReceiver.java

@@ -1,17 +0,0 @@
-package api.hbm.item;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-
-public interface IButtonReceiver {
-
-	/**
-	 * Called in ModEventHandlerClient for any keyboard input related to this item
-	 * @param stack
-	 * @param player
-	 */
-	@SideOnly(Side.CLIENT)
-	public void handleKeyboardInput(ItemStack stack, EntityPlayer player);
-}

src/main/java/api/hbm/item/IClickReceiver.java

@@ -1,20 +0,0 @@
-package api.hbm.item;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-
-public interface IClickReceiver {
-
-	/**
-	 * Called in ModEventHandlerClient for any mouse input related to this item
-	 * @param stack
-	 * @param player
-	 * @param button
-	 * @param state
-	 * @return true if the event should be canceled
-	 */
-	@SideOnly(Side.CLIENT)
-	public boolean handleMouseInput(ItemStack stack, EntityPlayer player, int button, boolean state);
-}

src/main/java/api/hbm/recipe/IRecipeRegisterListener.java

@@ -0,0 +1,13 @@
+package api.hbm.recipe;
+
+public interface IRecipeRegisterListener {
+
+	/**
+	 * Called during SerializableRecipe.initialize(), after the defaults are loaded but before the template is written.
+	 * Due to the way the recipes are handled, calling it once is not enough, it has to be called once for every SerializableRecipe
+	 * instance handled, therefore the load operation passes the type name of the recipe, so that the listeners know what type of recipe
+	 * to register at that point. Note that the actual SerializableRecipe instance is irrelevant, since recipes are static anyway,
+	 * and direct tampering with SerializableRecipes is not recommended.
+	 */
+	public void onRecipeLoad(String recipeClassName);
+}

src/main/java/api/hbm/recipe/package-info.java

@@ -0,0 +1,17 @@
+package api.hbm.recipe;
+
+/*
+
+Quick guide on how to make robust and safe recipe integration:
+* Implement IRecipeRegisterListener, the resulting class will handle all recipes, and the onRecipeLoad method is called every time the SerializableRecipe system updates
+* Register your IRecipeRegisterListener using CompatExternal.registerRecipeRegisterListener, this has to happen before the SerializableRecipe initializes, doing this during PreInit should be safe
+* In your IRecipeRegisterListener, check the supplied recipe type string (which will be the class name of the SerializableRecipe currently being registered) and register your custom recipes accordingly using CompatRecipeRegistry
+
+Explanation:
+* Order of operations is important for the recipes to work, if recipes are loaded outside the scope of SerializableRecipe.initialize, they will not work correctly
+* If recipes are registered before the init, they are deleted, if they are registered after the init, they will not be part of the config template file, and get deleted when running /ntmreload
+* Machines change all the time, so the recipe classes should not be considered API, since the compat would break immediately if a machine is changed or removed
+* CompatRecipeRegistry promises to never change its method signatures, and have solid sanity checking when recipes are registered, allowing it to make the bst of whatever data is thrown at it
+* Using this dedicated registry class means that even if a machine is changed or removed, the recipes will continue to work to the best of its abilities
+
+*/

src/main/java/api/hbm/redstoneoverradio/IRORInteractive.java

@@ -7,15 +7,17 @@ public interface IRORInteractive extends IRORInfo {
 
 	public static String EX_NULL = "Exception: Null Command";
 	public static String EX_NAME = "Exception: Multiple Name Separators";
+	public static String EX_FORMAT = "Exception: Parameter in Invalid Format";
 
 	/** Runs a function on the ROR component, usually causing the component to change or do something. Returns are optional. */
-	public Object runRORFunction(String name, String[] params);
+	public String runRORFunction(String name, String[] params);
 	
 	/** Extracts the command name from a full command string */
 	public static String getCommand(String input) {
 		if(input == null || input.isEmpty()) throw new RORFunctionException(EX_NULL);
 		String[] parts = input.split(NAME_SEPARATOR);
 		if(parts.length <= 0 || parts.length > 2) throw new RORFunctionException(EX_NAME);
+		if(parts[0].isEmpty()) throw new RORFunctionException(EX_NULL);
 		return parts[0];
 	}
 	
@@ -29,4 +31,11 @@ public interface IRORInteractive extends IRORInfo {
 		String[] params = paramList.split(PARAM_SEPARATOR);
 		return params;
 	}
+	
+	public static int parseInt(String val, int min, int max) {
+		int result = 0;
+		try { result = Integer.parseInt(val); } catch(Exception x) { throw new RORFunctionException(EX_FORMAT); };
+		if(result < min || result > max) throw new RORFunctionException(EX_FORMAT);
+		return result;
+	}
 }

src/main/java/api/hbm/redstoneoverradio/IRORValueProvider.java

@@ -3,5 +3,5 @@ package api.hbm.redstoneoverradio;
 public interface IRORValueProvider extends IRORInfo {
 
 	/** Grabs the specified value from this ROR component, operations should not cause any changes with the component itself */
-	public Object provideRORValue(String name);
+	public String provideRORValue(String name);
 }

src/main/java/api/hbm/redstoneoverradio/package-info.java

@@ -32,7 +32,7 @@ INDEX includes:
   optionally returning a value
 
 On the implementation side we can expect:
-- ROR readers, torches which have a list of named values which are read, as well as frequencies on which these values are boradcasted
+- ROR readers, torches which have a list of named values which are read, as well as frequencies on which these values are broadcasted
 - ROR controllers, torches which have one frequency and can receive commands with parameters which will be executed on the component
 - ROR programmers, torches which have a list of frequencies and return frequencies which can receive commands with parameters and
   then send the return value on the return frequency
@@ -43,4 +43,7 @@ ROR programmers can indeed do everything that the readers and controllers can, b
 which are more time-consuming to set up and limits the amount of command channels available, hence why readers and controllers exist
 when only a simple solution is required
 
+Addendum: While the RTTY system can support any arbitrary object as a signal, INDEX will strictly use strings, since that simplifies
+things regarding serialization and saving signals to NBT. Counters already use a parse to int32 function, so this still checks out.
+
 */

src/main/java/api/hbm/tile/ILoadedTile.java

@@ -1,5 +1,6 @@
 package api.hbm.tile;
 
+/** For anything that should be removed off networks when considered unloaded, only affects providers and receivers, not links. Must not necessarily be a tile. */
 public interface ILoadedTile {
 	
 	public boolean isLoaded();

src/main/java/com/hbm/blocks/BlockBase.java

@@ -1,7 +1,6 @@
 package com.hbm.blocks;
 
 import com.hbm.lib.RefStrings;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EnumCreatureType;

src/main/java/com/hbm/blocks/BlockDummyable.java

@@ -1,13 +1,11 @@
 package com.hbm.blocks;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
 import com.hbm.handler.MultiblockHandlerXR;
 import com.hbm.handler.ThreeInts;
+import com.hbm.interfaces.ICopiable;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.IPersistentNBT;
+import com.hbm.world.gen.INBTTransformable;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
@@ -15,6 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.RenderGlobal;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
@@ -27,12 +26,18 @@ import net.minecraft.stats.StatList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.DrawBlockHighlightEvent;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public abstract class BlockDummyable extends BlockContainer implements ICustomBlockHighlight {
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+public abstract class BlockDummyable extends BlockContainer implements ICustomBlockHighlight, ICopiable, INBTTransformable {
 
 	public BlockDummyable(Material mat) {
 		super(mat);
@@ -72,27 +77,20 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
 
 		super.onNeighborBlockChange(world, x, y, z, block);
 
-		if(world.isRemote || safeRem)
+		if(safeRem)
 			return;
 
-		int metadata = world.getBlockMetadata(x, y, z);
+		destroyIfOrphan(world, x, y, z);
-
-		// if it's an extra, remove the extra-ness
-		if(metadata >= extra)
-			metadata -= extra;
-
-		ForgeDirection dir = ForgeDirection.getOrientation(metadata).getOpposite();
-		Block b = world.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ);
-
-		if(b != this) {
-			world.setBlockToAir(x, y, z);
-		}
 	}
 
 	public void updateTick(World world, int x, int y, int z, Random rand) {
 
 		super.updateTick(world, x, y, z, rand);
 
+		destroyIfOrphan(world, x, y, z);
+	}
+
+	private void destroyIfOrphan(World world, int x, int y, int z) {
 		if(world.isRemote)
 			return;
 
@@ -105,10 +103,32 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
 		ForgeDirection dir = ForgeDirection.getOrientation(metadata).getOpposite();
 		Block b = world.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ);
 
-		if(b != this) {
+		// An extra precaution against multiblocks on chunk borders being erroneously deleted.
+		// Technically, this might be used to persist ghost dummy blocks by manipulating
+		// loaded chunks and block destruction, but this gives no benefit to the player,
+		// cannot be done accidentally, and is definitely preferable to multiblocks
+		// just vanishing when their chunks are unloaded in an unlucky way.
+		if(b != this && world.checkChunksExist(x - 1, y - 1, z - 1, x + 1, y + 1, z + 1)) {
+			if (isLegacyMonoblock(world, x, y, z)) {
+				fixLegacyMonoblock(world, x, y, z);
+			} else {
 				world.setBlockToAir(x, y, z);
 			}
+		}
+	}
 
+	// Override this when turning a single block into a pseudo-multiblock.
+	// If this returns true, instead of being deleted as an orphan, the block
+	// will be promoted to a core of a dummyable, however without any dummies.
+	// This is only called if the block is presumed an orphan, so you don't
+	// need to check that here.
+	protected boolean isLegacyMonoblock(World world, int x, int y, int z) {
+		return false;
+	}
+
+	protected void fixLegacyMonoblock(World world, int x, int y, int z) {
+		// Promote to a lone core block with the same effective rotation as before the change
+		world.setBlockMetadataWithNotify(x, y, z, offset + world.getBlockMetadata(x, y, z), 3);
 	}
 
 	public int[] findCore(World world, int x, int y, int z) {
@@ -116,7 +136,7 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
 		return findCoreRec(world, x, y, z);
 	}
 
-	List<ThreeInts> positions = new ArrayList();
+	List<ThreeInts> positions = new ArrayList<>();
 
 	public int[] findCoreRec(World world, int x, int y, int z) {
 
@@ -216,11 +236,6 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
 		super.onBlockPlacedBy(world, x, y, z, player, itemStack);
 	}
 
-	/*@Override
-	public void onBlockAdded(World world, int x, int y, int z) {
-		lastBlockSet = new BlockPos(x, y, z);
-	}*/
-	
 	/**
 	 * A bit more advanced than the dir modifier, but it is important that the resulting direction meta is in the core range.
 	 * Using the "extra" metas is technically possible but requires a bit of tinkering, e.g. preventing a recursive loop
@@ -267,9 +282,9 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
 			return;
 
 		// world.setBlockMetadataWithNotify(x, y, z, meta + extra, 3);
-		this.safeRem = true;
+		safeRem = true;
 		world.setBlock(x, y, z, this, meta + extra, 3);
-		this.safeRem = false;
+		safeRem = false;
 	}
 
 	public void removeExtra(World world, int x, int y, int z) {
@@ -283,9 +298,9 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
 			return;
 
 		// world.setBlockMetadataWithNotify(x, y, z, meta + extra, 3);
-		this.safeRem = true;
+		safeRem = true;
 		world.setBlock(x, y, z, this, meta - extra, 3);
-		this.safeRem = false;
+		safeRem = false;
 	}
 
 	// checks if the dummy metadata is within the extra range
@@ -423,8 +438,9 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
 		return !bounding.isEmpty();
 	}
 
-	public List<AxisAlignedBB> bounding = new ArrayList();
+	public List<AxisAlignedBB> bounding = new ArrayList<>();
 
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Override
 	public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB entityBounding, List list, Entity entity) {
 
@@ -442,8 +458,10 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
 		y = pos[1];
 		z = pos[2];
 
-		for(AxisAlignedBB aabb :this.bounding) {
+		ForgeDirection rot = ForgeDirection.getOrientation(world.getBlockMetadata(x, y, z) - offset).getRotation(ForgeDirection.UP);
-			AxisAlignedBB boxlet = getAABBRotationOffset(aabb, x + 0.5, y, z + 0.5, ForgeDirection.getOrientation(world.getBlockMetadata(x, y, z) - this.offset).getRotation(ForgeDirection.UP));
+
+		for(AxisAlignedBB aabb : this.bounding) {
+			AxisAlignedBB boxlet = getAABBRotationOffset(aabb, x + 0.5, y, z + 0.5, rot);
 
 			if(entityBounding.intersectsWith(boxlet)) {
 				list.add(boxlet);
@@ -468,6 +486,32 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
 		return AxisAlignedBB.getBoundingBox(aabb.minX, aabb.minY, aabb.minZ, aabb.maxX, aabb.maxY, aabb.maxZ).offset(x + 0.5, y + 0.5, z + 0.5);
 	}
 
+	// Don't mutate the xyz parameters, or the interaction max distance will bite you
+	@Override
+	public MovingObjectPosition collisionRayTrace(World world, int x, int y, int z, Vec3 startVec, Vec3 endVec) {
+		if(!this.useDetailedHitbox()) {
+			return super.collisionRayTrace(world, x, y, z, startVec, endVec);
+		}
+
+		int[] pos = this.findCore(world, x, y, z);
+
+		if(pos == null)
+			return super.collisionRayTrace(world, x, y, z, startVec, endVec);
+
+		ForgeDirection rot = ForgeDirection.getOrientation(world.getBlockMetadata(pos[0], pos[1], pos[2]) - offset).getRotation(ForgeDirection.UP);
+
+		for(AxisAlignedBB aabb : this.bounding) {
+			AxisAlignedBB boxlet = getAABBRotationOffset(aabb, pos[0] + 0.5, pos[1], pos[2] + 0.5, rot);
+
+			MovingObjectPosition intercept = boxlet.calculateIntercept(startVec, endVec);
+			if(intercept != null) {
+				return new MovingObjectPosition(x, y, z, intercept.sideHit, intercept.hitVec);
+			}
+		}
+
+		return null;
+	}
+
 	@Override
 	public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) {
 		if(!this.useDetailedHitbox()) {
@@ -501,10 +545,60 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
 		double dZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * (double)interp;
 		float exp = 0.002F;
 
-		int meta = world.getBlockMetadata(x, y, z);
+		ForgeDirection rot = ForgeDirection.getOrientation(world.getBlockMetadata(x, y, z) - offset).getRotation(ForgeDirection.UP);
 
 		ICustomBlockHighlight.setup();
-		for(AxisAlignedBB aabb : this.bounding) event.context.drawOutlinedBoundingBox(getAABBRotationOffset(aabb.expand(exp, exp, exp), 0, 0, 0, ForgeDirection.getOrientation(meta - offset).getRotation(ForgeDirection.UP)).getOffsetBoundingBox(x - dX + 0.5, y - dY, z - dZ + 0.5), -1);
+		for(AxisAlignedBB aabb : this.bounding) RenderGlobal.drawOutlinedBoundingBox(getAABBRotationOffset(aabb.expand(exp, exp, exp), 0, 0, 0, rot).getOffsetBoundingBox(x - dX + 0.5, y - dY, z - dZ + 0.5), -1);
 		ICustomBlockHighlight.cleanup();
 	}
+
+	@Override
+	public NBTTagCompound getSettings(World world, int x, int y, int z) {
+		int[] pos = findCore(world, x, y, z);
+		TileEntity tile = world.getTileEntity(pos[0], pos[1], pos[2]);
+		if (tile instanceof ICopiable)
+			return ((ICopiable) tile).getSettings(world, pos[0], pos[1], pos[2]);
+		else
+			return null;
+	}
+
+	@Override
+	public void pasteSettings(NBTTagCompound nbt, int index, World world, EntityPlayer player, int x, int y, int z) {
+		int[] pos = findCore(world, x, y, z);
+		TileEntity tile = world.getTileEntity(pos[0], pos[1], pos[2]);
+		if (tile instanceof ICopiable)
+			((ICopiable) tile).pasteSettings(nbt, index, world, player, pos[0], pos[1], pos[2]);
+	}
+
+	@Override
+	public String[] infoForDisplay(World world, int x, int y, int z) {
+		int[] pos = findCore(world, x, y, z);
+		TileEntity tile = world.getTileEntity(pos[0], pos[1], pos[2]);
+		if (tile instanceof ICopiable)
+			return ((ICopiable) tile).infoForDisplay(world, x, y, z);
+		return null;
+	}
+
+	@Override
+	public int transformMeta(int meta, int coordBaseMode) {
+		boolean isOffset = meta >= 12; // squishing causes issues
+		boolean isExtra = !isOffset && meta >= extra;
+
+		if(isOffset) {
+			meta -= offset;
+		} else if(isExtra) {
+			meta -= extra;
+		}
+
+		meta = INBTTransformable.transformMetaDeco(meta, coordBaseMode);
+
+		if(isOffset) {
+			meta += offset;
+		} else if(isExtra) {
+			meta += extra;
+		}
+
+		return meta;
+	}
+
 }

src/main/java/com/hbm/blocks/BlockEnumMulti.java

@@ -1,9 +1,6 @@
 package com.hbm.blocks;
 
-import java.util.Locale;
-
 import com.hbm.util.EnumUtil;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.material.Material;
@@ -11,6 +8,8 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
+import java.util.Locale;
+
 public class BlockEnumMulti extends BlockMulti {
 
 	public Class<? extends Enum> theEnum;

src/main/java/com/hbm/blocks/BlockEnums.java

@@ -58,6 +58,14 @@ public class BlockEnums {
 		SMALL
 	}
 	
+	public static enum LightstoneType {
+		UNREFINED,
+		TILE,
+		BRICKS,
+		BRICKS_CHISELED,
+		CHISELED
+	}
+	
 	public static enum DecoComputerEnum {
 		IBM_300PL
 	}

src/main/java/com/hbm/blocks/BlockFallingNT.java

@@ -1,9 +1,6 @@
 package com.hbm.blocks;
 
-import java.util.Random;
-
 import com.hbm.entity.item.EntityFallingBlockNT;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
@@ -14,6 +11,8 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.init.Blocks;
 import net.minecraft.world.World;
 
+import java.util.Random;
+
 public class BlockFallingNT extends Block {
 
 	public static boolean fallInstantly;

src/main/java/com/hbm/blocks/BlockMulti.java

@@ -1,7 +1,5 @@
 package com.hbm.blocks;
 
-import java.util.List;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.material.Material;
@@ -9,6 +7,8 @@ import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
+import java.util.List;
+
 public abstract class BlockMulti extends BlockBase implements IBlockMulti {
 
 	public BlockMulti() {

src/main/java/com/hbm/blocks/BlockRemap.java

@@ -1,8 +1,5 @@
 package com.hbm.blocks;
 
-import java.util.ArrayList;
-import java.util.Random;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
@@ -12,6 +9,9 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
 
+import java.util.ArrayList;
+import java.util.Random;
+
 public class BlockRemap extends Block implements ILookOverlay {
 
 	public Block remapBlock;

src/main/java/com/hbm/blocks/IAnalyzable.java

@@ -1,9 +1,9 @@
 package com.hbm.blocks;
 
-import java.util.List;
-
 import net.minecraft.world.World;
 
+import java.util.List;
+
 public interface IAnalyzable {
 
 	public List<String> getDebugInfo(World world, int x, int y, int z);

src/main/java/com/hbm/blocks/IBlockSideRotation.java

@@ -11,4 +11,27 @@ public interface IBlockSideRotation {
 	public static int getRenderType() {
 		return renderID;
 	}
+
+	// 0 1 3 2 becomes 0 2 3 1
+	// I want to smoke that swedish kush because it clearly makes you fucking stupid
+	public static int topToBottom(int topRotation) {
+		switch(topRotation) {
+		case 1: return 2;
+		case 2: return 1;
+		default: return topRotation;
+		}
+	}
+
+	public static boolean isOpposite(int from, int to) {
+		switch(from) {
+			case 0: return to == 1;
+			case 1: return to == 0;
+			case 2: return to == 3;
+			case 3: return to == 2;
+			case 4: return to == 5;
+			case 5: return to == 4;
+			default: return false;
+		}
+	}
+
 }

src/main/java/com/hbm/blocks/ICustomBlockHighlight.java

@@ -1,12 +1,11 @@
 package com.hbm.blocks;
 
-import org.lwjgl.opengl.GL11;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.DrawBlockHighlightEvent;
+import org.lwjgl.opengl.GL11;
 
 public interface ICustomBlockHighlight {
 

src/main/java/com/hbm/blocks/ILookOverlay.java

@@ -1,9 +1,5 @@
 package com.hbm.blocks;
 
-import java.util.List;
-
-import org.lwjgl.opengl.GL11;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.Minecraft;
@@ -11,6 +7,9 @@ import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
+import org.lwjgl.opengl.GL11;
+
+import java.util.List;
 
 public interface ILookOverlay {
 

src/main/java/com/hbm/blocks/IPersistentInfoProvider.java

@@ -1,11 +1,11 @@
 package com.hbm.blocks;
 
-import java.util.List;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
+import java.util.List;
+
 public interface IPersistentInfoProvider {
 
 	public void addInformation(ItemStack stack, NBTTagCompound persistentTag, EntityPlayer player, List list, boolean ext);

src/main/java/com/hbm/blocks/ITooltipProvider.java

@@ -1,16 +1,15 @@
 package com.hbm.blocks;
 
-import java.util.List;
-
-import org.lwjgl.input.Keyboard;
-
-import com.hbm.util.I18nUtil;
-
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
+import org.lwjgl.input.Keyboard;
+
+import com.hbm.util.i18n.I18nUtil;
+
+import java.util.List;
 
 public interface ITooltipProvider {
 

src/main/java/com/hbm/blocks/bomb/BlockChargeC4.java

@@ -5,6 +5,9 @@ import java.util.List;
 import com.hbm.explosion.vanillant.ExplosionVNT;
 import com.hbm.explosion.vanillant.standard.BlockAllocatorStandard;
 import com.hbm.explosion.vanillant.standard.BlockProcessorStandard;
+import com.hbm.explosion.vanillant.standard.EntityProcessorStandard;
+import com.hbm.explosion.vanillant.standard.PlayerProcessorStandard;
+import com.hbm.particle.helper.ExplosionCreator;
 
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import net.minecraft.entity.player.EntityPlayer;
@@ -22,10 +25,13 @@ public class BlockChargeC4 extends BlockChargeBase {
 			world.setBlockToAir(x, y, z);
 			safe = false;
 			
-			ExplosionVNT xnt = new ExplosionVNT(world, x + 0.5, y + 0.5, z + 0.5, 15F).makeStandard();
+			ExplosionVNT xnt = new ExplosionVNT(world, x + 0.5, y + 0.5, z + 0.5, 15F);
 			xnt.setBlockAllocator(new BlockAllocatorStandard(32));
 			xnt.setBlockProcessor(new BlockProcessorStandard().setNoDrop());
+			xnt.setEntityProcessor(new EntityProcessorStandard());
+			xnt.setPlayerProcessor(new PlayerProcessorStandard());
 			xnt.explode();
+			ExplosionCreator.composeEffectSmall(world, x + 0.5, y + 1, z + 0.5);
 			
 			return BombReturnCode.DETONATED;
 		}

src/main/java/com/hbm/blocks/bomb/BlockChargeDynamite.java

@@ -1,7 +1,7 @@
 package com.hbm.blocks.bomb;
 
-import com.hbm.explosion.ExplosionLarge;
 import com.hbm.explosion.ExplosionNT;
+import com.hbm.particle.helper.ExplosionSmallCreator;
 
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import net.minecraft.world.World;
@@ -17,7 +17,7 @@ public class BlockChargeDynamite extends BlockChargeBase {
 			safe = false;
 			ExplosionNT exp = new ExplosionNT(world, null, x + 0.5, y + 0.5, z + 0.5, 4F);
 			exp.explode();
-			ExplosionLarge.spawnParticles(world, x + 0.5, y + 0.5, z + 0.5, 20);
+			ExplosionSmallCreator.composeEffect(world, x + 0.5, y + 0.5, z + 0.5, 15, 3F, 1.25F);
 			
 			return BombReturnCode.DETONATED;
 		}

src/main/java/com/hbm/blocks/bomb/BlockChargeMiner.java

@@ -2,9 +2,9 @@ package com.hbm.blocks.bomb;
 
 import java.util.List;
 
-import com.hbm.explosion.ExplosionLarge;
 import com.hbm.explosion.ExplosionNT;
 import com.hbm.explosion.ExplosionNT.ExAttrib;
+import com.hbm.particle.helper.ExplosionSmallCreator;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -23,7 +23,7 @@ public class BlockChargeMiner extends BlockChargeBase {
 			ExplosionNT exp = new ExplosionNT(world, null, x + 0.5, y + 0.5, z + 0.5, 4F);
 			exp.addAllAttrib(ExAttrib.NOHURT, ExAttrib.ALLDROP);
 			exp.explode();
-			ExplosionLarge.spawnParticles(world, x + 0.5, y + 0.5, z + 0.5, 20);
+			ExplosionSmallCreator.composeEffect(world, x + 0.5, y + 0.5, z + 0.5, 15, 3F, 1.25F);
 			
 			return BombReturnCode.DETONATED;
 		}

src/main/java/com/hbm/blocks/bomb/BlockChargeSemtex.java

@@ -5,7 +5,7 @@ import java.util.List;
 import com.hbm.explosion.vanillant.ExplosionVNT;
 import com.hbm.explosion.vanillant.standard.BlockAllocatorStandard;
 import com.hbm.explosion.vanillant.standard.BlockProcessorStandard;
-import com.hbm.explosion.vanillant.standard.ExplosionEffectStandard;
+import com.hbm.particle.helper.ExplosionCreator;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -27,8 +27,8 @@ public class BlockChargeSemtex extends BlockChargeBase {
 			xnt.setBlockProcessor(new BlockProcessorStandard()
 					.setAllDrop()
 					.setFortune(3));
-			xnt.setSFX(new ExplosionEffectStandard());
 			xnt.explode();
+			ExplosionCreator.composeEffectSmall(world, x + 0.5, y + 1, z + 0.5);
 			
 			return BombReturnCode.DETONATED;
 		}

src/main/java/com/hbm/blocks/bomb/BlockCrashedBomb.java

@@ -1,91 +1,77 @@
 package com.hbm.blocks.bomb;
 
-import java.util.Random;
+import com.hbm.blocks.BlockEnumMulti;
-
-import com.hbm.blocks.ModBlocks;
 import com.hbm.config.BombConfig;
 import com.hbm.entity.logic.EntityBalefire;
+import com.hbm.entity.logic.EntityNukeExplosionMK5;
+import com.hbm.explosion.vanillant.ExplosionVNT;
+import com.hbm.explosion.vanillant.standard.BlockAllocatorStandard;
+import com.hbm.explosion.vanillant.standard.BlockProcessorStandard;
+import com.hbm.explosion.vanillant.standard.EntityProcessorCross;
+import com.hbm.explosion.vanillant.standard.PlayerProcessorStandard;
+import com.hbm.handler.threading.PacketThreading;
 import com.hbm.interfaces.IBomb;
 import com.hbm.items.ModItems;
-import com.hbm.packet.AuxParticlePacketNT;
+import com.hbm.main.MainRegistry;
-import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
+import com.hbm.particle.helper.ExplosionCreator;
 import com.hbm.tileentity.bomb.TileEntityCrashedBomb;
+import com.hbm.util.EnumUtil;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
-import net.minecraft.block.BlockContainer;
+import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
-public class BlockCrashedBomb extends BlockContainer implements IBomb {
+public class BlockCrashedBomb extends BlockEnumMulti implements ITileEntityProvider, IBomb {
 	
-	public BlockCrashedBomb(Material p_i45386_1_) {
+	public static enum EnumDudType {
-		super(p_i45386_1_);
+		BALEFIRE, CONVENTIONAL, NUKE, SALTED
+	}
+
+	public BlockCrashedBomb(Material mat) {
+		super(mat, EnumDudType.class, false, false);
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
+	public TileEntity createNewTileEntity(World world, int meta) {
 		return new TileEntityCrashedBomb();
 	}
 
-	@Override
+	@Override public int getRenderType() { return -1; }
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
+	@Override public boolean isOpaqueCube() { return false; }
-		return Item.getItemFromBlock(ModBlocks.crashed_balefire);
+	@Override public boolean renderAsNormalBlock() { return false; }
-	}
-
-	@Override
-	public int getRenderType() {
-		return -1;
-	}
-
-	@Override
-	public boolean isOpaqueCube() {
-		return false;
-	}
-
-	@Override
-	public boolean renderAsNormalBlock() {
-		return false;
-	}
-
-	@Override
-	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) {
-		int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
-
-		if(i == 0) {
-			world.setBlockMetadataWithNotify(x, y, z, 5, 2);
-		}
-		if(i == 1) {
-			world.setBlockMetadataWithNotify(x, y, z, 3, 2);
-		}
-		if(i == 2) {
-			world.setBlockMetadataWithNotify(x, y, z, 4, 2);
-		}
-		if(i == 3) {
-			world.setBlockMetadataWithNotify(x, y, z, 2, 2);
-		}
-	}
 
 	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int i, float fx, float fy, float fz) {
-
+		if(world.isRemote) return true;
-		if(world.isRemote)
-			return true;
 
 		if(player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.defuser) {
 			
-			world.func_147480_a(x, y, z, false);
+			EnumDudType type = EnumUtil.grabEnumSafely(EnumDudType.class, world.getBlockMetadata(x, y, z));
 
+			//TODO: make this less scummy
+			if(type == type.BALEFIRE) {
 				world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.egg_balefire_shard)));
-			world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.plate_steel, 10 + world.rand.nextInt(15))));
+			}
-			world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.plate_titanium, 2 + world.rand.nextInt(7))));
+			if(type == type.CONVENTIONAL) {
+				world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.ball_tnt, 16)));
+			}
+			if(type == type.NUKE) {
+				world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.ball_tnt, 8)));
+				world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.billet_plutonium, 4)));
+			}
+			if(type == type.SALTED) {
+				world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.ball_tnt, 8)));
+				world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.billet_plutonium, 2)));
+				world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(ModItems.ingot_cobalt, 12)));
+			}
 			
+			world.func_147480_a(x, y, z, false);
 			return true;
 		}
 
@@ -97,21 +83,46 @@ public class BlockCrashedBomb extends BlockContainer implements IBomb {
 
 		if(!world.isRemote) {
 
+			EnumDudType type = EnumUtil.grabEnumSafely(EnumDudType.class, world.getBlockMetadata(x, y, z));
 			world.setBlockToAir(x, y, z);
+
+			if(type == type.BALEFIRE) {
 				EntityBalefire bf = new EntityBalefire(world);
-			bf.posX = x;
+				bf.setPosition(x, y, z);
-			bf.posY = y;
-			bf.posZ = z;
 				bf.destructionRange = (int) (BombConfig.fatmanRadius * 1.25);
 				world.spawnEntityInWorld(bf);
+				spawnMush(world, x, y, z, true);
+			}
 
-			NBTTagCompound data = new NBTTagCompound();
+			if(type == type.CONVENTIONAL) {
-			data.setString("type", "muke");
+				ExplosionVNT xnt = new ExplosionVNT(world, x + 0.5, y + 0.5, z + 0.5, 35F);
-			data.setBoolean("balefire", true);
+				xnt.setBlockAllocator(new BlockAllocatorStandard(24));
-			PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, x + 0.5, y + 0.5, z + 0.5), new TargetPoint(world.provider.dimensionId, x + 0.5, y + 0.5, z + 0.5, 250));
+				xnt.setBlockProcessor(new BlockProcessorStandard().setNoDrop());
-			world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:weapon.mukeExplosion", 15.0F, 1.0F);
+				xnt.setEntityProcessor(new EntityProcessorCross(5D).withRangeMod(1.5F));
+				xnt.setPlayerProcessor(new PlayerProcessorStandard());
+				xnt.explode();
+				ExplosionCreator.composeEffectLarge(world, x + 0.5, y + 0.5, z + 0.5);
+			}
+			
+			if(type == type.NUKE) {
+				world.spawnEntityInWorld(EntityNukeExplosionMK5.statFac(world, 35, x + 0.5, y + 0.5, z + 0.5));
+				spawnMush(world, x, y, z, MainRegistry.polaroidID == 11 || world.rand.nextInt(100) == 0);
+			}
+			
+			if(type == type.SALTED) {
+				world.spawnEntityInWorld(EntityNukeExplosionMK5.statFac(world, 25, x + 0.5, y + 0.5, z + 0.5).moreFallout(25));
+				spawnMush(world, x, y, z, MainRegistry.polaroidID == 11 || world.rand.nextInt(100) == 0);
+			}
 		}
 
 		return BombReturnCode.DETONATED;
 	}
+	
+	public static void spawnMush(World world, int x, int y, int z, boolean balefire) {
+		world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:weapon.mukeExplosion", 15.0F, 1.0F);
+		NBTTagCompound data = new NBTTagCompound();
+		data.setString("type", "muke");
+		data.setBoolean("balefire", balefire);
+		PacketThreading.createAllAroundThreadedPacket(new AuxParticlePacketNT(data, x + 0.5, y + 0.5, z + 0.5), new TargetPoint(world.provider.dimensionId, x + 0.5, y + 0.5, z + 0.5, 250));
+	}
 }

src/main/java/com/hbm/blocks/bomb/BlockTaint.java

@@ -4,169 +4,72 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import com.hbm.blocks.ModBlocks;
+import com.hbm.blocks.ITooltipProvider;
 import com.hbm.entity.mob.EntityTaintCrab;
 import com.hbm.entity.mob.EntityCreeperTainted;
 import com.hbm.entity.mob.EntityTeslaCrab;
 import com.hbm.potion.HbmPotion;
 
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
+import net.minecraft.block.BlockFalling;
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityFallingBlock;
 import net.minecraft.entity.monster.EntityCreeper;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
-public class BlockTaint extends Block/*Container*/ {
+public class BlockTaint extends Block implements ITooltipProvider {
 
-    @SideOnly(Side.CLIENT)
+	public BlockTaint(Material mat) {
-    private IIcon[] icons;
+		super(mat);
-
-	public BlockTaint(Material p_i45386_1_) {
-		super(p_i45386_1_);
 		this.setTickRandomly(true);
 	}
 
-	/*@Override
+	@Override public MapColor getMapColor(int meta) { return MapColor.grayColor; }
-	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
+	@Override public Item getItemDropped(int i, Random rand, int j) { return null; }
-		return new TileEntityTaint();
-	}*/
-	
-    @SideOnly(Side.CLIENT)
-    public IIcon getIcon(int p_149691_1_, int meta)
-    {
-        return this.icons[meta % this.icons.length];
-    }
-    
-    public int damageDropped(int meta)
-    {
-        return 0;
-    }
-
-    public static int func_150032_b(int p_150032_0_)
-    {
-        return func_150031_c(p_150032_0_);
-    }
-
-    public static int func_150031_c(int p_150031_0_)
-    {
-        return p_150031_0_ & 15;
-    }
-
-    @SideOnly(Side.CLIENT)
-    public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_)
-    {
-        for (int i = 0; i < 16; ++i)
-        {
-            p_149666_3_.add(new ItemStack(p_149666_1_, 1, i));
-        }
-    }
-
-    @SideOnly(Side.CLIENT)
-    public void registerBlockIcons(IIconRegister p_149651_1_)
-    {
-        this.icons = new IIcon[16];
-
-        for (int i = 0; i < this.icons.length; ++i)
-        {
-            this.icons[i] = p_149651_1_.registerIcon("hbm:taint_" + i);
-        }
-    }
-
-    public MapColor getMapColor(int p_149728_1_)
-    {
-        return MapColor.purpleColor;
-    }
-    
-    public static int renderID = RenderingRegistry.getNextAvailableRenderId();
 
 	@Override
-	public int getRenderType(){
+	public void updateTick(World world, int x, int y, int z, Random rand) {
-		return renderID;
-	}
 
-    @Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
-    {
-        return null;
-    }
-	
-	@Override
-	public boolean isOpaqueCube() {
-		return false;
-	}
-	
-	@Override
-	public boolean renderAsNormalBlock() {
-		return false;
-	}
-    
-    public void onNeighborBlockChange(World world, int x, int y, int z, Block b)
-    {
-    	if(!hasPosNeightbour(world, x, y, z) && !world.isRemote)
-			world.setBlockToAir(x, y, z);
-    }
-
-    public void updateTick(World world, int x, int y, int z, Random rand)
-    {
 		int meta = world.getBlockMetadata(x, y, z);
-    	if(!world.isRemote && meta < 15) {
+		if(meta >= 15) return;
 		
-	    	for(int i = 0; i < 15; i++) {
+		for(int i = -3; i <= 3; i++) for(int j = -3; j <= 3; j++) for(int k = -3; k <= 3; k++) {
-	    		int a = rand.nextInt(11) + x - 5;
+			if(Math.abs(i) + Math.abs(j) + Math.abs(k) > 4) continue;
-	    		int b = rand.nextInt(11) + y - 5;
+			if(rand.nextFloat() > 0.25F) continue;
-	    		int c = rand.nextInt(11) + z - 5;
+			Block b = world.getBlock(x + i, y + j, z + k);
-	            if(world.getBlock(a, b, c).isReplaceable(world, a, b, c) && hasPosNeightbour(world, a, b, c))
+			if(b.isAir(world, x + i, y + j, z + k) || b == Blocks.bedrock) continue;
-	            	world.setBlock(a, b, c, ModBlocks.taint, meta + 1, 2);
+			int targetMeta = meta + 1;
-	    	}
+			boolean hasAir = false;
-	            
+			for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
-		    for(int i = 0; i < 85; i++) {
+				if(world.getBlock(x + i + dir.offsetX, y + j + dir.offsetY, z + k + dir.offsetZ).isAir(world, x + i + dir.offsetX, y + j + dir.offsetY, z + k + dir.offsetZ)) {
-		    	int a = rand.nextInt(7) + x - 3;
+					hasAir = true;
-		    	int b = rand.nextInt(7) + y - 3;
+					break;
-		    	int c = rand.nextInt(7) + z - 3;
-		           if(world.getBlock(a, b, c).isReplaceable(world, a, b, c) && hasPosNeightbour(world, a, b, c))
-		           	world.setBlock(a, b, c, ModBlocks.taint, meta + 1, 2);
 				}
 			}
+			if(!hasAir) targetMeta = meta + 3;
+			if(targetMeta > 15) continue;
+			if(b == this && world.getBlockMetadata(x + i, y + j, z + k) >= targetMeta) continue;
+			world.setBlock(x + i, y + j, z + k, this, targetMeta, 3);
+			if(rand.nextFloat() < 0.25F && BlockFalling.func_149831_e(world, x + i, y + j - 1, z + k)) {
+				EntityFallingBlock falling = new EntityFallingBlock(world, x + i + 0.5, y + j + 0.5, z + k + 0.5, this, targetMeta);
+				world.spawnEntityInWorld(falling);
+			}
 		}
-    
-    public static boolean hasPosNeightbour(World world, int x, int y, int z) {
-    	Block b0 = world.getBlock(x + 1, y, z);
-    	Block b1 = world.getBlock(x, y + 1, z);
-    	Block b2 = world.getBlock(x, y, z + 1);
-    	Block b3 = world.getBlock(x - 1, y, z);
-    	Block b4 = world.getBlock(x, y - 1, z);
-    	Block b5 = world.getBlock(x, y, z - 1);
-    	boolean b = (b0.renderAsNormalBlock() && b0.getMaterial().isOpaque()) ||
-    			(b1.renderAsNormalBlock() && b1.getMaterial().isOpaque()) ||
-    			(b2.renderAsNormalBlock() && b2.getMaterial().isOpaque()) ||
-    			(b3.renderAsNormalBlock() && b3.getMaterial().isOpaque()) ||
-    			(b4.renderAsNormalBlock() && b4.getMaterial().isOpaque()) ||
-    			(b5.renderAsNormalBlock() && b5.getMaterial().isOpaque());
-    	return b;
 	}
 
 	@Override
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4)
+	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
-	{
+		return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 0.75, z + 1);
-		return null;
-	}
-	
-	@Override
-	public AxisAlignedBB getSelectedBoundingBoxFromPool(World par1World, int par2, int par3, int par4)
-	{
-		return AxisAlignedBB.getBoundingBox(par2, par3, par4, par2, par3, par4);
 	}
 
 	@Override
@@ -175,13 +78,16 @@ public class BlockTaint extends Block/*Container*/ {
 		int meta = world.getBlockMetadata(x, y, z);
 		int level = 15 - meta;
 
+		entity.motionX *= 0.6;
+		entity.motionZ *= 0.6;
+
 		List<ItemStack> list = new ArrayList<ItemStack>();
 		PotionEffect effect = new PotionEffect(HbmPotion.taint.id, 15 * 20, level);
 		effect.setCurativeItems(list);
 
 		if(entity instanceof EntityLivingBase) {
 			if(world.rand.nextInt(50) == 0) {
-    			((EntityLivingBase)entity).addPotionEffect(effect);
+				((EntityLivingBase) entity).addPotionEffect(effect);
 			}
 		}
 
@@ -206,4 +112,8 @@ public class BlockTaint extends Block/*Container*/ {
 		}
 	}
 
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) {
+		list.add("DO NOT TOUCH, BREATHE OR STARE AT.");
+	}
 }

src/main/java/com/hbm/blocks/bomb/BlockVolcano.java

@@ -9,8 +9,8 @@ import com.hbm.blocks.ModBlocks;
 import com.hbm.entity.projectile.EntityShrapnel;
 import com.hbm.explosion.ExplosionNT;
 import com.hbm.explosion.ExplosionNT.ExAttrib;
-import com.hbm.packet.AuxParticlePacketNT;
+import com.hbm.handler.threading.PacketThreading;
-import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import cpw.mods.fml.relauncher.Side;
@@ -151,7 +151,7 @@ public class BlockVolcano extends BlockContainer implements ITooltipProvider, IB
 		@Override
 		public void writeToNBT(NBTTagCompound nbt) {
 			super.writeToNBT(nbt);
-			nbt.setInteger("tier", this.volcanoTimer);
+			nbt.setInteger("timer", this.volcanoTimer);
 		}
 
 		private boolean shouldGrow() {
@@ -283,7 +283,7 @@ public class BlockVolcano extends BlockContainer implements ITooltipProvider, IB
 			NBTTagCompound dPart = new NBTTagCompound();
 			dPart.setString("type", "vanillaExt");
 			dPart.setString("mode", "volcano");
-			PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(dPart, xCoord + 0.5, yCoord + 10, zCoord + 0.5), new TargetPoint(worldObj.provider.dimensionId, xCoord + 0.5, yCoord + 10, zCoord + 0.5, 250));
+			PacketThreading.createAllAroundThreadedPacket(new AuxParticlePacketNT(dPart, xCoord + 0.5, yCoord + 10, zCoord + 0.5), new TargetPoint(worldObj.provider.dimensionId, xCoord + 0.5, yCoord + 10, zCoord + 0.5, 250));
 		}
 	}
 }

src/main/java/com/hbm/blocks/bomb/BombFlameWar.java

@@ -1,7 +1,13 @@
 package com.hbm.blocks.bomb;
 
-import com.hbm.explosion.ExplosionChaos;
+import com.hbm.explosion.vanillant.ExplosionVNT;
+import com.hbm.explosion.vanillant.standard.BlockAllocatorStandard;
+import com.hbm.explosion.vanillant.standard.BlockProcessorStandard;
+import com.hbm.explosion.vanillant.standard.EntityProcessorCrossSmooth;
+import com.hbm.explosion.vanillant.standard.ExplosionEffectTiny;
+import com.hbm.explosion.vanillant.standard.PlayerProcessorStandard;
 import com.hbm.interfaces.IBomb;
+import com.hbm.particle.helper.ExplosionCreator;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -17,9 +23,7 @@ public class BombFlameWar extends Block implements IBomb {
 	public void onNeighborBlockChange(World world, int x, int y, int z, Block block) {
 		
 		if(world.isBlockIndirectlyGettingPowered(x, y, z)) {
-			ExplosionChaos.explode(world, x, y, z, 15);
+			explode(world, x, y, z);
-			ExplosionChaos.spawnExplosion(world, x, y, z, 75);
-			ExplosionChaos.flameDeath(world, x, y, z, 100);
 		}
 	}
 
@@ -27,9 +31,24 @@ public class BombFlameWar extends Block implements IBomb {
 	public BombReturnCode explode(World world, int x, int y, int z) {
 
 		if(!world.isRemote) {
-			ExplosionChaos.explode(world, x, y, z, 15);
+			
-			ExplosionChaos.spawnExplosion(world, x, y, z, 75);
+			world.func_147480_a(x, y, z, false);
-			ExplosionChaos.flameDeath(world, x, y, z, 100);
+			
+			for(int i = 0; i < 150; i++) {
+				ExplosionVNT vnt = new ExplosionVNT(world, x + world.rand.nextInt(51) - 25, y + world.rand.nextInt(11) - 5, z + world.rand.nextInt(51) - 25, 4, null);
+				vnt.setEntityProcessor(new EntityProcessorCrossSmooth(1, 25));
+				vnt.setPlayerProcessor(new PlayerProcessorStandard());
+				vnt.setSFX(new ExplosionEffectTiny());
+				vnt.explode();
+			}
+			
+			ExplosionVNT xnt = new ExplosionVNT(world, x + 0.5, y + 0.5, z + 0.5, 15F);
+			xnt.setBlockAllocator(new BlockAllocatorStandard(32));
+			xnt.setBlockProcessor(new BlockProcessorStandard().setNoDrop());
+			xnt.setEntityProcessor(new EntityProcessorCrossSmooth(2, 200));
+			xnt.setPlayerProcessor(new PlayerProcessorStandard());
+			xnt.explode();
+			ExplosionCreator.composeEffectSmall(world, x + 0.5, y + 0.5, z + 0.5);
 		}
 
 		return BombReturnCode.DETONATED;

src/main/java/com/hbm/blocks/bomb/BombMulti.java

@@ -18,10 +18,12 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 import com.hbm.blocks.ModBlocks;
+import com.hbm.entity.effect.EntityMist;
 import com.hbm.explosion.ExplosionChaos;
 import com.hbm.explosion.ExplosionLarge;
 import com.hbm.explosion.ExplosionNukeGeneric;
 import com.hbm.interfaces.IBomb;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.bomb.TileEntityBombMulti;
 
@@ -169,7 +171,11 @@ public class BombMulti extends BlockContainer implements IBomb {
 				}
 
 				if(gasCloud > 0) {
-					ExplosionChaos.spawnChlorine(world, x, y, z, gasCloud, gasCloud / 50, 0);
+					EntityMist mist = new EntityMist(world);
+					mist.setType(Fluids.CHLORINE);
+					mist.setPosition(x + 0.5, y + 0.5, z + 0.5);
+					mist.setArea(gasCloud * 15F / 50F, gasCloud * 7.5F / 50F);
+					world.spawnEntityInWorld(mist);
 				}
 				
 				return BombReturnCode.DETONATED;

src/main/java/com/hbm/blocks/bomb/ExplosiveCharge.java

@@ -5,10 +5,10 @@ import com.hbm.config.BombConfig;
 import com.hbm.entity.effect.EntityNukeTorex;
 import com.hbm.entity.item.EntityTNTPrimedBase;
 import com.hbm.entity.logic.EntityNukeExplosionMK5;
-import com.hbm.explosion.ExplosionLarge;
 import com.hbm.explosion.ExplosionNT;
 import com.hbm.interfaces.IBomb;
 import com.hbm.lib.RefStrings;
+import com.hbm.particle.helper.ExplosionCreator;
 
 import net.minecraft.util.MathHelper;
 import cpw.mods.fml.relauncher.Side;
@@ -65,11 +65,11 @@ public class ExplosiveCharge extends BlockDetonatable implements IBomb, IDetConn
 			}
 			if(this == ModBlocks.det_charge) {
 				new ExplosionNT(world, null, x + 0.5, y + 0.5, z + 0.5, 15).overrideResolution(64).explode();
-				ExplosionLarge.spawnParticles(world, x, y, z, ExplosionLarge.cloudFunction(15));
+				ExplosionCreator.composeEffectStandard(world, x + 0.5, y + 1, z + 0.5);
 			}
 			if(this == ModBlocks.det_nuke) {
 				world.spawnEntityInWorld(EntityNukeExplosionMK5.statFac(world, BombConfig.missileRadius, x + 0.5, y + 0.5, z + 0.5));
-				EntityNukeTorex.statFac(world, x + 0.5, y + 0.5, z + 0.5, BombConfig.missileRadius);
+				EntityNukeTorex.statFacStandard(world, x + 0.5, y + 0.5, z + 0.5, BombConfig.missileRadius);
 			}
 		}
 

src/main/java/com/hbm/blocks/bomb/Landmine.java

@@ -3,20 +3,29 @@ package com.hbm.blocks.bomb;
 import java.util.Random;
 
 import com.hbm.blocks.ModBlocks;
+import com.hbm.config.ServerConfig;
 import com.hbm.explosion.ExplosionLarge;
-import com.hbm.explosion.ExplosionNukeSmall;
+import com.hbm.explosion.vanillant.ExplosionVNT;
+import com.hbm.explosion.vanillant.standard.*;
 import com.hbm.interfaces.IBomb;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.factory.XFactoryCatapult;
+import com.hbm.main.MainRegistry;
+import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
 import com.hbm.tileentity.bomb.TileEntityLandmine;
 
+import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.BlockFence;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.IBlockAccess;
@@ -31,7 +40,6 @@ public class Landmine extends BlockContainer implements IBomb {
 
 	public Landmine(Material mat, double range, double height) {
 		super(mat);
-
 		this.range = range;
 		this.height = height;
 	}
@@ -41,20 +49,9 @@ public class Landmine extends BlockContainer implements IBomb {
 		return new TileEntityLandmine();
 	}
 
-	@Override
+	@Override public int getRenderType() { return -1; }
-	public int getRenderType() {
+	@Override public boolean isOpaqueCube() { return false; }
-		return -1;
+	@Override public boolean renderAsNormalBlock() { return false; }
-	}
-
-	@Override
-	public boolean isOpaqueCube() {
-		return false;
-	}
-
-	@Override
-	public boolean renderAsNormalBlock() {
-		return false;
-	}
 
 	@Override
 	public Item getItemDropped(int i, Random rand, int j) {
@@ -64,15 +61,10 @@ public class Landmine extends BlockContainer implements IBomb {
 	@Override
 	public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) {
 		float f = 0.0625F;
-		if(this == ModBlocks.mine_ap)
+		if(this == ModBlocks.mine_ap) this.setBlockBounds(5 * f, 0.0F, 5 * f, 11 * f, 1 * f, 11 * f);
-			this.setBlockBounds(6 * f, 0.0F, 6 * f, 10 * f, 2 * f, 10 * f);
+		if(this == ModBlocks.mine_he) this.setBlockBounds(4 * f, 0.0F, 4 * f, 12 * f, 2 * f, 12 * f);
-		if(this == ModBlocks.mine_he)
+		if(this == ModBlocks.mine_shrap) this.setBlockBounds(5 * f, 0.0F, 5 * f, 11 * f, 1 * f, 11 * f);
-			this.setBlockBounds(4 * f, 0.0F, 4 * f, 12 * f, 2 * f, 12 * f);
+		if(this == ModBlocks.mine_fat) this.setBlockBounds(5 * f, 0.0F, 4 * f, 11 * f, 6 * f, 12 * f);}
-		if(this == ModBlocks.mine_shrap)
-			this.setBlockBounds(4 * f, 0.0F, 4 * f, 12 * f, 2 * f, 12 * f);
-		if(this == ModBlocks.mine_fat)
-			this.setBlockBounds(5 * f, 0.0F, 4 * f, 11 * f, 6 * f, 12 * f);
-	}
 
 	@Override
 	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
@@ -137,6 +129,18 @@ public class Landmine extends BlockContainer implements IBomb {
 		return false;
 	}
 
+	public boolean isWaterAbove(World world, int x, int y, int z) {
+		for(int xo = -1; xo <= 1; xo++) {
+			for(int zo = -1; zo <= 1; zo++) {
+				Block blockAbove = world.getBlock(x + xo, y + 1, z + zo);
+				if(blockAbove == Blocks.water || blockAbove == Blocks.flowing_water) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 	@Override
 	public BombReturnCode explode(World world, int x, int y, int z) {
 
@@ -147,20 +151,64 @@ public class Landmine extends BlockContainer implements IBomb {
 			Landmine.safeMode = false;
 
 			if(this == ModBlocks.mine_ap) {
-				world.newExplosion(null, x + 0.5, y + 0.5, z + 0.5, 2.5F, false, false);
+				ExplosionVNT vnt = new ExplosionVNT(world, x + 0.5, y + 0.5, z + 0.5, 3F);
+				vnt.setEntityProcessor(new EntityProcessorCrossSmooth(0.5, ServerConfig.MINE_AP_DAMAGE.get()).setupPiercing(5F, 0.2F));
+				vnt.setPlayerProcessor(new PlayerProcessorStandard());
+				vnt.setSFX(new ExplosionEffectWeapon(5, 1F, 0.5F));
+				vnt.explode();
 			} else if(this == ModBlocks.mine_he) {
-				ExplosionLarge.explode(world, x + 0.5, y + 0.5, z + 0.5, 3F, true, false, false);
+				ExplosionVNT vnt = new ExplosionVNT(world, x + 0.5, y + 0.5, z + 0.5, 4F);
-				world.newExplosion(null, x + 0.5, y + 2, z + 0.5, 15F, false, false);
+				vnt.setBlockAllocator(new BlockAllocatorStandard());
+				vnt.setBlockProcessor(new BlockProcessorStandard());
+				vnt.setEntityProcessor(new EntityProcessorCrossSmooth(1, ServerConfig.MINE_HE_DAMAGE.get()).setupPiercing(15F, 0.2F));
+				vnt.setPlayerProcessor(new PlayerProcessorStandard());
+				vnt.setSFX(new ExplosionEffectWeapon(15, 3.5F, 1.25F));
+				vnt.explode();
 			} else if(this == ModBlocks.mine_shrap) {
-				ExplosionLarge.explode(world, x + 0.5, y + 0.5, z + 0.5, 1, true, false, false);
+				ExplosionVNT vnt = new ExplosionVNT(world, x + 0.5, y + 0.5, z + 0.5, 3F);
+				vnt.setEntityProcessor(new EntityProcessorCrossSmooth(0.5, ServerConfig.MINE_SHRAP_DAMAGE.get()));
+				vnt.setPlayerProcessor(new PlayerProcessorStandard());
+				vnt.setSFX(new ExplosionEffectWeapon(5, 1F, 0.5F));
+				vnt.explode();
+
 				ExplosionLarge.spawnShrapnelShower(world, x + 0.5, y + 0.5, z + 0.5, 0, 1D, 0, 45, 0.2D);
 				ExplosionLarge.spawnShrapnels(world, x + 0.5, y + 0.5, z + 0.5, 5);
+			} else if(this == ModBlocks.mine_naval) {
+				ExplosionVNT vnt = new ExplosionVNT(world, x + 5, y + 5, z + 5, 25F);
+				vnt.setBlockAllocator(new BlockAllocatorWater(32));
+				vnt.setBlockProcessor(new BlockProcessorStandard());
+				vnt.setEntityProcessor(new EntityProcessorCrossSmooth(0.5, ServerConfig.MINE_NAVAL_DAMAGE.get()).setupPiercing(5F, 0.2F));
+				vnt.setPlayerProcessor(new PlayerProcessorStandard());
+				vnt.setSFX(new ExplosionEffectWeapon(10, 1F, 0.5F));
+				vnt.explode();
+
+				ExplosionLarge.spawnParticlesRadial(world, x + 0.5, y + 2, z + 0.5, 30);
+				ExplosionLarge.spawnRubble(world,x + 0.5, y + 0.5, z + 0.5, 5 );
+
+				// Only spawn water effects if there's water above the mine
+				if (isWaterAbove(world, x, y, z)) {
+					ExplosionLarge.spawnFoam(world, x + 0.5, y + 0.5, z + 0.5, 60);
+				}
+
 			} else if(this == ModBlocks.mine_fat) {
-				ExplosionNukeSmall.explode(world, x + 0.5, y + 0.5, z + 0.5, ExplosionNukeSmall.PARAMS_MEDIUM);
+
+				ExplosionVNT vnt = new ExplosionVNT(world, x + 0.5, y + 0.5, z + 0.5, 10);
+				vnt.setBlockAllocator(new BlockAllocatorStandard(64));
+				vnt.setBlockProcessor(new BlockProcessorStandard());
+				vnt.setEntityProcessor(new EntityProcessorCrossSmooth(2, ServerConfig.MINE_NUKE_DAMAGE.get()).withRangeMod(1.5F));
+				vnt.setPlayerProcessor(new PlayerProcessorStandard());
+				vnt.explode();
+
+				XFactoryCatapult.incrementRad(world, x, y, z, 1.5F);
+				NBTTagCompound data = new NBTTagCompound();
+				data.setString("type", "muke");
+				data.setBoolean("balefire", MainRegistry.polaroidID == 11 || world.rand.nextInt(100) == 0);
+				PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, x + 0.5, y + 0.5, z + 0.5), new TargetPoint(world.provider.dimensionId, x + 0.5, y + 0.5, z + 0.5, 250));
+
+				world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:weapon.mukeExplosion", 25.0F, 0.9F); // this has to be the single worst solution ever
 			}
 		}
 
 		return BombReturnCode.DETONATED;
 	}
-
 }

src/main/java/com/hbm/blocks/bomb/NukeCustom.java

@@ -179,7 +179,7 @@ public class NukeCustom extends BlockContainer implements IBomb {
 			dirty *= 0.25F;
 
 			worldObj.spawnEntityInWorld(EntityNukeExplosionMK5.statFac(worldObj, (int)hydro, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5).moreFallout((int)dirty));
-			EntityNukeTorex.statFac(worldObj, xCoord + 0.5, yCoord + 5, zCoord + 0.5, hydro);
+			EntityNukeTorex.statFacStandard(worldObj, xCoord + 0.5, yCoord + 5, zCoord + 0.5, hydro);
 			
 		/// NUCLEAR ///
 		} else if(nuke > 0) {
@@ -188,7 +188,7 @@ public class NukeCustom extends BlockContainer implements IBomb {
 			nuke = Math.min(nuke, maxNuke);
 
 			worldObj.spawnEntityInWorld(EntityNukeExplosionMK5.statFac(worldObj, (int)nuke, xCoord + 0.5, yCoord + 5, zCoord + 0.5).moreFallout((int)dirty));
-			EntityNukeTorex.statFac(worldObj, xCoord + 0.5, yCoord + 5, zCoord + 0.5, nuke);
+			EntityNukeTorex.statFacStandard(worldObj, xCoord + 0.5, yCoord + 5, zCoord + 0.5, nuke);
 			
 		/// NON-NUCLEAR ///
 		} else if(tnt >= 75) {
@@ -196,7 +196,7 @@ public class NukeCustom extends BlockContainer implements IBomb {
 			tnt = Math.min(tnt, maxTnt);
 
 			worldObj.spawnEntityInWorld(EntityNukeExplosionMK5.statFacNoRad(worldObj, (int)tnt, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5));
-			EntityNukeTorex.statFac(worldObj, xCoord + 0.5, yCoord + 5, zCoord + 0.5, tnt);
+			EntityNukeTorex.statFacStandard(worldObj, xCoord + 0.5, yCoord + 5, zCoord + 0.5, tnt);
 		} else if(tnt > 0) {
 			
 			ExplosionLarge.explode(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, tnt, true, true, true);

src/main/java/com/hbm/blocks/bomb/NukeGadget.java

@@ -131,7 +131,7 @@ public class NukeGadget extends BlockContainer implements IBomb {
 			world.playSoundEffect(x, y, z, "random.explode", 1.0f, world.rand.nextFloat() * 0.1F + 0.9F);
 
 			world.spawnEntityInWorld(EntityNukeExplosionMK5.statFac(world, BombConfig.gadgetRadius, x + 0.5, y + 0.5, z + 0.5));
-			EntityNukeTorex.statFac(world, x + 0.5, y + 0.5, z + 0.5, BombConfig.gadgetRadius);
+			EntityNukeTorex.statFacStandard(world, x + 0.5, y + 0.5, z + 0.5, BombConfig.gadgetRadius);
 		}
 
 		return false;

src/main/java/com/hbm/blocks/bomb/NukeMan.java

@@ -124,7 +124,7 @@ public class NukeMan extends BlockContainer implements IBomb {
 			world.playSoundEffect(x, y, z, "random.explode", 1.0f, world.rand.nextFloat() * 0.1F + 0.9F);
 
 			world.spawnEntityInWorld(EntityNukeExplosionMK5.statFac(world, BombConfig.manRadius, x + 0.5, y + 0.5, z + 0.5));
-			EntityNukeTorex.statFac(world, x + 0.5, y + 0.5, z + 0.5, BombConfig.manRadius);
+			EntityNukeTorex.statFacStandard(world, x + 0.5, y + 0.5, z + 0.5, BombConfig.manRadius);
 		}
 
 		return false;

src/main/java/com/hbm/blocks/bomb/NukeMike.java

@@ -131,7 +131,7 @@ public class NukeMike extends BlockContainer implements IBomb {
 			world.playSoundEffect(x, y, z, "random.explode", 1.0f, world.rand.nextFloat() * 0.1F + 0.9F);
 
 			world.spawnEntityInWorld(EntityNukeExplosionMK5.statFac(world, BombConfig.mikeRadius, x + 0.5, y + 0.5, z + 0.5));
-			EntityNukeTorex.statFac(world, x + 0.5, y + 0.5, z + 0.5, BombConfig.mikeRadius);
+			EntityNukeTorex.statFacStandard(world, x + 0.5, y + 0.5, z + 0.5, BombConfig.mikeRadius);
 		}
 
 		return false;

src/main/java/com/hbm/blocks/bomb/NukeN2.java

@@ -120,7 +120,7 @@ public class NukeN2 extends BlockContainer implements IBomb {
 			world.playSoundEffect(x, y, z, "random.explode", 1.0f, world.rand.nextFloat() * 0.1F + 0.9F);
 
 			world.spawnEntityInWorld(EntityNukeExplosionMK5.statFacNoRad(world, r, x + 0.5, y + 0.5, z + 0.5));
-			EntityNukeTorex.statFac(world, x + 0.5, y + 0.5, z + 0.5, r);
+			EntityNukeTorex.statFacStandard(world, x + 0.5, y + 0.5, z + 0.5, r);
 		}
 
 		return false;

src/main/java/com/hbm/blocks/bomb/NukeTsar.java

@@ -129,7 +129,7 @@ public class NukeTsar extends BlockContainer implements IBomb {
 			tetn.clearSlots();
 			world.playSoundEffect(x, y, z, "random.explode", 1.0f, world.rand.nextFloat() * 0.1F + 0.9F);
 			world.spawnEntityInWorld(EntityNukeExplosionMK5.statFac(world, r, x + 0.5, y + 0.5, z + 0.5));
-			EntityNukeTorex.statFac(world, x + 0.5, y + 0.5, z + 0.5, r);
+			EntityNukeTorex.statFacStandard(world, x + 0.5, y + 0.5, z + 0.5, r);
 		}
 
 		return false;

src/main/java/com/hbm/blocks/generic/BlockAmmoCrate.java

@@ -3,8 +3,8 @@ package com.hbm.blocks.generic;
 import java.util.ArrayList;
 import java.util.Random;
 
-import com.hbm.items.ItemAmmoEnums.*;
 import com.hbm.items.ModItems;
+import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo;
 import com.hbm.lib.RefStrings;
 
 import cpw.mods.fml.relauncher.Side;
@@ -70,26 +70,21 @@ public class BlockAmmoCrate extends Block {
 		ret.add(new ItemStack(ModItems.cap_nuka, 12 + rand.nextInt(21)));
 		ret.add(new ItemStack(ModItems.syringe_metal_stimpak, 1 + rand.nextInt(3)));
 
-		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_22lr, 16 + rand.nextInt(17)));
+		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_standard, 16 + rand.nextInt(17), EnumAmmo.P9_SP.ordinal()));
-		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_9mm, 6 + rand.nextInt(13)));
+		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_standard, 16 + rand.nextInt(17), EnumAmmo.P9_FMJ.ordinal()));
-		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_12gauge, 6 + rand.nextInt(4)));
+		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_standard, 16 + rand.nextInt(17), EnumAmmo.M357_SP.ordinal()));
-		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_20gauge, 3 + rand.nextInt(4)));
+		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_standard, 16 + rand.nextInt(17), EnumAmmo.M357_FMJ.ordinal()));
-		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_357, 10 + rand.nextInt(11)));
+		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_standard, 16 + rand.nextInt(17), EnumAmmo.M44_SP.ordinal()));
-		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_357, 12 + rand.nextInt(15), Ammo357Magnum.IRON.ordinal()));
+		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_standard, 16 + rand.nextInt(17), EnumAmmo.M44_FMJ.ordinal()));
-		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_50bmg, 2 + rand.nextInt(7)));
+		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_standard, 16 + rand.nextInt(17), EnumAmmo.R556_SP.ordinal()));
-		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_rocket, 1));
+		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_standard, 16 + rand.nextInt(17), EnumAmmo.R556_FMJ.ordinal()));
-		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_grenade, 1 + rand.nextInt(2)));
+		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_standard, 16 + rand.nextInt(17), EnumAmmo.R762_SP.ordinal()));
+		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_standard, 16 + rand.nextInt(17), EnumAmmo.R762_FMJ.ordinal()));
+		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_standard, 16 + rand.nextInt(17), EnumAmmo.G12.ordinal()));
+		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_standard, 16 + rand.nextInt(17), EnumAmmo.G12_SLUG.ordinal()));
+		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_standard, 2 + rand.nextInt(3), EnumAmmo.G40_HE.ordinal()));
+		if(rand.nextBoolean()) ret.add(new ItemStack(ModItems.ammo_standard, 2 + rand.nextInt(3), EnumAmmo.ROCKET_HE.ordinal()));
 		
-		if(rand.nextInt(10) == 0) ret.add(new ItemStack(ModItems.ammo_12gauge, 3, Ammo12Gauge.INCENDIARY.ordinal()));
-		if(rand.nextInt(10) == 0) ret.add(new ItemStack(ModItems.ammo_20gauge, 3, Ammo20Gauge.INCENDIARY.ordinal()));
-		if(rand.nextInt(10) == 0) ret.add(new ItemStack(ModItems.ammo_20gauge, 3, Ammo20Gauge.CAUSTIC.ordinal()));
-		if(rand.nextInt(10) == 0) ret.add(new ItemStack(ModItems.ammo_20gauge, 3, Ammo20Gauge.FLECHETTE.ordinal()));
-		if(rand.nextInt(10) == 0) ret.add(new ItemStack(ModItems.ammo_9mm, 7, Ammo9mm.AP.ordinal()));
-		if(rand.nextInt(10) == 0) ret.add(new ItemStack(ModItems.ammo_rocket, 1, AmmoRocket.INCENDIARY.ordinal()));
-		if(rand.nextInt(10) == 0) ret.add(new ItemStack(ModItems.ammo_rocket, 1, AmmoRocket.SLEEK.ordinal()));
-		if(rand.nextInt(10) == 0) ret.add(new ItemStack(ModItems.ammo_grenade, 1, AmmoGrenade.HE.ordinal()));
-		if(rand.nextInt(10) == 0) ret.add(new ItemStack(ModItems.ammo_grenade, 1, AmmoGrenade.INCENDIARY.ordinal()));
-		if(rand.nextInt(10) == 0) ret.add(new ItemStack(ModItems.ammo_grenade, 1, AmmoGrenade.SLEEK.ordinal()));
 		if(rand.nextInt(10) == 0) ret.add(new ItemStack(ModItems.syringe_metal_super, 2));
 		
 		return ret;

src/main/java/com/hbm/blocks/generic/BlockBarrier.java

@@ -0,0 +1,161 @@
+package com.hbm.blocks.generic;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.lib.Library;
+import com.hbm.render.block.ISBRHUniversal;
+import com.hbm.render.util.RenderBlocksNT;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockBarrier extends Block implements ISBRHUniversal {
+
+	public BlockBarrier(Material mat) {
+		super(mat);
+	}
+
+	@Override public int getRenderType() { return renderID; }
+	@Override public boolean isOpaqueCube() { return false; }
+	@Override public boolean renderAsNormalBlock() { return false; }
+
+	@Override
+	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) {
+
+		if(world.getBlockMetadata(x, y, z) != 0) return;
+		
+		int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
+
+		if(i == 0) world.setBlockMetadataWithNotify(x, y, z, 2, 2);
+		if(i == 1) world.setBlockMetadataWithNotify(x, y, z, 5, 2);
+		if(i == 2) world.setBlockMetadataWithNotify(x, y, z, 3, 2);
+		if(i == 3) world.setBlockMetadataWithNotify(x, y, z, 4, 2);
+	}
+
+	@Override
+	public int onBlockPlaced(World world, int x, int y, int z, int side, float fX, float fY, float fZ, int meta) {
+		return side >= 2 && side <= 5 ? side : meta;
+	}
+
+	@Override
+	public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) {
+
+		int meta = world.getBlockMetadata(x, y, z);
+		setBlockBounds(0, 0, 0, 1, 1, 1);
+		
+		if(meta == Library.POS_X.ordinal()) setBlockBounds(0, 0, 0, 0.125F, 1, 1);
+		if(meta == Library.POS_Z.ordinal()) setBlockBounds(0, 0, 0, 1, 1, 0.125F);
+		if(meta == Library.NEG_X.ordinal()) setBlockBounds(0.875F, 0, 0, 1, 1, 1);
+		if(meta == Library.NEG_Z.ordinal()) setBlockBounds(0, 0, 0.875F, 1, 1, 1);
+	}
+
+	@Override
+	public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB aabb, List list, Entity collider) {
+
+		int meta = world.getBlockMetadata(x, y, z);
+		List<AxisAlignedBB> bbs = new ArrayList();
+		
+		Block nx = world.getBlock(x - 1, y, z);
+		Block px = world.getBlock(x + 1, y, z);
+		Block nz = world.getBlock(x, y, z - 1);
+		Block pz = world.getBlock(x, y, z + 1);
+
+		if(nx.isOpaqueCube() || nx.isNormalCube() || meta == Library.POS_X.ordinal()) bbs.add(AxisAlignedBB.getBoundingBox(x, y, z, x + 0.125, y + 1, z + 1));
+		if(nz.isOpaqueCube() || nz.isNormalCube() || meta == Library.POS_Z.ordinal()) bbs.add(AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 0.125));
+		if(px.isOpaqueCube() || px.isNormalCube() || meta == Library.NEG_X.ordinal()) bbs.add(AxisAlignedBB.getBoundingBox(x + 0.875, y, z, x + 1, y + 1, z + 1));
+		if(pz.isOpaqueCube() || pz.isNormalCube() || meta == Library.NEG_Z.ordinal()) bbs.add(AxisAlignedBB.getBoundingBox(x, y, z + 0.875, x + 1, y + 1, z + 1));
+
+		for(AxisAlignedBB bb : bbs) {
+			if(aabb.intersectsWith(bb)) {
+				list.add(bb);
+			}
+		}
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) {
+		return true;
+	}
+
+	@Override
+	public void renderInventoryBlock(Block block, int meta, int modelId, Object renderBlocks) {
+
+		GL11.glPushMatrix();
+		RenderBlocks renderer = (RenderBlocks) renderBlocks;
+		GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F);
+		GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
+
+		renderer.setRenderBounds(0.4375, 0D, 0.4375D, 0.5625D, 1D, 0.5625D); RenderBlocksNT.renderStandardInventoryBlock(block, meta, renderer);
+		renderer.setRenderBounds(0.5D, 0.0625D, 0D, 0.5625D, 0.4725, 1D); RenderBlocksNT.renderStandardInventoryBlock(block, meta, renderer);
+		renderer.setRenderBounds(0.5D, 0.5625D, 0D, 0.5625D, 0.9375, 1D); RenderBlocksNT.renderStandardInventoryBlock(block, meta, renderer);
+		GL11.glPopMatrix();
+	}
+
+	@Override
+	public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, Object renderBlocks) {
+
+		RenderBlocksNT renderer = RenderBlocksNT.INSTANCE.setWorld(world);
+		
+		Tessellator tessellator = Tessellator.instance;
+		tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
+		tessellator.setColorOpaque_F(1, 1, 1);
+		
+		int meta = world.getBlockMetadata(x, y, z);
+		
+		Block nx = world.getBlock(x - 1, y, z);
+		Block px = world.getBlock(x + 1, y, z);
+		Block nz = world.getBlock(x, y, z - 1);
+		Block pz = world.getBlock(x, y, z + 1);
+		Block py = world.getBlock(x, y + 1, z);
+
+		boolean negX = nx.isOpaqueCube() || nx.isNormalCube() || meta == Library.POS_X.ordinal();
+		boolean negZ = nz.isOpaqueCube() || nz.isNormalCube() || meta == Library.POS_Z.ordinal();
+		boolean posX = px.isOpaqueCube() || px.isNormalCube() || meta == Library.NEG_X.ordinal();
+		boolean posZ = pz.isOpaqueCube() || pz.isNormalCube() || meta == Library.NEG_Z.ordinal();
+		boolean posY = py.isOpaqueCube() || py.isNormalCube();
+
+		if(negX) {
+			renderer.setRenderBounds(0D, 0D, 0.4375D, 0.125D, 1D, 0.5625D); renderer.renderStandardBlock(block, x, y, z);
+			renderer.setRenderBounds(0D, 0.0625D, negZ ? 0.125D : 0D, 0.0625D, 0.4375D, posZ ? 0.875D : 1D); renderer.renderStandardBlock(block, x, y, z);
+			renderer.setRenderBounds(0D, 0.5625D, negZ ? 0.125D : 0D, 0.0625D, 0.9375D, posZ ? 0.875D : 1D); renderer.renderStandardBlock(block, x, y, z);
+		}
+		if(negZ) {
+			renderer.setRenderBounds(0.4375D, 0D, 0D, 0.5625D, 1D, 0.125D); renderer.renderStandardBlock(block, x, y, z);
+			renderer.setRenderBounds(negX ? 0.125D : 0D, 0.0625D, 0D, posX ? 0.875D : 1D, 0.4375D, 0.0625D); renderer.renderStandardBlock(block, x, y, z);
+			renderer.setRenderBounds(negX ? 0.125D : 0D, 0.5625D, 0D, posX ? 0.875D : 1D, 0.9375D, 0.0625D); renderer.renderStandardBlock(block, x, y, z);
+		}
+		if(posX) {
+			renderer.setRenderBounds(0.875D, 0D, 0.4375D, 1D, 1D, 0.5625D); renderer.renderStandardBlock(block, x, y, z);
+			renderer.setRenderBounds(0.9375D, 0.0625D, negZ ? 0.125D : 0D, 1D, 0.4375D, posZ ? 0.875D : 1D); renderer.renderStandardBlock(block, x, y, z);
+			renderer.setRenderBounds(0.9375D, 0.5625D, negZ ? 0.125D : 0D, 1D, 0.9375D, posZ ? 0.875D : 1D); renderer.renderStandardBlock(block, x, y, z);
+		}
+		if(posZ) {
+			renderer.setRenderBounds(0.4375D, 0D, 0.875D, 0.5625D, 1D, 1D); renderer.renderStandardBlock(block, x, y, z);
+			renderer.setRenderBounds(negX ? 0.125D : 0D, 0.0625D, 0.9375D, posX ? 0.875D : 1D, 0.4375D, 1D); renderer.renderStandardBlock(block, x, y, z);
+			renderer.setRenderBounds(negX ? 0.125D : 0D, 0.5625D, 0.9375D, posX ? 0.875D : 1D, 0.9375D, 1D); renderer.renderStandardBlock(block, x, y, z);
+		}
+		if(posY) {
+			renderer.setRenderBounds(0D, 0.875D, 0D, 0.125D, 0.9375D, 1D); renderer.renderStandardBlock(block, x, y, z);
+			renderer.setRenderBounds(0.875D, 0.875D, 0D, 1D, 0.9375D, 1D); renderer.renderStandardBlock(block, x, y, z);
+			renderer.setRenderBounds(0D, 0.9375D, 0.0625D, 1D, 1D, 0.4375D); renderer.renderStandardBlock(block, x, y, z);
+			renderer.setRenderBounds(0D, 0.9375D, 0.5625D, 1D, 1D, 0.9375D); renderer.renderStandardBlock(block, x, y, z);
+		}
+		
+		return true;
+	}
+}

src/main/java/com/hbm/blocks/generic/BlockBedrockOreTE.java

@@ -16,9 +16,9 @@ import com.hbm.lib.RefStrings;
 import com.hbm.main.MainRegistry;
 import com.hbm.render.block.RenderBlockMultipass;
 import com.hbm.util.EnumUtil;
-import com.hbm.util.I18nUtil;
+import com.hbm.util.i18n.I18nUtil;
 
-import api.hbm.fluid.IFillableItem;
+import api.hbm.fluidmk2.IFillableItem;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.BlockContainer;

src/main/java/com/hbm/blocks/generic/BlockBobble.java

@@ -4,12 +4,14 @@ import com.hbm.inventory.gui.GUIScreenBobble;
 import com.hbm.items.special.ItemPlasticScrap.ScrapType;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.IGUIProvider;
+import com.hbm.world.gen.INBTTileEntityTransformable;
+import com.hbm.world.gen.INBTTransformable;
+
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
@@ -32,7 +34,7 @@ import net.minecraft.world.World;
 import java.util.List;
 import java.util.Random;
 
-public class BlockBobble extends BlockContainer implements IGUIProvider {
+public class BlockBobble extends BlockContainer implements IGUIProvider, INBTTransformable {
 
 	public BlockBobble() {
 		super(Material.iron);
@@ -137,12 +139,17 @@ public class BlockBobble extends BlockContainer implements IGUIProvider {
 		return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ);
 	}
 
+	@Override
+	public int transformMeta(int meta, int coordBaseMode) {
+		return (meta + coordBaseMode * 4) % 16;
+	}
+
 	@Override
 	public TileEntity createNewTileEntity(World world, int meta) {
 		return new TileEntityBobble();
 	}
 
-	public static class TileEntityBobble extends TileEntity {
+	public static class TileEntityBobble extends TileEntity implements INBTTileEntityTransformable {
 
 		public BobbleType type = BobbleType.NONE;
 
@@ -174,6 +181,11 @@ public class BlockBobble extends BlockContainer implements IGUIProvider {
 			super.writeToNBT(nbt);
 			nbt.setByte("type", (byte) type.ordinal());
 		}
+
+		@Override
+		public void transformTE(World world, int coordBaseMode) {
+			type = BobbleType.values()[world.rand.nextInt(BobbleType.values().length - 1) + 1];
+		}
 	}
 
 	public static enum BobbleType {
@@ -199,9 +211,10 @@ public class BlockBobble extends BlockContainer implements IGUIProvider {
 		NOS(			"Dr Nostalgia",						"Dr Nostalgia",		"SSG and Vortex models",									"Take a picture, I'ma pose, paparazzi$I've been drinking, moving like a zombie",					true,	ScrapType.BOARD_TRANSISTOR),
 		DRILLGON(		"Drillgon200",						"Drillgon200",		"1.12 Port",												null,																								false,	ScrapType.CPU_LOGIC),
 		CIRNO(			"Cirno",							"Cirno",			"the only multi layered skin i had",						"No brain. Head empty.",																			true,	ScrapType.BOARD_BLANK),
-		MICROWAVE(		"Microwave",						"Microwave",		"OC Compatibility",											"they call me the food heater",																		true,	ScrapType.BOARD_CONVERTER),
+		MICROWAVE(		"Microwave",						"Microwave",		"OC Compatibility and massive RBMK/packet optimizations",	"they call me the food heater$john optimization",													true,	ScrapType.BOARD_CONVERTER),
 		PEEP(			"Peep",								"LePeeperSauvage",	"Coilgun, Leadburster and Congo Lake models, BDCL QC",		"Fluffy ears can't hide in ash, nor snow.",															true,	ScrapType.CARD_BOARD),
-		MELLOW(			"MELLOWARPEGGIATION",				"Mellow",			"Industrial lighting, animation tools",						"Make something cool now, ask for permission later.",												true,	ScrapType.CARD_PROCESSOR);
+		MELLOW(			"MELLOWARPEGGIATION",				"Mellow",			"NBT Structures, industrial lighting, animation tools",		"Make something cool now, ask for permission later.",												true,	ScrapType.CARD_PROCESSOR),
+		ABEL(			"Abel1502", 						"Abel1502", 		"Abilities GUI, optimizations and many QoL improvements", 	"NANTO SUBARASHII",																				true,	ScrapType.CPU_REGISTER);
 
 		public String name;			//the title of the tooltip
 		public String label;		//the name engraved in the socket
@@ -227,7 +240,7 @@ public class BlockBobble extends BlockContainer implements IGUIProvider {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public GuiScreen provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) {
+	public Object provideGUI(int ID, EntityPlayer player, World world, int x, int y, int z) {
 		return new GUIScreenBobble((TileEntityBobble) world.getTileEntity(x, y, z));
 	}
 }

src/main/java/com/hbm/blocks/generic/BlockCluster.java

@@ -6,7 +6,7 @@ import java.util.Random;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.items.ModItems;
-import com.hbm.util.I18nUtil;
+import com.hbm.util.i18n.I18nUtil;
 
 import api.hbm.block.IDrillInteraction;
 import api.hbm.block.IMiningDrill;

src/main/java/com/hbm/blocks/generic/BlockCoalOil.java

@@ -3,20 +3,12 @@ package com.hbm.blocks.generic;
 import java.util.Random;
 
 import com.hbm.blocks.ModBlocks;
-import com.hbm.items.tool.ItemToolAbility;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemTool;
-import net.minecraft.item.Item.ToolMaterial;
-import net.minecraft.util.Vec3;
-import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 
 public class BlockCoalOil extends Block {
 
@@ -24,19 +16,6 @@ public class BlockCoalOil extends Block {
 		super(mat);
 	}
 
-	@Override
-	public void onNeighborBlockChange(World world, int x, int y, int z, Block b) {
-
-		for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
-
-			Block n = world.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ);
-
-			if(n == ModBlocks.ore_coal_oil_burning || n == ModBlocks.balefire || n == Blocks.fire || n.getMaterial() == Material.lava) {
-				world.scheduleBlockUpdate(x, y, z, this, world.rand.nextInt(20) + 2);
-			}
-		}
-	}
-
 	@Override
 	public void updateTick(World world, int x, int y, int z, Random rand) {
 		world.setBlock(x, y, z, ModBlocks.ore_coal_oil_burning);
@@ -51,58 +30,4 @@ public class BlockCoalOil extends Block {
 	public int quantityDropped(Random rand) {
 		return 2 + rand.nextInt(2);
 	}
-
-	public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) {
-		
-		if(doesToolIgnite(player)) {
-			if(world.rand.nextInt(10) == 0)
-				world.setBlock(x, y, z, Blocks.fire);
-		}
-	}
-
-	public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player) {
-
-		if(!world.isRemote)
-			return;
-		
-		if(doesToolIgnite(player)) {
-
-			Random rand = world.rand;
-			for(int i = 0; i < 15; i++) {
-				Vec3 vec = Vec3.createVectorHelper(1, 0, 0);
-				vec.rotateAroundZ((float)(Math.PI * rand.nextDouble() * 2D));
-				vec.rotateAroundY((float)(Math.PI * rand.nextDouble() * 2D));
-				
-				double dX = vec.xCoord;
-				double dY = vec.yCoord;
-				double dZ = vec.zCoord;
-
-				if(Math.abs(dX) > 1)
-					dX /= Math.abs(dX);
-				if(Math.abs(dY) > 1)
-					dY /= Math.abs(dY);
-				if(Math.abs(dX) > 1)
-					dZ /= Math.abs(dZ);
-				
-				world.spawnParticle("flame", x + 0.5 + dX * 0.75, y + 0.5 + dY * 0.75, z + 0.5 + dZ * 0.75, 0.0, 0.0, 0.0);
-			}
-		}
-	}
-
-	public void onBlockDestroyedByExplosion(World world, int x, int y, int z, Explosion explosion) {
-		world.setBlock(x, y, z, Blocks.fire);
-	}
-	
-	private boolean doesToolIgnite(EntityPlayer player) {
-
-		if(player.getHeldItem() == null)
-			return false;
-
-		if(!(player.getHeldItem().getItem() instanceof ItemTool || player.getHeldItem().getItem() instanceof ItemToolAbility))
-			return false;
-
-		ItemTool tool = (ItemTool) player.getHeldItem().getItem();
-
-		return tool.func_150913_i() != ToolMaterial.WOOD;
-	}
 }

src/main/java/com/hbm/blocks/generic/BlockCrate.java

@@ -5,7 +5,7 @@ import java.util.List;
 import java.util.Random;
 
 import com.hbm.blocks.ModBlocks;
-import com.hbm.items.ItemAmmoEnums.Ammo44Magnum;
+import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmoSecret;
 import com.hbm.items.ModItems;
 
 import net.minecraft.block.BlockFalling;
@@ -52,18 +52,6 @@ public class BlockCrate extends BlockFalling {
 		// Supply Crate
 		BlockCrate.addToListWithWeight(crateList, ModItems.syringe_metal_stimpak, 10);
 		BlockCrate.addToListWithWeight(crateList, ModItems.syringe_antidote, 5);
-		BlockCrate.addToListWithWeight(crateList, ModItems.clip_revolver_iron, 9);
-		BlockCrate.addToListWithWeight(crateList, ModItems.clip_revolver, 7);
-		BlockCrate.addToListWithWeight(crateList, ModItems.clip_revolver_gold, 4);
-		BlockCrate.addToListWithWeight(crateList, ModItems.clip_revolver_lead, 6);
-		BlockCrate.addToListWithWeight(crateList, ModItems.clip_revolver_cursed, 5);
-		BlockCrate.addToListWithWeight(crateList, ModItems.clip_rpg, 5);
-		BlockCrate.addToListWithWeight(crateList, ModItems.clip_fatman, 1);
-		BlockCrate.addToListWithWeight(crateList, ModItems.clip_mp40, 7);
-		BlockCrate.addToListWithWeight(crateList, ModItems.clip_uzi, 7);
-		BlockCrate.addToListWithWeight(crateList, ModItems.clip_uboinik, 7);
-		BlockCrate.addToListWithWeight(crateList, ModItems.clip_lever_action, 5);
-		BlockCrate.addToListWithWeight(crateList, ModItems.clip_bolt_action, 5);
 		BlockCrate.addToListWithWeight(crateList, ModItems.grenade_generic, 8);
 		BlockCrate.addToListWithWeight(crateList, ModItems.grenade_strong, 6);
 		BlockCrate.addToListWithWeight(crateList, ModItems.grenade_mk2, 4);
@@ -71,21 +59,13 @@ public class BlockCrate extends BlockFalling {
 		BlockCrate.addToListWithWeight(crateList, ModItems.ammo_container, 2);
 
 		// Weapon Crate
-		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_revolver, 9);
+		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_light_revolver, 10);
-		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_revolver_gold, 7);
+		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_maresleg, 7);
-		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_revolver_cursed, 7);
+		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_heavy_revolver, 5);
-		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_calamity, 3);
+		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_greasegun, 5);
-		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_rpg, 7);
+		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_liberator, 2);
-		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_karl, 4);
+		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_flaregun, 8);
-		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_panzerschreck, 6);
+		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_panzerschreck, 1);
-		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_hk69, 8);
-		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_stinger, 7);
-		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_mp40, 9);
-		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_uzi, 6);
-		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_uzi_silencer, 5);
-		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_uboinik, 8);
-		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_lever_action, 7);
-		BlockCrate.addToListWithWeight(weaponList, ModItems.gun_bolt_action, 7);
 
 		// Lead Crate
 		BlockCrate.addToListWithWeight(leadList, ModItems.ingot_uranium, 10);
@@ -123,7 +103,6 @@ public class BlockCrate extends BlockFalling {
 		BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_press), 10);
 		BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_difurnace_off), 9);
 		BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_reactor_breeding), 6);
-		BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_nuke_furnace_off), 7);
 		BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_wood_burner), 10);
 		BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_diesel), 8);
 		BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_rtg_grey), 4);
@@ -144,12 +123,12 @@ public class BlockCrate extends BlockFalling {
 
 		// Red Crate
 		BlockCrate.addToListWithWeight(redList, ModItems.mysteryshovel, 1);
-		BlockCrate.addToListWithWeight(redList, ModItems.gun_revolver_pip, 1);
+		BlockCrate.addToListWithWeight(redList, ModItems.gun_heavy_revolver_lilmac, 1);
-		BlockCrate.addToListWithWeight(redList, ModItems.gun_revolver_blackjack, 1);
+		BlockCrate.addToListWithWeight(redList, ModItems.gun_autoshotgun_sexy, 1);
-		BlockCrate.addToListWithWeight(redList, ModItems.gun_revolver_silver, 1);
+		BlockCrate.addToListWithWeight(redList, ModItems.gun_maresleg_broken, 1);
-		BlockCrate.addToListWithWeight(redList, ModItems.ammo_44.stackFromEnum(Ammo44Magnum.PIP), 1);
+		BlockCrate.addToListWithWeight(redList, new ItemStack(ModItems.ammo_secret, 1, EnumAmmoSecret.M44_EQUESTRIAN.ordinal()), 1);
-		BlockCrate.addToListWithWeight(redList, ModItems.ammo_44.stackFromEnum(Ammo44Magnum.BJ), 1);
+		BlockCrate.addToListWithWeight(redList, new ItemStack(ModItems.ammo_secret, 1, EnumAmmoSecret.G12_EQUESTRIAN.ordinal()), 1);
-		BlockCrate.addToListWithWeight(redList, ModItems.ammo_44.stackFromEnum(Ammo44Magnum.SILVER), 1);
+		BlockCrate.addToListWithWeight(redList, new ItemStack(ModItems.ammo_secret, 1, EnumAmmoSecret.BMG50_EQUESTRIAN.ordinal()), 1);
 		BlockCrate.addToListWithWeight(redList, ModItems.battery_spark, 1);
 		BlockCrate.addToListWithWeight(redList, ModItems.bottle_sparkle, 1);
 		BlockCrate.addToListWithWeight(redList, ModItems.bottle_rad, 1);

src/main/java/com/hbm/blocks/generic/BlockDecoCRT.java

@@ -2,6 +2,7 @@ package com.hbm.blocks.generic;
 
 import com.hbm.blocks.BlockMulti;
 import com.hbm.lib.RefStrings;
+import com.hbm.world.gen.INBTTransformable;
 
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -14,7 +15,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
-public class BlockDecoCRT extends BlockMulti {
+public class BlockDecoCRT extends BlockMulti implements INBTTransformable {
 
 	protected String[] variants = new String[] {"crt_clean", "crt_broken", "crt_blinking", "crt_bsod"};
 	@SideOnly(Side.CLIENT) protected IIcon[] icons;
@@ -73,4 +74,10 @@ public class BlockDecoCRT extends BlockMulti {
 	public int getSubCount() {
 		return 4;
 	}
+
+	@Override
+	public int transformMeta(int meta, int coordBaseMode) {
+		return INBTTransformable.transformMetaDecoModel(meta, coordBaseMode);
+	}
+
 }

src/main/java/com/hbm/blocks/generic/BlockDecoCT.java

@@ -1,17 +1,19 @@
 package com.hbm.blocks.generic;
 
+import com.hbm.blocks.ModBlocks;
 import com.hbm.render.block.ct.CT;
 import com.hbm.render.block.ct.CTStitchReceiver;
 import com.hbm.render.block.ct.IBlockCT;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
-public class BlockDecoCT extends BlockOre implements IBlockCT{
+public class BlockDecoCT extends BlockOre implements IBlockCT {
 
 	public BlockDecoCT(Material mat) {
 		super(mat);
@@ -35,4 +37,12 @@ public class BlockDecoCT extends BlockOre implements IBlockCT{
 	public IIcon[] getFragments(IBlockAccess world, int x, int y, int z) {
 		return rec.fragCache;
 	}
+
+	@Override
+	public boolean canConnect(IBlockAccess world, int x, int y, int z, Block block) {
+		// i don't care
+		if(this == ModBlocks.deco_steel && block == ModBlocks.deco_rusty_steel) return true;
+		if(this == ModBlocks.deco_rusty_steel && block == ModBlocks.deco_steel) return true;
+		return this == block;
+	}
 }

src/main/java/com/hbm/blocks/generic/BlockDecoModel.java

@@ -1,6 +1,7 @@
 package com.hbm.blocks.generic;
 
 import com.hbm.blocks.BlockEnumMulti;
+import com.hbm.world.gen.INBTTransformable;
 
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import net.minecraft.block.material.Material;
@@ -11,7 +12,7 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class BlockDecoModel extends BlockEnumMulti {
+public class BlockDecoModel extends BlockEnumMulti implements INBTTransformable {
 
 	public BlockDecoModel(Material mat, Class<? extends Enum> theEnum, boolean multiName, boolean multiTexture) {
 		super(mat, theEnum, multiName, multiTexture);
@@ -104,4 +105,34 @@ public class BlockDecoModel extends BlockEnumMulti {
 		this.setBlockBoundsBasedOnState(world, x, y, z);
 		return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ);
 	}
+
+	@Override
+	public int transformMeta(int meta, int coordBaseMode) {
+		if(coordBaseMode == 0) return meta;
+		//N: 0b00, S: 0b01, W: 0b10, E: 0b11
+		int rot = meta >> 2;
+		int type = meta & 3;
+
+		switch(coordBaseMode) {
+		default: //South
+			break;
+		case 1: //West
+			if((rot & 3) < 2) //N & S can just have bits toggled
+				rot = rot ^ 3;
+			else //W & E can just have first bit set to 0
+				rot = rot ^ 2;
+			break;
+		case 2: //North
+			rot = rot ^ 1; //N, W, E & S can just have first bit toggled
+			break;
+		case 3: //East
+			if((rot & 3) < 2)//N & S can just have second bit set to 1
+				rot = rot ^ 2;
+			else //W & E can just have bits toggled
+				rot = rot ^ 3;
+			break;
+		}
+		//genuinely like. why did i do that
+		return (rot << 2) | type; //To accommodate for BlockDecoModel's shift in the rotation bits; otherwise, simply bit-shift right and or any non-rotation meta after
+	}
 }

src/main/java/com/hbm/blocks/generic/BlockDecoToaster.java

@@ -2,6 +2,7 @@ package com.hbm.blocks.generic;
 
 import com.hbm.blocks.BlockMulti;
 import com.hbm.lib.RefStrings;
+import com.hbm.world.gen.INBTTransformable;
 
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -16,7 +17,7 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class BlockDecoToaster extends BlockMulti {
+public class BlockDecoToaster extends BlockMulti implements INBTTransformable {
 
 	protected String[] variants = new String[] {"toaster_iron", "toaster_steel", "toaster_wood"};
 	@SideOnly(Side.CLIENT) protected IIcon[] icons;
@@ -90,4 +91,10 @@ public class BlockDecoToaster extends BlockMulti {
 		this.setBlockBoundsBasedOnState(world, x, y, z);
 		return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ);
 	}
+
+	@Override
+	public int transformMeta(int meta, int coordBaseMode) {
+		return INBTTransformable.transformMetaDecoModel(meta, coordBaseMode);
+	}
+
 }

src/main/java/com/hbm/blocks/generic/BlockDepth.java

@@ -3,7 +3,7 @@ package com.hbm.blocks.generic;
 import java.util.List;
 
 import com.hbm.blocks.ITooltipProvider;
-import com.hbm.util.I18nUtil;
+import com.hbm.util.i18n.I18nUtil;
 
 import api.hbm.item.IDepthRockTool;
 import net.minecraft.block.Block;

src/main/java/com/hbm/blocks/generic/BlockDoorGeneric.java

@@ -17,6 +17,8 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -116,6 +118,22 @@ public class BlockDoorGeneric extends BlockDummyable implements IBomb {
 		return aabb;
 	}
 
+	// Enables clicking through the open door
+	@Override
+	public MovingObjectPosition collisionRayTrace(World world, int x, int y, int z, Vec3 startVec, Vec3 endVec) {
+		AxisAlignedBB box = getBoundingBox(world, x, y ,z);
+		box = AxisAlignedBB.getBoundingBox(
+			Math.min(box.minX, box.maxX), Math.min(box.minY, box.maxY), Math.min(box.minZ, box.maxZ),
+			Math.max(box.minX, box.maxX), Math.max(box.minY, box.maxY), Math.max(box.minZ, box.maxZ)
+		);
+		
+		MovingObjectPosition intercept = box.calculateIntercept(startVec, endVec);
+		if(intercept != null) {
+			return new MovingObjectPosition(x, y, z, intercept.sideHit, intercept.hitVec);
+		}
+		return null;
+	}
+
 	@Override //should fix AI pathfinding
 	public boolean getBlocksMovement(IBlockAccess world, int x, int y, int z) { //btw the method name is the exact opposite of that it's doing, check net.minecraft.pathfinding.PathNavigate#512
 		return hasExtra(world.getBlockMetadata(x, y, z)); //if it's open

src/main/java/com/hbm/blocks/generic/BlockDynamicSlag.java

@@ -135,7 +135,7 @@ public class BlockDynamicSlag extends BlockContainer {
 		TileEntitySlag self = (TileEntitySlag) s;
 		
 		/* Flow down */
-		if(world.getBlock(x, y - 1, z).isReplaceable(world, x, y - 1, z)) {
+		if(world.getBlock(x, y - 1, z).isReplaceable(world, x, y - 1, z) && y > 0) {
 			world.setBlock(x, y - 1, z, ModBlocks.slag);
 			TileEntitySlag tile = (TileEntitySlag) Compat.getTileStandard(world, x, y - 1, z);
 			tile.mat = self.mat;

src/main/java/com/hbm/blocks/generic/BlockEmitter.java

@@ -4,15 +4,15 @@ import java.awt.Color;
 import java.util.List;
 
 import com.hbm.blocks.ITooltipProvider;
-import com.hbm.packet.AuxParticlePacketNT;
+import com.hbm.handler.threading.PacketThreading;
-import com.hbm.packet.NBTPacket;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
-import com.hbm.packet.PacketDispatcher;
-import com.hbm.tileentity.INBTPacketReceiver;
 
 import api.hbm.block.IToolable;
+import com.hbm.tileentity.TileEntityLoadedBase;
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.BlockPistonBase;
@@ -103,7 +103,7 @@ public class BlockEmitter extends BlockContainer implements IToolable, ITooltipP
 		return false;
 	}
 
-	public static class TileEntityEmitter extends TileEntity implements INBTPacketReceiver {
+	public static class TileEntityEmitter extends TileEntityLoadedBase {
 
 		public static final int range = 100;
 		public int color;
@@ -169,19 +169,15 @@ public class BlockEmitter extends BlockContainer implements IToolable, ITooltipP
 							data.setFloat("yaw", 90);
 						}
 
-						PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, x, y, z),
+						PacketThreading.createAllAroundThreadedPacket(new AuxParticlePacketNT(data, x, y, z),
 								new TargetPoint(worldObj.provider.dimensionId, x, y, z, 100));
 
 						color = prevColor;
 					}
 				}
 
-				NBTTagCompound data = new NBTTagCompound();
+				networkPackNT(150);
-				data.setInteger("beam", this.beam);
+
-				data.setInteger("color", this.color);
-				data.setFloat("girth", this.girth);
-				data.setInteger("effect", this.effect);
-				PacketDispatcher.wrapper.sendToAllAround(new NBTPacket(data, xCoord, yCoord, zCoord), new TargetPoint(this.worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 150));
 			}
 		}
 
@@ -225,11 +221,19 @@ public class BlockEmitter extends BlockContainer implements IToolable, ITooltipP
 		}
 
 		@Override
-		public void networkUnpack(NBTTagCompound nbt) {
+		public void serialize(ByteBuf buf) {
-			this.beam = nbt.getInteger("beam");
+			buf.writeInt(this.beam);
-			this.color = nbt.getInteger("color");
+			buf.writeInt(this.color);
-			this.girth = nbt.getFloat("girth");
+			buf.writeFloat(this.girth);
-			this.effect = nbt.getInteger("effect");
+			buf.writeInt(this.effect);
+		}
+
+		@Override
+		public void deserialize(ByteBuf buf) {
+			this.beam = buf.readInt();
+			this.color = buf.readInt();
+			this.girth = buf.readFloat();
+			this.effect = buf.readInt();
 		}
 	}
 

src/main/java/com/hbm/blocks/generic/BlockFissure.java

@@ -2,21 +2,28 @@ package com.hbm.blocks.generic;
 
 import java.util.Random;
 
+import api.hbm.fluid.IFluidStandardSender;
 import com.hbm.blocks.IBlockMultiPass;
 import com.hbm.blocks.ModBlocks;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
+import com.hbm.inventory.fluid.tank.FluidTank;
 import com.hbm.lib.RefStrings;
 import com.hbm.render.block.RenderBlockMultipass;
+import com.hbm.tileentity.TileEntityLoadedBase;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.init.Blocks;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
 
-public class BlockFissure extends Block implements IBlockMultiPass {
+public class BlockFissure extends BlockContainer implements IBlockMultiPass {
 
 	private IIcon overlay;
 
@@ -65,4 +72,31 @@ public class BlockFissure extends Block implements IBlockMultiPass {
 	public int getRenderType(){
 		return IBlockMultiPass.getRenderType();
 	}
+
+	@Override
+	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
+		return new TileEntityFissure();
+	}
+	
+	public static class TileEntityFissure extends TileEntityLoadedBase implements IFluidStandardSender {
+
+		public FluidTank lava = new FluidTank(Fluids.LAVA, 1_000);
+		
+		@Override
+		public void updateEntity() {
+			
+			if(!worldObj.isRemote) {
+				lava.setFill(1_000);
+				this.sendFluid(lava, worldObj, xCoord, yCoord + 1, zCoord, ForgeDirection.UP);
+			}
+		}
+
+		@Override
+		public boolean canConnect(FluidType type, ForgeDirection dir) {
+			return dir == ForgeDirection.DOWN && type == Fluids.LAVA;
+		}
+		
+		@Override public FluidTank[] getAllTanks() { return new FluidTank[] {lava}; }
+		@Override public FluidTank[] getSendingTanks() { return new FluidTank[] {lava}; }
+	}
 }

src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java

@@ -18,6 +18,6 @@ public class BlockGenericStairs extends BlockStairs {
 		
 		recipeGen.add(new Object[] {block, meta, this});
 		
-		this.setBlockTextureName(RefStrings.MODID + ":concrete_smooth");
+		this.setBlockTextureName(RefStrings.MODID + ":concrete");
 	}
 }

src/main/java/com/hbm/blocks/generic/BlockGlyphid.java

@@ -22,6 +22,7 @@ public class BlockGlyphid extends Block implements IBlockMulti {
 
 	public IIcon[] iconsStandard = new IIcon[2];
 	public IIcon[] iconsInfested = new IIcon[2];
+	public IIcon[] iconsRad = new IIcon[2];
 
 	public BlockGlyphid(Material mat) {
 		super(mat);
@@ -57,16 +58,19 @@ public class BlockGlyphid extends Block implements IBlockMulti {
 		iconsStandard[1] = reg.registerIcon(RefStrings.MODID + ":glyphid_base_alt");
 		iconsInfested[0] = reg.registerIcon(RefStrings.MODID + ":glyphid_base_infested");
 		iconsInfested[1] = reg.registerIcon(RefStrings.MODID + ":glyphid_base_infested_alt");
+		iconsRad[0] = reg.registerIcon(RefStrings.MODID + ":glyphid_base_rad");
+		iconsRad[1] = reg.registerIcon(RefStrings.MODID + ":glyphid_base_rad_alt");
 	}
 
 	protected IIcon[] getIconArray(int meta) {
 		if(meta == 1) return this.iconsInfested;
+		if(meta == 2) return this.iconsRad;
 		return this.iconsStandard;
 	}
 
 	@Override
 	public int getSubCount() {
-		return 2;
+		return 3;
 	}
 
 	@Override

src/main/java/com/hbm/blocks/generic/BlockGlyphidSpawner.java

@@ -38,7 +38,7 @@ import net.minecraft.world.World;
 
 public class BlockGlyphidSpawner extends BlockContainer implements IBlockMulti {
 	
-	public IIcon[] icons = new IIcon[2];
+	public IIcon[] icons = new IIcon[3];
 
 	public BlockGlyphidSpawner(Material mat) {
 		super(mat);
@@ -61,11 +61,12 @@ public class BlockGlyphidSpawner extends BlockContainer implements IBlockMulti {
 	public void registerBlockIcons(IIconRegister reg) {
 		icons[0] = reg.registerIcon(RefStrings.MODID + ":glyphid_eggs_alt");
 		icons[1] = reg.registerIcon(RefStrings.MODID + ":glyphid_eggs_infested");
+		icons[2] = reg.registerIcon(RefStrings.MODID + ":glyphid_eggs_rad");
 	}
 
 	@Override
 	public int getSubCount() {
-		return 2;
+		return 3;
 	}
 
 	@Override
@@ -122,15 +123,16 @@ public class BlockGlyphidSpawner extends BlockContainer implements IBlockMulti {
 					List<EntityGlyphid> list = worldObj.getEntitiesWithinAABB(EntityGlyphid.class, AxisAlignedBB.getBoundingBox(xCoord - 5, yCoord + 1, zCoord - 5, xCoord + 6, yCoord + 7, zCoord + 6));
 					float soot = PollutionHandler.getPollution(worldObj, xCoord, yCoord, zCoord, PollutionType.SOOT);
 
-					if(list.size() <= 3) {
+					int subtype = this.getBlockMetadata();
+					if(list.size() <= 3 || subtype == EntityGlyphid.TYPE_RADIOACTIVE) {
 
-						ArrayList<EntityGlyphid> currentSwarm = createSwarm(soot, this.getBlockMetadata());
+						ArrayList<EntityGlyphid> currentSwarm = createSwarm(soot, subtype);
 
 						for(EntityGlyphid glyphid : currentSwarm) {
 							trySpawnEntity(glyphid);
 						}
 
-						if(!initialSpawn && worldObj.rand.nextInt(MobConfig.scoutSwarmSpawnChance + 1) == 0 && soot >= MobConfig.scoutThreshold) {
+						if(!initialSpawn && worldObj.rand.nextInt(MobConfig.scoutSwarmSpawnChance + 1) == 0 && soot >= MobConfig.scoutThreshold && subtype != EntityGlyphid.TYPE_RADIOACTIVE) {
 							EntityGlyphidScout scout = new EntityGlyphidScout(worldObj);
 							if(this.getBlockMetadata() == 1) scout.getDataWatcher().updateObject(EntityGlyphid.DW_SUBTYPE, (byte) EntityGlyphid.TYPE_INFECTED);
 							trySpawnEntity(scout);
@@ -168,6 +170,7 @@ public class BlockGlyphidSpawner extends BlockContainer implements IBlockMulti {
 					if(soot >= chance[2] && rand.nextInt(100) <= adjustedChance) {
 						EntityGlyphid entity = glyphid.getKey().apply(worldObj);
 						if(meta == 1) entity.getDataWatcher().updateObject(EntityGlyphid.DW_SUBTYPE, (byte) EntityGlyphid.TYPE_INFECTED);
+						if(meta == 2) entity.getDataWatcher().updateObject(EntityGlyphid.DW_SUBTYPE, (byte) EntityGlyphid.TYPE_RADIOACTIVE);
 						currentSpawns.add(entity);
 					}
 				}

src/main/java/com/hbm/blocks/generic/BlockGrate.java

@@ -5,7 +5,7 @@ import java.util.List;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.lib.RefStrings;
-import com.hbm.util.I18nUtil;
+import com.hbm.util.i18n.I18nUtil;
 
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;

src/main/java/com/hbm/blocks/generic/BlockHangingVine.java

@@ -0,0 +1,127 @@
+package com.hbm.blocks.generic;
+
+import java.util.ArrayList;
+
+import com.hbm.lib.RefStrings;
+
+import cpw.mods.fml.client.registry.RenderingRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+import net.minecraftforge.common.IShearable;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class BlockHangingVine extends Block implements IShearable {
+
+	public BlockHangingVine(Material mat) {
+		super(mat);
+	}
+	
+	@Override
+	public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) {
+		entity.motionX *= 0.5;
+		entity.motionY *= 0.5;
+		entity.motionZ *= 0.5;
+		entity.fallDistance = 0F;
+	}
+	
+	@Override
+	public boolean canPlaceBlockAt(World world, int x, int y, int z) {
+		return this.canBlockStay(world, x, y, z);
+	}
+	
+	@Override
+	public boolean canBlockStay(World world, int x, int y, int z) {
+		Block b = world.getBlock(x, y + 1, z);
+		return b.isSideSolid(world, x, y + 1, z, ForgeDirection.UP) || b == this;
+	}
+	
+	@Override
+	public void onNeighborBlockChange(World world, int x, int y, int z, Block block) {
+		super.onNeighborBlockChange(world, x, y, z, block);
+		this.checkAndDropBlock(world, x, y, z);
+	}
+
+	protected void checkAndDropBlock(World world, int x, int y, int z) {
+		if(!this.canBlockStay(world, x, y, z)) {
+			world.setBlock(x, y, z, Blocks.air);
+		}
+	}
+	
+	@Override protected boolean canSilkHarvest() { return true; }
+	
+	@Override
+	public boolean isShearable(ItemStack item, IBlockAccess world, int x, int y, int z) {
+		return true;
+	}
+	
+	@Override
+	public ArrayList<ItemStack> onSheared(ItemStack item, IBlockAccess world, int x, int y, int z, int fortune) {
+		ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
+		ret.add(new ItemStack(this)); //placeholder
+		return ret;
+	}
+	
+	@Override
+	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
+		return null;
+	}
+	
+	@Override
+	public boolean isOpaqueCube() {
+		return false;
+	}
+
+	@Override
+	public boolean renderAsNormalBlock() {
+		return false;
+	}
+
+	@SideOnly(Side.CLIENT) public IIcon iconItem;
+	@SideOnly(Side.CLIENT) public IIcon iconGround; //when touching a solid face below
+	@SideOnly(Side.CLIENT) public IIcon iconHang; //when hanging mid-air
+	@SideOnly(Side.CLIENT) public IIcon iconGlow; //regular phosphor
+	@SideOnly(Side.CLIENT) public IIcon iconHangGlow; //phosphor in different position when hanging for variety
+	
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister reg) {
+		this.iconItem = reg.registerIcon(RefStrings.MODID + ":vine_phosphor_item");
+		this.blockIcon = reg.registerIcon(RefStrings.MODID + ":vine_phosphor");
+		this.iconGround = reg.registerIcon(RefStrings.MODID + ":vine_phosphor_ground");
+		this.iconHang = reg.registerIcon(RefStrings.MODID + ":vine_phosphor_hang");
+		this.iconGlow = reg.registerIcon(RefStrings.MODID + ":vine_phosphor_spots");
+		this.iconHangGlow = reg.registerIcon(RefStrings.MODID + ":vine_phosphor_spots_hang");
+	}
+	
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(IBlockAccess world, int x, int y, int z, boolean pass) {
+		Block b = world.getBlock(x, y - 1, z);
+		
+		if(!pass)
+			return b.isSideSolid(world, x, y, z, ForgeDirection.UP) ? iconGround : b == this ? blockIcon : iconHang;
+		else
+			return b.isAir(world, x, y, z) ? iconHangGlow : iconGlow;
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(int side, int meta) {
+		return this.iconItem;
+	}
+	
+	public static int renderID = RenderingRegistry.getNextAvailableRenderId();
+	
+	@Override
+	public int getRenderType() {
+		return renderID;
+	}
+}

src/main/java/com/hbm/blocks/generic/BlockKeyhole.java

@@ -108,6 +108,14 @@ public class BlockKeyhole extends BlockStone {
 			}
 		}
 		
+		if(world.rand.nextInt(1) == 0) {
+			int r = world.rand.nextInt(4);
+			if(r == 0) world.setBlock(x + width, y + 2, z, ModBlocks.stone_keyhole_meta, 4, 3);
+			if(r == 1) world.setBlock(x - width, y + 2, z, ModBlocks.stone_keyhole_meta, 5, 3);
+			if(r == 2) world.setBlock(x, y + 2, z + width, ModBlocks.stone_keyhole_meta, 2, 3);
+			if(r == 3) world.setBlock(x, y + 2, z - width, ModBlocks.stone_keyhole_meta, 3, 3);
+		}
+		
 		for(int i = -width + 1; i <= width - 1; i++) {
 			for(int j = -width + 1; j <= width - 1; j++) {
 				//Floor and ceiling

src/main/java/com/hbm/blocks/generic/BlockLanternBehemoth.java

@@ -53,7 +53,7 @@ public class BlockLanternBehemoth extends BlockDummyable implements IToolable, I
 		
 		if(didRepair) {
 			HbmPlayerProps data = HbmPlayerProps.getData(player);
-			data.reputation++;
+			if(data.reputation < 25) data.reputation++;
 		}
 		
 		return didRepair;

src/main/java/com/hbm/blocks/generic/BlockLightstone.java

@@ -0,0 +1,39 @@
+package com.hbm.blocks.generic;
+
+import com.hbm.blocks.BlockEnumMulti;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.IIcon;
+
+public class BlockLightstone extends BlockEnumMulti {
+
+	public BlockLightstone(Material mat, Class<? extends Enum> theEnum, boolean multiName, boolean multiTexture) {
+		super(mat, theEnum, multiName, multiTexture);
+	}
+	
+	protected IIcon[] topIcons;
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void registerBlockIcons(IIconRegister reg) {
+
+		Enum[] enums = theEnum.getEnumConstants();
+		this.icons = new IIcon[enums.length];
+		this.topIcons = new IIcon[enums.length];
+
+		for(int i = 0; i < icons.length; i++) {
+			Enum num = enums[i];
+			this.icons[i] = reg.registerIcon(this.getTextureMultiName(num));
+			if(i >= 3) this.topIcons[i] = reg.registerIcon(this.getTextureMultiName(num) + ".top");
+		}
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(int side, int meta) {
+		return (side == 0 || side == 1) && this.topIcons[meta % this.icons.length] != null ? this.topIcons[meta % this.icons.length] : this.icons[meta % this.icons.length];
+	}
+}