Fix typos

README.md

@@ -30,7 +30,7 @@ features or change existing behaviour or balance, please discuss it on the featu
 Do not submit pull requests which solely "fix" formatting. As these kinds of changes are usually very intrusive in commit history and everyone has their own idea what "proper formatting" is, they should be done by one of the main contributors. 
 Please only submit "code cleanup", if the changes actually have a substantial impact on readability.
 
-PR implementing new features or changing large portions of code are helpful. But if you're doing such a change and if it gets accepted, please don't "fire and forget". Complex changes are introducing bugs, and as thourough as testing and peer review may be, there will be bugs. Please carry on playing your changes after initial commit and fix residual issues. It is extremely frustrating for others to spend days fixing regressions introduced by unmaintained submissions.
+PR implementing new features or changing large portions of code are helpful. But if you're doing such a change and if it gets accepted, please don't "fire and forget". Complex changes are introducing bugs, and as thorough as testing and peer review may be, there will be bugs. Please carry on playing your changes after initial commit and fix residual issues. It is extremely frustrating for others to spend days fixing regressions introduced by unmaintained submissions.
 
 #### Frequently reported
 
@@ -48,7 +48,7 @@ PR implementing new features or changing large portions of code are helpful. But
 1. Clone (and update) the submodules into 'baseDir/BuildCraft with 'git submodule init' and 'git submodule update'
 1. Navigate to basedir/BuildCraft in a shell and run one of two commands:
  * `gradlew setupCIWorkspace build` to just build a current jar (this may take a while).
- * `gradlew setupDecompWorkspace` to setup a complete developement enviroment.
+ * `gradlew setupDecompWorkspace` to setup a complete development environment.
  * With `Gradle` installed: use `gradle` instead of `gradlew`
  * On Windows: use `gradlew.bat` instead of `gradlew`
 1. The compiles and obfuscated module jars will be in 'baseDir/BuildCraft/modules'

build.gradle

