diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceCombination.java b/src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceCombination.java index de325d440..4b6c42214 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceCombination.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceCombination.java @@ -122,9 +122,8 @@ public class TileEntityFurnaceCombination extends TileEntityMachinePolluting imp for(Entity e : entities) e.setFire(5); if(worldObj.getTotalWorldTime() % 10 == 0) this.worldObj.playSoundEffect(this.xCoord, this.yCoord + 1, this.zCoord, "hbm:weapon.flamethrowerShoot", 0.25F, 0.5F); + if(worldObj.getTotalWorldTime() % 20 == 0) this.pollute(PollutionType.SOOT, PollutionHandler.SOOT_PER_SECOND * 3); } - - if(worldObj.getTotalWorldTime() % 20 == 0) this.pollute(PollutionType.SOOT, PollutionHandler.SOOT_PER_SECOND * 3); } else { this.progress = 0; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDetector.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDetector.java index e71df5eab..8f62d9f47 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDetector.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineDetector.java @@ -52,4 +52,9 @@ public class TileEntityMachineDetector extends TileEntityLoadedBase implements I return 5; } + @Override + public ConnectionPriority getPriority() { + return ConnectionPriority.HIGH; + } + } diff --git a/src/main/resources/assets/hbm/textures/items/ingot_cft.png b/src/main/resources/assets/hbm/textures/items/ingot_cft.png new file mode 100644 index 000000000..9346dbb5a Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ingot_cft.png differ diff --git a/src/main/resources/assets/hbm/textures/items/ingot_crystalline.png b/src/main/resources/assets/hbm/textures/items/ingot_crystalline.png new file mode 100644 index 000000000..e120cf4ee Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/ingot_crystalline.png differ diff --git a/src/main/resources/assets/hbm/textures/models/machines/pump.png b/src/main/resources/assets/hbm/textures/models/machines/pump.png deleted file mode 100644 index 57b8c9d99..000000000 Binary files a/src/main/resources/assets/hbm/textures/models/machines/pump.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/models/machines/pump_electric.png b/src/main/resources/assets/hbm/textures/models/machines/pump_electric.png index a54bf774f..ca6baef2d 100644 Binary files a/src/main/resources/assets/hbm/textures/models/machines/pump_electric.png and b/src/main/resources/assets/hbm/textures/models/machines/pump_electric.png differ diff --git a/src/main/resources/assets/hbm/textures/models/machines/pump_steam.png b/src/main/resources/assets/hbm/textures/models/machines/pump_steam.png index b071ee478..8a1306035 100644 Binary files a/src/main/resources/assets/hbm/textures/models/machines/pump_steam.png and b/src/main/resources/assets/hbm/textures/models/machines/pump_steam.png differ