Skip to content

Commit

Permalink
fix:重生后jrrp数据丢失
Browse files Browse the repository at this point in the history
  • Loading branch information
lyuxc-unknow committed Apr 26, 2024
1 parent c462ef7 commit 8f5b865
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 119 deletions.
40 changes: 0 additions & 40 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,59 +1,19 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false


## Environment Properties

# The Minecraft version must agree with the Forge version to get a valid artifact
minecraft_version=1.20.4
# The Minecraft version range can use any release version of Minecraft as bounds.
# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
# as they do not follow standard versioning conventions.
minecraft_version_range=[1.20.4,1.21)
# The Forge version must agree with the Minecraft version to get a valid artifact
forge_version=49.0.22
# The Forge version range can use any version of Forge as bounds or match the loader version range
forge_version_range=[0,)
# The loader version range can only use the major version of Forge/FML as bounds
loader_version_range=[0,)
# The mapping channel to use for mappings.
# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
#
# | Channel | Version | |
# |-----------|----------------------|--------------------------------------------------------------------------------|
# | official | MCVersion | Official field/method names from Mojang mapping files |
# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official |
#
# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
#
# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge.
# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started
mapping_channel=official
# The mapping version to query from the mapping channel.
# This must match the format required by the mapping channel.
mapping_version=1.20.4


## Mod Properties

# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
# Must match the String constant located in the main mod class annotated with @Mod.
mod_id=jrrp
# The human-readable display name for the mod.
mod_name=Jrrp
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
mod_license=MIT
# The mod version. See https://semver.org/
mod_version=1.0.0-Forge
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
# This should match the base package used for the mod sources.
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
mod_group_id=mod.lyuxc
# The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
mod_authors=lyuxc
# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
mod_description=Jrrp in Minecraft
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
48 changes: 32 additions & 16 deletions src/main/java/mod/lyuxc/Jrrp.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

import java.util.Calendar;
import java.util.List;
import java.util.Objects;

