.github/workflows/build.yml

@@ -7,46 +7,29 @@
 
 # Yes this is a mostly untouched Github actions template
 
-
 name: Java CI with Gradle
 
 on:
-  schedule:
-    - cron: "0 0 * * *"
-  workflow_dispatch:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
 
 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
 
-    # Calculate days since 10/10/10
-    - name: Calculate days since 10/10/10
-      id: calculate_days
-      run: |
-        start_date="2010-10-10"
-        current_date=$(date +%Y-%m-%d)
-        days_since=$(( ($(date -d "$current_date" +%s) - $(date -d "$start_date" +%s)) / 86400 ))
-        echo "days=$days_since" >> $GITHUB_OUTPUT
-
-    # Update version files with proper sed syntax
-    - name: Update version files
-      run: |
-        days=${{ steps.calculate_days.outputs.days }}
-        # Use proper sed syntax for Linux runners
-        sed -i "s/public static final String VERSION = \".*\";/public static final String VERSION = \"1.0.27 BETA ($days)\";/" src/main/java/com/hbm/lib/RefStrings.java
-        sed -i "s/mod_build_number=.*/mod_build_number=$days/" gradle.properties
-
     # 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
@@ -60,3 +43,5 @@ jobs:
       with:
         # A file, directory or wildcard pattern that describes what to upload
         path: ./build/libs
+          
+    

CONTRIBUTING.md

@@ -13,8 +13,6 @@ 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
 
@@ -22,9 +20,6 @@ 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

@@ -2,7 +2,7 @@
 
 [NTM on Modrinth](https://modrinth.com/mod/ntm)
 
-[NTM on CurseForge](https://www.curseforge.com/minecraft/mc-mods/hbms-nuclear-tech-mod)
+[NTM on CurseForge](https://minecraft.curseforge.com/projects/hbms-nuclear-tech-mod?gameCategorySlug=mc-mods&projectID=235439)
 
 [Official NTM Wiki](https://nucleartech.wiki/wiki/Main_Page)
 
@@ -10,9 +10,8 @@
 
 **This is for 1.7.10!** For 1.12, check out these projects:
 
-* NTM Community Edition (WarFactory): https://github.com/MisterNorwood/Hbm-s-Nuclear-Tech-CE
-* NTM Extended Edition (Alcater): https://github.com/Alcatergit/Hbm-s-Nuclear-Tech-GIT/releases
 * 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
 
 For 1.18, try Martin's remake: https://codeberg.org/MartinTheDragon/Nuclear-Tech-Mod-Remake/releases
 
@@ -25,7 +24,7 @@ Simply navigate to "Releases" on the right side of the page, download links for
 Tired of waiting until the next version comes out? Here is a tutorial on how to compile the very newest version yourself:
 Please note that these installation instructions are assuming you're running Microsoft Windows operating system. Linux users should know what to do by looking at the same guide.
 
- 1. Make sure you have JDK8 installed. If not, download it from [adoptium.net](https://adoptium.net/temurin/releases?version=8)
+ 1. Make sure you have JDK8 installed. If not, download it from [adoptium.net](https://adoptium.net/?variant=openjdk8&jvmVariant=hotspot)
  2. If you don't have git installed, download&install it from [here](https://git-scm.com/downloads).
  3. Open up "Git Bash":
     * Press Windows Button, type "Git Bash" and press ENTER

build.gradle

@@ -6,7 +6,6 @@ import java.nio.file.StandardCopyOption
 
 buildscript {
 	repositories {
-		maven { url = 'https://maven.ntmr.dev/proxy/' }
 		maven { url = 'https://maven.minecraftforge.net/' }
 		maven { url = 'https://plugins.gradle.org/m2' }
 		mavenCentral()
@@ -68,10 +67,6 @@ eclipse.classpath.file.whenMerged { cp ->
 }
 
 repositories {
-	maven {
-		name = 'Blerg'
-		url = 'https://maven.ntmr.dev/proxy/'
-	}
 	maven {
 		name = 'ModMaven'
 		url = 'https://modmaven.dev'
@@ -84,18 +79,6 @@ 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 {
@@ -111,8 +94,6 @@ 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,27 +1,44 @@
-## Changed
-* Updated russian localization
-* Rad absorbers now use metadata, existing blocks will be converted automatically
-* Fissure bombs that go off in crater biomes now create fissures with metadata 1 which creates radioactive volcanic lava
-  * If a crater biome is created on top of an existing fissure, it will keep producing normal volcanic lava
-* Simplified the battery socket's client packets, reducing CPU load
-* Muzzle flashes on guns now work in third person mode, including on other players and on NPCs, making it more apparent when you're being fired at
-  * This includes non-standard special effects like the .44 gap flash and the .35-800 ejector plume
-* Removed the old unused satelite deco blocks, freeing up 6 block IDs
-* Crucibles that smelt metal with no template set will no place the metal in the recipe stack instead of the waste stack, this should make it easier to get a recipe to work in the many, many cases where people add the template after smelting the material
-* Battery sockets and the FENSU now support the copy tool
-* Removed unused displaylist support from the model loader
-  * DLs have been long phased out in favor of VBOs anyway
-* Rebranded canned horse slime
-  * Now with extra bone marrow
-* Updated the deuterium tower's model
-* Increased the energy requirement for welding osmiridium
+## Added
+* Refueling station
+  * Like a charging station, but for fluids
 
-# Fixed
-* Potentially fixed yet another issue regarding crates
-* Fixed battery socket `fillpercent` RoR function always assuming a max power of 1
-* Fixed issue where multiblock ports would generate many OpenComputers component entries
-* Fixed RBMK automatic control rods having incorrect settings when using the copy tool
-* Fixed battery sockets producing junk debug data in the logs
-* Fixed an issue where the charging station would crash when trying to charge certain items
-* Fixed the DFC's core component not dropping its contents when mined
-* Fixed audio problems with guns
+## Changed
+* Updated chinese localization
+* Particle detectors now print an error for when the recipe could not be completed
+* Night Vision Goggles toggles with armor HUD
+* Removed "no ore dict data" line from tooltips with extended view enabled
+* Added a client config called `GUN_ANIMATION_SPEED` which allows the speed of gun animations to be changed
+  * Mostly for debugging, since it only applies to the bus animation system, things like smoke trails and muzzle flashes are unaffected
+* Item filters can now filter by bedrock ore grade
+* Meteorite dungeons now use a new structure system
+  * The rooms have been completely changed, and the dungeons are no longer single-level with fixed room sizes
+  * Dungeons no longer lag the game to hell when generating
+* Decimated bobmazon
+  * All books have been merged into one with way fewer offers
+  * Sells things like basic gear, MREs, plushies, snow globes, and certain things only found in worldgen like jungle tree saplings and NTM flowers (including mustard willow)
+* Each acidizer recipe now has a "productivity" value which is the percent chance that the effectiveness upgrades use, instead of a fixed 5% per level
+  * This means that certain recipes like re-crystallizing gems no longer allow for item duping
+  * Due to duping no longer being a concern, productivity rates for certain recipes can now be much higher
+  * Things like sawdust to cordite have a 75% chance of not using the input at level 3
+  * Effectiveness no longer increases acid consumption (since many recipes now use the acidizer like a solid output "mixer") but instead adds +200% power consumption per level
+  * Effectiveness can be configured with the recipe and caps out at 99% (since 100% would just print free items)
+* Chemical dyes can now also be made with light oil
+* There's now statistics for creating legendary weapons and ammo, stepping on landmines and firing guns
+* Assembly templates no longer specify whether they are persistent and volatile, since volatile templates haven't existed in years
+* Obliterated the HTR-01 item for good
+  * Idk why it still existed
+* Skeletons, slimes and cybercrabs can no longer be gibbed, since they don't have flesh
+* The template folder's description now uses flashing colors to make it harder to ignore
+* Scaled swords no longer use 1.1 scale in the inventory, making them larger than the inventory slot
+* Fissures can now be connected to fluid ducts, providing 1,000mB of lava per tick
+
+## Fixed
+* Fixed items being annihilated when shift clicking them into the particle source
+* Fixed packet optimization not allowing packets to be sent when the day night cycle is halted
+* Fixed particle detectors not always using power when they should
+* Fixed rotary furnace voiding low pressure steam when dealing with input numbers not divisible by 100
+* Fixed state leak causing smoke from the right akimbo weapon to glow when the first one is fired
+* Fixed incorrect default values for new RBMK dials
+* Fixed blast doors self-destructing when closing
+* Fixed PA coils being in the wrong creative tab
+* Fixed flux calculation for RBMKs being wrong, mainly affecting reactors using fast flux

gradle.properties

@@ -1,80 +1,63 @@
-mod_version=1.0.27
-# Empty build number makes a release type
-mod_build_number=5572
-
-credits=HbMinecraft,\
-  \ rodolphito (explosion algorithms),\
-  \ grangerave (explosion algorithms),\
-  \ Hoboy (textures, models),\
-  \ Drillgon200 (effects, models),\
-  \ MartinTheDragon (calculator, chunk-based fallout, bendable cranes, pipe improvements, PWR sounds),\
-  \ Alcater (GUI textures),\
-  \ MellowArpeggiation (new animation system, turbine sounds, sound fixes, industrial lights, conveyor wand, NBT structures, MSU displays),\
-  \ Pheo (textures, various machines, models, weapons),\
-  \ 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),\
-  \ RayzerHan (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),\
-  \ NarekoMichigami810 (chinese localization),\
-  \ Maksymisio (polish localization)\
-  \ el3ctro4ndre (italian localization),\
-  \ Goaty1208 (italian localization),\
-  \ Pu-238 (Tom impact effects),\
-  \ Frooz (gun models),\
-  \ VT-6/24 (models, textures),\
-  \ Nos (models),\
-  \ WushiThe (models),\
-  \ Minecreep (models),\
-  \ 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),\
-  \ Burningwater202 (laminate glass),\
-  \ TehTemmie (reacher radiation function),\
-  \ Silly541 (config for safe ME drives),\
-  \ Voxelstice (OpenComputers integration, turbine spinup),\
-  \ BallOfEnergy1 (OpenComputers integration, RBMK and packet optimization, crate backpacks),\
-  \ PewPewCricket (OpenComputers integration),\
-  \ kelllllen (OpenComputers integration),\
-  \ 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),\
-  \ ranch21 (improved HUD gauges),\
-  \ 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, OpenComputers integration, fluid counter valve),\
-  \ Dash (PA particle serialization fix),\
-  \ archiecarrot123 (armor rendering compatibility fix),\
-  \ mikkerlo (mining laser & builder's jetpack improvements),\
-  \ icomet (refactoring),\
-  \ martemen (project settings),\
-  \ OvermindDL1 (project settings),\
-  \ impbk2002 (project settings)\
+mod_version=1.0.27
+# Empty build number makes a release type
+mod_build_number=5243
+
+credits=HbMinecraft,\
+  \ rodolphito (explosion algorithms),\
+  \ grangerave (explosion algorithms),\
+  \ Hoboy (textures, models),\
+  \ 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),\
+  \ Pheo (textures, various machines, models, weapons),\
+  \ Vær (gas centrifuges, better worldgen, ZIRNOX, CP-1 parts, starter guide, new cyclotron, weapon animations),\
+  \ LePeep (coilgun model, BDCL QC),\
+  \ Adam29 (liquid petroleum, ethanol, electric furnace),\
+  \ Pvndols (thorium fuel recipe, gas turbine),\
+  \ JamesH2 (blood mechanics, nitric acid, particle emitter),\
+  \ PastaBaguette (coal horse decal),\
+  \ Doctor17 (russian localization)),\
+  \ Pashtet (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),\
+  \ 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),\
+  \ Minecreep (models),\
+  \ 70k (textures, glyphid AI, strand caster, electrolyzer changes, cryolite),\
+  \ instantnootles (concept artist),\
+  \ haru315 (spiral point algorithm),\
+  \ Sten89 (models),\
+  \ Pixelguru26 (textures),\
+  \ TheBlueHat (textures),\
+  \ Burningwater202 (laminate glass),\
+  \ TehTemmie (reacher radiation function),\
+  \ Silly541 (config for safe ME drives),\
+  \ Voxelstice (OpenComputers integration, turbine spinup),\
+  \ BallOfEnergy1 (OpenComputers integration),\
+  \ sdddddf80 (recipe configs, chinese localization, custom machine holograms),\
+  \ Abel1502 (optimization, crate upgrade recipes, strand caster improvements, varous tweaks),\
+  \ 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),\
+  \ martemen (project settings),\
+  \ OvermindDL1 (project settings),\
+  \ impbk2002 (project settings)\

src/main/java/api/hbm/block/IDrillInteraction.java

@@ -3,7 +3,6 @@ package api.hbm.block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-@Deprecated
 public interface IDrillInteraction {
 
 	/**

src/main/java/api/hbm/block/IMiningDrill.java

@@ -1,6 +1,5 @@
 package api.hbm.block;
 
-@Deprecated
 public interface IMiningDrill {
 	
 	/**

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

@@ -11,8 +11,8 @@ public interface IBatteryItem {
 	public void dischargeBattery(ItemStack stack, long i);
 	public long getCharge(ItemStack stack);
 	public long getMaxCharge(ItemStack stack);
-	public long getChargeRate(ItemStack stack);
-	public long getDischargeRate(ItemStack stack);
+	public long getChargeRate();
+	public long getDischargeRate();
 	
 	/** Returns a string for the NBT tag name of the long storing power */
 	public default String getChargeTagName() {

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

@@ -1,7 +1,8 @@
 package api.hbm.energymk2;
 
-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;
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
@@ -17,32 +18,32 @@ public interface IEnergyProviderMK2 extends IEnergyHandlerMK2 {
 	public default void usePower(long power) {
 		this.setPower(this.getPower() - power);
 	}
-
+	
 	public default long getProviderSpeed() {
 		return this.getMaxPower();
 	}
-
+	
 	public default void tryProvide(World world, int x, int y, int z, ForgeDirection dir) {
 
-		TileEntity te = TileAccessCache.getTileOrCache(world, x, y, z);
+		TileEntity te = Compat.getTileStandard(world, x, y, z);
 		boolean red = false;
-
+		
 		if(te instanceof IEnergyConductorMK2) {
 			IEnergyConductorMK2 con = (IEnergyConductorMK2) te;
 			if(con.canConnect(dir.getOpposite())) {
-
+				
 				PowerNode node = Nodespace.getNode(world, x, y, z);
-
+				
 				if(node != null && node.net != null) {
 					node.net.addProvider(this);
 					red = true;
 				}
 			}
 		}
-
+		
 		if(te instanceof IEnergyReceiverMK2 && te != this) {
 			IEnergyReceiverMK2 rec = (IEnergyReceiverMK2) te;
-			if(rec.canConnect(dir.getOpposite()) && rec.allowDirectProvision()) {
+			if(rec.canConnect(dir.getOpposite())) {
 				long provides = Math.min(this.getPower(), this.getProviderSpeed());
 				long receives = Math.min(rec.getMaxPower() - rec.getPower(), rec.getReceiverSpeed());
 				long toTransfer = Math.min(provides, receives);
@@ -50,7 +51,7 @@ public interface IEnergyProviderMK2 extends IEnergyHandlerMK2 {
 				this.usePower(toTransfer);
 			}
 		}
-
+		
 		if(particleDebug) {
 			NBTTagCompound data = new NBTTagCompound();
 			data.setString("type", "network");
@@ -61,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));
-			PacketThreading.createAllAroundThreadedPacket(new AuxParticlePacketNT(data, posX, posY, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 25));
+			PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, posX, posY, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 25));
 		}
 	}
 }

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

@@ -1,9 +1,9 @@
 package api.hbm.energymk2;
 
-import com.hbm.handler.threading.PacketThreading;
 import com.hbm.interfaces.NotableComments;
+import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.toclient.AuxParticlePacketNT;
-import com.hbm.util.fauxpointtwelve.DirPos;
+import com.hbm.util.Compat;
 
 import api.hbm.energymk2.Nodespace.PowerNode;
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
@@ -26,33 +26,28 @@ public interface IEnergyReceiverMK2 extends IEnergyHandlerMK2 {
 		this.setPower(this.getMaxPower());
 		return overshoot;
 	}
-
+	
 	public default long getReceiverSpeed() {
 		return this.getMaxPower();
 	}
 	
-	/** Whether a provider can provide power by touching the block (i.e. via proxies), bypassing the need for a network entirely */
-	public default boolean allowDirectProvision() { return true; }
-
-	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 = TileAccessCache.getTileOrCache(world, x, y, z);
+		TileEntity te = Compat.getTileStandard(world, x, y, z);
 		boolean red = false;
-
+		
 		if(te instanceof IEnergyConductorMK2) {
 			IEnergyConductorMK2 con = (IEnergyConductorMK2) te;
 			if(!con.canConnect(dir.getOpposite())) return;
-
+			
 			PowerNode node = Nodespace.getNode(world, x, y, z);
-
+			
 			if(node != null && node.net != null) {
 				node.net.addReceiver(this);
 				red = true;
 			}
 		}
-
+		
 		if(particleDebug) {
 			NBTTagCompound data = new NBTTagCompound();
 			data.setString("type", "network");
@@ -63,24 +58,49 @@ 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));
-			PacketThreading.createAllAroundThreadedPacket(new AuxParticlePacketNT(data, posX, posY, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 25));
+			PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, posX, posY, posZ), new TargetPoint(world.provider.dimensionId, posX, posY, posZ, 25));
 		}
 	}
-
+	
 	public default void tryUnsubscribe(World world, int x, int y, int z) {
 
 		TileEntity te = world.getTileEntity(x, y, z);
-
+		
 		if(te instanceof IEnergyConductorMK2) {
 			IEnergyConductorMK2 con = (IEnergyConductorMK2) te;
 			PowerNode node = con.createNode();
-
+			
 			if(node != null && node.net != null) {
 				node.net.removeReceiver(this);
 			}
 		}
 	}
-
+	
+	/**
+	 * 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,
@@ -88,8 +108,4 @@ public interface IEnergyReceiverMK2 extends IEnergyHandlerMK2 {
 		HIGH,
 		HIGHEST
 	}
-	
-	public default ConnectionPriority getPriority() {
-		return ConnectionPriority.NORMAL;
-	}
 }

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

@@ -1,41 +1,161 @@
 package api.hbm.energymk2;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map.Entry;
+import java.util.Set;
+
 import com.hbm.interfaces.NotableComments;
-import com.hbm.uninos.GenNode;
-import com.hbm.uninos.UniNodespace;
-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 dead fucking corpse of nodespace MK1.
- * 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.
- * 
+ * 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
  * @author hbm
+ *
  */
