Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-23 23:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Ellpeck:7a95edfcaae11ddd2918390e1e8d830cfd7f179a
Branches Tags
Ellpeck:main
Ellpeck:1.21
Ellpeck:1.20.4
Ellpeck:1.20.1
Ellpeck:1.16
Ellpeck:clean-start
Ellpeck:1.12.2
Ellpeck:1.14-rewrite
Ellpeck:1.10.2
Ellpeck:1.11.2
Ellpeck:1.9.4
Ellpeck:1.9
Ellpeck:1.8.9
Ellpeck:1.7.10
Ellpeck:v1.3.10
Ellpeck:v1.3.9
Ellpeck:v1.3.8
Ellpeck:v1.3.7
..
compare: Ellpeck:9492973a2802b9e74dd4eff4069f45fa9ca21b25
Branches Tags
Ellpeck:main
Ellpeck:1.21
Ellpeck:1.20.4
Ellpeck:1.20.1
Ellpeck:1.16
Ellpeck:clean-start
Ellpeck:1.12.2
Ellpeck:1.14-rewrite
Ellpeck:1.10.2
Ellpeck:1.11.2
Ellpeck:1.9.4
Ellpeck:1.9
Ellpeck:1.8.9
Ellpeck:1.7.10
Ellpeck:v1.3.10
Ellpeck:v1.3.9
Ellpeck:v1.3.8
Ellpeck:v1.3.7

No commits in common. "7a95edfcaae11ddd2918390e1e8d830cfd7f179a" and "9492973a2802b9e74dd4eff4069f45fa9ca21b25" have entirely different histories.
7a95edfcaa ... 9492973a28

5 changed files with 92 additions and 85 deletions
Show stats Expand all files Collapse all files

109
src/main/java/de/ellpeck/actuallyadditions/mod/data/PlayerData.java
View file

