aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorWalker Selby <git@walkerselby.com>2023-01-22 21:21:20 -0800
committerWalker Selby <git@walkerselby.com>2023-01-22 21:21:20 -0800
commitb6494f93b773d9cc7a3bffff9a9a1abb10697051 (patch)
tree3d9073a48607864394cde3607087595b57e3d7d5 /mod
parent3759e885f2b737fec82c1dffbf2f51ea94a59f99 (diff)
downloadSkyblock-Dungeons-Guide-b6494f93b773d9cc7a3bffff9a9a1abb10697051.tar.gz
Skyblock-Dungeons-Guide-b6494f93b773d9cc7a3bffff9a9a1abb10697051.tar.bz2
Skyblock-Dungeons-Guide-b6494f93b773d9cc7a3bffff9a9a1abb10697051.zip
Fix typos, grammar, and article agreement
Adjust variable capitalization to match camelCase
Diffstat (limited to 'mod')
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/actions/ActionBreakWithSuperBoom.java6
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/DungeonDoor.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/CatacombsDataProvider.java4
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/MasterModeDataProvider.java2
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/NormalModeDataProvider.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/events/DungeonEventRecorder.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/DungeonMapConstantRetreiver.java9
7 files changed, 16 insertions, 19 deletions
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/actions/ActionBreakWithSuperBoom.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/actions/ActionBreakWithSuperBoom.java
index 23b348a1..84c3ce1c 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/actions/ActionBreakWithSuperBoom.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/actions/ActionBreakWithSuperBoom.java
@@ -80,13 +80,13 @@ public class ActionBreakWithSuperBoom extends AbstractAction {
GlStateManager.enableBlend();
Tessellator tessellator = Tessellator.getInstance();
- WorldRenderer vertexbuffer = tessellator.getWorldRenderer();
- vertexbuffer.begin(7, DefaultVertexFormats.BLOCK);
+ WorldRenderer vertexBuffer = tessellator.getWorldRenderer();
+ vertexBuffer.begin(7, DefaultVertexFormats.BLOCK);
BlockRendererDispatcher blockrendererdispatcher = Minecraft.getMinecraft().getBlockRendererDispatcher();
blockrendererdispatcher.getBlockModelRenderer().renderModel(Minecraft.getMinecraft().theWorld,
blockrendererdispatcher.getBlockModelShapes().getModelForState(Blocks.tnt.getDefaultState()),
- Blocks.tnt.getDefaultState(), blockpos, vertexbuffer, false);
+ Blocks.tnt.getDefaultState(), blockpos, vertexBuffer, false);
tessellator.draw();
GlStateManager.enableLighting();
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/DungeonDoor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/DungeonDoor.java
index 502d21a8..00469a47 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/DungeonDoor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/DungeonDoor.java
@@ -39,9 +39,9 @@ public class DungeonDoor {
public DungeonDoor(World world, BlockPos pos, EDungeonDoorType type) {
this.w = world;
this.position = pos;
- Block itshouldbeall = world.getChunkFromBlockCoords(pos).getBlock(pos);
+ Block itShouldBeAll = world.getChunkFromBlockCoords(pos).getBlock(pos);
- if (type == EDungeonDoorType.WITHER && itshouldbeall == Blocks.air) type = EDungeonDoorType.WITHER_FAIRY;
+ if (type == EDungeonDoorType.WITHER && itShouldBeAll == Blocks.air) type = EDungeonDoorType.WITHER_FAIRY;
this.type = type;
boolean exist = type.isExist();
@@ -50,7 +50,7 @@ public class DungeonDoor {
for (int z = -1; z<=1; z++) {
BlockPos pos2 = pos.add(x,y,z);
Block block = world.getChunkFromBlockCoords(pos2).getBlock(pos2);
- if (itshouldbeall != block) exist = false;
+ if (itShouldBeAll != block) exist = false;
}
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/CatacombsDataProvider.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/CatacombsDataProvider.java
index 7730cd55..0003cd7e 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/CatacombsDataProvider.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/CatacombsDataProvider.java
@@ -55,12 +55,12 @@ public abstract class CatacombsDataProvider implements DungeonSpecificDataProvid
}
/**
- * This gets all morts checks for iron bars near him
+ * This gets all Mort's checks for iron bars near him
* and based on iron bars determine the door location
*
* @param w World that we are going to look for the door in
* world is explicitly specified instead of mc.theWorld bc we can use cached worlds
- * @param dungeonName dungeon type eg master mode, currently unused
+ * @param dungeonName dungeon type e.g. master mode, currently unused
* @return Block pos of the dungeon entrance
*/
public BlockPos findDoor(World w, String dungeonName) {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/MasterModeDataProvider.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/MasterModeDataProvider.java
index ab3f5df3..7cb217ce 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/MasterModeDataProvider.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/MasterModeDataProvider.java
@@ -31,7 +31,7 @@ public class MasterModeDataProvider extends CatacombsDataProvider {
@Override
public BossfightProcessor createBossfightProcessor(World w, String dungeonName) {
String floor = dungeonName.substring(14).trim();
- ChatTransmitter.sendDebugChat(new ChatComponentText("Floor: Master mode "+floor+ " Building bossfight processor"));
+ ChatTransmitter.sendDebugChat(new ChatComponentText("Floor: Master mode " +floor+ " Building boss fight processor"));
if (floor.equals("M5")) {
return new BossfightProcessorLivid(true);
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/NormalModeDataProvider.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/NormalModeDataProvider.java
index 880cf473..563239ed 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/NormalModeDataProvider.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/doorfinder/catacombs/impl/NormalModeDataProvider.java
@@ -30,7 +30,7 @@ public class NormalModeDataProvider extends CatacombsDataProvider {
@Override
public BossfightProcessor createBossfightProcessor(World w, String dungeonName) {
String floor = dungeonName.substring(14).trim();
- ChatTransmitter.sendDebugChat(new ChatComponentText("Floor: "+floor+ " Building bossfight processor"));
+ ChatTransmitter.sendDebugChat(new ChatComponentText("Floor: " +floor+ " Building boss fight processor"));
switch (floor) {
case "F1":
return new BossfightProcessorBonzo();
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/events/DungeonEventRecorder.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/events/DungeonEventRecorder.java
index ff3061e5..f1718585 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/events/DungeonEventRecorder.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/events/DungeonEventRecorder.java
@@ -46,9 +46,9 @@ public class DungeonEventRecorder {
createEvent(new DungeonSecretCountChangeEvent(latestSecretCnt, latestSecretCnt, latestTotalSecret, FeatureRegistry.DUNGEON_SECRETS.sureOfTotalSecrets()));
}
if (latestCrypts != FeatureRegistry.DUNGEON_TOMBS.getTombsFound()) {
- int newlatestCrypts = FeatureRegistry.DUNGEON_TOMBS.getTombsFound();
- createEvent(new DungeonCryptBrokenEvent(latestCrypts, newlatestCrypts));
- this.latestCrypts = newlatestCrypts;
+ int newLatestCrypts = FeatureRegistry.DUNGEON_TOMBS.getTombsFound();
+ createEvent(new DungeonCryptBrokenEvent(latestCrypts, newLatestCrypts));
+ this.latestCrypts = newLatestCrypts;
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/DungeonMapConstantRetreiver.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/DungeonMapConstantRetreiver.java
index 34e12e05..4df16ca9 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/DungeonMapConstantRetreiver.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/DungeonMapConstantRetreiver.java
@@ -20,12 +20,9 @@ package kr.syeyoung.dungeonsguide.mod.dungeon.map;
import com.google.common.collect.Sets;
import kr.syeyoung.dungeonsguide.mod.chat.ChatTransmitter;
-import kr.syeyoung.dungeonsguide.mod.dungeon.events.impl.DungeonNodataEvent;
-import kr.syeyoung.dungeonsguide.mod.events.impl.DungeonContextInitializationEvent;
import kr.syeyoung.dungeonsguide.mod.utils.MapUtils;
import net.minecraft.util.BlockPos;
import net.minecraft.util.ChatComponentText;
-import net.minecraftforge.common.MinecraftForge;
import javax.vecmath.Vector2d;
import java.awt.*;
@@ -74,7 +71,7 @@ public class DungeonMapConstantRetreiver {
Vector2d mapDoorOffset,
Vector2d worldDoorOffset, BlockPos worldDoor) {
Point unitPoint = mapPointToRoomPoint(firstRoom.getLocation(), topLeftMapPoint, firstRoom.getSize(), doorDimension);
- unitPoint.translate(unitPoint.x + 1, unitPoint.y + 1); // basically we make each room 2x2 large in this coordinate, and get the center coord
+ unitPoint.translate(unitPoint.x + 1, unitPoint.y + 1); // basically, we make each room 2x2 large in this coordinate and get the center coord
unitPoint.translate((int) mapDoorOffset.x, (int) mapDoorOffset.y);
if (!worldDoorOffset.equals(mapDoorOffset))
@@ -124,10 +121,10 @@ public class DungeonMapConstantRetreiver {
private static Vector2d obtainStartingRoomToFirstRoomDoorDirection(byte[] mapData, Rectangle firstRoom) {
Vector2d doorDir = null;
- Point midfirstRoom = new Point(firstRoom.x + firstRoom.width / 2, firstRoom.y + firstRoom.height / 2);
+ Point midFirstRoom = new Point(firstRoom.x + firstRoom.width / 2, firstRoom.y + firstRoom.height / 2);
final int halfWidth = firstRoom.width / 2 + 2;
for (Vector2d v : directions) {
- byte color = MapUtils.getMapColorAt(mapData, (int) (v.x * halfWidth + midfirstRoom.x), (int) (v.y * halfWidth + midfirstRoom.y));
+ byte color = MapUtils.getMapColorAt(mapData, (int) (v.x * halfWidth + midFirstRoom.x), (int) (v.y * halfWidth + midFirstRoom.y));
if (color != 0) {
doorDir = v;
break;