guh

changelog

@@ -1,47 +1,3 @@
-## Added
-* New grenades
-  * Universal system where there's only one grenade item
-  * A grenade is composed of a shell, filling and fuze, which can be mixed and matched as needed
-  * Instead of having dedicated grenades with impact or long timers, the desired fuze can simply be put into any grenade configuration
-  * Comes with proper 3D models and animations
-  * Grenade max stacksize has been drastically reduced (and now depends on the shell used)
-
-## Changed
-* Updated russian and chinese localization
-* Removed the euphemium and DNT compound plate recipes from the anvil, they are now plasma forge exclusive
-* More RoR integration
-  * PWRs can now output the control rod position
-  * Industrial turbines and leviathans can now output their current energy production
-  * Industrial turbines can output their current flywheel speed in %
-  * The ZIRNOX now outputs its heat and pressure
-  * The CCGT can output the turbine setting in percent, the turbine's RPM and the produced energy
-  * The fusion reactor plasma vessel can output its output plasma energy and fuel consumption in percent
-* Cast plate foundry molds now have a triple variant
-* Zombies now have a chance to drop copper, aluminium and titanium ingots (1:200 each)
-* The burner press now has nine additional storage slots for things like stamps and reserve fuel
-* Crucible recipes no longer require templates, instead featuring a recipe selector
-  * This means that the template folder has been fully deprecated
-  * The item still exists solely for providing the icon for the recipe selector
-* Improved minigun muzzleflash
-  * The flash is now faster and larger
-  * Moved the origin up to be at the firing barrel instead of the center of the rotor
-* RoR implicit addition as well as RoR display components now support 64 bit integer numbers (~9 quintillion) instead of just 32 bits (~2 billion)
-* Antischrabidium can no longer be made via cyclotron, it is now exclusively post particle accelerator
-* Reduced the cost of armor batteries to compensate for the new capacitor recipes
-* Quadrupled the amount of polymer created by recipe
-  * Petroleum gas required has been doubled
-* Cadmium and fish oil to rubber recipe now needs mmore fish oil and outputs 16 rubber at once
-
 ## Fixed
-* Fixed euphemium compound plate recipe not yielding four items as it should in the plasma forge
+* Fixed the grenade crafting handler not checking if a shell/filling combination is even valid, allowing weird combos
-* Fixed NTM rare item drops ignoring the mob loot gamerule
+* Fixed dispenser fired laser grenades crashing the game
-* Fixed flamethrowers not properly igniting entities on direct hit, only via lingering fire
-* Fixed PWR RoR components not properly showing the possible values/functions when connected to ports
-* Fixed missing ports on the plasma forge
-* Fixed wrong texture being bound in the crucible for the molten metal gauge
-* Fixed RoR panels having no hardness at all
-* Undid the change to the crucible where using no recipe would fill up the recipe stack anyway because people would NOT STOP smelting stuff then setting the recipe after the fact which DOES NOT WORK.
-  * This change however introduced yet another inconsistency with external pouring behavior that I simply cannot be assed to fix, so we are just rolling all that back
-  * If you're still to dumb, bald or irradiated to use the crucible correctly, please bother LITERALLY ANOYNE EXCEPT ME.
-  * This basically fixes the aforementioned inconsistency
-* Fixed meteorite sword progression having some issues ever since the fusion reactor rework

src/main/java/com/hbm/crafting/handlers/GrenadeCraftingHandler.java

@@ -21,6 +21,7 @@ public class GrenadeCraftingHandler implements IRecipe {
 		if(hasForeignObject(inv)) return false; // can't be non-grenade items and can't be more than 4 items total
 		EnumGrenadeShell shell = getFirst(inv, ModItems.grenade_shell, EnumGrenadeShell.class); // only one shell, null otherwise
 		EnumGrenadeFilling filling = getFirst(inv, ModItems.grenade_filling, EnumGrenadeFilling.class); // only one filling, null otherwise
+		if(!filling.compatibleShells.contains(shell)) return false;
 		EnumGrenadeFuze fuze = getFirst(inv, ModItems.grenade_fuze, EnumGrenadeFuze.class); // only one fuze, null otherwise
 		// this leaves the extra unaccounted for, but the restrictions we put in place will allow exactly one without dedicated check
 		return shell != null && filling != null && fuze != null;

src/main/java/com/hbm/entity/projectile/EntityBulletBeamBase.java

@@ -43,15 +43,18 @@ public class EntityBulletBeamBase extends Entity implements IEntityAdditionalSpa
 	
 	public EntityLivingBase getThrower() { return this.thrower; }
 	
-	public EntityBulletBeamBase(EntityLivingBase entity, BulletConfig config, float baseDamage) {
+	public EntityBulletBeamBase(World world, BulletConfig config, float baseDamage) {
-		this(entity.worldObj);
+		this(world);
 		
-		this.thrower = entity;
 		this.setBulletConfig(config);
-		
 		this.damage = baseDamage * this.config.damageMult;
 	}
 	
+	public EntityBulletBeamBase(EntityLivingBase entity, BulletConfig config, float baseDamage) {
+		this(entity.worldObj, config, baseDamage);
+		this.thrower = entity;
+	}
+	
 	public EntityBulletBeamBase(EntityLivingBase entity, BulletConfig config, float baseDamage, float angularInaccuracy, double sideOffset, double heightOffset, double frontOffset) {
 		this(entity.worldObj);
 		

src/main/java/com/hbm/items/weapon/grenade/ItemGrenadeFilling.java

@@ -191,7 +191,8 @@ public class ItemGrenadeFilling extends ItemEnumMulti {
 
 			Vec3 delta = Vec3.createVectorHelper(target.posX - x, target.posY + target.height / 2 - y, target.posZ - z);
 			if(delta.lengthVector() > range) continue;
-			EntityBulletBeamBase sub = new EntityBulletBeamBase(grenade.getThrower(), laser, 30);
+			EntityBulletBeamBase sub = new EntityBulletBeamBase(grenade.worldObj, laser, 30);
+			sub.thrower = grenade.getThrower();
 			sub.setPosition(x, y, z);
 			sub.setRotationsFromVector(delta);
 			sub.performHitscanExternal(delta.lengthVector());