@ -10,10 +10,15 @@
package de.ellpeck.actuallyadditions.mod.data; package de.ellpeck.actuallyadditions.mod.data;
import de.ellpeck.actuallyadditions.api.booklet.IBookletPage;
import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.StringTag;
import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@ -49,13 +54,13 @@ public final class PlayerData {
public UUID id; public UUID id;
public boolean bookGottenAlready; public boolean bookGottenAlready;
// public boolean didBookTutorial; public boolean didBookTutorial;
public boolean hasBatWings; public boolean hasBatWings;
public boolean shouldDisableBatWings; public boolean shouldDisableBatWings;
public int batWingsFlyTime; public int batWingsFlyTime;
// public IBookletPage[] bookmarks = new IBookletPage[12]; public IBookletPage[] bookmarks = new IBookletPage[12];
// public List<String> completedTrials = new ArrayList<>(); public List<String> completedTrials = new ArrayList<>();
// //
// public GuiBooklet lastOpenBooklet; // public GuiBooklet lastOpenBooklet;
@ -66,16 +71,16 @@ public final class PlayerData {
public void readFromNBT(CompoundTag compound, boolean savingToFile) { public void readFromNBT(CompoundTag compound, boolean savingToFile) {
this.bookGottenAlready = compound.getBoolean("BookGotten"); this.bookGottenAlready = compound.getBoolean("BookGotten");
// this.didBookTutorial = compound.getBoolean("DidTutorial"); this.didBookTutorial = compound.getBoolean("DidTutorial");
this.hasBatWings = compound.getBoolean("HasBatWings"); this.hasBatWings = compound.getBoolean("HasBatWings");
this.batWingsFlyTime = compound.getInt("BatWingsFlyTime"); this.batWingsFlyTime = compound.getInt("BatWingsFlyTime");
// ListTag bookmarks = compound.getList("Bookmarks", 8); ListTag bookmarks = compound.getList("Bookmarks", 8);
// this.loadBookmarks(bookmarks); this.loadBookmarks(bookmarks);
//
// ListTag trials = compound.getList("Trials", 8); ListTag trials = compound.getList("Trials", 8);
// this.loadTrials(trials); this.loadTrials(trials);
if (!savingToFile) { if (!savingToFile) {
this.shouldDisableBatWings = compound.getBoolean("ShouldDisableWings"); this.shouldDisableBatWings = compound.getBoolean("ShouldDisableWings");
@ -84,59 +89,59 @@ public final class PlayerData {
public void writeToNBT(CompoundTag compound, boolean savingToFile) { public void writeToNBT(CompoundTag compound, boolean savingToFile) {
compound.putBoolean("BookGotten", this.bookGottenAlready); compound.putBoolean("BookGotten", this.bookGottenAlready);
// compound.putBoolean("DidTutorial", this.didBookTutorial); compound.putBoolean("DidTutorial", this.didBookTutorial);
compound.putBoolean("HasBatWings", this.hasBatWings); compound.putBoolean("HasBatWings", this.hasBatWings);
compound.putInt("BatWingsFlyTime", this.batWingsFlyTime); compound.putInt("BatWingsFlyTime", this.batWingsFlyTime);
// compound.put("Bookmarks", this.saveBookmarks()); compound.put("Bookmarks", this.saveBookmarks());
// compound.put("Trials", this.saveTrials()); compound.put("Trials", this.saveTrials());
if (!savingToFile) { if (!savingToFile) {
compound.putBoolean("ShouldDisableWings", this.shouldDisableBatWings); compound.putBoolean("ShouldDisableWings", this.shouldDisableBatWings);
} }
} }
// public ListTag saveBookmarks() { public ListTag saveBookmarks() {
// ListTag bookmarks = new ListTag(); ListTag bookmarks = new ListTag();
// for (IBookletPage bookmark : this.bookmarks) { for (IBookletPage bookmark : this.bookmarks) {
// bookmarks.add(StringTag.valueOf(bookmark == null bookmarks.add(StringTag.valueOf(bookmark == null
// ? "" ? ""
// : bookmark.getIdentifier())); : bookmark.getIdentifier()));
// } }
// return bookmarks; return bookmarks;
// } }
//
// public void loadBookmarks(ListTag bookmarks) { public void loadBookmarks(ListTag bookmarks) {
// for (int i = 0; i < bookmarks.size(); i++) { for (int i = 0; i < bookmarks.size(); i++) {
// String strg = bookmarks.getString(i); String strg = bookmarks.getString(i);
// if (!strg.isEmpty()) { if (!strg.isEmpty()) {
//// IBookletPage page = BookletUtils.getBookletPageById(strg); // IBookletPage page = BookletUtils.getBookletPageById(strg);
// this.bookmarks[i] = null; // page; this.bookmarks[i] = null; // page;
// } else { } else {
// this.bookmarks[i] = null; this.bookmarks[i] = null;
// } }
// } }
// } }
//
// public ListTag saveTrials() { public ListTag saveTrials() {
// ListTag trials = new ListTag(); ListTag trials = new ListTag();
// for (String trial : this.completedTrials) { for (String trial : this.completedTrials) {
// trials.add(StringTag.valueOf(trial)); trials.add(StringTag.valueOf(trial));
// } }
// return trials; return trials;
// } }
//
// public void loadTrials(ListTag trials) { public void loadTrials(ListTag trials) {
// this.completedTrials.clear(); this.completedTrials.clear();
//
// for (int i = 0; i < trials.size(); i++) { for (int i = 0; i < trials.size(); i++) {
// String strg = trials.getString(i); String strg = trials.getString(i);
// if (!strg.isEmpty()) { if (!strg.isEmpty()) {
// this.completedTrials.add(strg); this.completedTrials.add(strg);
// } }
// } }
// } }
} }
} }

4
src/main/java/de/ellpeck/actuallyadditions/mod/gen/modifier/BoolConfigFeatureBiomeModifier.java
View file

@ -25,6 +25,8 @@ public record BoolConfigFeatureBiomeModifier(HolderSet<Biome> biomes, HolderSet<
private boolean checkConfig() { private boolean checkConfig() {
switch (boolConfig) { switch (boolConfig) {
default:
return true;
case "generateQuartz": case "generateQuartz":
return CommonConfig.Worldgen.GENERATE_QUARTZ.get(); return CommonConfig.Worldgen.GENERATE_QUARTZ.get();
case "generateCanola": case "generateCanola":
@ -33,8 +35,6 @@ public record BoolConfigFeatureBiomeModifier(HolderSet<Biome> biomes, HolderSet<
return CommonConfig.Worldgen.GENERATE_FLAX.get(); return CommonConfig.Worldgen.GENERATE_FLAX.get();
case "generateCoffee": case "generateCoffee":
return CommonConfig.Worldgen.GENERATE_COFFEE.get(); return CommonConfig.Worldgen.GENERATE_COFFEE.get();
default:
return true;
} }
} }

38
src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHelperClient.java
View file

@ -10,6 +10,8 @@
package de.ellpeck.actuallyadditions.mod.network; 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;
import de.ellpeck.actuallyadditions.mod.data.PlayerData.PlayerSave; import de.ellpeck.actuallyadditions.mod.data.PlayerData.PlayerSave;
import de.ellpeck.actuallyadditions.mod.network.packet.ButtonToTilePacket; import de.ellpeck.actuallyadditions.mod.network.packet.ButtonToTilePacket;
@ -42,24 +44,24 @@ public final class PacketHelperClient {
PlayerSave data = PlayerData.getDataFromPlayer(player); PlayerSave data = PlayerData.getDataFromPlayer(player);
// if (type == 0) { if (type == 0) {
// compound.put("Bookmarks", data.saveBookmarks()); compound.put("Bookmarks", data.saveBookmarks());
// } else if (type == 1) { } else if (type == 1) {
// compound.putBoolean("DidBookTutorial", data.didBookTutorial); compound.putBoolean("DidBookTutorial", data.didBookTutorial);
// } else if (type == 2) { } else if (type == 2) {
// compound.put("Trials", data.saveTrials()); compound.put("Trials", data.saveTrials());
//
// int total = 0; int total = 0;
// for (IBookletChapter chapter : ActuallyAdditionsAPI.entryTrials.getAllChapters()) { for (IBookletChapter chapter : ActuallyAdditionsAPI.entryTrials.getAllChapters()) {
// //if (chapter instanceof BookletChapterTrials) { //if (chapter instanceof BookletChapterTrials) {
// // total++; // total++;
// //} //}
// } }
//
// if (data.completedTrials.size() >= total) { if (data.completedTrials.size() >= total) {
// compound.putBoolean("Achievement", true); compound.putBoolean("Achievement", true);
// } }
// } }
PacketDistributor.sendToServer(new SyncPlayerPacket(compound)); PacketDistributor.sendToServer(new SyncPlayerPacket(compound));
} }

2
src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHelperServer.java
View file

@ -32,7 +32,7 @@ public final class PacketHelperServer {
CompoundTag data = new CompoundTag(); CompoundTag data = new CompoundTag();
PlayerData.getDataFromPlayer(player).writeToNBT(data, false); PlayerData.getDataFromPlayer(player).writeToNBT(data, false);
compound.put("Data", data); compound.put("Data", data);
ActuallyAdditions.LOGGER.debug("Sending data {}", data); ActuallyAdditions.LOGGER.info("Sending data {}", data);
if (player instanceof ServerPlayer serverPlayer) { if (player instanceof ServerPlayer serverPlayer) {
serverPlayer.connection.send(new SyncPlayerPacket(data)); serverPlayer.connection.send(new SyncPlayerPacket(data));

24
src/main/java/de/ellpeck/actuallyadditions/mod/network/handler/ServerPayloadHandler.java
View file

@ -121,18 +121,18 @@ public class ServerPayloadHandler {
if (player != null) { if (player != null) {
PlayerData.PlayerSave data = PlayerData.getDataFromPlayer(player); PlayerData.PlayerSave data = PlayerData.getDataFromPlayer(player);
// int type = tag.getInt("Type"); int type = tag.getInt("Type");
// if (type == 0) { if (type == 0) {
// data.loadBookmarks(tag.getList("Bookmarks", 8)); data.loadBookmarks(tag.getList("Bookmarks", 8));
// } else if (type == 1) { } else if (type == 1) {
// data.didBookTutorial = tag.getBoolean("DidBookTutorial"); data.didBookTutorial = tag.getBoolean("DidBookTutorial");
// } else if (type == 2) { } else if (type == 2) {
// data.loadTrials(tag.getList("Trials", 8)); data.loadTrials(tag.getList("Trials", 8));
//
// if (tag.getBoolean("Achievement")) { if (tag.getBoolean("Achievement")) {
// //TheAchievements.COMPLETE_TRIALS.get(player); //TheAchievements.COMPLETE_TRIALS.get(player);
// } }
// } }
WorldData.get(level).setDirty(); WorldData.get(level).setDirty();
if (tag.getBoolean("Log")) { if (tag.getBoolean("Log")) {