@Mod("jrrp")
@Mod.EventBusSubscriber
Expand All @@ -28,6 +27,8 @@ public class Jrrp {
private static final Calendar CALENDAR = Calendar.getInstance();
private static final String DAY_OF_YEAR = String.valueOf(CALENDAR.get(Calendar.DAY_OF_YEAR));
private static final RandomSource RANDOM_SOURCE = RandomSource.create();
private static String jrrpValueBackup;
private static String jrrpLastTimeValueBackup;

public Jrrp() {
ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder();
Expand All @@ -49,26 +50,41 @@ public static void PlayerLogging(PlayerEvent.PlayerLoggedInEvent event) {
if(ON_LOGGING_TIP.get()) JrrpEvent((ServerPlayer) event.getEntity());
}

@SubscribeEvent
public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) {
if(!event.getEntity().level().isClientSide()) {
event.getEntity().getPersistentData().putString("jrrp",jrrpValueBackup);
event.getEntity().getPersistentData().putString("jrrpLastTime",jrrpLastTimeValueBackup);
}
}

public static int JrrpEvent(ServerPlayer player) {
CompoundTag compoundTag = player.getPersistentData();
if ((compoundTag.get("jrrpLaseTime") == null || compoundTag.get("jrrp") == null) || (!Objects.requireNonNull(compoundTag.get("jrrpLaseTime")).getAsString().equals(DAY_OF_YEAR))) {
player.getPersistentData().putString("jrrpLaseTime", DAY_OF_YEAR);
player.getPersistentData().putString("jrrp", String.valueOf(RANDOM_SOURCE.nextInt(101)));
compoundTag.putString("jrrpLaseTime", DAY_OF_YEAR);
compoundTag.putString("jrrp", String.valueOf(RANDOM_SOURCE.nextInt(101)));
player.save(compoundTag);
CompoundTag persistentData = player.getPersistentData();
String jrrpLastTime = persistentData.getString("jrrpLastTime");
String jrrp = persistentData.getString("jrrp");

if (!jrrpLastTime.equals(DAY_OF_YEAR)) {
persistentData.putString("jrrpLastTime", DAY_OF_YEAR);
jrrp = String.valueOf(RANDOM_SOURCE.nextInt(101));
persistentData.putString("jrrp", jrrp);
}
int jrrpValue = Integer.parseInt(Objects.requireNonNull(compoundTag.get("jrrp")).getAsString());
String tipsText;

int jrrpValue = Integer.parseInt(jrrp);
jrrpValueBackup = jrrp;
jrrpLastTimeValueBackup = jrrpLastTime;

List<? extends String> promptWords;
if (jrrpValue < 50) {
tipsText = tip.get().replace("$w",PROMPT_WORD_LOW.get().get(RANDOM_SOURCE.nextInt(PROMPT_WORD_LOW.get().size())));
} else if(jrrpValue < 90) {
tipsText = tip.get().replace("$w",PROMPT_WORD_HIGH.get().get(RANDOM_SOURCE.nextInt(PROMPT_WORD_HIGH.get().size())));
promptWords = PROMPT_WORD_LOW.get();
} else if (jrrpValue < 90) {
promptWords = PROMPT_WORD_HIGH.get();
} else {
tipsText = tip.get().replace("$w",PROMPT_WORD_HIGHEST.get().get(RANDOM_SOURCE.nextInt(PROMPT_WORD_HIGHEST.get().size())));
promptWords = PROMPT_WORD_HIGHEST.get();
}
tipsText = tipsText.replace("$v",String.valueOf(jrrpValue));
player.sendSystemMessage(Component.literal(tipsText));

String tipsText = tip.get().replace("$w", promptWords.get(RANDOM_SOURCE.nextInt(promptWords.size())));
tipsText = tipsText.replace("$v", String.valueOf(jrrpValue));
player.displayClientMessage(Component.literal(tipsText), false);
return 0;
}
}
73 changes: 11 additions & 62 deletions src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,73 +1,22 @@
# This is an example mods.toml file. It contains the data relating to the loading mods.
# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
# The overall format is standard TOML format, v0.5.0.
# Note that there are a couple of TOML lists in this file.
# Find more information on toml format here: https://github.com/toml-lang/toml
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
modLoader="javafml" #mandatory
# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
loaderVersion="${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
modLoader="javafml"
loaderVersion="${loader_version_range}"
license="${mod_license}"
# A URL to refer people to when problems occur with this mod
#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
# If your mod is purely client-side and has no multiplayer functionality (be it dedicated servers or Open to LAN),
# set this to true, and Forge will set the correct displayTest for you and skip loading your mod on dedicated servers.
#clientSideOnly=true #optional - defaults to false if absent
# A list of mods - how many allowed here is determined by the individual mod loader
[[mods]] #mandatory
# The modid of the mod
modId="${mod_id}" #mandatory
# The version number of the mod
version="${mod_version}" #mandatory
# A display name for the mod
displayName="${mod_name}" #mandatory
# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/
#updateJSONURL="https://change.me.example.invalid/updates.json" #optional
# A URL for the "homepage" for this mod, displayed in the mod UI
#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional
# A file name (in the root of the mod JAR) containing a logo for display
#logoFile="examplemod.png" #optional
# A text field displayed in the mod UI
#credits="" #optional
# A text field displayed in the mod UI
authors="${mod_authors}" #optional
# Display Test controls the display for your mod in the server connection screen
# MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod.
# IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod.
# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component.
# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value.
# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself.
#displayTest="MATCH_VERSION" # if nothing is specified, MATCH_VERSION is the default when clientSideOnly=false, otherwise IGNORE_ALL_VERSION when clientSideOnly=true (#optional)

# The description text for the mod (multi line!) (#mandatory)
[[mods]]
modId="${mod_id}"
version="${mod_version}"
displayName="${mod_name}"
authors="${mod_authors}"
description='''${mod_description}'''
# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
[[dependencies.${mod_id}]] #optional
# the modid of the dependency
modId="forge" #mandatory
# Does this dependency have to exist - if not, ordering below must be specified
mandatory=true #mandatory
# The version range of the dependency
versionRange="${forge_version_range}" #mandatory
# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory
# BEFORE - This mod is loaded BEFORE the dependency
# AFTER - This mod is loaded AFTER the dependency
[[dependencies.${mod_id}]]
modId="forge"
mandatory=true
versionRange="${forge_version_range}"
ordering="NONE"
# Side this dependency is applied on - BOTH, CLIENT, or SERVER
side="BOTH"
# Here's another dependency
[[dependencies.${mod_id}]]
modId="minecraft"
mandatory=true
# This version range declares a minimum of the current minecraft version up to but not including the next major version
versionRange="${minecraft_version_range}"
ordering="NONE"
side="BOTH"

# Features are specific properties of the game environment, that you may want to declare you require. This example declares
# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't
# stop your mod loading on the server for example.
#[features.${mod_id}]
#openGLVersion="[3.2,)"

0 comments on commit 8f5b865

Please sign in to comment.