-@NotableComments
 public class Nodespace {
 	
-	public static final PowerNetProvider THE_POWER_PROVIDER = new PowerNetProvider();
+	/** Contains all "NodeWorld" instances, i.e. lists of nodes existing per world */
+	public static HashMap<World, NodeWorld> worlds = new HashMap<>();
+	public static Set<PowerNetMK2> activePowerNets = new HashSet<>();
 	
-	@Deprecated public static PowerNode getNode(World world, int x, int y, int z) {
-		return (PowerNode) UniNodespace.getNode(world, x, y, z, THE_POWER_PROVIDER);
+	public static PowerNode getNode(World world, int x, int y, int z) {
+		NodeWorld nodeWorld = worlds.get(world);
+		if(nodeWorld != null) return nodeWorld.nodes.get(new BlockPos(x, y, z));
+		return null;
 	}
 	
-	@Deprecated public static void createNode(World world, PowerNode node) {
-		UniNodespace.createNode(world, node);
+	public static void createNode(World world, PowerNode node) {
+		NodeWorld nodeWorld = worlds.get(world);
+		if(nodeWorld == null) {
+			nodeWorld = new NodeWorld();
+			worlds.put(world, nodeWorld);
+		}
+		nodeWorld.pushNode(node);
 	}
 	
-	@Deprecated public static void destroyNode(World world, int x, int y, int z) {
-		UniNodespace.destroyNode(world, x, y, z, THE_POWER_PROVIDER);
+	public static void destroyNode(World world, int x, int y, int z) {
+		PowerNode node = getNode(world, x, y, z);
+		if(node != null) {
+			worlds.get(world).popNode(node);
+		}
+	}
+	
+	/** Goes over each node and manages connections */
+	public static void updateNodespace() {
+		
+		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);
+		}
 	}
 
 	@NotableComments
-	public static class PowerNode extends GenNode<PowerNetMK2> {
+	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.
@@ -47,16 +167,32 @@ 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) {
-			super.setConnections(connections);
+			this.connections = 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,32 +1,125 @@
 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;
 
-/**
- * Technically MK3 since it's now UNINOS compatible, although UNINOS was build out of 95% nodespace code
- * 
- * @author hbm
- */
-public class PowerNetMK2 extends NodeNet<IEnergyReceiverMK2, IEnergyProviderMK2, PowerNode> {
+public class PowerNetMK2 {
+	
+	public static Random rand = new Random();
+	public boolean valid = true;
+	public Set<PowerNode> links = new HashSet();
+
+	/** 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;
 	
-	@Override public void resetTrackers() { this.energyTracker = 0; }
-	
-	@Override
-	public void update() {
+	public void transferPower() {
 		
 		if(providerEntries.isEmpty()) return;
 		if(receiverEntries.isEmpty()) return;
@@ -36,19 +129,15 @@ public class PowerNetMK2 extends NodeNet<IEnergyReceiverMK2, IEnergyProviderMK2,
 		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 || isBadLink(entry.getKey())) { provIt.remove(); continue; }
+			if(timestamp - entry.getValue() > timeout) { 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;
-			}
+			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];
@@ -58,27 +147,24 @@ public class PowerNetMK2 extends NodeNet<IEnergyReceiverMK2, IEnergyProviderMK2,
 		
 		while(recIt.hasNext()) {
 			Entry<IEnergyReceiverMK2, Long> entry = recIt.next();
-			if(timestamp - entry.getValue() > timeout || isBadLink(entry.getKey())) { recIt.remove(); continue; }
+			if(timestamp - entry.getValue() > timeout) { 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;
-			}
+			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];
 			
 			for(Pair<IEnergyReceiverMK2, Long> entry : list) {
 				double weight = (double) entry.getValue() / (double) (priorityDemand);
-				long toSend = (long) Math.min(Math.max(toTransfer * weight, 0D), entry.getValue());
+				long toSend = (long) Math.max(toTransfer * weight, 0D);
 				energyUsed += (toSend - entry.getKey().transferPower(toSend)); //leftovers are subtracted from the intended amount to use up
 			}
 			
@@ -88,7 +174,6 @@ public class PowerNetMK2 extends NodeNet<IEnergyReceiverMK2, IEnergyProviderMK2,
 		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);
@@ -96,7 +181,7 @@ public class PowerNetMK2 extends NodeNet<IEnergyReceiverMK2, IEnergyProviderMK2,
 			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--;
@@ -110,6 +195,118 @@ public class PowerNetMK2 extends NodeNet<IEnergyReceiverMK2, IEnergyProviderMK2,
 		}
 	}
 	
+	@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;
@@ -153,4 +350,14 @@ public class PowerNetMK2 extends NodeNet<IEnergyReceiverMK2, IEnergyProviderMK2,
 		
 		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/fluid/IFillableItem.java

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

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

@@ -0,0 +1,19 @@
+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,6 +1,93 @@
 package api.hbm.fluid;
 
-import api.hbm.fluidmk2.IFluidConnectorMK2;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
+import com.hbm.util.Compat;
 
-@Deprecated
-public interface IFluidConnector extends IFluidConnectorMK2 { }
+import api.hbm.tile.ILoadedTile;
+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 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,6 +1,12 @@
 package api.hbm.fluid;
 
-import api.hbm.fluidmk2.IFluidConnectorBlockMK2;
+import com.hbm.inventory.fluid.FluidType;
 
-@Deprecated
-public interface IFluidConnectorBlock extends IFluidConnectorBlockMK2 { }
+import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.common.util.ForgeDirection;
+
+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,35 +1,49 @@
 package api.hbm.fluid;
 
 import com.hbm.inventory.fluid.FluidType;
-import com.hbm.uninos.GenNode;
-import com.hbm.uninos.UniNodespace;
+import com.hbm.inventory.fluid.tank.FluidTank;
 
-import api.hbm.fluidmk2.IFluidStandardReceiverMK2;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
+/**
+ * Uses default implementation to make the underlying interfaces easier to use for the most common fluid users.
+ * Only handles a single input tank of the same type.
+ * Uses standard FluidTanks which use int32.
+ * Don't use this as part of the API!
+ * @author hbm
+ *
+ */
+public interface IFluidStandardReceiver extends IFluidUser {
+	
+	@Override
+	public default long transferFluid(FluidType type, int pressure, long amount) {
 
-@Deprecated
-public interface IFluidStandardReceiver extends IFluidStandardReceiverMK2 {
-
-	public default void subscribeToAllAround(FluidType type, TileEntity tile) {
-		subscribeToAllAround(type, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord);
-	}
-
-	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);
+		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;
 	}
 
-	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) {
-			tryUnsubscribe(type, tile.getWorldObj(), tile.xCoord + dir.offsetX, tile.yCoord + dir.offsetY, tile.zCoord + dir.offsetZ);
+	@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;
 	}
 }

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

@@ -1,22 +1,50 @@
 package api.hbm.fluid;
 
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.fluid.tank.FluidTank;
 
-import api.hbm.fluidmk2.IFluidStandardSenderMK2;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
+/**
+ * Uses default implementation to make the underlying interfaces easier to use for the most common fluid users.
+ * Only handles a single output tank of the same type.
+ * Uses standard FluidTanks which use int32.
+ * Don't use this as part of the API!
+ * @author hbm
+ *
+ */
+public interface IFluidStandardSender extends IFluidUser {
 
-@Deprecated
-public interface IFluidStandardSender extends IFluidStandardSenderMK2 {
-
-	public default void sendFluid(FluidTank tank, World world, int x, int y, int z, ForgeDirection dir) {
-		tryProvide(tank, world, x, y, z, dir);
+	public FluidTank[] getSendingTanks();
+	
+	@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;
 	}
-
-	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,4 +1,79 @@
 package api.hbm.fluid;
 
-@Deprecated
-public interface IFluidStandardTransceiver extends IFluidStandardReceiver, IFluidStandardSender { }
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.tank.FluidTank;
+
+/**
+ * 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

@@ -0,0 +1,130 @@
+package api.hbm.fluid;
+
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.tank.FluidTank;
+import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.toclient.AuxParticlePacketNT;
+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

@@ -0,0 +1,30 @@
+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

@@ -0,0 +1,205 @@
+package api.hbm.fluid;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+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);
+				}
+
+				/* debug code
+				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

@@ -1,152 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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/IFluidConnectorBlockMK2.java

@@ -1,12 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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

@@ -1,27 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,63 +0,0 @@
-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.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 = TileAccessCache.getTileOrCache(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

@@ -1,9 +0,0 @@
-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

@@ -1,68 +0,0 @@
-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

@@ -1,129 +0,0 @@
-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.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 = TileAccessCache.getTileOrCache(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

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

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

@@ -1,15 +0,0 @@
-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

@@ -1,24 +0,0 @@
-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/recipe/IRecipeRegisterListener.java

@@ -1,13 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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,17 +7,15 @@ 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 String runRORFunction(String name, String[] params);
+	public Object 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];
 	}
 	
@@ -31,11 +29,4 @@ 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 String provideRORValue(String name);
+	public Object provideRORValue(String name);
 }

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

@@ -43,7 +43,4 @@ 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,55 +1,6 @@
 package api.hbm.tile;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import com.hbm.util.Compat;
-import com.hbm.util.Tuple.Quartet;
-
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-
-/** 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();
-	
-	// should we gunk this into the API? no, but i don't care
-	public static class TileAccessCache {
-		
-		public static Map<Quartet, TileAccessCache> cache = new HashMap();
-
-		public static int NULL_CACHE = 20;
-		public static int NONNULL_CACHE = 60;
-		
-		public TileEntity tile;
-		public long expiresOn;
-		
-		public TileAccessCache(TileEntity tile, long expiresOn) {
-			this.tile = tile;
-			this.expiresOn = expiresOn;
-		}
-		
-		public boolean hasExpired(long worldTime) {
-			if(tile != null && tile.isInvalid()) return true;
-			if(worldTime >= expiresOn) return true;
-			if(tile instanceof ILoadedTile && !((ILoadedTile) tile).isLoaded()) return true;
-			return false;
-		}
-		
-		public static Quartet publicCumRag = new Quartet(0, 0, 0, 0);
-		public static TileEntity getTileOrCache(World world, int x, int y, int z) {
-			publicCumRag.mangle(x, y, z, world.provider.dimensionId);
-			TileAccessCache cache = TileAccessCache.cache.get(publicCumRag);
-			
-			if(cache == null || cache.hasExpired(world.getTotalWorldTime())) {
-				TileEntity tile = Compat.getTileStandard(world, x, y, z);
-				cache = new TileAccessCache(tile, world.getTotalWorldTime() + (tile == null ? NULL_CACHE : NONNULL_CACHE));
-				TileAccessCache.cache.put(publicCumRag.clone(), cache);
-				return tile;
-			} else {
-				return cache.tile;
-			}
-		}
-	}
 }

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

@@ -5,7 +5,7 @@ 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.nbt.INBTBlockTransformable;
+import com.hbm.world.gen.INBTTransformable;
 
 import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import cpw.mods.fml.relauncher.Side;
@@ -26,8 +26,6 @@ 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;
@@ -37,7 +35,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-public abstract class BlockDummyable extends BlockContainer implements ICustomBlockHighlight, ICopiable, INBTBlockTransformable {
+public abstract class BlockDummyable extends BlockContainer implements ICustomBlockHighlight, ICopiable, INBTTransformable {
 
 	public BlockDummyable(Material mat) {
 		super(mat);
@@ -77,20 +75,27 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
 
 		super.onNeighborBlockChange(world, x, y, z, block);
 
-		if(safeRem)
+		if(world.isRemote || safeRem)
 			return;
 
-		destroyIfOrphan(world, x, y, z);
+		int metadata = world.getBlockMetadata(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;
 
@@ -103,32 +108,10 @@ 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);
 
-		// 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);
-			}
+		if(b != this) {
+			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) {
@@ -458,10 +441,8 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
 		y = pos[1];
 		z = pos[2];
 
-		ForgeDirection rot = ForgeDirection.getOrientation(world.getBlockMetadata(x, y, z) - offset).getRotation(ForgeDirection.UP);
-
-		for(AxisAlignedBB aabb : this.bounding) {
-			AxisAlignedBB boxlet = getAABBRotationOffset(aabb, x + 0.5, y, z + 0.5, rot);
+		for(AxisAlignedBB aabb :this.bounding) {
+			AxisAlignedBB boxlet = getAABBRotationOffset(aabb, x + 0.5, y, z + 0.5, ForgeDirection.getOrientation(world.getBlockMetadata(x, y, z) - offset).getRotation(ForgeDirection.UP));
 
 			if(entityBounding.intersectsWith(boxlet)) {
 				list.add(boxlet);
@@ -486,32 +467,6 @@ 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()) {
@@ -545,10 +500,10 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
 		double dZ = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * (double)interp;
 		float exp = 0.002F;
 
-		ForgeDirection rot = ForgeDirection.getOrientation(world.getBlockMetadata(x, y, z) - offset).getRotation(ForgeDirection.UP);
+		int meta = world.getBlockMetadata(x, y, z);
 
 		ICustomBlockHighlight.setup();
-		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);
+		for(AxisAlignedBB aabb : this.bounding) RenderGlobal.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);
 		ICustomBlockHighlight.cleanup();
 	}
 
@@ -565,7 +520,6 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
 	@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);
-		if(pos == null) return;
 		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]);
@@ -591,7 +545,7 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
 			meta -= extra;
 		}
 
-		meta = INBTBlockTransformable.transformMetaDeco(meta, coordBaseMode);
+		meta = INBTTransformable.transformMetaDeco(meta, coordBaseMode);
 
 		if(isOffset) {
 			meta += offset;

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

@@ -58,14 +58,6 @@ public class BlockEnums {
 		SMALL
 	}
 	
-	public static enum LightstoneType {
-		UNREFINED,
-		TILE,
-		BRICKS,
-		BRICKS_CHISELED,
-		CHISELED
-	}
-	
 	public static enum DecoComputerEnum {
 		IBM_300PL
 	}
@@ -80,5 +72,4 @@ public class BlockEnums {
 		FLUORESCENT,
 		HALOGEN
 	}
-
 }

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

@@ -1,5 +1,6 @@
 package com.hbm.blocks;
 
+import com.hbm.util.I18nUtil;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
@@ -7,8 +8,6 @@ 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/BlockCrashedBomb.java

@@ -1,77 +1,91 @@
 package com.hbm.blocks.bomb;
 
-import com.hbm.blocks.BlockEnumMulti;
+import java.util.Random;
+
+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.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.ITileEntityProvider;
+import net.minecraft.block.BlockContainer;
 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 BlockEnumMulti implements ITileEntityProvider, IBomb {
-	
-	public static enum EnumDudType {
-		BALEFIRE, CONVENTIONAL, NUKE, SALTED
-	}
+public class BlockCrashedBomb extends BlockContainer implements IBomb {
 
-	public BlockCrashedBomb(Material mat) {
-		super(mat, EnumDudType.class, false, false);
+	public BlockCrashedBomb(Material p_i45386_1_) {
+		super(p_i45386_1_);
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World world, int meta) {
+	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
 		return new TileEntityCrashedBomb();
 	}
 
-	@Override public int getRenderType() { return -1; }
-	@Override public boolean isOpaqueCube() { return false; }
-	@Override public boolean renderAsNormalBlock() { return false; }
+	@Override
+	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
+		return Item.getItemFromBlock(ModBlocks.crashed_balefire);
+	}
+
+	@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) {
-			
-			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)));
-			}
-			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);
+
+			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))));
+
 			return true;
 		}
 
@@ -83,46 +97,21 @@ public class BlockCrashedBomb extends BlockEnumMulti implements ITileEntityProvi
 
 		if(!world.isRemote) {
 
-			EnumDudType type = EnumUtil.grabEnumSafely(EnumDudType.class, world.getBlockMetadata(x, y, z));
 			world.setBlockToAir(x, y, z);
+			EntityBalefire bf = new EntityBalefire(world);
+			bf.posX = x;
+			bf.posY = y;
+			bf.posZ = z;
+			bf.destructionRange = (int) (BombConfig.fatmanRadius * 1.25);
+			world.spawnEntityInWorld(bf);
 
-			if(type == type.BALEFIRE) {
-				EntityBalefire bf = new EntityBalefire(world);
-				bf.setPosition(x, y, z);
-				bf.destructionRange = (int) (BombConfig.fatmanRadius * 1.25);
-				world.spawnEntityInWorld(bf);
-				spawnMush(world, x, y, z, true);
-			}
-
-			if(type == type.CONVENTIONAL) {
-				ExplosionVNT xnt = new ExplosionVNT(world, x + 0.5, y + 0.5, z + 0.5, 35F);
-				xnt.setBlockAllocator(new BlockAllocatorStandard(24));
-				xnt.setBlockProcessor(new BlockProcessorStandard().setNoDrop());
-				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);
-			}
+			NBTTagCompound data = new NBTTagCompound();
+			data.setString("type", "muke");
+			data.setBoolean("balefire", true);
+			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", 15.0F, 1.0F);
 		}
-
+		
 		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/BlockFissureBomb.java

@@ -3,7 +3,6 @@ package com.hbm.blocks.bomb;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.entity.item.EntityTNTPrimedBase;
 import com.hbm.explosion.ExplosionNukeSmall;
-import com.hbm.world.biome.BiomeGenCraterBase;
 
 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
@@ -17,8 +16,6 @@ public class BlockFissureBomb extends BlockTNTBase {
 		
 		int range = 5;
 		
-		boolean crater = world.getBiomeGenForCoords((int) Math.floor(x), (int) Math.floor(z)) instanceof BiomeGenCraterBase;
-		
 		for(int i = -range; i <= range; i++) {
 			for(int j = -range; j <= range; j++) {
 				for(int k = -range; k <= range; k++) {
@@ -30,7 +27,7 @@ public class BlockFissureBomb extends BlockTNTBase {
 					Block block = world.getBlock(a, b, c);
 					
 					if(block == ModBlocks.ore_bedrock) {
-						world.setBlock(a, b, c, ModBlocks.ore_volcano, crater ? 1 : 0, 3);
+						world.setBlock(a, b, c, ModBlocks.ore_volcano);
 					} else if(block == ModBlocks.ore_bedrock_oil) {
 						world.setBlock(a, b, c, Blocks.bedrock);
 					}

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

@@ -4,72 +4,169 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import com.hbm.blocks.ITooltipProvider;
+import com.hbm.blocks.ModBlocks;
 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 implements ITooltipProvider {
+public class BlockTaint extends Block/*Container*/ {
+	
+    @SideOnly(Side.CLIENT)
+    private IIcon[] icons;
 
-	public BlockTaint(Material mat) {
-		super(mat);
-		this.setTickRandomly(true);
+	public BlockTaint(Material p_i45386_1_) {
+		super(p_i45386_1_);
+        this.setTickRandomly(true);
 	}
 
-	@Override public MapColor getMapColor(int meta) { return MapColor.grayColor; }
-	@Override public Item getItemDropped(int i, Random rand, int j) { return null; }
+	/*@Override
+	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
+		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 void updateTick(World world, int x, int y, int z, Random rand) {
-
-		int meta = world.getBlockMetadata(x, y, z);
-		if(meta >= 15) return;
-		
-		for(int i = -3; i <= 3; i++) for(int j = -3; j <= 3; j++) for(int k = -3; k <= 3; k++) {
-			if(Math.abs(i) + Math.abs(j) + Math.abs(k) > 4) continue;
-			if(rand.nextFloat() > 0.25F) continue;
-			Block b = world.getBlock(x + i, y + j, z + k);
-			if(b.isAir(world, x + i, y + j, z + k) || b == Blocks.bedrock) continue;
-			int targetMeta = meta + 1;
-			boolean hasAir = false;
-			for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
-				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)) {
-					hasAir = true;
-					break;
-				}
-			}
-			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 int getRenderType(){
+		return renderID;
 	}
 
+    @Override
+	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
+    {
+        return null;
+    }
+	
 	@Override
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
-		return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 0.75, z + 1);
+	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) {
+    		
+	    	for(int i = 0; i < 15; i++) {
+	    		int a = rand.nextInt(11) + x - 5;
+	    		int b = rand.nextInt(11) + y - 5;
+	    		int c = rand.nextInt(11) + z - 5;
+	            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);
+	    	}
+	            
+		    for(int i = 0; i < 85; i++) {
+		    	int a = rand.nextInt(7) + x - 3;
+		    	int b = rand.nextInt(7) + y - 3;
+		    	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);
+		    }
+    	}
+    }
+    
+    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)
+	{
+		return null;
+	}
+	
+	@Override
+	public AxisAlignedBB getSelectedBoundingBoxFromPool(World par1World, int par2, int par3, int par4)
+	{
+		return AxisAlignedBB.getBoundingBox(par2, par3, par4, par2, par3, par4);
 	}
 
 	@Override
@@ -77,43 +174,36 @@ public class BlockTaint extends Block implements ITooltipProvider {
 		
 		int meta = world.getBlockMetadata(x, y, z);
 		int level = 15 - meta;
+		
+    	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);
+    		}
+    	}
+    	
+    	if(entity != null && entity.getClass().equals(EntityCreeper.class)) {
+    		EntityCreeperTainted creep = new EntityCreeperTainted(world);
+    		creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch);
 
-		entity.motionX *= 0.6;
-		entity.motionZ *= 0.6;
+    		if(!world.isRemote) {
+    			entity.setDead();
+    			world.spawnEntityInWorld(creep);
+    		}
+    	}
+    	
+    	if(entity instanceof EntityTeslaCrab) {
+    		EntityTaintCrab crab = new EntityTaintCrab(world);
+    		crab.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch);
 
-		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);
-			}
-		}
-
-		if(entity != null && entity.getClass().equals(EntityCreeper.class)) {
-			EntityCreeperTainted creep = new EntityCreeperTainted(world);
-			creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch);
-
-			if(!world.isRemote) {
-				entity.setDead();
-				world.spawnEntityInWorld(creep);
-			}
-		}
-
-		if(entity instanceof EntityTeslaCrab) {
-			EntityTaintCrab crab = new EntityTaintCrab(world);
-			crab.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch);
-
-			if(!world.isRemote) {
-				entity.setDead();
-				world.spawnEntityInWorld(crab);
-			}
-		}
+    		if(!world.isRemote) {
+    			entity.setDead();
+    			world.spawnEntityInWorld(crab);
+    		}
+    	}
 	}
 
-	@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,7 +9,7 @@ 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.handler.threading.PacketThreading;
+import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
@@ -43,10 +43,10 @@ public class BlockVolcano extends BlockContainer implements ITooltipProvider, IB
 	public int getSubCount() {
 		return 5;
 	}
-
+	
 	@SideOnly(Side.CLIENT)
 	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
-
+		
 		for(int i = 0; i < 5; ++i) {
 			list.add(new ItemStack(item, 1, i));
 		}
@@ -54,14 +54,14 @@ public class BlockVolcano extends BlockContainer implements ITooltipProvider, IB
 
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) {
-
+		
 		int meta = stack.getItemDamage();
-
+		
 		if(meta == META_SMOLDERING) {
 			list.add(EnumChatFormatting.GOLD + "SHIELD VOLCANO");
 			return;
 		}
-
+		
 		list.add(BlockVolcano.isGrowing(meta) ? (EnumChatFormatting.RED + "DOES GROW") : (EnumChatFormatting.DARK_GRAY + "DOES NOT GROW"));
 		list.add(BlockVolcano.isExtinguishing(meta) ? (EnumChatFormatting.RED + "DOES EXTINGUISH") : (EnumChatFormatting.DARK_GRAY + "DOES NOT EXTINGUISH"));
 	}
@@ -71,25 +71,25 @@ public class BlockVolcano extends BlockContainer implements ITooltipProvider, IB
 	public static final int META_GROWING_ACTIVE = 2;
 	public static final int META_GROWING_EXTINGUISHING = 3;
 	public static final int META_SMOLDERING = 4;
-
+	
 	public static boolean isGrowing(int meta) {
 		return meta == META_GROWING_ACTIVE || meta == META_GROWING_EXTINGUISHING;
 	}
-
+	
 	public static boolean isExtinguishing(int meta) {
 		return meta == META_STATIC_EXTINGUISHING || meta == META_GROWING_EXTINGUISHING;
 	}
-
+	
 	public static class TileEntityVolcanoCore extends TileEntity {
 
 		private static List<ExAttrib> volcanoExplosion = Arrays.asList(new ExAttrib[] {ExAttrib.NODROP, ExAttrib.LAVA_V, ExAttrib.NOSOUND, ExAttrib.ALLMOD, ExAttrib.NOHURT});
 		private static List<ExAttrib> volcanoRadExplosion = Arrays.asList(new ExAttrib[] {ExAttrib.NODROP, ExAttrib.LAVA_R, ExAttrib.NOSOUND, ExAttrib.ALLMOD, ExAttrib.NOHURT});
-
+		
 		public int volcanoTimer;
-
+		
 		@Override
 		public void updateEntity() {
-
+			
 			if(!worldObj.isRemote) {
 				this.volcanoTimer++;
 
@@ -99,24 +99,24 @@ public class BlockVolcano extends BlockContainer implements ITooltipProvider, IB
 						this.blastMagmaChannel();
 						this.raiseMagma();
 					}
-
+					
 					double magmaChamber = this.magmaChamberSize();
 					if(magmaChamber > 0) this.blastMagmaChamber(magmaChamber);
-
+					
 					Object[] melting = this.surfaceMeltingParams();
 					if(melting != null) this.meltSurface((int)melting[0], (double)melting[1], (double)melting[2]);
-
+					
 					//self-explanatory
 					if(this.isSpewing()) this.spawnBlobs();
 					if(this.isSmoking()) this.spawnSmoke();
-
+					
 					//generates a 3x3x3 cube of lava
 					this.surroundLava();
 				}
-
+				
 				if(this.volcanoTimer >= this.getUpdateRate()) {
 					this.volcanoTimer = 0;
-
+					
 					if(this.shouldGrow()) {
 						worldObj.setBlock(xCoord, yCoord + 1, zCoord, this.getBlockType(), this.getBlockMetadata(), 3);
 						worldObj.setBlock(xCoord, yCoord, zCoord, getLava());
@@ -128,16 +128,16 @@ public class BlockVolcano extends BlockContainer implements ITooltipProvider, IB
 				}
 			}
 		}
-
+		
 		public boolean isRadioacitve() {
 			return this.getBlockType() == ModBlocks.volcano_rad_core;
 		}
-
+		
 		protected Block getLava() {
 			if(isRadioacitve()) return ModBlocks.rad_lava_block;
 			return ModBlocks.volcanic_lava_block;
 		}
-
+		
 		protected List<ExAttrib> getExpAttrb() {
 			return this.isRadioacitve() ? this.volcanoRadExplosion : this.volcanoExplosion;
 		}
@@ -151,44 +151,44 @@ public class BlockVolcano extends BlockContainer implements ITooltipProvider, IB
 		@Override
 		public void writeToNBT(NBTTagCompound nbt) {
 			super.writeToNBT(nbt);
-			nbt.setInteger("timer", this.volcanoTimer);
+			nbt.setInteger("tier", this.volcanoTimer);
 		}
-
+		
 		private boolean shouldGrow() {
 			return isGrowing() && yCoord < 200;
 		}
-
+		
 		private boolean isGrowing() {
 			int meta = this.getBlockMetadata();
 			return meta == META_GROWING_ACTIVE || meta == META_GROWING_EXTINGUISHING;
 		}
-
+		
 		private boolean isExtinguishing() {
 			int meta = this.getBlockMetadata();
 			return meta == META_STATIC_EXTINGUISHING || meta == META_GROWING_EXTINGUISHING;
 		}
-
+		
 		private boolean isSmoking() {
 			return this.getBlockMetadata() != META_SMOLDERING;
 		}
-
+		
 		private boolean isSpewing() {
 			return this.getBlockMetadata() != META_SMOLDERING;
 		}
-
+		
 		private boolean hasVerticalChannel() {
 			return this.getBlockMetadata() != META_SMOLDERING;
 		}
-
+		
 		private double magmaChamberSize() {
 			return this.getBlockMetadata() == META_SMOLDERING ? 15 : 0;
 		}
-
+		
 		/* count per tick, radius, depth */
 		private Object[] surfaceMeltingParams() {
 			return this.getBlockMetadata() == META_SMOLDERING ? new Object[] {50, 50D, 10D} : null;
 		}
-
+		
 		private int getUpdateRate() {
 			switch(this.getBlockMetadata()) {
 			case META_STATIC_EXTINGUISHING: return 60 * 60 * 20; //once per hour
@@ -197,7 +197,7 @@ public class BlockVolcano extends BlockContainer implements ITooltipProvider, IB
 			default: return 10;
 			}
 		}
-
+		
 		/** Causes two magma explosions, one from bedrock to the core and one from the core to 15 blocks above. */
 		private void blastMagmaChannel() {
 			ExplosionNT explosion = new ExplosionNT(worldObj, null, xCoord + 0.5, yCoord + worldObj.rand.nextInt(15) + 1.5, zCoord + 0.5, 7);
@@ -205,53 +205,53 @@ public class BlockVolcano extends BlockContainer implements ITooltipProvider, IB
 			ExplosionNT explosion2 = new ExplosionNT(worldObj, null, xCoord + 0.5 + worldObj.rand.nextGaussian() * 3, worldObj.rand.nextInt(yCoord + 1), zCoord + 0.5 + worldObj.rand.nextGaussian() * 3, 10);
 			explosion2.addAllAttrib(getExpAttrb()).explode();
 		}
-
+		
 		/** Causes two magma explosions at a random position around the core, one at normal and one at half range. */
 		private void blastMagmaChamber(double size) {
-
+			
 			for(int i = 0; i < 2; i++) {
 				double dist = size / (double) (i + 1);
 				ExplosionNT explosion = new ExplosionNT(worldObj, null, xCoord + 0.5 + worldObj.rand.nextGaussian() * dist, yCoord + 0.5 + worldObj.rand.nextGaussian() * dist, zCoord + 0.5 + worldObj.rand.nextGaussian() * dist, 7);
 				explosion.addAllAttrib(getExpAttrb()).explode();
 			}
 		}
-
+		
 		/** Randomly selects surface blocks and converts them into lava if solid or air if not solid. */
 		private void meltSurface(int count, double radius, double depth) {
-
+			
 			for(int i = 0; i < count; i++) {
 				int x = (int) Math.floor(xCoord + worldObj.rand.nextGaussian() * radius);
 				int z = (int) Math.floor(zCoord + worldObj.rand.nextGaussian() * radius);
 				//gaussian distribution makes conversions more likely on the surface and rarer at the bottom
 				int y = worldObj.getHeightValue(x, z) + 1 - (int) Math.floor(Math.abs(worldObj.rand.nextGaussian() * depth));
-
+				
 				Block b = worldObj.getBlock(x, y, z);
-
+				
 				if(!b.isAir(worldObj, x, y, z) && b.getExplosionResistance(null) < Blocks.obsidian.getExplosionResistance(null)) {
 					//turn into lava if solid block, otherwise just break
 					worldObj.setBlock(x, y, z, b.isNormalCube() ? this.getLava() : Blocks.air);
 				}
 			}
 		}
-
+		
 		/** Increases the magma level in a small radius around the core. */
 		private void raiseMagma() {
 
 			int rX = xCoord - 10 + worldObj.rand.nextInt(21);
 			int rY = yCoord + worldObj.rand.nextInt(11);
 			int rZ = zCoord - 10 + worldObj.rand.nextInt(21);
-
+			
 			if(worldObj.getBlock(rX, rY, rZ) == Blocks.air && worldObj.getBlock(rX, rY - 1, rZ) == this.getLava())
 				worldObj.setBlock(rX, rY, rZ, this.getLava());
 		}
-
+		
 		/** Creates a 3x3x3 lava sphere around the core. */
 		private void surroundLava() {
-
+			
 			for(int i = -1; i <= 1; i++) {
 				for(int j = -1; j <= 1; j++) {
 					for(int k = -1; k <= 1; k++) {
-
+						
 						if(i != 0 || j != 0 || k != 0) {
 							worldObj.setBlock(xCoord + i, yCoord + j, zCoord + k, this.getLava());
 						}
@@ -259,10 +259,10 @@ public class BlockVolcano extends BlockContainer implements ITooltipProvider, IB
 				}
 			}
 		}
-
+		
 		/** Spews specially tagged shrapnels which create volcanic lava and monoxide clouds. */
 		private void spawnBlobs() {
-
+			
 			for(int i = 0; i < 3; i++) {
 				EntityShrapnel frag = new EntityShrapnel(worldObj);
 				frag.setLocationAndAngles(xCoord + 0.5, yCoord + 1.5, zCoord + 0.5, 0.0F, 0.0F);
@@ -277,13 +277,13 @@ public class BlockVolcano extends BlockContainer implements ITooltipProvider, IB
 				worldObj.spawnEntityInWorld(frag);
 			}
 		}
-
+		
 		/** I SEE SMOKE, AND WHERE THERE'S SMOKE THERE'S FIRE! */
 		private void spawnSmoke() {
 			NBTTagCompound dPart = new NBTTagCompound();
 			dPart.setString("type", "vanillaExt");
 			dPart.setString("mode", "volcano");
-			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));
+			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));
 		}
 	}
 }

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

@@ -1,13 +1,7 @@
 package com.hbm.blocks.bomb;
 
-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.explosion.ExplosionChaos;
 import com.hbm.interfaces.IBomb;
-import com.hbm.particle.helper.ExplosionCreator;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -23,7 +17,9 @@ 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)) {
-			explode(world, x, y, z);
+			ExplosionChaos.explode(world, x, y, z, 15);
+			ExplosionChaos.spawnExplosion(world, x, y, z, 75);
+			ExplosionChaos.flameDeath(world, x, y, z, 100);
 		}
 	}
 
