Skip to content

Commit 0d71d0b

Browse files
author
MrTrollNugNug(Cazsius)
committed
Revert "Ported to 1.11.2"
This reverts commit 6654836.
1 parent 6654836 commit 0d71d0b

File tree

4 files changed

+25
-21
lines changed

4 files changed

+25
-21
lines changed

.gitignore

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
*.class
2-
*.iml
1+
# eclipse
2+
bin
3+
*.launch
4+
.settings
5+
.metadata
6+
.classpath
7+
.project
8+
9+
# idea
10+
out
311
*.ipr
412
*.iws
5-
*.classpath
6-
*.project
7-
*.prefs
8-
*.launch
9-
/output
13+
*.iml
14+
.idea
15+
16+
# gradle
17+
build
18+
.gradle
1019

11-
#ForgeGradle
12-
/build
13-
/.gradle
14-
/eclipse/assets
15-
/libs
16-
/bin/
17-
/run/
18-
/out/
19-
gradle.properties
20+
# other
21+
eclipse
22+
run
2023

21-
\.idea/
24+
/README.txt
25+
/forge-*-changelog.txt

src/main/java/mmd/orespawn/EventHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void onPopulateChunk(PopulateChunkEvent event) {
4444

4545
public void generateChunk(WorldServer world, Chunk chunk) {
4646
OreSpawnData data = OreSpawnData.getData(world);
47-
NBTTagList dataList = data.chunkData.get(chunk.getChunkCoordIntPair());
47+
NBTTagList dataList = data.chunkData.get(chunk.getPos());
4848
List<String> generatedIDs = new ArrayList<>();
4949

5050
if (dataList == null) {
@@ -75,7 +75,7 @@ public void generateChunk(WorldServer world, Chunk chunk) {
7575
}
7676
}
7777

78-
data.chunkData.put(chunk.getChunkCoordIntPair(), dataList);
78+
data.chunkData.put(chunk.getPos(), dataList);
7979
data.markDirty();
8080
}
8181

src/main/java/mmd/orespawn/command/AddOreCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
105105
throw new CommandException("Failed to read the json file");
106106
}
107107

108-
player.sendStatusMessage(new TextComponentString("Added " + state.getBlock().getRegistryName().toString() + " to the json"));
108+
player.sendStatusMessage(new TextComponentString("Added " + state.getBlock().getRegistryName().toString() + " to the json"), false);
109109
}
110110

111111
private void saveFile(JsonArray array, File file) throws CommandException {

src/main/java/mmd/orespawn/command/ClearChunkCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
3131

3232
EntityPlayer player = (EntityPlayer) sender;
3333
Chunk chunk = player.getEntityWorld().getChunkFromBlockCoords(player.getPosition());
34-
ChunkPos chunkPos = chunk.getChunkCoordIntPair();
34+
ChunkPos chunkPos = chunk.getPos();
3535

3636
for (int x = chunkPos.getXStart(); x <= chunkPos.getXEnd(); x++) {
3737
for (int y = 0; y < 256; y++) {

0 commit comments

Comments
 (0)