diff --git a/src/main/java/mekanism/client/gui/robit/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/robit/GuiRobitRepair.java index 226346f29..85a02958c 100644 --- a/src/main/java/mekanism/client/gui/robit/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/robit/GuiRobitRepair.java @@ -8,6 +8,7 @@ import mekanism.common.inventory.container.robit.ContainerRobitRepair; import mekanism.common.util.LangUtils; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ContainerRepair; @@ -17,7 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.client.CPacketCustomPayload; import net.minecraft.util.NonNullList; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.input.Keyboard; @@ -64,7 +64,7 @@ public class GuiRobitRepair extends GuiRobit implements IContainerListener { if (repairContainer.maximumCost > 0) { int k = 8453920; boolean flag = true; - String s = I18n.translateToLocalFormatted("container.repair.cost", repairContainer.maximumCost); + String s = I18n.format("container.repair.cost", repairContainer.maximumCost); if (repairContainer.maximumCost >= 40 && !mc.player.capabilities.isCreativeMode) { s = LangUtils.localize("container.repair.expensive"); diff --git a/src/main/java/mekanism/client/jei/RecipeRegistryHelper.java b/src/main/java/mekanism/client/jei/RecipeRegistryHelper.java index c99535a33..8895a3a16 100644 --- a/src/main/java/mekanism/client/jei/RecipeRegistryHelper.java +++ b/src/main/java/mekanism/client/jei/RecipeRegistryHelper.java @@ -251,7 +251,7 @@ public class RecipeRegistryHelper { // Only add added recipes Map smeltingRecipes = Recipe.ENERGIZED_SMELTER.get(); List smeltingWrapper = smeltingRecipes.entrySet().stream().filter(entry -> - !FurnaceRecipes.instance().getSmeltingList().keySet().contains(entry.getKey().ingredient)).map(entry -> + !FurnaceRecipes.instance().getSmeltingList().containsKey(entry.getKey().ingredient)).map(entry -> new MachineRecipeWrapper<>(entry.getValue())).collect(Collectors.toList()); registry.addRecipes(smeltingWrapper, Recipe.ENERGIZED_SMELTER.getJEICategory()); diff --git a/src/main/java/mekanism/client/jei/gas/GasStackRenderer.java b/src/main/java/mekanism/client/jei/gas/GasStackRenderer.java index 4316b5deb..c5e5b3393 100644 --- a/src/main/java/mekanism/client/jei/gas/GasStackRenderer.java +++ b/src/main/java/mekanism/client/jei/gas/GasStackRenderer.java @@ -66,10 +66,10 @@ public class GasStackRenderer implements IIngredientRenderer { } private static void drawTextureWithMasking(double xCoord, double yCoord, TextureAtlasSprite textureSprite, int maskTop, int maskRight, double zLevel) { - double uMin = (double) textureSprite.getMinU(); - double uMax = (double) textureSprite.getMaxU(); - double vMin = (double) textureSprite.getMinV(); - double vMax = (double) textureSprite.getMaxV(); + double uMin = textureSprite.getMinU(); + double uMax = textureSprite.getMaxU(); + double vMin = textureSprite.getMinV(); + double vMax = textureSprite.getMaxV(); uMax = uMax - (maskRight / 16.0 * (uMax - uMin)); vMax = vMax - (maskTop / 16.0 * (vMax - vMin)); diff --git a/src/main/java/mekanism/client/render/entity/RenderFlame.java b/src/main/java/mekanism/client/render/entity/RenderFlame.java index 916bc0e63..58cf94114 100644 --- a/src/main/java/mekanism/client/render/entity/RenderFlame.java +++ b/src/main/java/mekanism/client/render/entity/RenderFlame.java @@ -68,10 +68,10 @@ public class RenderFlame extends Render { GlStateManager.glNormal3f(0.0F, 0.0F, scale); worldrenderer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - worldrenderer.pos(-8.0D, -2.0D, 0.0D).tex((double) f2, (double) f4).endVertex(); - worldrenderer.pos(8.0D, -2.0D, 0.0D).tex((double) f3, (double) f4).endVertex(); - worldrenderer.pos(8.0D, 2.0D, 0.0D).tex((double) f3, (double) f5).endVertex(); - worldrenderer.pos(-8.0D, 2.0D, 0.0D).tex((double) f2, (double) f5).endVertex(); + worldrenderer.pos(-8.0D, -2.0D, 0.0D).tex(f2, f4).endVertex(); + worldrenderer.pos(8.0D, -2.0D, 0.0D).tex(f3, f4).endVertex(); + worldrenderer.pos(8.0D, 2.0D, 0.0D).tex(f3, f5).endVertex(); + worldrenderer.pos(-8.0D, 2.0D, 0.0D).tex(f2, f5).endVertex(); tessellator.draw(); } GlStateManager.disableRescaleNormal(); diff --git a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java index be33111f3..c82de69c9 100644 --- a/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java +++ b/src/main/java/mekanism/client/render/transmitter/RenderLogisticalTransporter.java @@ -259,7 +259,7 @@ public class RenderLogisticalTransporter extends RenderTransmitterBase 2200 ? 2200 : availableBytes]; + byte[] audioData = new byte[Math.min(availableBytes, 2200)]; int bytesRead = audioInput.read(audioData, 0, audioData.length); if (bytesRead > 0) { diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index 13d4e0c66..81f5f3455 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -114,7 +114,7 @@ public class EntityFlame extends Entity implements IEntityAdditionalSpawnData { for (Entity entity1 : list) { if ((entity1 instanceof EntityItem || entity1.canBeCollidedWith()) && entity1 != owner) { float boundsScale = 0.3F; - AxisAlignedBB newBounds = entity1.getEntityBoundingBox().expand((double) boundsScale, (double) boundsScale, (double) boundsScale); + AxisAlignedBB newBounds = entity1.getEntityBoundingBox().expand(boundsScale, boundsScale, boundsScale); RayTraceResult RayTraceResult1 = newBounds.calculateIntercept(localVec, motionVec); if (RayTraceResult1 != null) { diff --git a/src/main/java/mekanism/common/integration/computer/OCDriver.java b/src/main/java/mekanism/common/integration/computer/OCDriver.java index 314210977..30a5b506b 100644 --- a/src/main/java/mekanism/common/integration/computer/OCDriver.java +++ b/src/main/java/mekanism/common/integration/computer/OCDriver.java @@ -35,7 +35,7 @@ public class OCDriver extends DriverSidedTileEntity { return null; } - public class OCManagedEnvironment extends AbstractManagedEnvironment implements NamedBlock, ManagedPeripheral { + public static class OCManagedEnvironment extends AbstractManagedEnvironment implements NamedBlock, ManagedPeripheral { public IComputerIntegration computerTile; diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index be0e455ee..bf313b4c7 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -22,7 +22,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -89,7 +88,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem { public String getItemStackDisplayName(@Nonnull ItemStack stack) { EnumColor color = getColor(stack); String dyeName = color.getDyedName(); - if (I18n.canTranslate(getTranslationKey(stack) + "." + color.dyeName)) { + if (LangUtils.canLocalize(getTranslationKey(stack) + "." + color.dyeName)) { return LangUtils.localize(getTranslationKey(stack) + "." + color.dyeName); } if (getColor(stack) == EnumColor.BLACK) { @@ -171,6 +170,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem { for (EntityBalloon balloon : balloonsNear) { if (balloon.latchedEntity == entity) { hasBalloon = true; + break; } } if (!hasBalloon) { diff --git a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java index 37f845bf7..7e2060239 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java +++ b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java @@ -16,7 +16,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; @@ -76,7 +75,7 @@ public class ItemBlockGlowPanel extends ItemBlockMultipartAble { } EnumColor colour = EnumColor.DYES[itemDamage]; String colourName; - if (I18n.canTranslate(getTranslationKey(stack) + "." + colour.dyeName)) { + if (LangUtils.canLocalize(getTranslationKey(stack) + "." + colour.dyeName)) { return LangUtils.localize(getTranslationKey(stack) + "." + colour.dyeName); } if (colour == EnumColor.BLACK) { diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 707e4bc5e..8b3f6ce00 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -73,7 +73,6 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; @@ -138,7 +137,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec RecipeType recipeType = getRecipeTypeOrNull(itemstack); if (recipeType != null) { String langKey = "tile." + tier.getSimpleName() + recipeType.getTranslationKey() + "Factory"; - if (I18n.canTranslate(langKey)) { + if (LangUtils.canLocalize(langKey)) { return LangUtils.localize(langKey); } return tier.getLocalizedName() + " " + recipeType.getLocalizedName() + " " + super.getItemStackDisplayName(itemstack); diff --git a/src/main/java/mekanism/common/item/ItemBlockPlastic.java b/src/main/java/mekanism/common/item/ItemBlockPlastic.java index 9ea6d9ea8..6dabfd149 100644 --- a/src/main/java/mekanism/common/item/ItemBlockPlastic.java +++ b/src/main/java/mekanism/common/item/ItemBlockPlastic.java @@ -7,7 +7,6 @@ import net.minecraft.block.Block; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.translation.I18n; public class ItemBlockPlastic extends ItemBlock { @@ -30,7 +29,7 @@ public class ItemBlockPlastic extends ItemBlock { EnumDyeColor dyeColour = EnumDyeColor.byDyeDamage(stack.getItemDamage() & 15); EnumColor colour = EnumColor.DYES[dyeColour.getDyeDamage()]; String colourName; - if (I18n.canTranslate(getTranslationKey(stack) + "." + colour.dyeName)) { + if (LangUtils.canLocalize(getTranslationKey(stack) + "." + colour.dyeName)) { return LangUtils.localize(getTranslationKey(stack) + "." + colour.dyeName); } if (colour == EnumColor.BLACK) { diff --git a/src/main/java/mekanism/common/item/ItemProxy.java b/src/main/java/mekanism/common/item/ItemProxy.java index 721673b01..3e6933139 100644 --- a/src/main/java/mekanism/common/item/ItemProxy.java +++ b/src/main/java/mekanism/common/item/ItemProxy.java @@ -49,7 +49,8 @@ public class ItemProxy extends Item { if (entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entity; for (int i = 0; i < player.inventory.mainInventory.size(); i++) { - if (!player.inventory.mainInventory.get(i).isEmpty() && player.inventory.mainInventory.get(i).getItem() == this) { + ItemStack itemStack = player.inventory.mainInventory.get(i); + if (!itemStack.isEmpty() && itemStack.getItem() == this) { player.inventory.mainInventory.remove(i); } } diff --git a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java index b9e3455d7..68bbfe2a8 100644 --- a/src/main/java/mekanism/common/multiblock/UpdateProtocol.java +++ b/src/main/java/mekanism/common/multiblock/UpdateProtocol.java @@ -429,7 +429,7 @@ public abstract class UpdateProtocol> { } } - public class NodeCounter { + public static class NodeCounter { public Set iterated = new HashSet<>(); diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 6d8b30ba6..c2c37e15d 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -66,7 +66,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; -import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.items.ItemHandlerHelper; @@ -807,7 +806,7 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt @Nonnull @Override public String getName() { - if (I18n.canTranslate("tile." + tier.getBaseTier().getName() + recipeType.getTranslationKey() + "Factory")) { + if (LangUtils.canLocalize("tile." + tier.getBaseTier().getName() + recipeType.getTranslationKey() + "Factory")) { return LangUtils.localize("tile." + tier.getBaseTier().getName() + recipeType.getTranslationKey() + "Factory"); } return tier.getBaseTier().getLocalizedName() + " " + recipeType.getLocalizedName() + " " + super.getName(); diff --git a/src/main/java/mekanism/common/util/LangUtils.java b/src/main/java/mekanism/common/util/LangUtils.java index a98531829..797759483 100644 --- a/src/main/java/mekanism/common/util/LangUtils.java +++ b/src/main/java/mekanism/common/util/LangUtils.java @@ -40,6 +40,10 @@ public final class LangUtils { return I18n.translateToLocal(s); } + public static boolean canLocalize(String s) { + return I18n.canTranslate(s); + } + public static String localizeWithFormat(String key, Object... format) { String s = localize(key); try { diff --git a/src/main/java/mekanism/common/world/DummyWorld.java b/src/main/java/mekanism/common/world/DummyWorld.java index 635f7d8ca..716d02368 100644 --- a/src/main/java/mekanism/common/world/DummyWorld.java +++ b/src/main/java/mekanism/common/world/DummyWorld.java @@ -2,6 +2,8 @@ package mekanism.common.world; import java.io.File; import javax.annotation.Nullable; +import javax.annotation.ParametersAreNonnullByDefault; +import mcp.MethodsReturnNonnullByDefault; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.profiler.Profiler; import net.minecraft.world.DimensionType; @@ -18,6 +20,8 @@ import net.minecraft.world.storage.WorldInfo; /** * Dummy object for providing something to CraftingManager#findMatchingRecipe during startup, to prevent in-dev non-null assertions from breaking things */ +@ParametersAreNonnullByDefault +@MethodsReturnNonnullByDefault public class DummyWorld extends World { public DummyWorld() { diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index ee0e29584..3239539e7 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -223,7 +223,7 @@ public abstract class BlockGenerator extends BlockMekanismContainer { if (MekanismUtils.isActive(world, pos)) { float xRandom = (float) pos.getX() + 0.5F; - float yRandom = (float) pos.getY() + 0.0F + random.nextFloat() * 6.0F / 16.0F; + float yRandom = (float) pos.getY() + random.nextFloat() * 6.0F / 16.0F; float zRandom = (float) pos.getZ() + 0.5F; float iRandom = 0.52F; float jRandom = random.nextFloat() * 0.6F - 0.3F; @@ -231,8 +231,8 @@ public abstract class BlockGenerator extends BlockMekanismContainer { if (tileEntity.facing == EnumFacing.WEST) { switch (type) { case HEAT_GENERATOR: - world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, (double) (xRandom + iRandom), (double) yRandom, (double) (zRandom - jRandom), 0.0D, 0.0D, 0.0D); - world.spawnParticle(EnumParticleTypes.FLAME, (double) (xRandom + iRandom), (double) yRandom, (double) (zRandom - jRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, xRandom + iRandom, yRandom, zRandom - jRandom, 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.FLAME, xRandom + iRandom, yRandom, zRandom - jRandom, 0.0D, 0.0D, 0.0D); break; case BIO_GENERATOR: world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + .25, pos.getY() + .2, pos.getZ() + .5, 0.0D, 0.0D, 0.0D); @@ -243,8 +243,8 @@ public abstract class BlockGenerator extends BlockMekanismContainer { } else if (tileEntity.facing == EnumFacing.EAST) { switch (type) { case HEAT_GENERATOR: - world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, (double) (xRandom + iRandom), (double) yRandom + 0.5F, (double) (zRandom - jRandom), 0.0D, 0.0D, 0.0D); - world.spawnParticle(EnumParticleTypes.FLAME, (double) (xRandom + iRandom), (double) yRandom + 0.5F, (double) (zRandom - jRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, xRandom + iRandom, yRandom + 0.5F, zRandom - jRandom, 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.FLAME, xRandom + iRandom, yRandom + 0.5F, zRandom - jRandom, 0.0D, 0.0D, 0.0D); break; case BIO_GENERATOR: world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + .75, pos.getY() + .2, pos.getZ() + .5, 0.0D, 0.0D, 0.0D); @@ -255,8 +255,8 @@ public abstract class BlockGenerator extends BlockMekanismContainer { } else if (tileEntity.facing == EnumFacing.NORTH) { switch (type) { case HEAT_GENERATOR: - world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, (double) (xRandom - jRandom), (double) yRandom + 0.5F, (double) (zRandom - iRandom), 0.0D, 0.0D, 0.0D); - world.spawnParticle(EnumParticleTypes.FLAME, (double) (xRandom - jRandom), (double) yRandom + 0.5F, (double) (zRandom - iRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, xRandom - jRandom, yRandom + 0.5F, zRandom - iRandom, 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.FLAME, xRandom - jRandom, yRandom + 0.5F, zRandom - iRandom, 0.0D, 0.0D, 0.0D); break; case BIO_GENERATOR: world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + .5, pos.getY() + .2, pos.getZ() + .25, 0.0D, 0.0D, 0.0D); @@ -267,8 +267,8 @@ public abstract class BlockGenerator extends BlockMekanismContainer { } else if (tileEntity.facing == EnumFacing.SOUTH) { switch (type) { case HEAT_GENERATOR: - world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, (double) (xRandom - jRandom), (double) yRandom + 0.5F, (double) (zRandom + iRandom), 0.0D, 0.0D, 0.0D); - world.spawnParticle(EnumParticleTypes.FLAME, (double) (xRandom - jRandom), (double) yRandom + 0.5F, (double) (zRandom + iRandom), 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, xRandom - jRandom, yRandom + 0.5F, zRandom + iRandom, 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.FLAME, xRandom - jRandom, yRandom + 0.5F, zRandom + iRandom, 0.0D, 0.0D, 0.0D); break; case BIO_GENERATOR: world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + .5, pos.getY() + .2, pos.getZ() + .75, 0.0D, 0.0D, 0.0D); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 12adea173..e60861d24 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -197,14 +197,8 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui @Override public int fill(EnumFacing from, @Nonnull FluidStack resource, boolean doFill) { - int fuelTransfer; int fuelNeeded = bioFuelSlot.MAX_FLUID - bioFuelSlot.fluidStored; - int attemptTransfer = resource.amount; - if (attemptTransfer <= fuelNeeded) { - fuelTransfer = attemptTransfer; - } else { - fuelTransfer = fuelNeeded; - } + int fuelTransfer = Math.min(resource.amount, fuelNeeded); if (doFill) { bioFuelSlot.setFluid(bioFuelSlot.fluidStored + fuelTransfer); } diff --git a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java index ac4599e60..76a1e55d5 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java @@ -98,7 +98,7 @@ public class ItemMekanismHoe extends ItemMekanism { Multimap multimap = super.getAttributeModifiers(equipmentSlot, stack); if (equipmentSlot == EntityEquipmentSlot.MAINHAND) { multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", 0.0D, 0)); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", (double) (this.speed - 4.0F), 0)); + multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", this.speed - 4.0F, 0)); } return multimap; } diff --git a/src/main/resources/assets/mekanism/lang/cs_cz.lang b/src/main/resources/assets/mekanism/lang/cs_cz.lang index 5d31ef193..54c878474 100644 --- a/src/main/resources/assets/mekanism/lang/cs_cz.lang +++ b/src/main/resources/assets/mekanism/lang/cs_cz.lang @@ -1009,16 +1009,16 @@ item.ObsidianHoe.name=Obsidiánová Motyka item.ObsidianSword.name=Obsidiánový Meč # Lapis Lazuli -item.LazuliHelmet.name=Lapis Lazuli Helma -item.LazuliChestplate.name=Lapis Lazuli Brnění -item.LazuliLeggings.name=Lapis Lazuli Kalhoty -item.LazuliBoots.name=Lapis Lazuli Boty -item.LazuliPaxel.name=Lapis Lazuli Sekrumpáč -item.LazuliPickaxe.name=Lapis Lazuli Krumpáč -item.LazuliAxe.name=Lapis Lazuli Sekyra -item.LazuliShovel.name=Lapis Lazuli Lopata -item.LazuliHoe.name=Lapis Lazuli Motyka -item.LazuliSword.name=Lapis Lazuli Meč +item.LapisLazuliHelmet.name=Lapis Lazuli Helma +item.LapisLazuliChestplate.name=Lapis Lazuli Brnění +item.LapisLazuliLeggings.name=Lapis Lazuli Kalhoty +item.LapisLazuliBoots.name=Lapis Lazuli Boty +item.LapisLazuliPaxel.name=Lapis Lazuli Sekrumpáč +item.LapisLazuliPickaxe.name=Lapis Lazuli Krumpáč +item.LapisLazuliAxe.name=Lapis Lazuli Sekyra +item.LapisLazuliShovel.name=Lapis Lazuli Lopata +item.LapisLazuliHoe.name=Lapis Lazuli Motyka +item.LapisLazuliSword.name=Lapis Lazuli Meč # Osmium item.OsmiumHelmet.name=Osmiová Helma diff --git a/src/main/resources/assets/mekanism/lang/da_dk.lang b/src/main/resources/assets/mekanism/lang/da_dk.lang index 9834a4fba..44a81a1c9 100644 --- a/src/main/resources/assets/mekanism/lang/da_dk.lang +++ b/src/main/resources/assets/mekanism/lang/da_dk.lang @@ -984,16 +984,16 @@ item.ObsidianHoe.name=Obsidianlugejern item.ObsidianSword.name=Obsidiansværd # Lapis Lazuli -item.LazuliHelmet.name=Lapis Lazuli-hjelm -item.LazuliChestplate.name=Lapis Lazuli-brystplate -item.LazuliLeggings.name=Lapis Lazuli-bukser -item.LazuliBoots.name=Lapis Lazuli-støvler -item.LazuliPaxel.name=Lapis Lazuli-paxel -item.LazuliPickaxe.name=Lapis Lazuli-hakke -item.LazuliAxe.name=Lapis Lazuli-økse -item.LazuliShovel.name=Lapis Lazuli-spade -item.LazuliHoe.name=Lapis Lazuli-lugejern -item.LazuliSword.name=Lapis Lazuli-sværd +item.LapisLazuliHelmet.name=Lapis Lazuli-hjelm +item.LapisLazuliChestplate.name=Lapis Lazuli-brystplate +item.LapisLazuliLeggings.name=Lapis Lazuli-bukser +item.LapisLazuliBoots.name=Lapis Lazuli-støvler +item.LapisLazuliPaxel.name=Lapis Lazuli-paxel +item.LapisLazuliPickaxe.name=Lapis Lazuli-hakke +item.LapisLazuliAxe.name=Lapis Lazuli-økse +item.LapisLazuliShovel.name=Lapis Lazuli-spade +item.LapisLazuliHoe.name=Lapis Lazuli-lugejern +item.LapisLazuliSword.name=Lapis Lazuli-sværd # Osmium item.OsmiumHelmet.name=Osmiumhjelm diff --git a/src/main/resources/assets/mekanism/lang/de_de.lang b/src/main/resources/assets/mekanism/lang/de_de.lang index af160a9a4..b0413b213 100644 --- a/src/main/resources/assets/mekanism/lang/de_de.lang +++ b/src/main/resources/assets/mekanism/lang/de_de.lang @@ -1010,16 +1010,16 @@ item.ObsidianHoe.name=Obsidianhacke item.ObsidianSword.name=Obsidianschwert # Lapis Lazuli -item.LazuliHelmet.name=Lapislazulihelm -item.LazuliChestplate.name=Lapislazulibrustpanzer -item.LazuliLeggings.name=Lapislazulibeinschutz -item.LazuliBoots.name=Lapislazulistiefel -item.LazuliPaxel.name=Lapislazuli-Paxel -item.LazuliPickaxe.name=Lapislazulispitzhacke -item.LazuliAxe.name=Lapislazuliaxt -item.LazuliShovel.name=Lapislazulischaufel -item.LazuliHoe.name=Lapislazulihacke -item.LazuliSword.name=Lapislazulischwert +item.LapisLazuliHelmet.name=Lapislazulihelm +item.LapisLazuliChestplate.name=Lapislazulibrustpanzer +item.LapisLazuliLeggings.name=Lapislazulibeinschutz +item.LapisLazuliBoots.name=Lapislazulistiefel +item.LapisLazuliPaxel.name=Lapislazuli-Paxel +item.LapisLazuliPickaxe.name=Lapislazulispitzhacke +item.LapisLazuliAxe.name=Lapislazuliaxt +item.LapisLazuliShovel.name=Lapislazulischaufel +item.LapisLazuliHoe.name=Lapislazulihacke +item.LapisLazuliSword.name=Lapislazulischwert # Osmium item.OsmiumHelmet.name=Osmiumhelm diff --git a/src/main/resources/assets/mekanism/lang/fr_fr.lang b/src/main/resources/assets/mekanism/lang/fr_fr.lang index 3dbc3020c..4957aeb3b 100644 --- a/src/main/resources/assets/mekanism/lang/fr_fr.lang +++ b/src/main/resources/assets/mekanism/lang/fr_fr.lang @@ -953,16 +953,16 @@ item.ObsidianHoe.name=Houe en obsidienne item.ObsidianSword.name=Épée en obsidienne # Lapis Lazuli -item.LazuliHelmet.name=Casque en lapis lazuli -item.LazuliChestplate.name=Plastron en lapis lazuli -item.LazuliLeggings.name=Jambières en lapis lazuli -item.LazuliBoots.name=Bottes en lapis lazuli -item.LazuliPaxel.name=Piopèche en lapis lazuli -item.LazuliPickaxe.name=Pioche en lapis lazuli -item.LazuliAxe.name=Hache en lapis lazuli -item.LazuliShovel.name=Pelle en lapis lazuli -item.LazuliHoe.name=Houe en lapis lazuli -item.LazuliSword.name=Épée en lapis lazuli +item.LapisLazuliHelmet.name=Casque en lapis lazuli +item.LapisLazuliChestplate.name=Plastron en lapis lazuli +item.LapisLazuliLeggings.name=Jambières en lapis lazuli +item.LapisLazuliBoots.name=Bottes en lapis lazuli +item.LapisLazuliPaxel.name=Piopèche en lapis lazuli +item.LapisLazuliPickaxe.name=Pioche en lapis lazuli +item.LapisLazuliAxe.name=Hache en lapis lazuli +item.LapisLazuliShovel.name=Pelle en lapis lazuli +item.LapisLazuliHoe.name=Houe en lapis lazuli +item.LapisLazuliSword.name=Épée en lapis lazuli # Osmium item.OsmiumHelmet.name=Casque en osmium diff --git a/src/main/resources/assets/mekanism/lang/it_it.lang b/src/main/resources/assets/mekanism/lang/it_it.lang index 47d72cab0..caa97266f 100644 --- a/src/main/resources/assets/mekanism/lang/it_it.lang +++ b/src/main/resources/assets/mekanism/lang/it_it.lang @@ -862,16 +862,16 @@ item.ObsidianHoe.name=Zappa di ossidiana item.ObsidianSword.name=Spada di ossidiana # Lapis Lazuli -item.LazuliHelmet.name=Elmo di lapislazuli -item.LazuliChestplate.name=Corazza di lapislazuli -item.LazuliLeggings.name=Gambiera di lapislazuli -item.LazuliBoots.name=Stivali di lapislazuli -item.LazuliPaxel.name=Paxel di lapislazuli -item.LazuliPickaxe.name=Piccone di lapislazuli -item.LazuliAxe.name=Ascia di lapislazuli -item.LazuliShovel.name=Pala di lapislazuli -item.LazuliHoe.name=Zappa di lapislazuli -item.LazuliSword.name=Spada di lapislazuli +item.LapisLazuliHelmet.name=Elmo di lapislazuli +item.LapisLazuliChestplate.name=Corazza di lapislazuli +item.LapisLazuliLeggings.name=Gambiera di lapislazuli +item.LapisLazuliBoots.name=Stivali di lapislazuli +item.LapisLazuliPaxel.name=Paxel di lapislazuli +item.LapisLazuliPickaxe.name=Piccone di lapislazuli +item.LapisLazuliAxe.name=Ascia di lapislazuli +item.LapisLazuliShovel.name=Pala di lapislazuli +item.LapisLazuliHoe.name=Zappa di lapislazuli +item.LapisLazuliSword.name=Spada di lapislazuli # Osmium item.OsmiumHelmet.name=Elmo di osmio diff --git a/src/main/resources/assets/mekanism/lang/ja_jp.lang b/src/main/resources/assets/mekanism/lang/ja_jp.lang index 93b7d2178..d87e11a52 100644 --- a/src/main/resources/assets/mekanism/lang/ja_jp.lang +++ b/src/main/resources/assets/mekanism/lang/ja_jp.lang @@ -547,7 +547,6 @@ gui.unit=単位 gui.temp=温度 gui.usage=使用 gui.transferred=移動済み -gui.dissipated=発散 gui.dissipated=温度変化 gui.boilRate=沸騰量 gui.maxBoil=蒸気生成量 diff --git a/src/main/resources/assets/mekanism/lang/ko_kr.lang b/src/main/resources/assets/mekanism/lang/ko_kr.lang index 42649c8de..28ea71176 100644 --- a/src/main/resources/assets/mekanism/lang/ko_kr.lang +++ b/src/main/resources/assets/mekanism/lang/ko_kr.lang @@ -358,16 +358,16 @@ item.ObsidianHoe.name=옵시디언 괭이 item.ObsidianSword.name=옵시디언 검 # Lazuli -item.LazuliHelmet.name=라피스 헬맷 -item.LazuliChestplate.name=라피스 갑옷 -item.LazuliLeggings.name=라피스 레깅스 -item.LazuliBoots.name=라피스 부츠 -item.LazuliPaxel.name=라피스 팩셀 -item.LazuliPickaxe.name=라피스 곡괭이 -item.LazuliAxe.name=라피스 도끼 -item.LazuliShovel.name=라피스 삽 -item.LazuliHoe.name=라피스 괭이 -item.LazuliSword.name=라피스 검 +item.LapisLazuliHelmet.name=라피스 헬맷 +item.LapisLazuliChestplate.name=라피스 갑옷 +item.LapisLazuliLeggings.name=라피스 레깅스 +item.LapisLazuliBoots.name=라피스 부츠 +item.LapisLazuliPaxel.name=라피스 팩셀 +item.LapisLazuliPickaxe.name=라피스 곡괭이 +item.LapisLazuliAxe.name=라피스 도끼 +item.LapisLazuliShovel.name=라피스 삽 +item.LapisLazuliHoe.name=라피스 괭이 +item.LapisLazuliSword.name=라피스 검 # Osmium item.OsmiumHelmet.name=오스뮴 헬맷 diff --git a/src/main/resources/assets/mekanism/lang/no_no.lang b/src/main/resources/assets/mekanism/lang/no_no.lang index 9639696d1..19ea76774 100644 --- a/src/main/resources/assets/mekanism/lang/no_no.lang +++ b/src/main/resources/assets/mekanism/lang/no_no.lang @@ -716,16 +716,16 @@ item.ObsidianHoe.name=Obsidian Ljå item.ObsidianSword.name=Obsidian Sverd # Lapis Lazuli -item.LazuliHelmet.name=Lapis Lazuli Hjelm -item.LazuliChestplate.name=Lapis Lazuli Brystplate -item.LazuliLeggings.name=Lapis Lazuli Benplater -item.LazuliBoots.name=Lapis Lazuli Støvler -item.LazuliPaxel.name=Lapis Lazuli Paxel -item.LazuliPickaxe.name=Lapis Lazuli Hakke -item.LazuliAxe.name=Lapis Lazuli Øks -item.LazuliShovel.name=Lapis Lazuli Spade -item.LazuliHoe.name=Lapis Lazuli Ljå -item.LazuliSword.name=Lapis Lazuli Sverd +item.LapisLazuliHelmet.name=Lapis Lazuli Hjelm +item.LapisLazuliChestplate.name=Lapis Lazuli Brystplate +item.LapisLazuliLeggings.name=Lapis Lazuli Benplater +item.LapisLazuliBoots.name=Lapis Lazuli Støvler +item.LapisLazuliPaxel.name=Lapis Lazuli Paxel +item.LapisLazuliPickaxe.name=Lapis Lazuli Hakke +item.LapisLazuliAxe.name=Lapis Lazuli Øks +item.LapisLazuliShovel.name=Lapis Lazuli Spade +item.LapisLazuliHoe.name=Lapis Lazuli Ljå +item.LapisLazuliSword.name=Lapis Lazuli Sverd # Osmium item.OsmiumHelmet.name=Osmium Hjelm diff --git a/src/main/resources/assets/mekanism/lang/pt_br.lang b/src/main/resources/assets/mekanism/lang/pt_br.lang index e82fee624..f1641e7f1 100644 --- a/src/main/resources/assets/mekanism/lang/pt_br.lang +++ b/src/main/resources/assets/mekanism/lang/pt_br.lang @@ -1004,16 +1004,16 @@ item.ObsidianHoe.name=Enxada de Obsidiana item.ObsidianSword.name=Espada de Obsidiana # Lapis Lazuli -item.LazuliHelmet.name=Elmo de Lápis-Lazúli -item.LazuliChestplate.name=Peitoral de Lápis-Lazúli -item.LazuliLeggings.name=Calças de Lápis-Lazúli -item.LazuliBoots.name=Botas de Lápis-Lazúli -item.LazuliPaxel.name=Pacachado de Lápis-Lazúli -item.LazuliPickaxe.name=Picareta de Lápis-Lazúli -item.LazuliAxe.name=Machado de Lápis-Lazúli -item.LazuliShovel.name=Pá de Lápis-Lazúli -item.LazuliHoe.name=Enxada de Lápis-Lazúli -item.LazuliSword.name=Espada de Lápis-Lazúli +item.LapisLazuliHelmet.name=Elmo de Lápis-Lazúli +item.LapisLazuliChestplate.name=Peitoral de Lápis-Lazúli +item.LapisLazuliLeggings.name=Calças de Lápis-Lazúli +item.LapisLazuliBoots.name=Botas de Lápis-Lazúli +item.LapisLazuliPaxel.name=Pacachado de Lápis-Lazúli +item.LapisLazuliPickaxe.name=Picareta de Lápis-Lazúli +item.LapisLazuliAxe.name=Machado de Lápis-Lazúli +item.LapisLazuliShovel.name=Pá de Lápis-Lazúli +item.LapisLazuliHoe.name=Enxada de Lápis-Lazúli +item.LapisLazuliSword.name=Espada de Lápis-Lazúli # Osmium item.OsmiumHelmet.name=Elmo de Ósmio diff --git a/src/main/resources/assets/mekanism/lang/pt_pt.lang b/src/main/resources/assets/mekanism/lang/pt_pt.lang index 6dbc986b0..b536db8fc 100644 --- a/src/main/resources/assets/mekanism/lang/pt_pt.lang +++ b/src/main/resources/assets/mekanism/lang/pt_pt.lang @@ -1004,16 +1004,16 @@ item.ObsidianHoe.name=Enxada de Obsidiana item.ObsidianSword.name=Espada de Obsidiana # Lapis Lazuli -item.LazuliHelmet.name=Capacete de Lápis-Lazúli -item.LazuliChestplate.name=Peitoral de Lápis-Lazúli -item.LazuliLeggings.name=Perneiras de Lápis-Lazúli -item.LazuliBoots.name=Botas de Lápis-Lazúli -item.LazuliPaxel.name=Pacachado de Lápis-Lazúli -item.LazuliPickaxe.name=Picareta de Lápis-Lazúli -item.LazuliAxe.name=Machado de Lápis-Lazúli -item.LazuliShovel.name=Pá de Lápis-Lazúli -item.LazuliHoe.name=Enxada de Lápis-Lazúli -item.LazuliSword.name=Espada de Lápis-Lazúli +item.LapisLazuliHelmet.name=Capacete de Lápis-Lazúli +item.LapisLazuliChestplate.name=Peitoral de Lápis-Lazúli +item.LapisLazuliLeggings.name=Perneiras de Lápis-Lazúli +item.LapisLazuliBoots.name=Botas de Lápis-Lazúli +item.LapisLazuliPaxel.name=Pacachado de Lápis-Lazúli +item.LapisLazuliPickaxe.name=Picareta de Lápis-Lazúli +item.LapisLazuliAxe.name=Machado de Lápis-Lazúli +item.LapisLazuliShovel.name=Pá de Lápis-Lazúli +item.LapisLazuliHoe.name=Enxada de Lápis-Lazúli +item.LapisLazuliSword.name=Espada de Lápis-Lazúli # Osmium item.OsmiumHelmet.name=Capacete de Ósmio diff --git a/src/main/resources/assets/mekanism/lang/zh_tw.lang b/src/main/resources/assets/mekanism/lang/zh_tw.lang index 93acd052c..f9c550a67 100644 --- a/src/main/resources/assets/mekanism/lang/zh_tw.lang +++ b/src/main/resources/assets/mekanism/lang/zh_tw.lang @@ -776,16 +776,16 @@ item.ObsidianHoe.name=黑曜石鋤頭 item.ObsidianSword.name=黑曜石劍 # Lapis Lazuli -item.LazuliHelmet.name=青金石頭盔 -item.LazuliChestplate.name=青金石胸甲 -item.LazuliLeggings.name=青金石護腿 -item.LazuliBoots.name=青金石靴子 -item.LazuliPaxel.name=青金石鎬尖斧 -item.LazuliPickaxe.name=青金石鎬 -item.LazuliAxe.name=青金石斧頭 -item.LazuliShovel.name=青金石鏟子 -item.LazuliHoe.name=青金石鋤頭 -item.LazuliSword.name=青金石劍 +item.LapisLazuliHelmet.name=青金石頭盔 +item.LapisLazuliChestplate.name=青金石胸甲 +item.LapisLazuliLeggings.name=青金石護腿 +item.LapisLazuliBoots.name=青金石靴子 +item.LapisLazuliPaxel.name=青金石鎬尖斧 +item.LapisLazuliPickaxe.name=青金石鎬 +item.LapisLazuliAxe.name=青金石斧頭 +item.LapisLazuliShovel.name=青金石鏟子 +item.LapisLazuliHoe.name=青金石鋤頭 +item.LapisLazuliSword.name=青金石劍 # Osmium item.OsmiumHelmet.name=鋨頭盔