mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-23 23:58:34 +01:00
Compare commits
No commits in common. "7a95edfcaae11ddd2918390e1e8d830cfd7f179a" and "9492973a2802b9e74dd4eff4069f45fa9ca21b25" have entirely different histories.
7a95edfcaa
...
9492973a28
5 changed files with 92 additions and 85 deletions
|
|
@ -10,10 +10,15 @@
|
|||
|
||||
package de.ellpeck.actuallyadditions.mod.data;
|
||||
|
||||
import de.ellpeck.actuallyadditions.api.booklet.IBookletPage;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.nbt.ListTag;
|
||||
import net.minecraft.nbt.StringTag;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
|
|
@ -49,13 +54,13 @@ public final class PlayerData {
|
|||
public UUID id;
|
||||
|
||||
public boolean bookGottenAlready;
|
||||
// public boolean didBookTutorial;
|
||||
public boolean didBookTutorial;
|
||||
public boolean hasBatWings;
|
||||
public boolean shouldDisableBatWings;
|
||||
public int batWingsFlyTime;
|
||||
|
||||
// public IBookletPage[] bookmarks = new IBookletPage[12];
|
||||
// public List<String> completedTrials = new ArrayList<>();
|
||||
public IBookletPage[] bookmarks = new IBookletPage[12];
|
||||
public List<String> completedTrials = new ArrayList<>();
|
||||
|
||||
//
|
||||
// public GuiBooklet lastOpenBooklet;
|
||||
|
|
@ -66,16 +71,16 @@ public final class PlayerData {
|
|||
|
||||
public void readFromNBT(CompoundTag compound, boolean savingToFile) {
|
||||
this.bookGottenAlready = compound.getBoolean("BookGotten");
|
||||
// this.didBookTutorial = compound.getBoolean("DidTutorial");
|
||||
this.didBookTutorial = compound.getBoolean("DidTutorial");
|
||||
|
||||
this.hasBatWings = compound.getBoolean("HasBatWings");
|
||||
this.batWingsFlyTime = compound.getInt("BatWingsFlyTime");
|
||||
|
||||
// ListTag bookmarks = compound.getList("Bookmarks", 8);
|
||||
// this.loadBookmarks(bookmarks);
|
||||
//
|
||||
// ListTag trials = compound.getList("Trials", 8);
|
||||
// this.loadTrials(trials);
|
||||
ListTag bookmarks = compound.getList("Bookmarks", 8);
|
||||
this.loadBookmarks(bookmarks);
|
||||
|
||||
ListTag trials = compound.getList("Trials", 8);
|
||||
this.loadTrials(trials);
|
||||
|
||||
if (!savingToFile) {
|
||||
this.shouldDisableBatWings = compound.getBoolean("ShouldDisableWings");
|
||||
|
|
@ -84,59 +89,59 @@ public final class PlayerData {
|
|||
|
||||
public void writeToNBT(CompoundTag compound, boolean savingToFile) {
|
||||
compound.putBoolean("BookGotten", this.bookGottenAlready);
|
||||
// compound.putBoolean("DidTutorial", this.didBookTutorial);
|
||||
compound.putBoolean("DidTutorial", this.didBookTutorial);
|
||||
|
||||
compound.putBoolean("HasBatWings", this.hasBatWings);
|
||||
compound.putInt("BatWingsFlyTime", this.batWingsFlyTime);
|
||||
|
||||
// compound.put("Bookmarks", this.saveBookmarks());
|
||||
// compound.put("Trials", this.saveTrials());
|
||||
compound.put("Bookmarks", this.saveBookmarks());
|
||||
compound.put("Trials", this.saveTrials());
|
||||
|
||||
if (!savingToFile) {
|
||||
compound.putBoolean("ShouldDisableWings", this.shouldDisableBatWings);
|
||||
}
|
||||
}
|
||||
|
||||
// public ListTag saveBookmarks() {
|
||||
// ListTag bookmarks = new ListTag();
|
||||
// for (IBookletPage bookmark : this.bookmarks) {
|
||||
// bookmarks.add(StringTag.valueOf(bookmark == null
|
||||
// ? ""
|
||||
// : bookmark.getIdentifier()));
|
||||
// }
|
||||
// return bookmarks;
|
||||
// }
|
||||
//
|
||||
// public void loadBookmarks(ListTag bookmarks) {
|
||||
// for (int i = 0; i < bookmarks.size(); i++) {
|
||||
// String strg = bookmarks.getString(i);
|
||||
// if (!strg.isEmpty()) {
|
||||
//// IBookletPage page = BookletUtils.getBookletPageById(strg);
|
||||
// this.bookmarks[i] = null; // page;
|
||||
// } else {
|
||||
// this.bookmarks[i] = null;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// public ListTag saveTrials() {
|
||||
// ListTag trials = new ListTag();
|
||||
// for (String trial : this.completedTrials) {
|
||||
// trials.add(StringTag.valueOf(trial));
|
||||
// }
|
||||
// return trials;
|
||||
// }
|
||||
//
|
||||
// public void loadTrials(ListTag trials) {
|
||||
// this.completedTrials.clear();
|
||||
//
|
||||
// for (int i = 0; i < trials.size(); i++) {
|
||||
// String strg = trials.getString(i);
|
||||
// if (!strg.isEmpty()) {
|
||||
// this.completedTrials.add(strg);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
public ListTag saveBookmarks() {
|
||||
ListTag bookmarks = new ListTag();
|
||||
for (IBookletPage bookmark : this.bookmarks) {
|
||||
bookmarks.add(StringTag.valueOf(bookmark == null
|
||||
? ""
|
||||
: bookmark.getIdentifier()));
|
||||
}
|
||||
return bookmarks;
|
||||
}
|
||||
|
||||
public void loadBookmarks(ListTag bookmarks) {
|
||||
for (int i = 0; i < bookmarks.size(); i++) {
|
||||
String strg = bookmarks.getString(i);
|
||||
if (!strg.isEmpty()) {
|
||||
// IBookletPage page = BookletUtils.getBookletPageById(strg);
|
||||
this.bookmarks[i] = null; // page;
|
||||
} else {
|
||||
this.bookmarks[i] = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public ListTag saveTrials() {
|
||||
ListTag trials = new ListTag();
|
||||
for (String trial : this.completedTrials) {
|
||||
trials.add(StringTag.valueOf(trial));
|
||||
}
|
||||
return trials;
|
||||
}
|
||||
|
||||
public void loadTrials(ListTag trials) {
|
||||
this.completedTrials.clear();
|
||||
|
||||
for (int i = 0; i < trials.size(); i++) {
|
||||
String strg = trials.getString(i);
|
||||
if (!strg.isEmpty()) {
|
||||
this.completedTrials.add(strg);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@ public record BoolConfigFeatureBiomeModifier(HolderSet<Biome> biomes, HolderSet<
|
|||
|
||||
private boolean checkConfig() {
|
||||
switch (boolConfig) {
|
||||
default:
|
||||
return true;
|
||||
case "generateQuartz":
|
||||
return CommonConfig.Worldgen.GENERATE_QUARTZ.get();
|
||||
case "generateCanola":
|
||||
|
|
@ -33,8 +35,6 @@ public record BoolConfigFeatureBiomeModifier(HolderSet<Biome> biomes, HolderSet<
|
|||
return CommonConfig.Worldgen.GENERATE_FLAX.get();
|
||||
case "generateCoffee":
|
||||
return CommonConfig.Worldgen.GENERATE_COFFEE.get();
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@
|
|||
|
||||
package de.ellpeck.actuallyadditions.mod.network;
|
||||
|
||||
import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
|
||||
import de.ellpeck.actuallyadditions.api.booklet.IBookletChapter;
|
||||
import de.ellpeck.actuallyadditions.mod.data.PlayerData;
|
||||
import de.ellpeck.actuallyadditions.mod.data.PlayerData.PlayerSave;
|
||||
import de.ellpeck.actuallyadditions.mod.network.packet.ButtonToTilePacket;
|
||||
|
|
@ -42,24 +44,24 @@ public final class PacketHelperClient {
|
|||
|
||||
PlayerSave data = PlayerData.getDataFromPlayer(player);
|
||||
|
||||
// if (type == 0) {
|
||||
// compound.put("Bookmarks", data.saveBookmarks());
|
||||
// } else if (type == 1) {
|
||||
// compound.putBoolean("DidBookTutorial", data.didBookTutorial);
|
||||
// } else if (type == 2) {
|
||||
// compound.put("Trials", data.saveTrials());
|
||||
//
|
||||
// int total = 0;
|
||||
// for (IBookletChapter chapter : ActuallyAdditionsAPI.entryTrials.getAllChapters()) {
|
||||
// //if (chapter instanceof BookletChapterTrials) {
|
||||
// // total++;
|
||||
// //}
|
||||
// }
|
||||
//
|
||||
// if (data.completedTrials.size() >= total) {
|
||||
// compound.putBoolean("Achievement", true);
|
||||
// }
|
||||
// }
|
||||
if (type == 0) {
|
||||
compound.put("Bookmarks", data.saveBookmarks());
|
||||
} else if (type == 1) {
|
||||
compound.putBoolean("DidBookTutorial", data.didBookTutorial);
|
||||
} else if (type == 2) {
|
||||
compound.put("Trials", data.saveTrials());
|
||||
|
||||
int total = 0;
|
||||
for (IBookletChapter chapter : ActuallyAdditionsAPI.entryTrials.getAllChapters()) {
|
||||
//if (chapter instanceof BookletChapterTrials) {
|
||||
// total++;
|
||||
//}
|
||||
}
|
||||
|
||||
if (data.completedTrials.size() >= total) {
|
||||
compound.putBoolean("Achievement", true);
|
||||
}
|
||||
}
|
||||
|
||||
PacketDistributor.sendToServer(new SyncPlayerPacket(compound));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ public final class PacketHelperServer {
|
|||
CompoundTag data = new CompoundTag();
|
||||
PlayerData.getDataFromPlayer(player).writeToNBT(data, false);
|
||||
compound.put("Data", data);
|
||||
ActuallyAdditions.LOGGER.debug("Sending data {}", data);
|
||||
ActuallyAdditions.LOGGER.info("Sending data {}", data);
|
||||
|
||||
if (player instanceof ServerPlayer serverPlayer) {
|
||||
serverPlayer.connection.send(new SyncPlayerPacket(data));
|
||||
|
|
|
|||
|
|
@ -121,18 +121,18 @@ public class ServerPayloadHandler {
|
|||
if (player != null) {
|
||||
PlayerData.PlayerSave data = PlayerData.getDataFromPlayer(player);
|
||||
|
||||
// int type = tag.getInt("Type");
|
||||
// if (type == 0) {
|
||||
// data.loadBookmarks(tag.getList("Bookmarks", 8));
|
||||
// } else if (type == 1) {
|
||||
// data.didBookTutorial = tag.getBoolean("DidBookTutorial");
|
||||
// } else if (type == 2) {
|
||||
// data.loadTrials(tag.getList("Trials", 8));
|
||||
//
|
||||
// if (tag.getBoolean("Achievement")) {
|
||||
// //TheAchievements.COMPLETE_TRIALS.get(player);
|
||||
// }
|
||||
// }
|
||||
int type = tag.getInt("Type");
|
||||
if (type == 0) {
|
||||
data.loadBookmarks(tag.getList("Bookmarks", 8));
|
||||
} else if (type == 1) {
|
||||
data.didBookTutorial = tag.getBoolean("DidBookTutorial");
|
||||
} else if (type == 2) {
|
||||
data.loadTrials(tag.getList("Trials", 8));
|
||||
|
||||
if (tag.getBoolean("Achievement")) {
|
||||
//TheAchievements.COMPLETE_TRIALS.get(player);
|
||||
}
|
||||
}
|
||||
WorldData.get(level).setDirty();
|
||||
|
||||
if (tag.getBoolean("Log")) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue