hit that yoinky sploinky

changelog

@@ -1,15 +1,21 @@
 ## Added
 * Phosphor vines
+  * Will be used for an upcoming dungeon, don't worry about it
 
 ## Changed
 * Raw bedrock ore taken out of the creative tab now has the stats of the position the player is in, instead of being worthless
 * U233's color coded isotope indicator is now yellow instead of orange, making yellow standard code for "secondary fissile isotope" and orange for "radioisotope"
 * NITAN powders can now be found in the creative tab
+* Coltass' description no longer calls the player a dipshit
 
 ## Fixed
 * Fixed raw bedrock ore tooltip not showing the density's color correctly
 * Fixed T45 helmet not protecting against carbon monoxide
 * Fixed general issues regarding the rotary furnace
 * Fixed corrupted broadcaster noise having infinite range
 * Fixed packet issues for explosive charges and custom machines
-* Fixed one of the rotary furnace's visual connections now properly showing up
+* Fixed one of the rotary furnace's visual connections now properly showing up
+* Fixed dupe regarding items on a conveyor belt
+* Potentially fixed chunkloading drones for real this time(tm)
+  * No, I did not test it
+* Fixed missing localization for keybinds

gradle.properties

@@ -1,6 +1,6 @@
 mod_version=1.0.27
 # Empty build number makes a release type
-mod_build_number=5202
+mod_build_number=5209
 
 credits=HbMinecraft,\
   \ rodolphito (explosion algorithms),\

src/main/java/com/hbm/entity/item/EntityDeliveryDrone.java

@@ -201,7 +201,7 @@ public void loadNeighboringChunks(int newChunkX, int newChunkZ) {
 		if(!worldObj.isRemote && loaderTicket != null) {
 			clearChunkLoader();
 			ForgeChunkManager.forceChunk(loaderTicket, new ChunkCoordIntPair(newChunkX, newChunkZ));
-			ForgeChunkManager.forceChunk(loaderTicket, new ChunkCoordIntPair(newChunkX + (int) Math.ceil((this.posX + this.motionX) / 16D), newChunkZ + (int) Math.ceil((this.posZ + this.motionZ) / 16D)));
+			ForgeChunkManager.forceChunk(loaderTicket, new ChunkCoordIntPair((int) Math.ceil((this.posX + this.motionX) / 16D), (int) Math.ceil((this.posZ + this.motionZ) / 16D)));
 		}
 	}
 

src/main/java/com/hbm/entity/item/EntityMovingItem.java

@@ -4,6 +4,7 @@
 
 import api.hbm.conveyor.IConveyorItem;
 import api.hbm.conveyor.IEnterableBlock;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
@@ -31,24 +32,33 @@ public ItemStack getItemStack() {
 		return stack == null ? new ItemStack(Blocks.stone) : stack;
 	}
 