@@ -31,24 +27,9 @@ public class BombFlameWar extends Block implements IBomb {
 	public BombReturnCode explode(World world, int x, int y, int z) {
 
 		if(!world.isRemote) {
-			
-			world.func_147480_a(x, y, z, false);
-			
-			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);
+			ExplosionChaos.explode(world, x, y, z, 15);
+			ExplosionChaos.spawnExplosion(world, x, y, z, 75);
+			ExplosionChaos.flameDeath(world, x, y, z, 100);
 		}
 
 		return BombReturnCode.DETONATED;

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

@@ -18,12 +18,10 @@ 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;
 
@@ -171,11 +169,7 @@ public class BombMulti extends BlockContainer implements IBomb {
 				}
 
 				if(gasCloud > 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);
+					ExplosionChaos.spawnChlorine(world, x, y, z, gasCloud, gasCloud / 50, 0);
 				}
 				
 				return BombReturnCode.DETONATED;

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

@@ -69,7 +69,7 @@ public class ExplosiveCharge extends BlockDetonatable implements IBomb, IDetConn
 			}
 			if(this == ModBlocks.det_nuke) {
 				world.spawnEntityInWorld(EntityNukeExplosionMK5.statFac(world, BombConfig.missileRadius, x + 0.5, y + 0.5, z + 0.5));
-				EntityNukeTorex.statFacStandard(world, x + 0.5, y + 0.5, z + 0.5, BombConfig.missileRadius);
+				EntityNukeTorex.statFac(world, x + 0.5, y + 0.5, z + 0.5, BombConfig.missileRadius);
 			}
 		}
 

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

@@ -3,29 +3,26 @@ 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.explosion.vanillant.standard.BlockAllocatorStandard;
+import com.hbm.explosion.vanillant.standard.BlockProcessorStandard;
+import com.hbm.explosion.vanillant.standard.EntityProcessorCrossSmooth;
+import com.hbm.explosion.vanillant.standard.ExplosionEffectWeapon;
+import com.hbm.explosion.vanillant.standard.PlayerProcessorStandard;
 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;