@@ -66,7 +66,7 @@ minecraft {
     // the mappings can be changed at any time, and must be in the following format.
     // snapshot_YYYYMMDD   snapshot are built nightly.
     // stable_#            stables are built at the discretion of the MCP team.
-    // Use non-default mappings at your own risk. they may not allways work.
+    // Use non-default mappings at your own risk. they may not always work.
     // simply re-run your setup task after changing the mappings to update your workspace.
     mappings = config.mappings_version
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.

buildcraft_resources/assets/buildcraftcore/guide/en_us/item/gear_gold.md

@@ -1,4 +1,4 @@
-More complex tasks require lots of very small interlocking gears, and iron simple refueses to
+More complex tasks require lots of very small interlocking gears, and iron simple refuses to
 
 Gold however can be [...]
 $[special.all_crafting](buildcraftcore:gear_gold)

buildcraft_resources/assets/buildcraftcore/guide/en_us/item/paintbrush.md

@@ -1,5 +1,5 @@
 Paintbrushes can be used to paint various different blocks into one of 16 colours.
 
-Paiting a block is normally only useful for decoration, however some blocks have special properties once painted.
+Painting a block is normally only useful for decoration, however some blocks have special properties once painted.
 For example pipes will not connect to other pipes if they are painted different colours.
 $[special.all_crafting](buildcraftcore:paintbrush)

common/buildcraft/builders/BCBuildersConfig.java

@@ -35,7 +35,7 @@ public static void preInit() {
         none.setTo(propBptStoreExternalThreshold);
 
         propQuarryFrameMinHeight = BCCoreConfig.config.get("general", "quarryFrameMinHeight", 4);
-        propQuarryFrameMinHeight.setComment("The minimum height that all quarry frames must be. A value of 1 will look strange when it drills the toppermost layer.");
+        propQuarryFrameMinHeight.setComment("The minimum height that all quarry frames must be. A value of 1 will look strange when it drills the uppermost layer.");
         propQuarryFrameMinHeight.setMinValue(1);
         none.setTo(propQuarryFrameMinHeight);
 

common/buildcraft/builders/BCBuildersProxy.java

@@ -16,7 +16,7 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import buildcraft.lib.client.render.DetatchedRenderer;
+import buildcraft.lib.client.render.DetachedRenderer;
 
 import buildcraft.builders.client.render.RenderArchitectTables;
 import buildcraft.builders.client.render.RenderBuilder;
@@ -161,8 +161,8 @@ public void fmlInit() {
             ClientRegistry.bindTileEntitySpecialRenderer(TileBuilder.class, new RenderBuilder());
             ClientRegistry.bindTileEntitySpecialRenderer(TileFiller.class, new RenderFiller());
             ClientRegistry.bindTileEntitySpecialRenderer(TileQuarry.class, new RenderQuarry());
-            DetatchedRenderer.INSTANCE.addRenderer(
-                DetatchedRenderer.RenderMatrixType.FROM_WORLD_ORIGIN,
+            DetachedRenderer.INSTANCE.addRenderer(
+                DetachedRenderer.RenderMatrixType.FROM_WORLD_ORIGIN,
                 RenderArchitectTables.INSTANCE
             );
         }

common/buildcraft/builders/client/render/RenderArchitectTables.java

@@ -27,11 +27,11 @@
 import net.minecraft.util.math.Vec3d;
 
 import buildcraft.lib.client.model.ModelUtil;
-import buildcraft.lib.client.render.DetatchedRenderer;
+import buildcraft.lib.client.render.DetachedRenderer;
 
 import buildcraft.builders.client.ClientArchitectTables;
 
-public enum RenderArchitectTables implements DetatchedRenderer.IDetachedRenderer {
+public enum RenderArchitectTables implements DetachedRenderer.IDetachedRenderer {
     INSTANCE;
 
     @Override

common/buildcraft/builders/snapshot/Blueprint.java

@@ -104,7 +104,7 @@ public void deserializeNBT(NBTTagCompound nbt) throws InvalidInputDataException
         }
         int len = list == null ? serializedData.length : list.tagCount();
         if (len != size.getX() * size.getY() * size.getZ()) {
-            throw new InvalidInputDataException("Pallette has length of " + len
+            throw new InvalidInputDataException("Palette has length of " + len
                 + ", but we expected " + size.getX() * size.getY() * size.getZ() + size.toString());
         }
         int i = 0;

common/buildcraft/builders/tile/TileBuilder.java

@@ -55,7 +55,7 @@
 import buildcraft.lib.misc.PositionUtil;
 import buildcraft.lib.misc.data.Box;
 import buildcraft.lib.misc.data.IdAllocator;
-import buildcraft.lib.mj.MjBatteryReciver;
+import buildcraft.lib.mj.MjBatteryReceiver;
 import buildcraft.lib.net.MessageManager;
 import buildcraft.lib.net.PacketBufferBC;
 import buildcraft.lib.tile.TileBC_Neptune;
@@ -120,7 +120,7 @@ public TileBuilder() {
         for (int i = 1; i <= 4; i++) {
             tankManager.add(new Tank("fluid" + i, Fluid.BUCKET_VOLUME * 8, this));
         }
-        caps.addProvider(new MjCapabilityHelper(new MjBatteryReciver(battery)));
+        caps.addProvider(new MjCapabilityHelper(new MjBatteryReceiver(battery)));
         caps.addCapabilityInstance(CapUtil.CAP_FLUIDS, tankManager, EnumPipePart.VALUES);
     }
 

common/buildcraft/builders/tile/TileFiller.java

@@ -42,7 +42,7 @@
 import buildcraft.lib.misc.NBTUtilBC;
 import buildcraft.lib.misc.data.Box;
 import buildcraft.lib.misc.data.IdAllocator;
-import buildcraft.lib.mj.MjBatteryReciver;
+import buildcraft.lib.mj.MjBatteryReceiver;
 import buildcraft.lib.net.MessageManager;
 import buildcraft.lib.net.PacketBufferBC;
 import buildcraft.lib.tile.TileBC_Neptune;
@@ -93,7 +93,7 @@ public class TileFiller extends TileBC_Neptune implements ITickable, IDebuggable
     public TemplateBuilder builder = new TemplateBuilder(this);
 
     public TileFiller() {
-        caps.addProvider(new MjCapabilityHelper(new MjBatteryReciver(battery)));
+        caps.addProvider(new MjCapabilityHelper(new MjBatteryReceiver(battery)));
     }
 
     @Override

common/buildcraft/builders/tile/TileQuarry.java

@@ -73,7 +73,7 @@
 import buildcraft.lib.misc.data.Box;
 import buildcraft.lib.misc.data.BoxIterator;
 import buildcraft.lib.misc.data.EnumAxisOrder;
-import buildcraft.lib.mj.MjBatteryReciver;
+import buildcraft.lib.mj.MjBatteryReceiver;
 import buildcraft.lib.net.PacketBufferBC;
 import buildcraft.lib.tile.TileBC_Neptune;
 import buildcraft.lib.world.WorldEventListenerAdapter;
@@ -131,7 +131,7 @@ public void notifyBlockUpdate(@Nonnull World world,
     };
 
     public TileQuarry() {
-        caps.addProvider(new MjCapabilityHelper(new MjBatteryReciver(battery) {
+        caps.addProvider(new MjCapabilityHelper(new MjBatteryReceiver(battery) {
             @Override
             public long receivePower(long microJoules, boolean simulate) {
                 long excess = super.receivePower(microJoules, simulate);

common/buildcraft/core/BCCoreConfig.java

@@ -34,7 +34,7 @@ public class BCCoreConfig {
     public static boolean worldGen;
     public static boolean worldGenWaterSpring;
     public static boolean useLocalServerOnClient;
-    public static boolean minePlayerProteted;
+    public static boolean minePlayerProtected;
     public static boolean hidePower;
     public static boolean hideFluid;
     public static int markerMaxDistance;
@@ -62,7 +62,7 @@ public static void preInit(File cfgFolder) {
         objConfig = RegistryHelper.setRegistryConfig(BCCore.MODID, new File(cfgFolder, "objects.cfg"));
 
         detailedConfigManager = new FileConfigManager(
-            " The buildcraft detailed configuration file. This contains a lot of miscelaneous options that have no "
+            " The buildcraft detailed configuration file. This contains a lot of miscellaneous options that have no "
                 + "affect on gameplay.\n You should refer to the BC source code for a detailed description of what these do. (https://github.com/BuildCraft/BuildCraft)\n"
                 + " This file will be overwritten every time that buildcraft starts, so don't change anything other than the values.");
         detailedConfigManager.setConfigFile(new File(cfgFolder, "detailed.properties"));
@@ -180,7 +180,7 @@ public static void postInit() {
 
     public static void reloadConfig(EnumRestartRequirement restarted) {
         useLocalServerOnClient = propUseLocalServerOnClient.getBoolean();
-        minePlayerProteted = propMinePlayerProtected.getBoolean();
+        minePlayerProtected = propMinePlayerProtected.getBoolean();
         BCLibConfig.useColouredLabels = propUseColouredLabels.getBoolean();
         BCLibConfig.useHighContrastLabelColours = propUseHighContrastColouredLabels.getBoolean();
         hidePower = propHidePower.getBoolean();

common/buildcraft/core/BCCoreProxy.java

@@ -13,8 +13,8 @@
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import buildcraft.lib.client.render.DetatchedRenderer;
-import buildcraft.lib.client.render.DetatchedRenderer.RenderMatrixType;
+import buildcraft.lib.client.render.DetachedRenderer;
+import buildcraft.lib.client.render.DetachedRenderer.RenderMatrixType;
 
 import buildcraft.core.client.BuildCraftLaserManager;
 import buildcraft.core.client.RenderTickListener;
@@ -70,7 +70,7 @@ public void fmlPreInit() {
             BCCoreSprites.fmlPreInit();
             BCCoreModels.fmlPreInit();
             BuildCraftLaserManager.fmlPreInit();
-            DetatchedRenderer.INSTANCE.addRenderer(RenderMatrixType.FROM_WORLD_ORIGIN, RenderVolumeInWorld.INSTANCE);
+            DetachedRenderer.INSTANCE.addRenderer(RenderMatrixType.FROM_WORLD_ORIGIN, RenderVolumeInWorld.INSTANCE);
         }
 
         @Override

common/buildcraft/core/client/RenderTickListener.java

@@ -39,15 +39,14 @@
 import buildcraft.api.tiles.IDebuggable;
 
 import buildcraft.lib.BCLibProxy;
-import buildcraft.lib.client.render.DetatchedRenderer;
+import buildcraft.lib.client.render.DetachedRenderer;
 import buildcraft.lib.client.render.laser.LaserBoxRenderer;
 import buildcraft.lib.client.render.laser.LaserData_BC8;
 import buildcraft.lib.client.render.laser.LaserData_BC8.LaserType;
 import buildcraft.lib.client.render.laser.LaserRenderer_BC8;
 import buildcraft.lib.marker.MarkerCache;
 import buildcraft.lib.marker.MarkerSubCache;
 import buildcraft.lib.misc.MatrixUtil;
-import buildcraft.lib.misc.SpriteUtil;
 import buildcraft.lib.misc.StackUtil;
 import buildcraft.lib.misc.VecUtil;
 import buildcraft.lib.misc.data.Box;
@@ -202,7 +201,7 @@ private static void renderHeldItemInWorld(float partialTicks) {
         mc.mcProfiler.startSection("bc");
         mc.mcProfiler.startSection("renderWorld");
 
-        DetatchedRenderer.fromWorldOriginPre(player, partialTicks);
+        DetachedRenderer.fromWorldOriginPre(player, partialTicks);
 
         Item mainHandItem = mainHand.getItem();
         Item offHandItem = offHand.getItem();
@@ -213,7 +212,7 @@ private static void renderHeldItemInWorld(float partialTicks) {
             renderMarkerConnector(world, player);
         }
 
-        DetatchedRenderer.fromWorldOriginPost();
+        DetachedRenderer.fromWorldOriginPost();
 
         mc.mcProfiler.endSection();
         mc.mcProfiler.endSection();

common/buildcraft/core/client/render/RenderMarkerVolume.java

@@ -16,7 +16,7 @@
 import net.minecraft.util.EnumFacing.Axis;
 import net.minecraft.util.math.Vec3d;
 
-import buildcraft.lib.client.render.DetatchedRenderer;
+import buildcraft.lib.client.render.DetachedRenderer;
 import buildcraft.lib.client.render.laser.LaserData_BC8;
 import buildcraft.lib.client.render.laser.LaserData_BC8.LaserType;
 import buildcraft.lib.client.render.laser.LaserRenderer_BC8;
@@ -48,7 +48,7 @@ public void renderTileEntityAt(TileMarkerVolume marker, double tileX, double til
         Minecraft.getMinecraft().mcProfiler.startSection("marker");
         Minecraft.getMinecraft().mcProfiler.startSection("volume");
 
-        DetatchedRenderer.fromWorldOriginPre(Minecraft.getMinecraft().player, partialTicks);
+        DetachedRenderer.fromWorldOriginPre(Minecraft.getMinecraft().player, partialTicks);
         RenderHelper.disableStandardItemLighting();
         Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
 
@@ -65,7 +65,7 @@ public void renderTileEntityAt(TileMarkerVolume marker, double tileX, double til
         }
 
         RenderHelper.enableStandardItemLighting();
-        DetatchedRenderer.fromWorldOriginPost();
+        DetachedRenderer.fromWorldOriginPost();
 
         Minecraft.getMinecraft().mcProfiler.endSection();
         Minecraft.getMinecraft().mcProfiler.endSection();

common/buildcraft/core/client/render/RenderVolumeInWorld.java

@@ -23,7 +23,7 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 
-import buildcraft.lib.client.render.DetatchedRenderer;
+import buildcraft.lib.client.render.DetachedRenderer;
 import buildcraft.lib.client.render.laser.LaserData_BC8;
 import buildcraft.lib.client.render.laser.LaserData_BC8.LaserType;
 import buildcraft.lib.client.render.laser.LaserRenderer_BC8;
@@ -36,7 +36,7 @@
 import buildcraft.core.marker.volume.IFastAddonRenderer;
 import buildcraft.core.marker.volume.Lock;
 
-public enum RenderVolumeInWorld implements DetatchedRenderer.IDetachedRenderer {
+public enum RenderVolumeInWorld implements DetachedRenderer.IDetachedRenderer {
     INSTANCE;
 
     private static final double OFFSET_BY = 2 / 16.0;

common/buildcraft/core/marker/VolumeConnection.java

@@ -27,14 +27,14 @@
 public class VolumeConnection extends MarkerConnection<VolumeConnection> {
     private static final double RENDER_SCALE = 1 / 16.05;
 
-    private final Set<BlockPos> makup = new HashSet<>();
+    private final Set<BlockPos> makeup = new HashSet<>();
     private final Box box = new Box();
 
     public static boolean tryCreateConnection(VolumeSubCache subCache, BlockPos from, BlockPos to) {
         if (canCreateConnection(subCache, from, to)) {
             VolumeConnection connection = new VolumeConnection(subCache);
-            connection.makup.add(from);
-            connection.makup.add(to);
+            connection.makeup.add(from);
+            connection.makeup.add(to);
             connection.createBox();
             subCache.addConnection(connection);
             return true;
@@ -59,23 +59,23 @@ public VolumeConnection(VolumeSubCache subCache) {
 
     public VolumeConnection(VolumeSubCache subCache, Collection<BlockPos> positions) {
         super(subCache);
-        makup.addAll(positions);
+        makeup.addAll(positions);
         createBox();
     }
 
     @Override
     public void removeMarker(BlockPos pos) {
-        makup.remove(pos);
-        if (makup.size() < 2) {
+        makeup.remove(pos);
+        if (makeup.size() < 2) {
             // This connection will be removed by the sub-cache
-            makup.clear();
+            makeup.clear();
         }
         createBox();
     }
 
     public boolean addMarker(BlockPos pos) {
         if (canAddMarker(pos)) {
-            makup.add(pos);
+            makeup.add(pos);
             createBox();
             subCache.refreshConnection(this);
             return true;
@@ -85,7 +85,7 @@ public boolean addMarker(BlockPos pos) {
 
     public boolean canAddMarker(BlockPos to) {
         Set<Axis> taken = getConnectedAxis();
-        for (BlockPos from : makup) {
+        for (BlockPos from : makeup) {
             EnumFacing direct = PositionUtil.getDirectFacingOffset(from, to);
             if (direct != null && !taken.contains(direct.getAxis())) {
                 return true;
@@ -96,8 +96,8 @@ public boolean canAddMarker(BlockPos to) {
 
     public boolean mergeWith(VolumeConnection other) {
         if (canMergeWith(other)) {
-            makup.addAll(other.makup);
-            other.makup.clear();
+            makeup.addAll(other.makeup);
+            other.makeup.clear();
             createBox();
             subCache.refreshConnection(other);
             subCache.refreshConnection(this);
@@ -117,8 +117,8 @@ public boolean canMergeWith(VolumeConnection other) {
         }
         Set<Axis> blacklisted = EnumSet.copyOf(us);
         blacklisted.addAll(them);
-        for (BlockPos from : makup) {
-            for (BlockPos to : other.makup) {
+        for (BlockPos from : makeup) {
+            for (BlockPos to : other.makeup) {
                 EnumFacing offset = PositionUtil.getDirectFacingOffset(from, to);
                 if (offset != null && !blacklisted.contains(offset.getAxis())) {
                     return true;
@@ -143,12 +143,12 @@ public EnumSet<Axis> getConnectedAxis() {
 
     @Override
     public Collection<BlockPos> getMarkerPositions() {
-        return makup;
+        return makeup;
     }
 
     private void createBox() {
         box.reset();
-        for (BlockPos p : makup) {
+        for (BlockPos p : makeup) {
             box.extendToEncompass(p);
         }
     }

common/buildcraft/core/statements/StatementParameterDirection.java

@@ -31,7 +31,7 @@
 import buildcraft.lib.misc.LocaleUtil;
 import buildcraft.lib.misc.StackUtil;
 
-/** Directions *might* be replaced with indervidual triggers and actions per direction. Not sure yet. */
+/** Directions *might* be replaced with individual triggers and actions per direction. Not sure yet. */
 @Deprecated
 public class StatementParameterDirection implements IStatementParameter {
 

common/buildcraft/core/statements/TriggerRedstoneInput.java

@@ -25,7 +25,7 @@ public class TriggerRedstoneInput extends BCStatement implements ITriggerInterna
 
     public TriggerRedstoneInput(boolean active) {
         super("buildcraft:redstone.input." + (active ? "active" : "inactive"),//
-                "buildcraft.redtone.input." + (active ? "active" : "inactive"));
+                "buildcraft.redstone.input." + (active ? "active" : "inactive"));
         this.active = active;
     }