+	/** Adds the item to the player's inventory */
 	@Override
 	public boolean interactFirst(EntityPlayer player) {
 
-		if(!worldObj.isRemote && player.inventory.addItemStackToInventory(this.getItemStack().copy())) {
+		if(!worldObj.isRemote && !this.isDead && player.inventory.addItemStackToInventory(this.getItemStack().copy())) {
 			player.inventoryContainer.detectAndSendChanges();
 			this.setDead();
 		}
 
 		return false;
 	}
 
+	/** Knocks the item off the belt */
 	@Override
-	public boolean attackEntityFrom(DamageSource source, float amount) {
+	public boolean hitByEntity(Entity attacker) {
 
-		if(!worldObj.isRemote) {
+		if(!worldObj.isRemote && !this.isDead) {
 			this.setDead();
 			worldObj.spawnEntityInWorld(new EntityItem(worldObj, posX, posY, posZ, this.getItemStack()));
 		}
+		return false;
+	}
+
+	/** Ensures the item is knocked off the belt due to non-player attacks (explosions, etc) */
+	@Override
+	public boolean attackEntityFrom(DamageSource source, float amount) {
+		this.hitByEntity(source.getEntity());
 		return true;
 	}
 
@@ -88,6 +98,8 @@ public void enterBlock(IEnterableBlock enterable, BlockPos pos, ForgeDirection d
 	@Override
 	public boolean onLeaveConveyor() {
 
+		if(this.isDead) return true;
+
 		this.setDead();
 		EntityItem item = new EntityItem(worldObj, posX + motionX * 2, posY + motionY * 2, posZ + motionZ * 2, this.getItemStack());
 		item.motionX = this.motionX * 2;

src/main/java/com/hbm/entity/item/EntityMovingPackage.java

@@ -5,6 +5,7 @@
 
 import api.hbm.conveyor.IConveyorPackage;
 import api.hbm.conveyor.IEnterableBlock;
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -38,7 +39,7 @@ public ItemStack[] getItemStacks() {
 	@Override
 	public boolean interactFirst(EntityPlayer player) {
 
-		if(!worldObj.isRemote) {
+		if(!worldObj.isRemote && !this.isDead) {
 
 			for(ItemStack stack : contents) {
 				if(!player.inventory.addItemStackToInventory(stack.copy())) {
@@ -53,15 +54,21 @@ public boolean interactFirst(EntityPlayer player) {
 	}
 
 	@Override
-	public boolean attackEntityFrom(DamageSource source, float amount) {
+	public boolean hitByEntity(Entity attacker) {
 
-		if(!worldObj.isRemote) {
+		if(!worldObj.isRemote && !this.isDead) {
 			this.setDead();
 
 			for(ItemStack stack : contents) {
 				worldObj.spawnEntityInWorld(new EntityItem(worldObj, posX, posY + 0.125, posZ, stack));
 			}
 		}
+		return false;
+	}
+
+	@Override
+	public boolean attackEntityFrom(DamageSource source, float amount) {
+		this.hitByEntity(source.getEntity());
 		return true;
 	}
 

src/main/java/com/hbm/handler/HbmKeybinds.java

@@ -25,8 +25,8 @@ public class HbmKeybinds {
 	public static KeyBinding hudKey = new KeyBinding(category + ".toggleHUD", Keyboard.KEY_V, category);
 	public static KeyBinding dashKey = new KeyBinding(category + ".dash", Keyboard.KEY_LSHIFT, category);
 	public static KeyBinding trainKey = new KeyBinding(category + ".trainInv", Keyboard.KEY_R, category);
+
 	public static KeyBinding copyToolAlt = new KeyBinding(category + ".copyToolAlt", Keyboard.KEY_LMENU, category);
-
 	public static KeyBinding copyToolCtrl = new KeyBinding(category + ".copyToolCtrl", Keyboard.KEY_LCONTROL, category);
 
 	public static KeyBinding reloadKey = new KeyBinding(category + ".reload", Keyboard.KEY_R, category);

src/main/java/com/hbm/items/tool/ItemColtanCompass.java

@@ -31,7 +31,7 @@ public class ItemColtanCompass extends Item {
 	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) {
 		list.add("Points towards the coltan deposit.");
 		list.add("The deposit is a large area where coltan ore spawns like standard ore,");
-		list.add("it's not one large blob of ore on that exact location, dipshit.");
+		list.add("it's not one large blob of ore on that exact location.");
 	}
 
 	@Override

src/main/java/com/hbm/lib/RefStrings.java

@@ -3,7 +3,7 @@
 public class RefStrings {
 	public static final String MODID = "hbm";
 	public static final String NAME = "Hbm's Nuclear Tech Mod";
-	public static final String VERSION = "1.0.27 BETA (5202)";
+	public static final String VERSION = "1.0.27 BETA (5209)";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version

src/main/resources/assets/hbm/lang/de_DE.lang

@@ -680,13 +680,20 @@ hazard.sand=Augenreizstoffe
 
 hbm.key=NTM Hotkeys
 hbm.key.calculator=Taschenrechner
+hbm.key.copyToolAlt=Kopierwerkzeug: Einfügen umschalten
+hbm.key.copyToolCtrl=Kopierwerkzeug: Auf Rohre einfügen
 hbm.key.craneLoad=Kran laden/entladen
 hbm.key.craneMoveDown=Kran rückwärts
 hbm.key.craneMoveLeft=Kran nach links
 hbm.key.craneMoveRight=Kran nach rechts
 hbm.key.craneMoveUp=Kran vorwärts
+hbm.key.dash=Schub
+hbm.key.gunPrimary=Primärfeuer
+hbm.key.gunSecondary=Sekundärfeuer
+hbm.key.gunTertitary=Zielvisier
 hbm.key.toggleBack=Jetpack umschalten
 hbm.key.toggleHUD=HUD umschalten
+hbm.key.trainInv=Zug-Inventar
 hbm.key.reload=Nachladen
 
 hbmfluid.amat=Antimaterie

src/main/resources/assets/hbm/lang/en_US.lang

@@ -1387,17 +1387,21 @@ hazard.sand=Eye Irritants
 
 hbm.key=NTM Hotkeys
 hbm.key.calculator=Calculator
+hbm.key.copyToolAlt=Copy Tool: Switch Paste
+hbm.key.copyToolCtrl=Copy Tool: Paste to Pipes
 hbm.key.craneLoad=Load/Unload Crane
 hbm.key.craneMoveDown=Move Crane Backward
 hbm.key.craneMoveLeft=Move Crane Left
 hbm.key.craneMoveRight=Move Crane Right
 hbm.key.craneMoveUp=Move Crane Forward
-hbm.key.dash=Dash (Unbind from Crouch in config)
+hbm.key.dash=Dash
+hbm.key.gunPrimary=Primary Fire
+hbm.key.gunSecondary=Secondary Fire
+hbm.key.gunTertitary=Gun Sights
 hbm.key.toggleBack=Toggle Jetpack
 hbm.key.toggleHUD=Toggle HUD
+hbm.key.trainInv=Train Inventory
 hbm.key.reload=Reload
-hbm.key.copyToolAlt=Copy Tool: Switch Paste
-hbm.key.copyToolCtrl=Copy Tool: Paste to Pipes
 
 hbmfluid.amat=Antimatter
 hbmfluid.aromatics=Aromatic Hydrocarbons