-
Notifications
You must be signed in to change notification settings - Fork 112
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #83 from DevotedMC/master
Merging up to v4.0.9
- Loading branch information
Showing
17 changed files
with
337 additions
and
223 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
src/main/java/com/lishid/orebfuscator/internal/BlockCoord.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package com.lishid.orebfuscator.internal; | ||
|
|
||
| public class BlockCoord { | ||
| public int x; | ||
| public int y; | ||
| public int z; | ||
|
|
||
| public BlockCoord(int x, int y, int z) { | ||
| this.x = x; | ||
| this.y = y; | ||
| this.z = z; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object other) { | ||
| if (other == null || !(other instanceof BlockCoord)) { | ||
| return false; | ||
| } | ||
|
|
||
| BlockCoord object = (BlockCoord) other; | ||
|
|
||
| return this.x == object.x && this.y == object.y && this.z == object.z; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return this.x ^ this.y ^ this.z; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return this.x + " " + this.y + " " + this.z; | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
src/main/java/com/lishid/orebfuscator/internal/BlockInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package com.lishid.orebfuscator.internal; | ||
|
|
||
| import net.minecraft.server.v1_9_R1.Block; | ||
| import net.minecraft.server.v1_9_R1.IBlockData; | ||
|
|
||
| public class BlockInfo { | ||
| public int x; | ||
| public int y; | ||
| public int z; | ||
| public IBlockData blockData; | ||
|
|
||
| public int getTypeId() { | ||
| return Block.getId(this.blockData.getBlock()); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object other) { | ||
| if (other == null || !(other instanceof BlockInfo)) { | ||
| return false; | ||
| } | ||
|
|
||
| BlockInfo object = (BlockInfo) other; | ||
|
|
||
| return this.x == object.x && this.y == object.y && this.z == object.z; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return this.x ^ this.y ^ this.z; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return this.x + " " + this.y + " " + this.z; | ||
| } | ||
| } |
33 changes: 33 additions & 0 deletions
33
src/main/java/com/lishid/orebfuscator/internal/ChunkCoord.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package com.lishid.orebfuscator.internal; | ||
|
|
||
|
|
||
| public class ChunkCoord { | ||
| public int x; | ||
| public int z; | ||
|
|
||
| public ChunkCoord(int x, int z) { | ||
| this.x = x; | ||
| this.z = z; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object other) { | ||
| if (other == null || !(other instanceof ChunkCoord)) { | ||
| return false; | ||
| } | ||
|
|
||
| ChunkCoord object = (ChunkCoord) other; | ||
|
|
||
| return this.x == object.x && this.z == object.z; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return this.x ^ this.z; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return this.x + " " + this.z; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.