@@ -64,7 +61,8 @@ public class Landmine extends BlockContainer implements IBomb {
 		if(this == ModBlocks.mine_ap) this.setBlockBounds(5 * f, 0.0F, 5 * f, 11 * f, 1 * f, 11 * f);
 		if(this == ModBlocks.mine_he) this.setBlockBounds(4 * f, 0.0F, 4 * f, 12 * f, 2 * f, 12 * f);
 		if(this == ModBlocks.mine_shrap) this.setBlockBounds(5 * f, 0.0F, 5 * f, 11 * f, 1 * f, 11 * f);
-		if(this == ModBlocks.mine_fat) this.setBlockBounds(5 * f, 0.0F, 4 * f, 11 * f, 6 * 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) {
@@ -129,18 +127,6 @@ 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) {
 
@@ -152,7 +138,7 @@ public class Landmine extends BlockContainer implements IBomb {
 
 			if(this == ModBlocks.mine_ap) {
 				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.setEntityProcessor(new EntityProcessorCrossSmooth(0.5, 10F).setupPiercing(5F, 0.2F));
 				vnt.setPlayerProcessor(new PlayerProcessorStandard());
 				vnt.setSFX(new ExplosionEffectWeapon(5, 1F, 0.5F));
 				vnt.explode();
@@ -160,52 +146,21 @@ public class Landmine extends BlockContainer implements IBomb {
 				ExplosionVNT vnt = new ExplosionVNT(world, x + 0.5, y + 0.5, z + 0.5, 4F);
 				vnt.setBlockAllocator(new BlockAllocatorStandard());
 				vnt.setBlockProcessor(new BlockProcessorStandard());
-				vnt.setEntityProcessor(new EntityProcessorCrossSmooth(1, ServerConfig.MINE_HE_DAMAGE.get()).setupPiercing(15F, 0.2F));
+				vnt.setEntityProcessor(new EntityProcessorCrossSmooth(1, 35).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) {
 				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.setEntityProcessor(new EntityProcessorCrossSmooth(0.5, 7.5F));
 				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) {
-
-				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
+				ExplosionNukeSmall.explode(world, x + 0.5, y + 0.5, z + 0.5, ExplosionNukeSmall.PARAMS_MEDIUM);
 			}
 		}
 

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

@@ -3,17 +3,16 @@ package com.hbm.blocks.bomb;
 import java.util.Random;
 
 import com.hbm.blocks.ModBlocks;
-import com.hbm.config.BombConfig;
 import com.hbm.entity.effect.EntityCloudFleija;
-import com.hbm.entity.effect.EntityCloudFleijaRainbow;
 import com.hbm.entity.effect.EntityNukeTorex;
+import com.hbm.entity.grenade.EntityGrenadeZOMG;
 import com.hbm.entity.logic.EntityBalefire;
 import com.hbm.entity.logic.EntityNukeExplosionMK3;
 import com.hbm.entity.logic.EntityNukeExplosionMK5;
 import com.hbm.entity.projectile.EntityFallingNuke;
+import com.hbm.explosion.ExplosionChaos;
 import com.hbm.explosion.ExplosionLarge;
 import com.hbm.interfaces.IBomb;
-import com.hbm.interfaces.NotableComments;
 import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.bomb.TileEntityNukeCustom;
 
@@ -31,10 +30,10 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
-// this entire class sucks ass
-@NotableComments
 public class NukeCustom extends BlockContainer implements IBomb {
 
+	public TileEntityNukeCustom tetn = new TileEntityNukeCustom();
+
 	private static boolean keepInventory = false;
 	private final static Random field_149933_a = new Random();
 
@@ -135,7 +134,6 @@ public class NukeCustom extends BlockContainer implements IBomb {
 	public static final int maxAmat = 350;
 	public static final int maxSchrab = 250;
 	
-	// genuinely some of the worst fucking code i've ever written
 	public static void explodeCustom(World worldObj, double xCoord, double yCoord, double zCoord, float tnt, float nuke, float hydro, float amat, float dirty, float schrab, float euph) {
 		
 		dirty = Math.min(dirty, 100);
@@ -143,23 +141,8 @@ public class NukeCustom extends BlockContainer implements IBomb {
 		/// EUPHEMIUM ///
 		if(euph > 0) {
 			
-			EntityNukeExplosionMK3 ex = new EntityNukeExplosionMK3(worldObj);
-			ex.posX = xCoord;
-			ex.posY = yCoord;
-			ex.posZ = zCoord;
-			ex.destructionRange = 150;
-			ex.speed = BombConfig.blastSpeed;
-			ex.coefficient = 1.0F;
-			ex.waste = false;
-			worldObj.spawnEntityInWorld(ex);
-			
-			worldObj.playSoundEffect(xCoord, yCoord, zCoord, "random.explode", 100000.0F, 1.0F);
-			
-			EntityCloudFleijaRainbow cloud = new EntityCloudFleijaRainbow(worldObj, 50);
-			cloud.posX = xCoord;
-			cloud.posY = yCoord;
-			cloud.posZ = zCoord;
-			worldObj.spawnEntityInWorld(cloud);
+			EntityGrenadeZOMG zomg = new EntityGrenadeZOMG(worldObj, xCoord, yCoord, zCoord);
+			ExplosionChaos.zomgMeSinPi(worldObj, xCoord, yCoord, zCoord, 1000, null, zomg);
 			
 		// SCHRABIDIUM ///
 		} else if(schrab > 0) {
@@ -196,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.statFacStandard(worldObj, xCoord + 0.5, yCoord + 5, zCoord + 0.5, hydro);
+			EntityNukeTorex.statFac(worldObj, xCoord + 0.5, yCoord + 5, zCoord + 0.5, hydro);
 			
 		/// NUCLEAR ///
 		} else if(nuke > 0) {
@@ -205,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.statFacStandard(worldObj, xCoord + 0.5, yCoord + 5, zCoord + 0.5, nuke);
+			EntityNukeTorex.statFac(worldObj, xCoord + 0.5, yCoord + 5, zCoord + 0.5, nuke);
 			
 		/// NON-NUCLEAR ///
 		} else if(tnt >= 75) {
@@ -213,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.statFacStandard(worldObj, xCoord + 0.5, yCoord + 5, zCoord + 0.5, tnt);
+			EntityNukeTorex.statFac(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.statFacStandard(world, x + 0.5, y + 0.5, z + 0.5, BombConfig.gadgetRadius);
+			EntityNukeTorex.statFac(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.statFacStandard(world, x + 0.5, y + 0.5, z + 0.5, BombConfig.manRadius);
+			EntityNukeTorex.statFac(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.statFacStandard(world, x + 0.5, y + 0.5, z + 0.5, BombConfig.mikeRadius);
+			EntityNukeTorex.statFac(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.statFacStandard(world, x + 0.5, y + 0.5, z + 0.5, r);
+			EntityNukeTorex.statFac(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.statFacStandard(world, x + 0.5, y + 0.5, z + 0.5, r);
+			EntityNukeTorex.statFac(world, x + 0.5, y + 0.5, z + 0.5, r);
 		}
 
 		return false;

src/main/java/com/hbm/blocks/fluid/CoriumFinite.java

@@ -59,15 +59,8 @@ public class CoriumFinite extends GenericFiniteFluid {
 	
 	@Override
 	public void updateTick(World world, int x, int y, int z, Random rand) {
-
-		// COFH core apparently replaces the water block class with an incompatible type which breaks
-		// the finite fluid implementation. can't recreate the issue, but according to the provided log
-		// it seems like this shitty band aid might work
-		try {
-			super.updateTick(world, x, y, z, rand);
-		} catch(ClassCastException ex) {
-			if(!world.isRemote) world.setBlockToAir(x, y, z);
-		}
+		
+		super.updateTick(world, x, y, z, rand);
 		
 		if(!world.isRemote && rand.nextInt(10) == 0 && world.getBlock(x, y - 1, z) != this) {
 			

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

@@ -2,79 +2,38 @@ package com.hbm.blocks.generic;
 
 import java.util.Random;
 
-import com.hbm.blocks.BlockEnumMulti;
-import com.hbm.blocks.IBlockMulti;
 import com.hbm.handler.radiation.ChunkRadiationManager;
-import com.hbm.lib.RefStrings;
 
-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.item.ItemStack;
-import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class BlockAbsorber extends BlockEnumMulti implements IBlockMulti {
+public class BlockAbsorber extends Block {
 
-	// Enum for tiers they are in order of meta data, 0, 1, 2, 3 for Base, Red, Green, Pink
-	public static enum EnumAbsorberTier {
+	float absorb = 0;
 
-		BASE(2.5F, "absorber"), RED(10F, "absorber_red"), GREEN(100F, "absorber_green"), PINK(10000F, "absorber_pink");
-
-		public final float absorbAmount;
-		public final String textureName;
-
-		private EnumAbsorberTier(float absorb, String texture) {
-			this.absorbAmount = absorb;
-			this.textureName = texture;
-		}
-	}
-
-	public BlockAbsorber(Material mat) {
-		super(mat, EnumAbsorberTier.class, true, true);
+	public BlockAbsorber(Material mat, float ab) {
+		super(mat);
 		this.setTickRandomly(true);
-		this.setBlockName("rad_absorber");
+		absorb = ab;
 	}
 
-	public EnumAbsorberTier getTier(int meta) {
-		return EnumAbsorberTier.values()[rectify(meta)];
-	}
-
-	@Override
-	public String getUnlocalizedName(ItemStack stack) {
-		EnumAbsorberTier tier = getTier(stack.getItemDamage());
-		String tierName = net.minecraft.util.StatCollector.translateToLocal("tile.rad_absorber." + tier.name().toLowerCase());
-		return tierName;
-
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(net.minecraft.client.renderer.texture.IIconRegister reg) {
-		icons = new IIcon[EnumAbsorberTier.values().length];
-		for(int i = 0; i < icons.length; i++) {
-			icons[i] = reg.registerIcon(RefStrings.MODID + ":" + EnumAbsorberTier.values()[i].textureName);
-		}
-	}
-
-	// All that rad math shit that was on there already, did not touch this
-	// -Wolf
-
 	@Override
 	public int tickRate(World world) {
+
 		return 10;
 	}
 
 	@Override
 	public void updateTick(World world, int x, int y, int z, Random rand) {
-		EnumAbsorberTier tier = getTier(world.getBlockMetadata(x, y, z));
-		ChunkRadiationManager.proxy.decrementRad(world, x, y, z, tier.absorbAmount);
-		world.scheduleBlockUpdate(x, y, z, this, tickRate(world));
+
+		ChunkRadiationManager.proxy.decrementRad(world, x, y, z, absorb);
+		world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world));
 	}
 
-	@Override
 	public void onBlockAdded(World world, int x, int y, int z) {
 		super.onBlockAdded(world, x, y, z);
-		world.scheduleBlockUpdate(x, y, z, this, tickRate(world));
+
+		world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world));
 	}
 }

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

@@ -1,161 +0,0 @@
-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.i18n.I18nUtil;
+import com.hbm.util.I18nUtil;
 
-import api.hbm.fluidmk2.IFillableItem;
+import api.hbm.fluid.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,8 +4,8 @@ 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.nbt.INBTTileEntityTransformable;
-import com.hbm.world.gen.nbt.INBTBlockTransformable;
+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;
@@ -34,7 +34,7 @@ import net.minecraft.world.World;
 import java.util.List;
 import java.util.Random;
 
-public class BlockBobble extends BlockContainer implements IGUIProvider, INBTBlockTransformable {
+public class BlockBobble extends BlockContainer implements IGUIProvider, INBTTransformable {
 
 	public BlockBobble() {
 		super(Material.iron);
@@ -198,7 +198,7 @@ public class BlockBobble extends BlockContainer implements IGUIProvider, INBTBlo
 		INTELLIGENCE(	"Intelligence",						"Intelligence",		null,														"It takes the smartest individuals to realize$there's always more to learn.",						false,	ScrapType.BRIDGE_BUS),
 		AGILITY(		"Agility",							"Agility",			null,														"Never be afraid to dodge the sensitive issues.",													false,	ScrapType.BRIDGE_CHIPSET),
 		LUCK(			"Luck",								"Luck",				null,														"There's only one way to give 110%.",																false,	ScrapType.BRIDGE_CMOS),
-		BOB(			"Robert \"The Bobcat\" Katzinsky",	"HbMinecraft",		"Hbm's Nuclear Tech Mod",									"I know where you live, " + System.getProperty("user.name"),									false,	ScrapType.CPU_SOCKET),
+		BOB(			"Robert \"The Bobcat\" Katzinsky",	"HbMinecraft",		"Hbm's Nuclear Tech Mod",									"I know where you live, " + System.getProperty("user.name"),										false,	ScrapType.CPU_SOCKET),
 		FRIZZLE(		"Frooz",							"Frooz",			"Weapon models",											"BLOOD IS FUEL",																					true,	ScrapType.CPU_CLOCK),
 		PU238(			"Pu-238",							"Pu-238",			"Improved Tom impact mechanics",							null,																								false,	ScrapType.CPU_REGISTER),
 		VT(				"VT-6/24",							"VT-6/24",			"Balefire warhead model and general texturework",			"You cannot unfuck a horse.",																		true,	ScrapType.CPU_EXT),
@@ -211,10 +211,9 @@ public class BlockBobble extends BlockContainer implements IGUIProvider, INBTBlo
 		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 and massive RBMK/packet optimizations",	"they call me the food heater$john optimization",													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",			"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);
+		MELLOW(			"MELLOWARPEGGIATION",				"Mellow",			"NBT Structures, industrial lighting, animation tools",				"Make something cool now, ask for permission later.",												true,	ScrapType.CARD_PROCESSOR);
 
 		public String name;			//the title of the tooltip
 		public String label;		//the name engraved in the socket

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

@@ -7,7 +7,6 @@ import static net.minecraftforge.common.util.ForgeDirection.WEST;
 
 import com.hbm.lib.RefStrings;
 
-import com.hbm.world.gen.nbt.INBTBlockTransformable;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -21,23 +20,23 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public class BlockChain extends Block implements INBTBlockTransformable {
+public class BlockChain extends Block {
 
 	@SideOnly(Side.CLIENT)
 	private IIcon iconEnd;
-
+	
 	public BlockChain(Material mat) {
 		super(mat);
 	}
-
+	
     public boolean isOpaqueCube() {
         return false;
     }
-
+    
     public boolean renderAsNormalBlock() {
         return false;
     }
-
+    
     public static int renderID = RenderingRegistry.getNextAvailableRenderId();
 
     public int getRenderType() {
@@ -48,7 +47,7 @@ public class BlockChain extends Block implements INBTBlockTransformable {
     public boolean isLadder(IBlockAccess world, int x, int y, int z, EntityLivingBase entity) {
         return true;
     }
-
+	
 	@Override
 	@SideOnly(Side.CLIENT)
 	public void registerBlockIcons(IIconRegister iconRegister) {
@@ -61,14 +60,14 @@ public class BlockChain extends Block implements INBTBlockTransformable {
 
     	if(world.isSideSolid(x, y - 1, z, ForgeDirection.UP, false) || (world.getBlock(x, y - 1, z) == this && world.getBlockMetadata(x, y, z) == world.getBlockMetadata(x, y - 1, z)))
     		return this.blockIcon;
-
+    	
     	return this.iconEnd;
     }
-
+    
     public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
         return null;
     }
-
+    
     public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) {
     	func_149797_b(world.getBlockMetadata(x, y, z));
 
@@ -77,11 +76,11 @@ public class BlockChain extends Block implements INBTBlockTransformable {
     }
 
     public void func_149797_b(int meta) {
-
+    	
         float f = 0.125F;
-
+    	
     	if(meta == 0) {
-
+        	
         	this.minX = 3 * f;
         	this.minY = 0;
         	this.minZ = 3 * f;
@@ -110,24 +109,24 @@ public class BlockChain extends Block implements INBTBlockTransformable {
             this.setBlockBounds(0.0F, 0.0F, 3 * f, f, 1.0F, 5 * f);
         }
     }
-
+    
     @SideOnly(Side.CLIENT)
     public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) {
         this.setBlockBoundsBasedOnState(world, x, y, z);
         return super.getSelectedBoundingBoxFromPool(world, x, y, z);
     }
-
+    
     public boolean canPlaceBlockAt(World world, int x, int y, int z) {
-
+    	
     	if(world.isSideSolid(x, y + 1, z, ForgeDirection.DOWN) || world.getBlock(x, y + 1, z) == this)
     		return true;
-
+    	
     	return world.isSideSolid(x - 1, y, z, EAST ) ||
     			world.isSideSolid(x + 1, y, z, WEST ) ||
     			world.isSideSolid(x, y, z - 1, SOUTH) ||
     			world.isSideSolid(x, y, z + 1, NORTH);
     }
-
+    
     public int onBlockPlaced(World world, int x, int y, int z, int side, float p_149660_6_, float p_149660_7_, float p_149660_8_, int meta)
     {
         int j1 = meta;
@@ -143,12 +142,12 @@ public class BlockChain extends Block implements INBTBlockTransformable {
 
         if(side == 5 && world.isSideSolid(x - 1, y, z, EAST))
             j1 = 5;
-
+        
         if(j1 == 0) {
-
+        	
         	if(world.getBlock(x, y + 1, z) == this)
         		return world.getBlockMetadata(x, y + 1, z);
-
+        	
         	if(world.isSideSolid(x, y + 1, z, ForgeDirection.DOWN))
         		return 0;
         }
@@ -156,30 +155,30 @@ public class BlockChain extends Block implements INBTBlockTransformable {
         if(j1 == 0) {
 	        if(world.isSideSolid(x, y, z + 1, NORTH))
 	            j1 = 2;
-
+	
 	        if(world.isSideSolid(x, y, z - 1, SOUTH))
 	            j1 = 3;
-
+	
 	        if(world.isSideSolid(x + 1, y, z, WEST))
 	            j1 = 4;
-
+	
 	        if(world.isSideSolid(x - 1, y, z, EAST))
 	            j1 = 5;
         }
 
         return j1;
     }
-
+    
     public void onNeighborBlockChange(World world, int x, int y, int z, Block block) {
-
+    	
         int l = world.getBlockMetadata(x, y, z);
         boolean flag = false;
-
+        
         if(world.getBlock(x, y + 1, z) == this && world.getBlockMetadata(x, y, z) == world.getBlockMetadata(x, y + 1, z)) {
             super.onNeighborBlockChange(world, x, y, z, block);
             return;
         }
-
+        
         if(world.isSideSolid(x, y + 1, z, ForgeDirection.DOWN) && world.getBlockMetadata(x, y, z) == 0) {
             super.onNeighborBlockChange(world, x, y, z, block);
             return;
@@ -202,12 +201,4 @@ public class BlockChain extends Block implements INBTBlockTransformable {
 
         super.onNeighborBlockChange(world, x, y, z, block);
     }
-
-	@Override
-	public int transformMeta(int meta, int coordBaseMode) {
-		if (coordBaseMode == 0) return meta;
-		if (meta == 0) return meta;
-		if (meta == 1) return meta;
-		return INBTBlockTransformable.transformMetaDeco(meta, coordBaseMode);
-	}
 }

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

@@ -1,15 +1,26 @@
 package com.hbm.blocks.generic;
 
+import java.util.List;
 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 api.hbm.block.IDrillInteraction;
+import api.hbm.block.IMiningDrill;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
+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.util.EnumChatFormatting;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.FakePlayer;
 
-public class BlockCluster extends Block {
+public class BlockCluster extends Block implements IDrillInteraction, ITooltipProvider {
 
 	public BlockCluster(Material mat) {
 		super(mat);
@@ -17,7 +28,32 @@ public class BlockCluster extends Block {
 
 	@Override
 	public Item getItemDropped(int i, Random rand, int j) {
-		return getDrop();
+		return null;
+	}
+	
+	@Override
+	public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) {
+		
+		if(player instanceof FakePlayer || player == null) {
+			return;
+		}
+
+		if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops") && !world.restoringBlockSnapshots) {
+			
+			Item drop = getDrop();
+			
+			if(drop == null)
+				return;
+			
+			float f = 0.7F;
+			double mX = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
+			double mY = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
+			double mZ = (double) (world.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D;
+			
+			EntityItem entityitem = new EntityItem(world, (double) x + mX, (double) y + mY, (double) z + mZ, new ItemStack(drop));
+			entityitem.delayBeforeCanPickup = 10;
+			world.spawnEntityInWorld(entityitem);
+		}
 	}
 	
 	private Item getDrop() {
@@ -29,4 +65,24 @@ public class BlockCluster extends Block {
 		
 		return null;
 	}
+
+	@Override
+	public boolean canBreak(World world, int x, int y, int z, int meta, IMiningDrill drill) {
+		return drill.getDrillRating() > 70 || world.rand.nextFloat() < 0.05;
+	}
+
+	@Override
+	public ItemStack extractResource(World world, int x, int y, int z, int meta, IMiningDrill drill) {
+		return drill.getDrillRating() <= 70 ? new ItemStack(getDrop()) : null;
+	}
+
+	@Override
+	public float getRelativeHardness(World world, int x, int y, int z, int meta, IMiningDrill drill) {
+		return this.getBlockHardness(world, x, y, z);
+	}
+
+	@Override
+	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) {
+		list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey("trait.tile.cluster"));
+	}
 }

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

@@ -0,0 +1,78 @@
+package com.hbm.blocks.generic;
+
+import java.util.Random;
+
+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.entity.Entity;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class BlockCoalBurning extends BlockOutgas {
+
+	public BlockCoalBurning(Material mat) {
+		super(mat, false, 1, false);
+		this.setTickRandomly(true);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void randomDisplayTick(World world, int x, int y, int z, Random rand) {
+		super.randomDisplayTick(world, x, y, z, rand);
+
+		for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
+
+			if(dir == ForgeDirection.DOWN)
+				continue;
+
+			if(world.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ).getMaterial() == Material.air) {
+
+				double ix = x + 0.5F + dir.offsetX + rand.nextDouble() - 0.5D;
+				double iy = y + 0.5F + dir.offsetY + rand.nextDouble() - 0.5D;
+				double iz = z + 0.5F + dir.offsetZ + rand.nextDouble() - 0.5D;
+
+				if(dir.offsetX != 0)
+					ix = x + 0.5F + dir.offsetX * 0.5 + rand.nextDouble() * 0.125 * dir.offsetX;
+				if(dir.offsetY != 0)
+					iy = y + 0.5F + dir.offsetY * 0.5 + rand.nextDouble() * 0.125 * dir.offsetY;
+				if(dir.offsetZ != 0)
+					iz = z + 0.5F + dir.offsetZ * 0.5 + rand.nextDouble() * 0.125 * dir.offsetZ;
+
+				world.spawnParticle("flame", ix, iy, iz, 0.0, 0.0, 0.0);
+				world.spawnParticle("smoke", ix, iy, iz, 0.0, 0.0, 0.0);
+				world.spawnParticle("smoke", ix, iy, iz, 0.0, 0.1, 0.0);
+			}
+		}
+	}
+
+	@Override
+	public Item getItemDropped(int i, Random rand, int j) {
+		return null;
+	}
+
+	public void breakBlock(World world, int x, int y, int z, Block block, int i) {
+		super.breakBlock(world, x, y, z, block, i);
+
+		world.setBlock(x, y, z, Blocks.fire);
+		
+		for(int ix = -2; ix <= 2; ix++) {
+			for(int iy = -2; iy <= 2; iy++) {
+				for(int iz = -2; iz <= 2; iz++) {
+					
+					if(Math.abs(ix + iy + iz) < 5 && world.getBlock(x + ix, y + iy, z + iz) == Blocks.air) {
+						world.setBlock(x + ix, y + iy, z + iz, this.getGas());
+					}
+				}
+			}
+		}
+	}
+
+	@Override
+	public void onEntityWalking(World world, int x, int y, int z, Entity entity) {
+		entity.setFire(3);
+	}
+}

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

@@ -0,0 +1,33 @@
+package com.hbm.blocks.generic;
+
+import java.util.Random;
+
+import com.hbm.blocks.ModBlocks;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.world.World;
+
+public class BlockCoalOil extends Block {
+
+	public BlockCoalOil(Material mat) {
+		super(mat);
+	}
+
+	@Override
+	public void updateTick(World world, int x, int y, int z, Random rand) {
+		world.setBlock(x, y, z, ModBlocks.ore_coal_oil_burning);
+	}
+
+	@Override
+	public Item getItemDropped(int i, Random rand, int j) {
+		return Items.coal;
+	}
+
+	@Override
+	public int quantityDropped(Random rand) {
+		return 2 + rand.nextInt(2);
+	}
+}

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

@@ -5,10 +5,8 @@ import java.util.List;
 import java.util.Random;
 
 import com.hbm.blocks.ModBlocks;
-import com.hbm.interfaces.Spaghetti;
 import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmoSecret;
 import com.hbm.items.ModItems;
-import com.hbm.items.machine.ItemBatteryPack.EnumBatteryPack;
 
 import net.minecraft.block.BlockFalling;
 import net.minecraft.block.material.Material;
@@ -18,7 +16,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-@Spaghetti("this is implemented in the most braindead fucking way imaginable") // TODO: rework this unholy abomination using configurable loot pools
 public class BlockCrate extends BlockFalling {
 
 	List<ItemStack> crateList;
@@ -72,16 +69,22 @@ public class BlockCrate extends BlockFalling {
 
 		// Lead Crate
 		BlockCrate.addToListWithWeight(leadList, ModItems.ingot_uranium, 10);
+		// BlockCrate.addToListWithWeight(leadList, ModItems.ingot_u235, 5);
 		BlockCrate.addToListWithWeight(leadList, ModItems.ingot_u238, 8);
 		BlockCrate.addToListWithWeight(leadList, ModItems.ingot_plutonium, 7);
+		// BlockCrate.addToListWithWeight(leadList, ModItems.ingot_pu238, 5);
+		// BlockCrate.addToListWithWeight(leadList, ModItems.ingot_pu239, 4);
 		BlockCrate.addToListWithWeight(leadList, ModItems.ingot_pu240, 6);
 		BlockCrate.addToListWithWeight(leadList, ModItems.ingot_neptunium, 7);
 		BlockCrate.addToListWithWeight(leadList, ModItems.ingot_uranium_fuel, 8);
 		BlockCrate.addToListWithWeight(leadList, ModItems.ingot_plutonium_fuel, 7);
 		BlockCrate.addToListWithWeight(leadList, ModItems.ingot_mox_fuel, 6);
 		BlockCrate.addToListWithWeight(leadList, ModItems.nugget_uranium, 10);
+		// BlockCrate.addToListWithWeight(leadList, ModItems.nugget_u235, 5);
 		BlockCrate.addToListWithWeight(leadList, ModItems.nugget_u238, 8);
 		BlockCrate.addToListWithWeight(leadList, ModItems.nugget_plutonium, 7);
+		// BlockCrate.addToListWithWeight(leadList, ModItems.nugget_pu238, 5);
+		// BlockCrate.addToListWithWeight(leadList, ModItems.nugget_pu239, 4);
 		BlockCrate.addToListWithWeight(leadList, ModItems.nugget_pu240, 6);
 		BlockCrate.addToListWithWeight(leadList, ModItems.nugget_neptunium, 7);
 		BlockCrate.addToListWithWeight(leadList, ModItems.nugget_uranium_fuel, 8);
@@ -93,25 +96,29 @@ public class BlockCrate extends BlockFalling {
 		BlockCrate.addToListWithWeight(leadList, ModItems.cell_puf6, 8);
 		BlockCrate.addToListWithWeight(leadList, ModItems.pellet_rtg, 6);
 		BlockCrate.addToListWithWeight(leadList, ModItems.pellet_rtg_weak, 7);
+		BlockCrate.addToListWithWeight(leadList, ModItems.tritium_deuterium_cake, 5);
 		BlockCrate.addToListWithWeight(leadList, ModItems.powder_yellowcake, 10);
 
 		// Metal Crate
 		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);
 		BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.red_pylon), 9);
-		BlockCrate.addToListWithWeight(metalList, new ItemStack(ModItems.battery_pack, 1, EnumBatteryPack.BATTERY_LEAD.ordinal()), 10);
+		BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_battery), 8);
+		BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_lithium_battery), 5);
 		BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off), 8);
-		BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_assembly_machine), 10);
+		BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_assembler), 10);
 		BlockCrate.addToListWithWeight(metalList, Item.getItemFromBlock(ModBlocks.machine_fluidtank), 7);
 		BlockCrate.addToListWithWeight(metalList, ModItems.centrifuge_element, 6);
 		BlockCrate.addToListWithWeight(metalList, ModItems.motor, 8);
 		BlockCrate.addToListWithWeight(metalList, ModItems.coil_tungsten, 7);
 		BlockCrate.addToListWithWeight(metalList, ModItems.photo_panel, 3);
 		BlockCrate.addToListWithWeight(metalList, ModItems.coil_copper, 10);
+		BlockCrate.addToListWithWeight(metalList, ModItems.tank_steel, 9);
 		BlockCrate.addToListWithWeight(metalList, ModItems.blade_titanium, 3);
 		BlockCrate.addToListWithWeight(metalList, ModItems.piston_selenium, 6);
 

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

@@ -2,7 +2,7 @@ package com.hbm.blocks.generic;
 
 import com.hbm.blocks.BlockMulti;
 import com.hbm.lib.RefStrings;
-import com.hbm.world.gen.nbt.INBTBlockTransformable;
+import com.hbm.world.gen.INBTTransformable;
 
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -15,7 +15,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
-public class BlockDecoCRT extends BlockMulti implements INBTBlockTransformable {
+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;
@@ -77,7 +77,7 @@ public class BlockDecoCRT extends BlockMulti implements INBTBlockTransformable {
 
 	@Override
 	public int transformMeta(int meta, int coordBaseMode) {
-		return INBTBlockTransformable.transformMetaDecoModel(meta, coordBaseMode);
+		return INBTTransformable.transformMetaDecoModel(meta, coordBaseMode);
 	}
 
 }

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

@@ -1,19 +1,17 @@
 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);
@@ -37,12 +35,4 @@ 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,7 +1,7 @@
 package com.hbm.blocks.generic;
 
 import com.hbm.blocks.BlockEnumMulti;
-import com.hbm.world.gen.nbt.INBTBlockTransformable;
+import com.hbm.world.gen.INBTTransformable;
 
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import net.minecraft.block.material.Material;
@@ -12,7 +12,7 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class BlockDecoModel extends BlockEnumMulti implements INBTBlockTransformable {
+public class BlockDecoModel extends BlockEnumMulti implements INBTTransformable {
 
 	public BlockDecoModel(Material mat, Class<? extends Enum> theEnum, boolean multiName, boolean multiTexture) {
 		super(mat, theEnum, multiName, multiTexture);
@@ -108,7 +108,6 @@ public class BlockDecoModel extends BlockEnumMulti implements INBTBlockTransform
 
 	@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;

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

@@ -2,7 +2,7 @@ package com.hbm.blocks.generic;
 
 import com.hbm.blocks.BlockMulti;
 import com.hbm.lib.RefStrings;
-import com.hbm.world.gen.nbt.INBTBlockTransformable;
+import com.hbm.world.gen.INBTTransformable;
 
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -17,7 +17,7 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class BlockDecoToaster extends BlockMulti implements INBTBlockTransformable {
+public class BlockDecoToaster extends BlockMulti implements INBTTransformable {
 
 	protected String[] variants = new String[] {"toaster_iron", "toaster_steel", "toaster_wood"};
 	@SideOnly(Side.CLIENT) protected IIcon[] icons;
@@ -94,7 +94,7 @@ public class BlockDecoToaster extends BlockMulti implements INBTBlockTransformab
 
 	@Override
 	public int transformMeta(int meta, int coordBaseMode) {
-		return INBTBlockTransformable.transformMetaDecoModel(meta, 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.i18n.I18nUtil;
+import com.hbm.util.I18nUtil;
 
 import api.hbm.item.IDepthRockTool;
 import net.minecraft.block.Block;

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

@@ -17,8 +17,6 @@ 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;
@@ -94,7 +92,7 @@ public class BlockDoorGeneric extends BlockDummyable implements IBomb {
 	
 	@Override
 	public void addCollisionBoxesToList(World worldIn, int x, int y, int z, AxisAlignedBB entityBox, List collidingBoxes, Entity entityIn) {
-		AxisAlignedBB box = getBoundingBox(worldIn, x, y, z, true);
+		AxisAlignedBB box = getBoundingBox(worldIn, 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));
@@ -113,27 +111,11 @@ public class BlockDoorGeneric extends BlockDummyable implements IBomb {
 	
 	@Override
 	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
-		AxisAlignedBB aabb = this.getBoundingBox(world, x, y, z, true);
+		AxisAlignedBB aabb = this.getBoundingBox(world, x, y, z);
 		if(aabb.minX == aabb.maxX && aabb.minY == aabb.maxY && aabb.minZ == aabb.maxZ) return null;
 		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, false);
-		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
@@ -158,11 +140,11 @@ public class BlockDoorGeneric extends BlockDummyable implements IBomb {
 	
 	@Override
 	public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) {
-		return getBoundingBox(world, x, y, z, false);
+		return getBoundingBox(world, x, y, z);
 		//return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1);
 	}
 	
-	public AxisAlignedBB getBoundingBox(World world, int x, int y, int z, boolean forCollision) {
+	public AxisAlignedBB getBoundingBox(World world, int x, int y, int z) {
 		int meta = world.getBlockMetadata(x, y, z);
 		TileEntity te = world.getTileEntity(x, y, z);
 		int[] core = this.findCore(world, x, y, z);
@@ -173,7 +155,7 @@ public class BlockDoorGeneric extends BlockDummyable implements IBomb {
 		TileEntity te2 = world.getTileEntity(core[0], core[1], core[2]);
 		ForgeDirection dir = ForgeDirection.getOrientation(te2.getBlockMetadata() - BlockDummyable.offset);
 		BlockPos pos = new BlockPos(x - core[0], y - core[1], z - core[2]).rotate(Rotation.getBlockRotation(dir).add(Rotation.COUNTERCLOCKWISE_90));
-		AxisAlignedBB box = type.getBlockBound(pos.getX(), pos.getY(), pos.getZ(), open, forCollision);
+		AxisAlignedBB box = type.getBlockBound(pos.getX(), pos.getY(), pos.getZ(), open);
 		
 		switch(te2.getBlockMetadata() - offset){
 		case 2: return AxisAlignedBB.getBoundingBox(x + 1 - box.minX, y + box.minY, z + 1 - box.minZ, x + 1 - box.maxX, y + box.maxY, z + 1 - box.maxZ);

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

@@ -4,7 +4,7 @@ import java.awt.Color;
 import java.util.List;
 
 import com.hbm.blocks.ITooltipProvider;
-import com.hbm.handler.threading.PacketThreading;
+import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.toclient.AuxParticlePacketNT;
 
 import api.hbm.block.IToolable;
@@ -169,7 +169,7 @@ public class BlockEmitter extends BlockContainer implements IToolable, ITooltipP
 							data.setFloat("yaw", 90);
 						}
 
-						PacketThreading.createAllAroundThreadedPacket(new AuxParticlePacketNT(data, x, y, z),
+						PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, x, y, z),
 								new TargetPoint(worldObj.provider.dimensionId, x, y, z, 100));
 
 						color = prevColor;

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

@@ -55,8 +55,7 @@ public class BlockFissure extends BlockContainer implements IBlockMultiPass {
 
 	@Override
 	public void updateTick(World world, int x, int y, int z, Random rand) {
-		boolean crater = world.getBlockMetadata(x, y, z) != 0;
-		if(world.getBlock(x, y + 1, z).isReplaceable(world, x, y + 1, z)) world.setBlock(x, y + 1, z, crater ? ModBlocks.rad_lava_block : ModBlocks.volcanic_lava_block);
+		if(world.getBlock(x, y + 1, z).isReplaceable(world, x, y + 1, z)) world.setBlock(x, y + 1, z, ModBlocks.volcanic_lava_block);
 	}
 	
 	@Override

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");
+		this.setBlockTextureName(RefStrings.MODID + ":concrete_smooth");
 	}
 }

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.i18n.I18nUtil;
+import com.hbm.util.I18nUtil;
 
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;

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);
-			if(data.reputation < 25) data.reputation++;
+			data.reputation++;
 		}
 		
 		return didRepair;

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

@@ -1,39 +0,0 @@
-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];
-	}
-}

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

@@ -4,7 +4,6 @@ import java.util.Random;
 
 import com.hbm.blocks.ModBlocks;
 import com.hbm.items.ModItems;
-import com.hbm.world.gen.nbt.INBTBlockTransformable;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -21,7 +20,7 @@ import net.minecraft.util.Vec3;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class BlockModDoor extends Block implements INBTBlockTransformable {
+public class BlockModDoor extends Block {
 	@SideOnly(Side.CLIENT)
 	private IIcon[] field_150017_a;
 	@SideOnly(Side.CLIENT)
@@ -235,7 +234,7 @@ public class BlockModDoor extends Block implements INBTBlockTransformable {
 		}
 
 		p_149727_1_.playSoundEffect(p_149727_2_, p_149727_3_, p_149727_4_, "hbm:block.openDoor", 1.0F, p_149727_1_.rand.nextFloat() * 0.1F + 0.9F);
-
+		
 		return true;
 	}
 
@@ -312,10 +311,10 @@ public class BlockModDoor extends Block implements INBTBlockTransformable {
 	}
 
 	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
-
+		
 		if((p_149650_1_ & 8) != 0)
 			return null;
-
+		
 		if (this == ModBlocks.door_metal)
 			return ModItems.door_metal;
 		else if (this == ModBlocks.door_office)
@@ -397,9 +396,4 @@ public class BlockModDoor extends Block implements INBTBlockTransformable {
 			p_149681_1_.setBlockToAir(p_149681_2_, p_149681_3_ - 1, p_149681_4_);
 		}
 	}
-
-	@Override
-	public int transformMeta(int meta, int coordBaseMode) {
-		return INBTBlockTransformable.transformMetaDoor(meta, coordBaseMode);
-	}
-}
+}

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

@@ -35,17 +35,13 @@ public class BlockMultiSlab extends BlockSlab implements IStepTickReceiver {
 		
 		if(single == null) {
 			for(int i = 0; i < slabMaterials.length; i++) {
-				recipeGen.add(new Object[] {slabMaterials[i], 0, this, i});
+				recipeGen.add(new Object[] {slabMaterials[i], this, i});
 			}
 		}
 		
-		this.setBlockTextureName(RefStrings.MODID + ":concrete");
+		this.setBlockTextureName(RefStrings.MODID + ":concrete_smooth");
 	}
 	
-	public BlockMultiSlab(boolean b, Material mat) {
-		super(b, mat);
-	}
-
 	@Override
 	@SideOnly(Side.CLIENT)
 	public IIcon getIcon(int side, int meta) {
@@ -63,9 +59,8 @@ public class BlockMultiSlab extends BlockSlab implements IStepTickReceiver {
 	protected ItemStack createStackedBlock(int meta) {
 		return new ItemStack(Item.getItemFromBlock(single != null ? single : this), 2, (meta & 7) % slabMaterials.length);
 	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
+	
+    @SideOnly(Side.CLIENT)
 	public Item getItem(World world, int x, int y, int z) {
 		return Item.getItemFromBlock(single != null ? single : this);
 	}
@@ -81,8 +76,7 @@ public class BlockMultiSlab extends BlockSlab implements IStepTickReceiver {
 	public int getDamageValue(World world, int x, int y, int z) {
 		return (super.getDamageValue(world, x, y, z) & 7) % slabMaterials.length;
 	}
-
-	@Override
+	
 	@SideOnly(Side.CLIENT)
 	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
 		

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

@@ -1,48 +0,0 @@
-package com.hbm.blocks.generic;
-
-import com.hbm.lib.RefStrings;
-
-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.util.IIcon;
-
-public class BlockMultiSlabMeta extends BlockMultiSlab {
-	
-	public int[] metas;
-	
-	public BlockMultiSlabMeta(Block single, Material mat, Block[] slabMaterials, int...metas) {
-		super(single != null, mat);
-		this.single = single;
-		this.slabMaterials = slabMaterials;
-		this.metas = new int[slabMaterials.length]; //initialized to 0s
-		for(int i = 0; i < metas.length; i++) {
-			this.metas[i] = metas[i];
-		}
-		
-		this.useNeighborBrightness = true;
-		
-		if(single == null) {
-			for(int i = 0; i < slabMaterials.length; i++) {
-				recipeGen.add(new Object[] {slabMaterials[i], metas[i], this, i});
-			}
-		}
-		
-		this.setBlockTextureName(RefStrings.MODID + ":concrete");
-	}
-	
-	@Override
-	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int side, int meta) {
-		meta = (meta & 7) % slabMaterials.length;
-		Block block = slabMaterials[meta];
-		return block.getIcon(side, metas[meta]);
-	}
-	
-	@Override
-	public String func_150002_b(int meta) {
-		meta = (meta & 7) % slabMaterials.length;
-		return super.func_150002_b(meta) + "." + metas[meta];
-	}
-}

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

@@ -9,8 +9,6 @@ import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.generic.BlockDeadPlant.EnumDeadPlantType;
 import com.hbm.blocks.generic.BlockTallPlant.EnumTallFlower;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.block.Block;
 import net.minecraft.block.IGrowable;
 import net.minecraft.block.material.Material;
@@ -18,7 +16,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.world.ColorizerGrass;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.EnumPlantType;
@@ -101,7 +98,7 @@ public class BlockNTMFlower extends BlockEnumMulti implements IPlantable, IGrowa
 	public boolean renderAsNormalBlock() {
 		return false;
 	}
-	
+
 	@Override
 	public int getRenderType() {
 		return 1;
@@ -201,43 +198,6 @@ public class BlockNTMFlower extends BlockEnumMulti implements IPlantable, IGrowa
 		
 		this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
 	}
-	
-	
-	
-    @SideOnly(Side.CLIENT)
-    public int getRenderColor(int meta)
-    {
-    	if (meta == 1 || meta == 3) {
-    		return ColorizerGrass.getGrassColor(0.5D, 1.0D);
-        } else return 0xFFFFFF;
-    }
-    // if you need to make another tinted plant just throw the metadata value
-    // into the if statements above and below i really do not want to make this more 
-    // complicated than it needs to be
-
-    @SideOnly(Side.CLIENT)
-    public int colorMultiplier(IBlockAccess world, int x, int y, int z)
-    {
-    	int l = 0;
-        int i1 = 0;
-        int j1 = 0;
-
-        for (int k1 = -1; k1 <= 1; ++k1)
-        {
-            for (int l1 = -1; l1 <= 1; ++l1)
-            {
-                int i2 = world.getBiomeGenForCoords(x + l1, z + k1).getBiomeFoliageColor(x + l1, y, z + k1);
-                l += (i2 & 16711680) >> 16;
-                i1 += (i2 & 65280) >> 8;
-                j1 += i2 & 255;
-            }
-        }
-        int meta = world.getBlockMetadata(x, y, z);
-        if (meta == 1 || meta == 3) {
-        	return ((l / 9 & 255) << 16 | (i1 / 9 & 255) << 8 | j1 / 9 & 255);
-        } else return 0xFFFFFF;
-    }
-    
 
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { }

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

@@ -1,79 +0,0 @@
-package com.hbm.blocks.generic;
-
-import java.util.Locale;
-import java.util.Random;
-
-import com.hbm.blocks.BlockEnumMulti;
-import com.hbm.lib.RefStrings;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockFalling;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.item.EntityFallingBlock;
-import net.minecraft.world.World;
-
-public class BlockNTMSand extends BlockEnumMulti {
-
-	public BlockNTMSand(Material mat) {
-		super(mat, EnumSandType.class, true, true);
-	}
-
-	@Override
-	public void onBlockAdded(World world, int x, int y, int z) {
-		world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world));
-	}
-
-	@Override
-	public void onNeighborBlockChange(World world, int x, int y, int z, Block b) {
-		world.scheduleBlockUpdate(x, y, z, this, this.tickRate(world));
-	}
-
-	@Override
-	public void updateTick(World world, int x, int y, int z, Random rand) {
-		if(!world.isRemote) {
-			this.fall(world, x, y, z);
-		}
-	}
-
-	private void fall(World world, int x, int y, int z) {
-		if(BlockFalling.func_149831_e(world, x, y - 1, z) && y >= 0) {
-			byte b0 = 32;
-
-			if(!BlockFalling.fallInstantly && world.checkChunksExist(x - b0, y - b0, z - b0, x + b0, y + b0, z + b0)) {
-				if(!world.isRemote) {
-					EntityFallingBlock entityfallingblock = new EntityFallingBlock(world, x + 0.5, y + 0.5, z + 0.5, this, world.getBlockMetadata(x, y, z));
-					world.spawnEntityInWorld(entityfallingblock);
-				}
-			} else {
-				world.setBlockToAir(x, y, z);
-
-				while(BlockFalling.func_149831_e(world, x, y - 1, z) && y > 0) {
-					--y;
-				}
-
-				if(y > 0) {
-					world.setBlock(x, y, z, this);
-				}
-			}
-		}
-	}
-
-	@Override
-	public int tickRate(World p_149738_1_) {
-		return 2;
-	}
-
-	@Override
-	public String getTextureMultiName(Enum num) {
-		return RefStrings.MODID + ":sand_" + num.name().toLowerCase(Locale.US);
-	}
-
-	@Override
-	public String getUnlocalizedMultiName(Enum num) {
-		return "tile.sand_" + num.name().toLowerCase(Locale.US);
-	}
-
-	public static enum EnumSandType {
-		BORON, LEAD, URANIUM, POLONIUM, QUARTZ
-	}
-}

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

@@ -1,60 +0,0 @@
-package com.hbm.blocks.generic;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockTrapDoor;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-public class BlockNTMTrapdoor extends BlockTrapDoor {
-    public BlockNTMTrapdoor(Material material) {
-        super(material);
-    }
-
-    @Override
-    public boolean isLadder(IBlockAccess world, int x, int y, int z, EntityLivingBase entity) {
-        int meta = world.getBlockMetadata(x, y, z);
-
-        // isOpen
-        if (!func_150118_d(meta))
-            return false;
-        
-        Block blockBelow = world.getBlock(x, y - 1, z);
-        return blockBelow != null && blockBelow.isLadder(world, x, y - 1, z, entity);
-    }
-
-    @Override
-    public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
-        // Make the hitbox in-line with ladders, if relevant
-        if (isLadder(world, x, y, z, null)) {
-            int meta = world.getBlockMetadata(x, y, z);
-            float thickness = 0.125F;
-
-            if ((meta & 3) == 0)
-                return AxisAlignedBB.getBoundingBox(x, y, z + 1F - thickness, x + 1F, y + 1F, z + 1F);
-            
-            if ((meta & 3) == 1)
-                return AxisAlignedBB.getBoundingBox(x, y, z, x + 1F, y + 1F, z + thickness);
-            
-            if ((meta & 3) == 2)
-                return AxisAlignedBB.getBoundingBox(x + 1F - thickness, y, z, x + 1F, y + 1F, z + 1F);
-            
-            if ((meta & 3) == 3)
-                return AxisAlignedBB.getBoundingBox(x, y, z, x + thickness, y + 1F, z + 1F);
-        }
-
-        return super.getCollisionBoundingBoxFromPool(world, x, y, z);
-    }
-
-    @Override
-    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
-        // The original code prevented manual operation of Material.iron trapdoors. This bypasses that behavior
-        int meta = world.getBlockMetadata(x, y, z);
-        world.setBlockMetadataWithNotify(x, y, z, meta ^ 4, 2);
-        world.playAuxSFXAtEntity(player, 1003, x, y, z, 0);
-        return true;
-    }
-}

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

@@ -68,6 +68,9 @@ public class BlockOre extends Block {
 		if(this == ModBlocks.ore_nether_fire) {
 			return rand.nextInt(10) == 0 ? ModItems.ingot_phosphorus : ModItems.powder_fire;
 		}
+		if(this == ModBlocks.block_meteor) {
+			return rand.nextInt(10) == 0 ? ModItems.plate_dalekanium : Item.getItemFromBlock(ModBlocks.block_meteor);
+		}
 		if(this == ModBlocks.block_meteor_cobble) {
 			return ModItems.fragment_meteorite;
 		}

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

@@ -7,7 +7,6 @@ import java.util.Random;
 import com.hbm.blocks.BlockEnumMulti;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.items.ModItems;
-import com.hbm.util.EnumUtil;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -30,18 +29,11 @@ public class BlockOreBasalt extends BlockEnumMulti {
 	}
 	
 	public static enum EnumBasaltOreType {
-		SULFUR(ModItems.sulfur),
-		FLUORITE(ModItems.fluorite),
-		ASBESTOS(ModItems.ingot_asbestos),
-		GEM(ModItems.gem_volcanic),
-		MOLYSITE(ModItems.powder_molysite);
-		
-		public Item drop;
-		
-		private EnumBasaltOreType(Item drop) {
-			this.drop = drop;
-			if(drop == null) throw new IllegalStateException("EnumBasaltOreType initialized before ModItems!");
-		}
+		SULFUR,
+		FLUORITE,
+		ASBESTOS,
+		GEM,
+		MOLYSITE
 	}
 	
 	public String getTextureMultiName(Enum num) {
@@ -54,8 +46,12 @@ public class BlockOreBasalt extends BlockEnumMulti {
 	
 	@Override
 	public Item getItemDropped(int meta, Random rand, int fortune) {
-		EnumBasaltOreType type = EnumUtil.grabEnumSafely(EnumBasaltOreType.class, meta);
-		return type.drop;
+		if(meta == EnumBasaltOreType.SULFUR.ordinal())		return ModItems.sulfur;
+		if(meta == EnumBasaltOreType.FLUORITE.ordinal())	return ModItems.fluorite;
+		if(meta == EnumBasaltOreType.ASBESTOS.ordinal())	return ModItems.ingot_asbestos;
+		if(meta == EnumBasaltOreType.GEM.ordinal())			return ModItems.gem_volcanic;
+		if(meta == EnumBasaltOreType.MOLYSITE.ordinal())	return ModItems.powder_molysite;
+		return super.getItemDropped(meta, rand, fortune);
 	}
 
 	@Override

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

@@ -50,7 +50,7 @@ public class BlockOutgas extends BlockOre {
 		if(this == ModBlocks.ancient_scrap)
 			return ModBlocks.gas_radon_tomb;
 		
-		if(this == ModBlocks.ore_nether_coal) {
+		if(this == ModBlocks.ore_coal_oil_burning || this == ModBlocks.ore_nether_coal) {
 			return ModBlocks.gas_monoxide;
 		}
 		

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

@@ -2,7 +2,6 @@ package com.hbm.blocks.generic;
 
 import java.util.List;
 
-import com.hbm.extprop.HbmPlayerProps;
 import com.hbm.inventory.recipes.PedestalRecipes;
 import com.hbm.inventory.recipes.PedestalRecipes.PedestalRecipe;
 import com.hbm.lib.RefStrings;
@@ -59,26 +58,41 @@ public class BlockPedestal extends BlockContainer {
 
 	public static int renderID = RenderingRegistry.getNextAvailableRenderId();
 
-	@Override public int getRenderType() { return renderID; }
-	@Override public boolean isOpaqueCube() { return false; }
-	@Override public boolean renderAsNormalBlock() { return false; }
-	@Override @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { return true; }
+	@Override
+	public int getRenderType() {
+		return renderID;
+	}
+
+	@Override
+	public boolean isOpaqueCube() {
+		return false;
+	}
+
+	@Override
+	public boolean renderAsNormalBlock() {
+		return false;
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) {
+		return true;
+	}
 
 	@Override
 	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
+		if(world.isRemote) return true;
 		if(player.isSneaking()) return false;
 		
 		TileEntityPedestal pedestal = (TileEntityPedestal) world.getTileEntity(x, y, z);
 		
 		if(pedestal.item == null && player.getHeldItem() != null) {
-			if(world.isRemote) return true;
 			pedestal.item = player.getHeldItem().copy();
 			player.inventory.mainInventory[player.inventory.currentItem] = null;
 			pedestal.markDirty();
 			world.markBlockForUpdate(x, y, z);
 			return true;
 		} else if(pedestal.item != null && player.getHeldItem() == null) {
-			if(world.isRemote) return true;
 			player.inventory.mainInventory[player.inventory.currentItem] = pedestal.item.copy();
 			pedestal.item = null;
 			pedestal.markDirty();
@@ -119,11 +133,9 @@ public class BlockPedestal extends BlockContainer {
 				TileEntityPedestal se = castOrNull(Compat.getTileStandard(world, x + ForgeDirection.SOUTH.offsetX * 2 + ForgeDirection.EAST.offsetX * 2, y, z + ForgeDirection.SOUTH.offsetZ * 2 + ForgeDirection.EAST.offsetZ * 2));
 				
 				TileEntityPedestal[] tileArray = new TileEntityPedestal[] {nw, n, ne, w, center, e, sw, s, se};
-				List<EntityPlayer> nearbyPlayers = world.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1).expand(20, 20, 20));
 				
 				outer: for(PedestalRecipe recipe : PedestalRecipes.recipes) {
 					
-					/// EXTRA CONDITIONS ///
 					if(recipe.extra == recipe.extra.FULL_MOON) {
 						if(world.getCelestialAngle(0) < 0.35 || world.getCelestialAngle(0) > 0.65) continue;
 						if(world.provider.getMoonPhase(world.getWorldInfo().getWorldTime()) != 0) continue;
@@ -138,19 +150,6 @@ public class BlockPedestal extends BlockContainer {
 						if(world.getCelestialAngle(0) > 0.15 && world.getCelestialAngle(0) < 0.85) continue;
 					}
 					
-					if(recipe.extra == recipe.extra.BAD_KARMA) {
-						boolean matches = false;
-						for(EntityPlayer player : nearbyPlayers) if(HbmPlayerProps.getData(player).reputation <= -10) { matches = true; break; }
-						if(!matches) continue;
-					}
-					
-					if(recipe.extra == recipe.extra.GOOD_KARMA) {
-						boolean matches = false;
-						for(EntityPlayer player : nearbyPlayers) if(HbmPlayerProps.getData(player).reputation >= 10) { matches = true; break; }
-						if(!matches) continue;
-					}
-					
-					/// CHECK ITEMS ///
 					for(int i = 0; i < 9; i++) {
 						ItemStack pedestal = tileArray[i] != null ? tileArray[i].item : null;
 						if(pedestal == null && recipe.input[i] != null) continue outer;
@@ -160,7 +159,6 @@ public class BlockPedestal extends BlockContainer {
 						if(!recipe.input[i].matchesRecipe(pedestal, true) || recipe.input[i].stacksize != pedestal.stackSize) continue outer;
 					}
 					
-					/// REMOVE ITEMS ///
 					for(int i = 0; i < 9; i++) {
 						if(i == 4) continue;
 						ItemStack pedestal = tileArray[i] != null ? tileArray[i].item : null;
@@ -169,8 +167,7 @@ public class BlockPedestal extends BlockContainer {
 						tileArray[i].markDirty();
 						world.markBlockForUpdate(tileArray[i].xCoord, tileArray[i].yCoord, tileArray[i].zCoord);
 					}
-
-					/// PRODUCE RESULT ///
+					
 					center.item = recipe.output.copy();
 					center.markDirty();
 					world.markBlockForUpdate(x, y, z);
@@ -194,7 +191,10 @@ public class BlockPedestal extends BlockContainer {
 
 		public ItemStack item;
 		
-		@Override public boolean canUpdate() { return false; }
+		@Override
+		public boolean canUpdate() {
+			return false;
+		}
 
 		@Override
 		public Packet getDescriptionPacket() {

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

@@ -4,7 +4,7 @@ import java.util.List;
 
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.lib.RefStrings;
-import com.hbm.world.gen.nbt.INBTBlockTransformable;
+import com.hbm.world.gen.INBTTransformable;
 
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -17,7 +17,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-public class BlockPipe extends Block implements ITooltipProvider, INBTBlockTransformable {
+public class BlockPipe extends Block implements ITooltipProvider, INBTTransformable {
 
 	@SideOnly(Side.CLIENT)
 	private IIcon sideIcon;
@@ -96,7 +96,7 @@ public class BlockPipe extends Block implements ITooltipProvider, INBTBlockTrans
 
 	@Override
 	public int transformMeta(int meta, int coordBaseMode) {
-		return INBTBlockTransformable.transformMetaPillar(meta, coordBaseMode);
+		return INBTTransformable.transformMetaPillar(meta, coordBaseMode);
 	}
 
 }

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

@@ -10,33 +10,49 @@ import net.minecraft.item.Item;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
 
-@Deprecated
 public class BlockPlasma extends Block {
 
 	public BlockPlasma(Material p_i45394_1_) {
 		super(p_i45394_1_);
-		this.setTickRandomly(true);
+        this.setTickRandomly(true);
 	}
+	
+    @Override
+	public void updateTick(World world, int x, int y, int z, Random rand)
+    {
+        if (world.getGameRules().getGameRuleBooleanValue("doFireTick"))
+        	world.setBlock(x, y, z, Blocks.air);
+    }
+    
+    @Override
+	public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_)
+    {
+        return null;
+    }
+    
+    @Override
+	public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity p_149670_5_)
+    {
+        p_149670_5_.setFire(10);
+        p_149670_5_.setInWeb();
+    }
+    
+    @Override
+	public boolean isOpaqueCube()
+    {
+        return false;
+    }
 
 	@Override
-	public void updateTick(World world, int x, int y, int z, Random rand) {
-		if(world.getGameRules().getGameRuleBooleanValue("doFireTick"))
-			world.setBlock(x, y, z, Blocks.air);
-	}
-
-	@Override
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) {
+	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
+    {
 		return null;
-	}
-
-	@Override
-	public void onEntityCollidedWithBlock(World p_149670_1_, int p_149670_2_, int p_149670_3_, int p_149670_4_, Entity p_149670_5_) {
-		p_149670_5_.setFire(10);
-		p_149670_5_.setInWeb();
-	}
-
-	@Override public boolean isOpaqueCube() { return false; }
-	@Override public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { return null; }
-	@Override public boolean renderAsNormalBlock() { return false; }
+    }
+	
+    @Override
+	public boolean renderAsNormalBlock()
+    {
+        return false;
+    }
 
 }

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

@@ -5,8 +5,6 @@ import java.util.Random;
 
 import com.hbm.blocks.IBlockMulti;
 import com.hbm.blocks.ITooltipProvider;
-import com.hbm.world.gen.nbt.INBTTileEntityTransformable;
-import com.hbm.world.gen.nbt.INBTBlockTransformable;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -29,7 +27,7 @@ import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.StatCollector;
 import net.minecraft.world.World;
 
-public class BlockPlushie extends BlockContainer implements IBlockMulti, ITooltipProvider, INBTBlockTransformable {
+public class BlockPlushie extends BlockContainer implements IBlockMulti, ITooltipProvider {
 
 	public BlockPlushie() {
 		super(Material.cloth);
@@ -39,7 +37,7 @@ public class BlockPlushie extends BlockContainer implements IBlockMulti, IToolti
 	@Override public boolean isOpaqueCube() { return false; }
 	@Override public boolean renderAsNormalBlock() { return false; }
 	@Override public Item getItemDropped(int i, Random rand, int j) { return null; }
-
+	
 	@Override
 	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
 		TileEntityPlushie entity = (TileEntityPlushie) world.getTileEntity(x, y, z);
@@ -49,7 +47,7 @@ public class BlockPlushie extends BlockContainer implements IBlockMulti, IToolti
 
 	@Override
 	public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) {
-
+		
 		if(!player.capabilities.isCreativeMode) {
 			harvesters.set(player);
 			if(!world.isRemote) {
@@ -65,7 +63,7 @@ public class BlockPlushie extends BlockContainer implements IBlockMulti, IToolti
 			harvesters.set(null);
 		}
 	}
-
+	
 	@Override
 	public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) {
 		player.addStat(StatList.mineBlockStatArray[getIdFromBlock(this)], 1);
@@ -82,7 +80,7 @@ public class BlockPlushie extends BlockContainer implements IBlockMulti, IToolti
 	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) {
 		int meta = MathHelper.floor_double((double)((player.rotationYaw + 180.0F) * 16.0F / 360.0F) + 0.5D) & 15;
 		world.setBlockMetadataWithNotify(x, y, z, meta, 2);
-
+		
 		TileEntityPlushie plushie = (TileEntityPlushie) world.getTileEntity(x, y, z);
 		plushie.type = PlushieType.values()[Math.abs(stack.getItemDamage()) % PlushieType.values().length];
 		plushie.markDirty();
@@ -95,28 +93,19 @@ public class BlockPlushie extends BlockContainer implements IBlockMulti, IToolti
 
 	@Override
 	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
-
-		TileEntityPlushie plushie = (TileEntityPlushie) world.getTileEntity(x, y, z);
+		
 		if(world.isRemote) {
+			TileEntityPlushie plushie = (TileEntityPlushie) world.getTileEntity(x, y, z);
 			plushie.squishTimer = 11;
 			return true;
 		} else {
-			if(plushie.type == PlushieType.HUNDUN) {
-				world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:block.hunduns_magnificent_howl", 100F, 1F);
-			} else {
-				world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:block.squeakyToy", 0.25F, 1F);
-			}
+			world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:block.squeakyToy", 0.25F, 1F);
 			return true;
 		}
 	}
 
-	@Override
-	public int transformMeta(int meta, int coordBaseMode) {
-		return (meta + coordBaseMode * 4) % 16;
-	}
-
-	public static class TileEntityPlushie extends TileEntity implements INBTTileEntityTransformable {
-
+	public static class TileEntityPlushie extends TileEntity {
+		
 		public PlushieType type = PlushieType.NONE;
 		public int squishTimer;
 
@@ -131,7 +120,7 @@ public class BlockPlushie extends BlockContainer implements IBlockMulti, IToolti
 			this.writeToNBT(nbt);
 			return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, 0, nbt);
 		}
-
+		
 		@Override
 		public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) {
 			this.readFromNBT(pkt.func_148857_g());
@@ -148,23 +137,17 @@ public class BlockPlushie extends BlockContainer implements IBlockMulti, IToolti
 			super.writeToNBT(nbt);
 			nbt.setByte("type", (byte) type.ordinal());
 		}
-
-		@Override
-		public void transformTE(World world, int coordBaseMode) {
-			type = PlushieType.values()[world.rand.nextInt(PlushieType.values().length - 1) + 1];
-		}
 	}
-
+	
 	public static enum PlushieType {
 		NONE(		"NONE",				null),
 		YOMI(		"Yomi",				"Hi! Can I be your rabbit friend?"),
 		NUMBERNINE(	"Number Nine",		"None of y'all deserve coal."),
-		HUNDUN(		"Hundun",			"混沌"),
-		DERG(		"Dragon",			"Squeeze him.");
+		POOH(		"Winnie the Pooh",	"Beloved children's character with no malicious intent.");
 
 		public String label;
 		public String inscription;
-
+		
 		private PlushieType(String label, String inscription) {
 			this.label = label;
 			this.inscription = inscription;

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

@@ -1,497 +0,0 @@
-package com.hbm.blocks.generic;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.lwjgl.opengl.GL11;
-
-import com.hbm.blocks.ModBlocks;
-import com.hbm.config.ClientConfig;
-import com.hbm.inventory.RecipesCommon.ComparableStack;
-import com.hbm.inventory.fluid.FluidType;
-import com.hbm.inventory.fluid.Fluids;
-import com.hbm.inventory.fluid.tank.FluidTank;
-import com.hbm.items.ModItems;
-import com.hbm.items.tool.ItemRebarPlacer;
-import com.hbm.lib.Library;
-import com.hbm.lib.RefStrings;
-import com.hbm.main.MainRegistry;
-import com.hbm.main.ServerProxy;
-import com.hbm.render.block.ISBRHUniversal;
-import com.hbm.render.util.RenderBlocksNT;
-import com.hbm.tileentity.IBufPacketReceiver;
-import com.hbm.tileentity.TileEntityLoadedBase;
-import com.hbm.tileentity.network.TileEntityPipeBaseNT;
-import com.hbm.uninos.GenNode;
-import com.hbm.uninos.INetworkProvider;
-import com.hbm.uninos.UniNodespace;
-import com.hbm.uninos.networkproviders.RebarNetwork;
-import com.hbm.uninos.networkproviders.RebarNetworkProvider;
-import com.hbm.util.BobMathUtil;
-import com.hbm.util.Compat;
-import com.hbm.util.InventoryUtil;
-import com.hbm.util.fauxpointtwelve.BlockPos;
-import com.hbm.util.fauxpointtwelve.DirPos;
-
-import api.hbm.fluidmk2.IFluidReceiverMK2;
-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.material.Material;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.EntityRenderer;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.util.MovingObjectPosition.MovingObjectType;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
-
-public class BlockRebar extends BlockContainer implements ISBRHUniversal {
-
-	@SideOnly(Side.CLIENT) protected IIcon concrete;
-	
-	public BlockRebar() {
-		super(Material.iron);
-	}
-
-	@Override
-	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister reg) {
-		super.registerBlockIcons(reg);
-		this.concrete = reg.registerIcon(RefStrings.MODID + ":concrete_liquid");
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(World world, int meta) {
-		return new TileEntityRebar();
-	}
-
-	@Override public int getRenderType() { return renderID; }
-	@Override public boolean isOpaqueCube() { return false; }
-	@Override public boolean renderAsNormalBlock() { return false; }
-	
-	@Override
-	@SideOnly(Side.CLIENT)
-	public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) {
-		return true;
-	}
-
-	@Override
-	public void onNeighborBlockChange(World world, int x, int y, int z, Block block) {
-		TileEntity tile = world.getTileEntity(x, y, z);
-		if(!(tile instanceof TileEntityRebar)) return;
-		
-		TileEntityRebar rebar = (TileEntityRebar) tile;
-		rebar.hasConnection = false;
-		
-		for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
-			TileEntity neighbor = Compat.getTileStandard(world, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ);
-			if(neighbor instanceof TileEntityPipeBaseNT) {
-				rebar.hasConnection = true;
-				return;
-			}
-		}
-	}
-	
-	public static class TileEntityRebar extends TileEntityLoadedBase implements IFluidReceiverMK2, IBufPacketReceiver {
-
-		public Block concrete;
-		public int concreteMeta;
-		public int progress;
-		public int prevProgress;
-		protected RebarNode node;
-		public boolean hasConnection = false;
-		
-		public TileEntityRebar setup(Block b, int m) {
-			this.concrete = b;
-			this.concreteMeta = m;
-			return this;
-		}
-
-		@Override
-		public void updateEntity() {
-
-			long time = worldObj.getTotalWorldTime();
-
-			if(!worldObj.isRemote) {
-
-				if(prevProgress != progress) {
-					worldObj.markTileEntityChunkModified(xCoord, yCoord, zCoord, this);
-					prevProgress = progress;
-				}
-				
-				if(this.progress >= 1_000) {
-					if(concrete != null && ItemRebarPlacer.isValidConk(Item.getItemFromBlock(concrete), concreteMeta)) {
-						worldObj.setBlock(xCoord, yCoord, zCoord, concrete, concreteMeta, 3);
-					} else {
-						worldObj.setBlock(xCoord, yCoord, zCoord, ModBlocks.concrete_rebar);
-					}
-					return;
-				}
-				
-				if(time % 60 == 0) {
-					for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) {
-						this.trySubscribe(Fluids.CONCRETE, worldObj, xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, dir);
-					}
-				}
-
-				if(this.node == null || this.node.expired) {
-
-					this.node = (RebarNode) UniNodespace.getNode(worldObj, xCoord, yCoord, zCoord, RebarNetworkProvider.THE_PROVIDER);
-
-					if(this.node == null || this.node.expired) {
-						this.node = this.createNode();
-						UniNodespace.createNode(worldObj, this.node);
-					}
-				}
-				
-				this.networkPackNT(100);
-			}
-		}
-		
-		@Override
-		public void invalidate() {
-			super.invalidate();
-
-			if(!worldObj.isRemote) {
-				if(this.node != null) {
-					UniNodespace.destroyNode(worldObj, xCoord, yCoord, zCoord, RebarNetworkProvider.THE_PROVIDER);
-				}
-			}
-		}
-
-		@Override public void serialize(ByteBuf buf) { buf.writeInt(progress); }
-		@Override public void deserialize(ByteBuf buf) { this.progress = buf.readInt(); }
-
-		@Override
-		public void readFromNBT(NBTTagCompound nbt) {
-			super.readFromNBT(nbt);
-			this.progress = nbt.getInteger("progress");
-			this.hasConnection = nbt.getBoolean("hasConnection");
-			
-			if(nbt.hasKey("block")) {
-				this.concrete = Block.getBlockById(nbt.getInteger("block"));
-				this.concreteMeta = nbt.getInteger("meta");
-			}
-		}
-
-		@Override
-		public void writeToNBT(NBTTagCompound nbt) {
-			super.writeToNBT(nbt);
-			nbt.setInteger("progress", this.progress);
-			nbt.setBoolean("hasConnection", this.hasConnection);
-			
-			if(this.concrete != null) {
-				nbt.setInteger("block", Block.getIdFromBlock(this.concrete));
-				nbt.setInteger("meta", this.concreteMeta);
-			}
-		}
-		
-		public RebarNode createNode() {
-			TileEntity tile = (TileEntity) this;
-			return new RebarNode(RebarNetworkProvider.THE_PROVIDER, 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)
-					);
-		}
-
-		@Override
-		public FluidTank[] getAllTanks() {
-			FluidTank tank = new FluidTank(Fluids.CONCRETE, 1_000);
-			tank.setFill(progress);
-			return new FluidTank[] {tank};
-		}
-
-		@Override
-		public long transferFluid(FluidType type, int pressure, long amount) {
-			if(type != Fluids.CONCRETE) return amount;
-			if(this.node == null || this.node.expired || !this.node.hasValidNet()) return amount;
-			
-			List<TileEntityRebar> lowestLinks = new ArrayList();
-			int lowestY = 256;
-			int progress = 0;
-			int capacity = 0;
-			
-			for(Object o : this.node.net.links) {
-				RebarNode node = (RebarNode) o;
-				int y = node.positions[0].getY(); //rebar can only have one pos, there's no multiblock rebar
-				
-				if(y < lowestY) {
-					lowestY = y;
-					progress = 0;
-					capacity = 0;
-					lowestLinks.clear();
-				}
-				
-				if(y == lowestY) {
-					TileEntity tile = worldObj.getTileEntity(node.positions[0].getX(), y, node.positions[0].getZ());
-					if(!(tile instanceof TileEntityRebar)) continue;
-					
-					TileEntityRebar rebar = (TileEntityRebar) tile;
-					
-					progress += rebar.progress;
-					capacity += 1_000;
-					lowestLinks.add(rebar);
-				}
-			}
-			
-			if(capacity > 0 && !lowestLinks.isEmpty()) {
-				int maxSpeed = 50;
-				int maxAccept = (int) BobMathUtil.min(capacity - progress, amount, maxSpeed * lowestLinks.size());
-				int target = Math.min((progress + maxAccept) / lowestLinks.size(), 1_000);
-				
-				for(TileEntityRebar rebar : lowestLinks) {
-					if(rebar.progress >= target) continue;
-					int delta = target - rebar.progress;
-					if(delta > amount) continue;
-					
-					rebar.progress += delta;
-					amount -= delta;
-				}
-			}
-			
-			return amount;
-		}
-
-		@Override
-		public long getDemand(FluidType type, int pressure) {
-			return 10_000;
-		}
-	}
-	
-	public static class RebarNode extends GenNode<RebarNetwork> {
-
-		public RebarNode(INetworkProvider<RebarNetwork> provider, BlockPos... positions) {
-			super(provider, positions);
-		}
-		
-		@Override
-		public RebarNode setConnections(DirPos... connections) {
-			super.setConnections(connections);
-			return this;
-		}
-	}
-
-	@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);
-
-		double o = 0.25D;
-		renderer.setRenderBounds(0.4375D - o, 0D, 0.4375D - o, 0.5625D - o, 1D, 0.5625D - o); RenderBlocksNT.renderStandardInventoryBlock(block, meta, renderer);
-		renderer.setRenderBounds(0.4375D - o, 0D, 0.4375D + o, 0.5625D - o, 1D, 0.5625D + o); RenderBlocksNT.renderStandardInventoryBlock(block, meta, renderer);
-		renderer.setRenderBounds(0.4375D + o, 0D, 0.4375D - o, 0.5625D + o, 1D, 0.5625D - o); RenderBlocksNT.renderStandardInventoryBlock(block, meta, renderer);
-		renderer.setRenderBounds(0.4375D + o, 0D, 0.4375D + o, 0.5625D + o, 1D, 0.5625D + o); RenderBlocksNT.renderStandardInventoryBlock(block, meta, renderer);
-
-		renderer.setRenderBounds(0D, 0.4375D - o, 0.4375D - o, 1D, 0.5625D - o, 0.5625D - o); RenderBlocksNT.renderStandardInventoryBlock(block, meta, renderer);
-		renderer.setRenderBounds(0D, 0.4375D - o, 0.4375D + o, 1D, 0.5625D - o, 0.5625D + o); RenderBlocksNT.renderStandardInventoryBlock(block, meta, renderer);
-		renderer.setRenderBounds(0D, 0.4375D + o, 0.4375D - o, 1D, 0.5625D + o, 0.5625D - o); RenderBlocksNT.renderStandardInventoryBlock(block, meta, renderer);
-		renderer.setRenderBounds(0D, 0.4375D + o, 0.4375D + o, 1D, 0.5625D + o, 0.5625D + o); RenderBlocksNT.renderStandardInventoryBlock(block, meta, renderer);
-
-		renderer.setRenderBounds(0.4375D - o, 0.4375D - o, 0D, 0.5625D - o, 0.5625D - o, 1D); RenderBlocksNT.renderStandardInventoryBlock(block, meta, renderer);
-		renderer.setRenderBounds(0.4375D - o, 0.4375D + o, 0D, 0.5625D - o, 0.5625D + o, 1D); RenderBlocksNT.renderStandardInventoryBlock(block, meta, renderer);
-		renderer.setRenderBounds(0.4375D + o, 0.4375D - o, 0D, 0.5625D + o, 0.5625D - o, 1D); RenderBlocksNT.renderStandardInventoryBlock(block, meta, renderer);
-		renderer.setRenderBounds(0.4375D + o, 0.4375D + o, 0D, 0.5625D + o, 0.5625D + o, 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);
-
-		double o = 0.25D;
-		double min = -0.001;
-		double max = 1.001;
-		
-		if(ClientConfig.RENDER_REBAR_SIMPLE.get()) {
-			renderer.setRenderBounds(0.4375D, min, 0.4375D, 0.5625D, max, 0.5625D); renderer.renderStandardBlock(block, x, y, z);
-			renderer.setRenderBounds(min, 0.4375D, 0.4375D, max, 0.5625D, 0.5625D); renderer.renderStandardBlock(block, x, y, z);
-			renderer.setRenderBounds(0.4375D, 0.4375D, min, 0.5625D, 0.5625D, max); renderer.renderStandardBlock(block, x, y, z);
-		} else {
-			renderer.setRenderBounds(0.4375D - o, min, 0.4375D - o, 0.5625D - o, max, 0.5625D - o); renderer.renderStandardBlock(block, x, y, z);
-			renderer.setRenderBounds(0.4375D - o, min, 0.4375D + o, 0.5625D - o, max, 0.5625D + o); renderer.renderStandardBlock(block, x, y, z);
-			renderer.setRenderBounds(0.4375D + o, min, 0.4375D - o, 0.5625D + o, max, 0.5625D - o); renderer.renderStandardBlock(block, x, y, z);
-			renderer.setRenderBounds(0.4375D + o, min, 0.4375D + o, 0.5625D + o, max, 0.5625D + o); renderer.renderStandardBlock(block, x, y, z);
-
-			renderer.setRenderBounds(min, 0.4375D - o, 0.4375D - o, max, 0.5625D - o, 0.5625D - o); renderer.renderStandardBlock(block, x, y, z);
-			renderer.setRenderBounds(min, 0.4375D - o, 0.4375D + o, max, 0.5625D - o, 0.5625D + o); renderer.renderStandardBlock(block, x, y, z);
-			renderer.setRenderBounds(min, 0.4375D + o, 0.4375D - o, max, 0.5625D + o, 0.5625D - o); renderer.renderStandardBlock(block, x, y, z);
-			renderer.setRenderBounds(min, 0.4375D + o, 0.4375D + o, max, 0.5625D + o, 0.5625D + o); renderer.renderStandardBlock(block, x, y, z);
-
-			renderer.setRenderBounds(0.4375D - o, 0.4375D - o, min, 0.5625D - o, 0.5625D - o, max); renderer.renderStandardBlock(block, x, y, z);
-			renderer.setRenderBounds(0.4375D - o, 0.4375D + o, min, 0.5625D - o, 0.5625D + o, max); renderer.renderStandardBlock(block, x, y, z);
-			renderer.setRenderBounds(0.4375D + o, 0.4375D - o, min, 0.5625D + o, 0.5625D - o, max); renderer.renderStandardBlock(block, x, y, z);
-			renderer.setRenderBounds(0.4375D + o, 0.4375D + o, min, 0.5625D + o, 0.5625D + o, max); renderer.renderStandardBlock(block, x, y, z);
-		}
-		
-		/*TileEntity tile = world.getTileEntity(x, y, z);
-		if(tile instanceof TileEntityRebar) {
-			TileEntityRebar rebar = (TileEntityRebar) tile;
-			if(rebar.progress > 0) {
-				double height = rebar.progress / 1000D;
-				renderer.setOverrideBlockTexture(concrete);
-				renderer.setRenderBounds(0, 0, 0, 1, height, 1); renderer.renderStandardBlock(block, x, y, z);
-				renderer.clearOverrideBlockTexture();
-			}
-		}*/
-		
-		return true;
-	}
-
-	// from ModEventHandlerClient.onRenderWorldLastEvent
-	@SideOnly(Side.CLIENT)
-	public static void renderRebar(List tiles, float interp) {
-		
-		List<TileEntityRebar> rebars = new ArrayList();
-		for(Object o : tiles) {
-			if(!(o instanceof TileEntityRebar)) continue;
-			TileEntityRebar rebar = (TileEntityRebar) o;
-			if(rebar.progress > 0) rebars.add(rebar);
-			if(rebars.size() >= ClientConfig.RENDER_REBAR_LIMIT.get()) break;
-		}
-
-		Minecraft mc = Minecraft.getMinecraft();
-		EntityPlayer player = mc.thePlayer;
-		World world = mc.theWorld;
-
-		double dx = player.prevPosX + (player.posX - player.prevPosX) * interp;
-		double dy = player.prevPosY + (player.posY - player.prevPosY) * interp;
-		double dz = player.prevPosZ + (player.posZ - player.prevPosZ) * interp;
-		
-		if(!rebars.isEmpty()) {
-			
-			GL11.glPushMatrix();
-			GL11.glShadeModel(GL11.GL_SMOOTH);
-			//RenderHelper.enableStandardItemLighting();
-
-			EntityRenderer entityRenderer = mc.entityRenderer;
-			entityRenderer.enableLightmap(interp);
-
-			RenderBlocksNT renderer = RenderBlocksNT.INSTANCE.setWorld(world);
-			renderer.setOverrideBlockTexture(((BlockRebar) ModBlocks.rebar).concrete);
-			mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
-			
-			Tessellator tess = Tessellator.instance;
-			tess.startDrawingQuads();
-
-			for(TileEntityRebar rebar : rebars) {
-				tess.setTranslation(-dx, -dy, -dz);
-				tess.setColorRGBA_F(1F, 1F, 1F, 1F);
-				renderer.setRenderBounds(0, 0, 0, 1, rebar.progress / 1000D, 1);
-				renderer.renderStandardBlock(ModBlocks.rebar, rebar.xCoord, rebar.yCoord, rebar.zCoord);
-			}
-			
-			tess.draw();
-			tess.setTranslation(0, 0, 0);
-			renderer.clearOverrideBlockTexture();
-			entityRenderer.disableLightmap(interp);
-
-			GL11.glShadeModel(GL11.GL_FLAT);
-			GL11.glPopMatrix();
-		}
-		
-		if(player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.rebar_placer && player.getHeldItem().hasTagCompound() &&
-				player.getHeldItem().stackTagCompound.hasKey("pos") && mc.objectMouseOver != null && mc.objectMouseOver.typeOfHit == MovingObjectType.BLOCK) {
-
-			int[] pos = player.getHeldItem().stackTagCompound.getIntArray("pos");
-			MovingObjectPosition mop = mc.objectMouseOver;
-			ForgeDirection dir = ForgeDirection.getOrientation(mop.sideHit);
-			int iX = mop.blockX + dir.offsetX;
-			int iY = mop.blockY + dir.offsetY;
-			int iZ = mop.blockZ + dir.offsetZ;
-
-			double minX = Math.min(pos[0], iX) + 0.125;
-			double maxX = Math.max(pos[0], iX) + 0.875;
-			double minY = Math.min(pos[1], iY) + 0.125;
-			double maxY = Math.max(pos[1], iY) + 0.875;
-			double minZ = Math.min(pos[2], iZ) + 0.125;
-			double maxZ = Math.max(pos[2], iZ) + 0.875;
-			
-			GL11.glPushMatrix();
-			GL11.glDisable(GL11.GL_LIGHTING);
-			GL11.glDisable(GL11.GL_TEXTURE_2D);
-			GL11.glColor3f(1F, 1F, 1F);
-			
-			Tessellator tess = Tessellator.instance;
-			tess.setTranslation(-dx, -dy, -dz);
-			tess.startDrawing(GL11.GL_LINES);
-			tess.setBrightness(240);
-			tess.setColorRGBA_F(1F, 1F, 1F, 1F);
-			
-			// top
-			tess.addVertex(minX, maxY, minZ);
-			tess.addVertex(minX, maxY, maxZ);
-			
-			tess.addVertex(minX, maxY, maxZ);
-			tess.addVertex(maxX, maxY, maxZ);
-			
-			tess.addVertex(maxX, maxY, maxZ);
-			tess.addVertex(maxX, maxY, minZ);
-
-			tess.addVertex(maxX, maxY, minZ);
-			tess.addVertex(minX, maxY, minZ);
-			
-			// bottom
-			tess.addVertex(minX, minY, minZ);
-			tess.addVertex(minX, minY, maxZ);
-			
-			tess.addVertex(minX, minY, maxZ);
-			tess.addVertex(maxX, minY, maxZ);
-			
-			tess.addVertex(maxX, minY, maxZ);
-			tess.addVertex(maxX, minY, minZ);
-
-			tess.addVertex(maxX, minY, minZ);
-			tess.addVertex(minX, minY, minZ);
-
-			// sides
-			tess.addVertex(minX, minY, minZ);
-			tess.addVertex(minX, maxY, minZ);
-
-			tess.addVertex(maxX, minY, minZ);
-			tess.addVertex(maxX, maxY, minZ);
-
-			tess.addVertex(maxX, minY, maxZ);
-			tess.addVertex(maxX, maxY, maxZ);
-
-			tess.addVertex(minX, minY, maxZ);
-			tess.addVertex(minX, maxY, maxZ);
-			
-			tess.draw();
-			tess.setTranslation(0, 0, 0);
-			
-			GL11.glEnable(GL11.GL_TEXTURE_2D);
-			GL11.glDisable(GL11.GL_LIGHTING);
-			GL11.glPopMatrix();
-			
-			int rebarLeft = InventoryUtil.countAStackMatches(player, new ComparableStack(ModBlocks.rebar), true);
-			int rebarRequired = (Math.max(pos[0], iX) - Math.min(pos[0], iX) + 1) * (Math.max(pos[1], iY) - Math.min(pos[1], iY) + 1) * (Math.max(pos[2], iZ) - Math.min(pos[2], iZ) + 1);
-			MainRegistry.proxy.displayTooltip((rebarRequired > rebarLeft ? EnumChatFormatting.RED : EnumChatFormatting.GREEN) + (rebarLeft + " / " + rebarRequired), 1_000, ServerProxy.ID_CABLE);
-		}
-	}
-}

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

@@ -11,7 +11,6 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.IIcon;
@@ -67,7 +66,7 @@ public class BlockReeds extends Block {
 
 	@Override
 	public Item getItemDropped(int meta, Random rand, int fortune) {
-		return Items.stick;
+		return null;
 	}
 
 	@Override

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

@@ -1,84 +0,0 @@
-package com.hbm.blocks.generic;
-
-import org.lwjgl.opengl.GL11;
-
-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.util.AxisAlignedBB;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-public class BlockSandbags extends Block implements ISBRHUniversal {
-
-	public BlockSandbags(Material mat) {
-		super(mat);
-	}
-
-	@Override public int getRenderType() { return renderID; }
-	@Override public boolean isOpaqueCube() { return false; }
-	@Override public boolean renderAsNormalBlock() { return false; }
-
-	@Override
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
-		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
-	@SideOnly(Side.CLIENT)
-	public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) {
-		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 void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) {
-		
-		float min = 0.25F;
-		float max = 0.75F;
-
-		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);
-
-		float minX = (nx.isOpaqueCube() || nx.isNormalCube() || nx == this) ? 0F : min;
-		float minZ = (nz.isOpaqueCube() || nz.isNormalCube() || nz == this) ? 0F : min;
-		float maxX = (px.isOpaqueCube() || px.isNormalCube() || px == this) ? 1F : max;
-		float maxZ = (pz.isOpaqueCube() || pz.isNormalCube() || pz == this) ? 1F : max;
-		
-		this.setBlockBounds(minX, 0, minZ, maxX, 1, maxZ);
-	}
-
-	@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.125D, 0D, 0.125D, 0.875D, 1D, 0.875D);
-		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);
-		renderer.setRenderBoundsFromBlock(block);
-		Tessellator tessellator = Tessellator.instance;
-		tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
-		tessellator.setColorOpaque_F(1, 1, 1);
-		renderer.renderStandardBlock(block, x, y, z);
-		
-		return true;
-	}
-}

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

@@ -1,115 +0,0 @@
-package com.hbm.blocks.generic;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
-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.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.NetworkManager;
-import net.minecraft.network.Packet;
-import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
-
-public class BlockSkeletonHolder extends BlockContainer {
-
-	public BlockSkeletonHolder() {
-		super(Material.rock);
-	}
-
-	@Override
-	public TileEntity createNewTileEntity(World world, int meta) {
-		return new TileEntitySkeletonHolder();
-	}
-
-	@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);
-	} //I hope you change this shit to not be hardcoded because im not doing it
-
-	@Override
-	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
-		if(player.isSneaking()) return false;
-
-		TileEntitySkeletonHolder pedestal = (TileEntitySkeletonHolder) world.getTileEntity(x, y, z);
-
-		if(pedestal.item == null && player.getHeldItem() != null) {
-			if(world.isRemote) return true;
-			pedestal.item = player.getHeldItem().copy();
-			player.inventory.mainInventory[player.inventory.currentItem] = null;
-			pedestal.markDirty();
-			world.markBlockForUpdate(x, y, z);
-			return true;
-		} else if(pedestal.item != null && player.getHeldItem() == null) {
-			if(world.isRemote) return true;
-			player.inventory.mainInventory[player.inventory.currentItem] = pedestal.item.copy();
-			pedestal.item = null;
-			pedestal.markDirty();
-			world.markBlockForUpdate(x, y, z);
-			return true;
-		}
-
-		return false;
-	}
-
-	@Override
-	public void breakBlock(World world, int x, int y, int z, Block block, int meta) {
-
-		if(!world.isRemote) {
-			TileEntitySkeletonHolder entity = (TileEntitySkeletonHolder) world.getTileEntity(x, y, z);
-			if(entity != null && entity.item != null) {
-				EntityItem item = new EntityItem(world, x + 0.5, y, z + 0.5, entity.item.copy());
-				world.spawnEntityInWorld(item);
-			}
-		}
-
-		super.breakBlock(world, x, y, z, block, meta);
-	}
-
-	public static class TileEntitySkeletonHolder extends TileEntity {
-
-		public ItemStack item;
-
-		@Override public boolean canUpdate() { return false; }
-
-		@Override
-		public Packet getDescriptionPacket() {
-			NBTTagCompound nbt = new NBTTagCompound();
-			this.writeToNBT(nbt);
-			return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, 0, nbt);
-		}
-
-		@Override
-		public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) {
-			this.readFromNBT(pkt.func_148857_g());
-		}
-
-		@Override
-		public void readFromNBT(NBTTagCompound nbt) {
-			super.readFromNBT(nbt);
-			this.item = ItemStack.loadItemStackFromNBT(nbt.getCompoundTag("item"));
-		}
-
-		@Override
-		public void writeToNBT(NBTTagCompound nbt) {
-			super.writeToNBT(nbt);
-			if(this.item != null) {
-				NBTTagCompound stack = new NBTTagCompound();
-				this.item.writeToNBT(stack);
-				nbt.setTag("item", stack);
-			}
-		}
-	}
-}

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

@@ -6,10 +6,8 @@ import java.util.List;
 import java.util.Random;
 
 import com.hbm.blocks.IBlockMulti;
-import com.hbm.blocks.ILookOverlay;
 import com.hbm.blocks.ITooltipProvider;
 import com.hbm.blocks.ModBlocks;
-import com.hbm.config.ServerConfig;
 import com.hbm.items.ModItems;
 import com.hbm.items.tool.ItemLock;
 import com.hbm.lib.RefStrings;
@@ -40,9 +38,8 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
 
-public class BlockStorageCrate extends BlockContainer implements IBlockMulti, ILookOverlay, ITooltipProvider {
+public class BlockStorageCrate extends BlockContainer implements IBlockMulti, ITooltipProvider {
 
 	@SideOnly(Side.CLIENT)
 	private IIcon iconTop;
@@ -103,96 +100,64 @@ public class BlockStorageCrate extends BlockContainer implements IBlockMulti, IL
 		if(this == ModBlocks.safe) return new TileEntitySafe();
 		return null;
 	}
-
+	
 	private static boolean dropInv = true;
-
+	
 	@Override
 	public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) {
 		
-		if(!world.isRemote && !ServerConfig.CRATE_KEEP_CONTENTS.get()) {
-			dropInv = true;
-			if(!player.capabilities.isCreativeMode) {
-				world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(this)));
-			}
-			TileEntity inv = world.getTileEntity(x, y, z);
-			if(inv instanceof TileEntityLockableBase) {
-				TileEntityLockableBase lockable = (TileEntityLockableBase) inv;
-				if(lockable.isLocked()) dropInv = false;
-			}
-			boolean flag = world.setBlockToAir(x, y, z);
-			dropInv = true;
-			return flag;
-		}
-
 		if(!player.capabilities.isCreativeMode && !world.isRemote && willHarvest) {
-
+			
 			ItemStack drop = new ItemStack(this);
 			ISidedInventory inv = (ISidedInventory)world.getTileEntity(x, y, z);
-
+			
 			NBTTagCompound nbt = new NBTTagCompound();
-
+			
 			if(inv != null) {
-
+				
 				for(int i = 0; i < inv.getSizeInventory(); i++) {
-
+					
 					ItemStack stack = inv.getStackInSlot(i);
 					if(stack == null)
 						continue;
-
+					
 					NBTTagCompound slot = new NBTTagCompound();
 					stack.writeToNBT(slot);
 					nbt.setTag("slot" + i, slot);
 				}
 			}
-
+			
 			if(inv instanceof TileEntityLockableBase) {
 				TileEntityLockableBase lockable = (TileEntityLockableBase) inv;
-
+				
 				if(lockable.isLocked()) {
 					nbt.setInteger("lock", lockable.getPins());
 					nbt.setDouble("lockMod", lockable.getMod());
 				}
 			}
-
-			if(inv instanceof TileEntityCrateBase) {
-				TileEntityCrateBase crate = (TileEntityCrateBase) inv;
-				// Saves memory and ensures consistency between crafted crates and mined ones
-				if (crate.hasSpiders) {
-					nbt.setBoolean("spiders", true);
-				}
-			}
-
+			
 			if(!nbt.hasNoTags()) {
 				drop.stackTagCompound = nbt;
-			}
-
-			if(inv instanceof TileEntityCrateBase) {
-				TileEntityCrateBase crate = (TileEntityCrateBase) inv;
-				if (crate.hasCustomInventoryName()) {
-					drop.setStackDisplayName(crate.getInventoryName());
-				}
-			}
-
-			if (drop.hasTagCompound()) {
+				
 				try {
-					byte[] abyte = CompressedStreamTools.compress(drop.stackTagCompound);
-
+					byte[] abyte = CompressedStreamTools.compress(nbt);
+					
 					if(abyte.length > 6000) {
 						player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.RED + "Warning: Container NBT exceeds 6kB, contents will be ejected!"));
 						world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, new ItemStack(this)));
 						return world.setBlockToAir(x, y, z);
 					}
-
+					
 				} catch(IOException e) { }
 			}
-
+			
 			world.spawnEntityInWorld(new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, drop));
 		}
-
+		
 		dropInv = false;
 		boolean flag = world.setBlockToAir(x, y, z);
 		dropInv = true;
-
+		
 		return flag;
 	}
 
@@ -207,8 +172,6 @@ public class BlockStorageCrate extends BlockContainer implements IBlockMulti, IL
 			TileEntity entity = world.getTileEntity(x, y, z);
 			if(entity instanceof TileEntityCrateBase && ((TileEntityCrateBase) entity).canAccess(player)) {
 				FMLNetworkHandler.openGui(player, MainRegistry.instance, 0, world, x, y, z);
-				TileEntityCrateBase crate = (TileEntityCrateBase) entity;
-				TileEntityCrateBase.spawnSpiders(player, world, crate);
 			}
 			return true;
 		} else {
@@ -218,33 +181,24 @@ public class BlockStorageCrate extends BlockContainer implements IBlockMulti, IL
 
 	@Override
 	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) {
-
+		
 		ISidedInventory inv = (ISidedInventory)world.getTileEntity(x, y, z);
-
+		
 		if(inv != null && stack.hasTagCompound()) {
-
+			
 			for(int i = 0; i < inv.getSizeInventory(); i++) {
 				inv.setInventorySlotContents(i, ItemStack.loadItemStackFromNBT(stack.stackTagCompound.getCompoundTag("slot" + i)));
 			}
-
+			
 			if(inv instanceof TileEntityLockableBase) {
 				TileEntityLockableBase lockable = (TileEntityLockableBase) inv;
-
+				
 				if(stack.stackTagCompound.hasKey("lock")) {
 					lockable.setPins(stack.stackTagCompound.getInteger("lock"));
 					lockable.setMod(stack.stackTagCompound.getDouble("lockMod"));
 					lockable.lock();
 				}
 			}
-
-			if(inv instanceof TileEntityCrateBase) {
-				TileEntityCrateBase crate = (TileEntityCrateBase) inv;
-				crate.hasSpiders = stack.stackTagCompound.getBoolean("spiders");
-
-				if (stack.hasDisplayName()) {
-					crate.setCustomName(stack.getDisplayName());
-				}
-			}
 		}
 
 		if(this != ModBlocks.safe)
@@ -252,42 +206,50 @@ public class BlockStorageCrate extends BlockContainer implements IBlockMulti, IL
 
 		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);
+		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 void breakBlock(World world, int x, int y, int z, Block block, int meta) {
 
 		if(dropInv) {
 			ISidedInventory sided = (ISidedInventory) world.getTileEntity(x, y, z);
 			Random rand = world.rand;
-
+	
 			if(sided != null) {
 				for(int i1 = 0; i1 < sided.getSizeInventory(); ++i1) {
 					ItemStack itemstack = sided.getStackInSlot(i1);
-
+	
 					if(itemstack != null) {
 						float f = rand.nextFloat() * 0.8F + 0.1F;
 						float f1 = rand.nextFloat() * 0.8F + 0.1F;
 						float f2 = rand.nextFloat() * 0.8F + 0.1F;
-
+	
 						while(itemstack.stackSize > 0) {
 							int j1 = rand.nextInt(21) + 10;
-
+	
 							if(j1 > itemstack.stackSize) {
 								j1 = itemstack.stackSize;
 							}
-
+	
 							itemstack.stackSize -= j1;
 							EntityItem entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage()));
-
+	
 							if(itemstack.hasTagCompound()) {
 								entityitem.getEntityItem().setTagCompound((NBTTagCompound) itemstack.getTagCompound().copy());
 							}
-
+	
 							float f3 = 0.05F;
 							entityitem.motionX = (float) rand.nextGaussian() * f3;
 							entityitem.motionY = (float) rand.nextGaussian() * f3 + 0.2F;
@@ -296,7 +258,7 @@ public class BlockStorageCrate extends BlockContainer implements IBlockMulti, IL
 						}
 					}
 				}
-
+	
 				world.func_147453_f(x, y, z, block);
 			}
 		}
@@ -313,12 +275,12 @@ public class BlockStorageCrate extends BlockContainer implements IBlockMulti, IL
 	public int getSubCount() {
 		return 0;
 	}
-
+	
 	@Override
 	public boolean hasComparatorInputOverride() {
 		return true;
 	}
-
+	
 	@Override
 	public int getComparatorInputOverride(World world, int x, int y, int z, int side) {
 		return Container.calcRedstoneFromInventory((IInventory) world.getTileEntity(x, y, z));
@@ -327,69 +289,31 @@ public class BlockStorageCrate extends BlockContainer implements IBlockMulti, IL
 	@Override
 	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) {
 		if(stack.hasTagCompound()) {
-
-			if(stack.stackTagCompound.getBoolean("spiders")) {
-				if(stack.stackTagCompound.hasKey("lock")) {
-					list.add(EnumChatFormatting.RED + "This container is locked.");
-				}
-				list.add(EnumChatFormatting.GRAY + "" + EnumChatFormatting.ITALIC + "Skittering emanates from within..."); // lamo
-				return;
-			}
-
-			if(stack.stackTagCompound.hasKey("lock")) {
-				list.add(EnumChatFormatting.RED + "This container is locked."); // Sorry people who want to see what's in it while it's locked...
-
-				for(int i = 0; i < 104; i++) {
-					ItemStack content = ItemStack.loadItemStackFromNBT(stack.stackTagCompound.getCompoundTag("slot" + i));
-					if(content != null) {
-						list.add(EnumChatFormatting.YELLOW + "It feels heavy...");
-						return;
-					}
-				}
-				list.add(EnumChatFormatting.YELLOW + "It feels empty...");
-				return;
-			}
-
+			
 			List<String> contents = new ArrayList();
 			int amount = 0;
-
-			for(int i = 0; i < 104; i++) { //whatever the biggest container is, i can't be bothered to check
+			
+			for(int i = 0; i < 100; i++) { //whatever the biggest container is, i can't be bothered to check
 				ItemStack content = ItemStack.loadItemStackFromNBT(stack.stackTagCompound.getCompoundTag("slot" + i));
-
+				
 				if(content != null) {
 					amount++;
-
+					
 					if(contents.size() < 10) {
 						contents.add(EnumChatFormatting.AQUA + " - " + content.getDisplayName() + (content.stackSize > 1 ? (" x" + content.stackSize) : ""));
 					}
 				}
 			}
-
+			
 			if(!contents.isEmpty()) {
 				list.add(EnumChatFormatting.AQUA + "Contains:");
 				list.addAll(contents);
 				amount -= contents.size();
-
+				
 				if(amount > 0) {
 					list.add(EnumChatFormatting.AQUA + "...and " + amount + " more.");
 				}
 			}
 		}
 	}
-
-	@Override
-	public void printHook(RenderGameOverlayEvent.Pre event, World world, int x, int y, int z) {
-		
-		TileEntity te = world.getTileEntity(x, y, z);
-
-		if (!(te instanceof IInventory))
-			return;
-
-		IInventory inv = (IInventory) te;
-
-		if (!inv.hasCustomInventoryName())
-			return;
-		
-		ILookOverlay.printGeneric(event, inv.getInventoryName(), 0xffff00, 0x404000, new ArrayList<String>(0));
-	}
 }