Compare commits
18
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
14980c993f | ||
|
|
e17433f28f | ||
|
|
0833d4e44f | ||
|
|
07b2eba5c5 | ||
|
|
0f95a5cfc7 | ||
|
|
028d63b64a | ||
|
|
61ba842206 | ||
|
|
0476a74d43 | ||
|
|
d5fe55ddcc | ||
|
|
4a9f50e488 | ||
|
|
b9aabae914 | ||
|
|
b121606b4e | ||
|
|
7ee1e5f094 | ||
|
|
91b4def490 | ||
|
|
122ff939aa | ||
|
|
3fef2d5437 | ||
|
|
75ddc5b682 | ||
|
|
bf09bdfa78 |
+1
-1
@@ -34,7 +34,7 @@ Ambiance possède les trois payloads historiques canaplia:hemp_visual_sync, cana
|
||||
|
||||
Les monstres tués par un joueur peuvent laisser une `canaplia:codex_page` et, très rarement, le `canaplia:codex` complet. Quatre pages récupérées permettent aussi d'assembler le Livre interdit autour d'un livre vanilla. Un clic droit sur une page découvre au hasard une entrée encore inconnue et ne consomme la page qu'en cas de nouvelle découverte.
|
||||
|
||||
L'ID historique `canaplia:codex` est conservé, mais l'objet s'affiche désormais comme le « Livre interdit » : il utilise la couleur du livre enchanté, ouvre directement les seize entrées et les présente sur des pages noires. En main, son contenu est strictement personnel. Posé sur un pupitre, il est temporairement inscrit au nom du joueur qui le pose et partage ses découvertes avec tous les lecteurs ; le récupérer en s'accroupissant ou casser le pupitre efface cette inscription.
|
||||
L'ID historique `canaplia:codex` est conservé, mais l'objet s'affiche désormais comme le « Livre interdit » : il utilise la couleur du livre enchanté, ouvre directement les seize entrées et les présente sur les pages claires du livre vanilla. En main, son contenu est strictement personnel. Posé sur un pupitre, il est temporairement inscrit au nom du joueur qui le pose et partage ses découvertes avec tous les lecteurs ; le récupérer en s'accroupissant ou casser le pupitre efface cette inscription.
|
||||
|
||||
Les données `canaplia:codex` restent en version 1. Les clés futures syntaxiquement valides et l'ancien champ partagé restent conservés lors d'un aller-retour afin qu'une migration ne perde aucune découverte, mais les nouvelles découvertes ne sont plus publiées globalement. Aucun payload de découverte n'est accepté du client vers le serveur et le protocole It's Alive reste en version 4.
|
||||
|
||||
|
||||
@@ -6,6 +6,27 @@ Ce journal suit les **versions du modpack**. Lorsqu'un seul module change, sa ve
|
||||
- Depuis `26.2.0-alpha.6`, le pack et les modules ont des versions indépendantes. I Like To Move It et Only Fun deviennent les cinquième et sixième modules actifs dans l'alpha 46.
|
||||
- Les versions ci-dessous ont été reconstituées à partir des JAR archivés, des packs locaux et du code source actuel. Les dates n'étant pas enregistrées de manière fiable, elles ne sont pas inventées.
|
||||
|
||||
## Non distribué
|
||||
|
||||
Modules modifiés : **It's Alive `0.0.0-alpha.36`**, **Sanctuary `0.0.0-alpha.119`**, **Ambiance `0.0.0-alpha.15`**, **Only Fun `0.0.0-alpha.24`** et **Ouch `0.0.0-alpha.10`**. Le pack distribué reste en `26.2.0-alpha.210` jusqu’à la prochaine release.
|
||||
|
||||
- remplace les pages noires du Livre interdit par l’affichage clair du livre vanilla ;
|
||||
- conserve les seize entrées, les découvertes personnelles, le partage sur pupitre, les IDs, les données v3 et le protocole réseau 4.
|
||||
- rétablit l'accès au Black Market par clic molette sur un panneau, avec une intention vide et une nouvelle validation complète de la cible côté serveur ;
|
||||
- conserve les données Sanctuary v11 et porte son protocole réseau de 21 à 22, sans nouvel ID persistant.
|
||||
- ajoute le disque blanc, à fabriquer puis renommer avec une URL YouTube HTTPS avant de l’insérer dans un jukebox ;
|
||||
- valide strictement l’hôte et l’identifiant vidéo côté serveur, ne transmet qu’un identifiant borné de onze caractères et limite chaque client à quatre lectures de trente minutes maximum ;
|
||||
- diffuse le son en mono positionnel dans le canal des disques, sans nouvelle donnée persistante ; Ambiance conserve ses données v2 et passe son protocole réseau de 5 à 6.
|
||||
- importe le cœur GPL historique d’Abjection dans Only Fun, sans onzième JAR : `/piss`, `/vomit`, `/shit` et `/smoke` retrouvent leurs durées, jets, impacts et messages ;
|
||||
- restaure `abjection:shit_ball` ainsi que le bloc boueux `abjection:shit_cube`, sa recette, son butin et ses ressources originales en FR/EN/RU ;
|
||||
- expose une API serveur unique pour les commandes et le futur raccourci, nettoie les actions temporaires à la mort, en spectateur ou à la déconnexion, et conserve les données v2 ainsi que le protocole réseau 2 d’Only Fun.
|
||||
- rend `abjection:shit_ball` lançable à la main et par dispenser grâce à une fabrique publique installée par Ouch, sans réenregistrer l’objet possédé par Only Fun ;
|
||||
- restaure le projectile historique de 0,25 bloc, sa consommation unique hors créatif, son rendu d’objet, son impact boueux et ses sept secondes de nausée ajoutées à la durée existante ;
|
||||
- déclare la dépendance sans cycle `ouch -> onlyfun` ; les données et protocoles réseau d’Ouch et d’Only Fun restent inchangés.
|
||||
- ajoute la touche configurable « Chier » dans les contrôles Only Fun, assignée à `J` par défaut et sans répétition lorsque la touche reste maintenue ;
|
||||
- transmet une demande C2S vide, déduplique le spam d’un même tick et revalide côté serveur la connexion, la vie et le mode spectateur avant de réutiliser exactement l’action `/shit` ;
|
||||
- conserve les données Only Fun v2 et porte son protocole réseau de 2 à 3, sans nouveau cooldown, besoin ni donnée persistante.
|
||||
|
||||
## `26.2.0-alpha.210`
|
||||
|
||||
Modules modifiés : **Sanctuary `0.0.0-alpha.118`**, **Only Fun `0.0.0-alpha.21`**, **I Like To Move It `0.0.0-alpha.15`** et **It's Alive `0.0.0-alpha.35`**. Les six autres modules conservent leur version issue de l’alpha.209.
|
||||
|
||||
@@ -11,7 +11,7 @@ Licence : **GNU GPL 3.0 or Later** (`GPL-3.0-or-later`)
|
||||
|---|---|---|---|
|
||||
| `anotherworld` | Another World | choses matérielles | matière, photographie, instruments météo et 108 biomes natifs |
|
||||
| `itsalive` | It's Alive ! | vivant | Creepers, créatures, agriculture et gameplay serveur complet de Canaplia |
|
||||
| `ambiance` | Ambiance | perception | atmosphère, météo, lumières dynamiques, calendrier et composition visuelle accessible |
|
||||
| `ambiance` | Ambiance | perception | atmosphère, météo, lumières dynamiques, audio positionnel, calendrier et composition visuelle accessible |
|
||||
| `redstoner` | Red-Stoner | calcul et signaux | ordinateurs, identité serveur, Drawer et Particuleur |
|
||||
| `iliketomoveit` | I Like To Move It | déplacement | portails, véhicules, grappin, poulies et waystones locaux |
|
||||
| `ouch` | Ouch | combat et destruction | arsenal actif (6 armes) et TNT météo |
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
# Disque blanc YouTube
|
||||
|
||||
Le disque blanc appartient à **Ambiance**, propriétaire de l’audio positionnel. Il conserve l’ID
|
||||
`ambiance:white_disc` et se fabrique avec un disque 13 entouré de huit colorants blancs. Pour le
|
||||
lire, il faut le renommer dans une enclume avec une URL YouTube HTTPS puis l’insérer dans un
|
||||
jukebox vanilla.
|
||||
|
||||
## Contrat réseau et sécurité
|
||||
|
||||
- le serveur reste l’autorité de l’insertion et refuse les noms qui ne correspondent pas à une URL
|
||||
HTTPS exacte de `youtube.com`, `www.youtube.com`, `m.youtube.com`, `music.youtube.com` ou
|
||||
`youtu.be` ;
|
||||
- les formats `watch`, `shorts`, `embed`, `live` et le lien court sont acceptés, mais l’identifiant
|
||||
doit contenir exactement onze caractères ASCII autorisés ;
|
||||
- le payload S2C ne contient que la position du jukebox et cet identifiant borné, jamais une URL
|
||||
libre ; il est envoyé uniquement aux clients qui suivent le chunk et annoncent le canal ;
|
||||
- chaque client ouvre lui-même la source YouTube, refuse les directs et les vidéos de plus de
|
||||
trente minutes, et limite les lectures simultanées à quatre ;
|
||||
- la lecture utilise le canal `RECORDS`, un flux PCM mono positionnel et une atténuation à
|
||||
64 blocs. Elle s’arrête lorsque le disque est éjecté, le chunk disparaît ou la session se ferme.
|
||||
|
||||
Le disque ne crée aucune donnée persistante et ne demande aucune migration de sauvegarde.
|
||||
Ambiance conserve ses données v2 ; son protocole passe de 5 à 6.
|
||||
|
||||
## Dépendances clientes embarquées
|
||||
|
||||
Le décodage repose sur Lavaplayer `2.2.7` (Apache-2.0) et youtube-source `1.18.2` (MIT), ainsi que
|
||||
leurs dépendances transitives placées en JAR imbriqués par Loom. Leurs avis de licence restent dans
|
||||
les archives d’origine. L’accès YouTube est effectué uniquement par le client et peut cesser de
|
||||
fonctionner si YouTube modifie ses mécanismes de lecture ; aucune clé ou URL arbitraire n’est
|
||||
acceptée par le serveur.
|
||||
+86
-3
@@ -1,8 +1,43 @@
|
||||
import groovy.json.JsonSlurper
|
||||
|
||||
configurations {
|
||||
whiteDiscLibraries
|
||||
implementation.extendsFrom whiteDiscLibraries
|
||||
include.extendsFrom whiteDiscLibraries
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation project(':sanctuary')
|
||||
compileOnly "maven.modrinth:YL57xq9U:oaD6KQls"
|
||||
whiteDiscLibraries("dev.arbjerg:lavaplayer:2.2.7") {
|
||||
exclude group: "org.slf4j", module: "slf4j-api"
|
||||
exclude group: "org.jetbrains", module: "annotations"
|
||||
}
|
||||
whiteDiscLibraries("dev.lavalink.youtube:v2:1.18.2") {
|
||||
exclude group: "org.slf4j", module: "slf4j-api"
|
||||
exclude group: "org.jetbrains", module: "annotations"
|
||||
}
|
||||
[
|
||||
"dev.arbjerg:lavaplayer-natives:2.2.7",
|
||||
"dev.arbjerg:lava-common:2.2.7",
|
||||
"dev.lavalink.youtube:common:1.18.2",
|
||||
"org.mozilla:rhino-engine:1.7.15",
|
||||
"org.mozilla:rhino:1.7.15",
|
||||
"commons-io:commons-io:2.13.0",
|
||||
"org.jsoup:jsoup:1.16.1",
|
||||
"net.iharder:base64:2.3.9",
|
||||
"org.json:json:20240303",
|
||||
"org.apache.httpcomponents:httpclient:4.5.14",
|
||||
"org.apache.httpcomponents:httpcore:4.4.16",
|
||||
"commons-logging:commons-logging:1.2",
|
||||
"commons-codec:commons-codec:1.11",
|
||||
"com.fasterxml.jackson.core:jackson-core:2.15.2",
|
||||
"com.fasterxml.jackson.core:jackson-databind:2.15.2",
|
||||
"com.fasterxml.jackson.core:jackson-annotations:2.15.2",
|
||||
"com.grack:nanojson:1.7"
|
||||
].each { coordinates ->
|
||||
whiteDiscLibraries(coordinates) { transitive = false }
|
||||
}
|
||||
}
|
||||
|
||||
tasks.register("ambianceVisualApiSmoke", JavaExec) {
|
||||
@@ -21,13 +56,21 @@ tasks.register("ambianceScheduleSmoke", JavaExec) {
|
||||
mainClass = "fr.koka99cab.sanctuary26.ambiance.environment.AmbianceScheduleSmoke"
|
||||
}
|
||||
|
||||
tasks.register("whiteDiscUrlSmoke", JavaExec) {
|
||||
group = "verification"
|
||||
description = "Checks strict and bounded YouTube URL parsing for the white disc."
|
||||
dependsOn tasks.named("testClasses")
|
||||
classpath = sourceSets.test.runtimeClasspath
|
||||
mainClass = "fr.koka99cab.sanctuary26.ambiance.white_disc.WhiteDiscUrlSmoke"
|
||||
}
|
||||
|
||||
tasks.named("test") {
|
||||
failOnNoDiscoveredTests = false
|
||||
}
|
||||
|
||||
tasks.register("verifyAmbiance") {
|
||||
group = "verification"
|
||||
description = "Checks Ambiance alpha.12, including timed weather overrides, playable night fog and weather/lunar controls."
|
||||
description = "Checks Ambiance alpha.15, including the bounded YouTube white-disc playback contract."
|
||||
inputs.files(fileTree("src/main/java"))
|
||||
inputs.files(fileTree("src/main/resources"))
|
||||
inputs.file(rootProject.file("pack/migrations/26.2.0-alpha.125-realtime-calendar-to-alpha.126.json"))
|
||||
@@ -68,8 +111,17 @@ tasks.register("verifyAmbiance") {
|
||||
def languages = ["fr_fr", "en_us", "ru_ru"].collectEntries { language ->
|
||||
[(language): new JsonSlurper().parse(file("src/main/resources/assets/realtime/lang/${language}.json"))]
|
||||
}
|
||||
def ambianceLanguages = ["fr_fr", "en_us", "ru_ru"].collectEntries { language ->
|
||||
[(language): new JsonSlurper().parse(file("src/main/resources/assets/ambiance/lang/${language}.json"))]
|
||||
}
|
||||
def whiteDiscTexture = javax.imageio.ImageIO.read(
|
||||
file("src/main/resources/assets/ambiance/textures/item/white_disc.png"))
|
||||
def whiteDiscRecipe = new JsonSlurper().parse(
|
||||
file("src/main/resources/data/ambiance/recipe/white_disc.json"))
|
||||
def whiteDiscSong = new JsonSlurper().parse(
|
||||
file("src/main/resources/data/ambiance/jukebox_song/white_disc.json"))
|
||||
|
||||
if (project.version.toString() != "0.0.0-alpha.14"
|
||||
if (project.version.toString() != "0.0.0-alpha.15"
|
||||
|| migration.source?.pack_version != "26.2.0-alpha.125"
|
||||
|| migration.target?.pack_version != "26.2.0-alpha.126"
|
||||
|| migration.target?.modules?.ambiance != "0.0.0-alpha.1"
|
||||
@@ -84,7 +136,7 @@ tasks.register("verifyAmbiance") {
|
||||
|| migration.compatibility?.ambiance_data_version != 1
|
||||
|| migration.compatibility?.ambiance_network_protocol != 2
|
||||
|| manifest.custom?.sanctuary26?.data_version != 2
|
||||
|| manifest.custom?.sanctuary26?.network_protocol != 5
|
||||
|| manifest.custom?.sanctuary26?.network_protocol != 6
|
||||
|| dailyMigration.target?.pack_version != "26.2.0-alpha.128"
|
||||
|| dailyMigration.target?.modules?.ambiance != "0.0.0-alpha.2"
|
||||
|| dailyMigration.lunar_schedule?.cycle != "minecraft_native_eight_days"
|
||||
@@ -262,6 +314,36 @@ tasks.register("verifyAmbiance") {
|
||||
|| !javaText.contains("Mth.lerp(night, 1.0F, 0.98F)")) {
|
||||
throw new GradleException("Ambiance alpha.11 playable-night fog contract is incomplete")
|
||||
}
|
||||
if (!javaText.contains('id("white_disc_playback")')
|
||||
|| !javaText.contains('readUtf(WhiteDiscUrl.VIDEO_ID_LENGTH)')
|
||||
|| !javaText.contains('PlayerLookup.tracking(level, pos)')
|
||||
|| !javaText.contains('ServerPlayNetworking.canSend(receiver, WhiteDiscPlaybackPayload.ID)')
|
||||
|| !javaText.contains('MAXIMUM_SIMULTANEOUS_DISCS = 4')
|
||||
|| !javaText.contains('REQUESTS.size() + PLAYBACKS.size() >= MAXIMUM_SIMULTANEOUS_DISCS')
|
||||
|| !javaText.contains('client.level.dimension().equals(playback.dimension())')
|
||||
|| !javaText.contains('MAXIMUM_TRACK_MILLIS = 30L * 60L * 1_000L')
|
||||
|| !javaText.contains('new Pcm16AudioDataFormat(1, LavaplayerAudioStream.SAMPLE_RATE')
|
||||
|| !javaText.contains('SoundSource.RECORDS')
|
||||
|| !javaText.contains('channel.linearAttenuation(ATTENUATION_DISTANCE)')
|
||||
|| !javaText.contains('LONG_HOSTS = Set.of(')
|
||||
|| !javaText.contains('"https".equalsIgnoreCase(uri.getScheme())')
|
||||
|| !file("src/main/resources/assets/ambiance/items/white_disc.json").isFile()
|
||||
|| !file("src/main/resources/assets/ambiance/models/item/white_disc.json").isFile()
|
||||
|| whiteDiscTexture == null || whiteDiscTexture.width != 16 || whiteDiscTexture.height != 16
|
||||
|| whiteDiscRecipe.result?.id != "ambiance:white_disc"
|
||||
|| whiteDiscRecipe.key?.W != "minecraft:white_dye"
|
||||
|| whiteDiscSong.sound_event != "minecraft:intentionally_empty"
|
||||
|| whiteDiscSong.length_in_seconds != 1800
|
||||
|| ambianceLanguages.any { locale, translations ->
|
||||
!["item.ambiance.white_disc", "tooltip.ambiance.white_disc",
|
||||
"message.ambiance.white_disc.invalid_url", "message.ambiance.white_disc.failed"].every {
|
||||
translations.containsKey(it)
|
||||
}
|
||||
}
|
||||
|| !file("build.gradle").text.contains('dev.arbjerg:lavaplayer:2.2.7')
|
||||
|| !file("build.gradle").text.contains('dev.lavalink.youtube:v2:1.18.2')) {
|
||||
throw new GradleException("Ambiance alpha.15 white-disc playback contract is incomplete")
|
||||
}
|
||||
|
||||
[
|
||||
'class RealtimeMod', 'class RealtimeConfig', 'class MinecraftChronology',
|
||||
@@ -313,4 +395,5 @@ tasks.named("check") {
|
||||
dependsOn tasks.named("verifyAmbiance")
|
||||
dependsOn tasks.named("ambianceScheduleSmoke")
|
||||
dependsOn tasks.named("ambianceVisualApiSmoke")
|
||||
dependsOn tasks.named("whiteDiscUrlSmoke")
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import fr.koka99cab.sanctuary26.ambiance.environment.AmbianceBloodNightAssault;
|
||||
import fr.koka99cab.sanctuary26.ambiance.environment.AmbianceWeatherCommands;
|
||||
import fr.koka99cab.sanctuary26.ambiance.network.AmbianceNetworking;
|
||||
import fr.koka99cab.sanctuary26.ambiance.registry.AmbianceRegistries;
|
||||
import fr.koka99cab.sanctuary26.ambiance.white_disc.WhiteDiscService;
|
||||
import net.fabricmc.api.ModInitializer;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import org.slf4j.Logger;
|
||||
@@ -29,6 +30,7 @@ public final class AmbianceMod implements ModInitializer {
|
||||
public void onInitialize() {
|
||||
AmbianceRegistries.initialize();
|
||||
AmbianceNetworking.initialize();
|
||||
WhiteDiscService.initialize();
|
||||
RealtimeMod.initialize();
|
||||
AmbianceEnvironmentController.initialize();
|
||||
AmbianceFirstSpawnVision.initialize();
|
||||
|
||||
@@ -4,7 +4,10 @@ import fr.koka99cab.realtime.client.RealtimeClient;
|
||||
import fr.koka99cab.sanctuary26.ambiance.AmbianceMod;
|
||||
import fr.koka99cab.sanctuary26.ambiance.network.AmbianceEnvironmentPayload;
|
||||
import fr.koka99cab.sanctuary26.ambiance.network.AmbianceCanapliaVisualPayloads;
|
||||
import fr.koka99cab.sanctuary26.ambiance.network.WhiteDiscPlaybackPayload;
|
||||
import fr.koka99cab.sanctuary26.ambiance.client.audio.WhiteDiscAudioPlayer;
|
||||
import net.fabricmc.api.ClientModInitializer;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
||||
@@ -41,11 +44,15 @@ public final class AmbianceClient implements ClientModInitializer {
|
||||
context.client().execute(() -> AmbianceClientVisualEffects.apply(payload)));
|
||||
ClientPlayNetworking.registerGlobalReceiver(AmbianceCanapliaVisualPayloads.Clear.ID, (payload, context) ->
|
||||
context.client().execute(AmbianceClientVisualEffects::clear));
|
||||
ClientPlayNetworking.registerGlobalReceiver(WhiteDiscPlaybackPayload.ID, (payload, context) ->
|
||||
context.client().execute(() -> WhiteDiscAudioPlayer.play(
|
||||
context.client(), payload.pos(), payload.videoId())));
|
||||
visualSettingsKey = KeyMappingHelper.registerKeyMapping(new KeyMapping(
|
||||
"key.ambiance.visual_settings", InputConstants.Type.KEYSYM,
|
||||
GLFW.GLFW_KEY_UNKNOWN, AMBIANCE_CATEGORY));
|
||||
ClientTickEvents.END_CLIENT_TICK.register(client -> {
|
||||
AmbianceClientVisualEffects.tick();
|
||||
WhiteDiscAudioPlayer.tick(client);
|
||||
while (visualSettingsKey.consumeClick()) {
|
||||
if (client.gui.screen() == null) client.gui.setScreen(new AmbianceVisualSettingsScreen(null));
|
||||
}
|
||||
@@ -54,7 +61,9 @@ public final class AmbianceClient implements ClientModInitializer {
|
||||
AmbianceClientEnvironment.reset();
|
||||
DynamicTorchLights.reset();
|
||||
AmbianceClientVisualEffects.clear();
|
||||
WhiteDiscAudioPlayer.clear();
|
||||
});
|
||||
ClientLifecycleEvents.CLIENT_STOPPING.register(client -> WhiteDiscAudioPlayer.shutdown());
|
||||
AmbianceVisualOverlay.register();
|
||||
AmbianceBiomeTints.registerColorResolvers();
|
||||
registerWaterFluidTint();
|
||||
|
||||
+87
@@ -0,0 +1,87 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.client.audio;
|
||||
|
||||
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
|
||||
import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
|
||||
import java.io.IOException;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.TimeoutException;
|
||||
import javax.sound.sampled.AudioFormat;
|
||||
import net.minecraft.client.sounds.AudioStream;
|
||||
|
||||
/** Adapts bounded mono PCM frames from Lavaplayer to Minecraft's streaming OpenAL channel. */
|
||||
final class LavaplayerAudioStream implements AudioStream {
|
||||
static final int SAMPLE_RATE = 48_000;
|
||||
private static final int FRAME_SAMPLES = 960;
|
||||
private static final int BYTES_PER_SAMPLE = 2;
|
||||
private static final AudioFormat FORMAT =
|
||||
new AudioFormat(SAMPLE_RATE, 16, 1, true, false);
|
||||
private final AudioPlayer player;
|
||||
private byte[] pending = new byte[0];
|
||||
private int pendingOffset;
|
||||
private volatile boolean closed;
|
||||
private volatile boolean ended;
|
||||
|
||||
LavaplayerAudioStream(AudioPlayer player) {
|
||||
this.player = player;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AudioFormat getFormat() {
|
||||
return FORMAT;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ByteBuffer read(int maximumBytes) throws IOException {
|
||||
if (closed || maximumBytes <= 0) return null;
|
||||
ByteBuffer output = ByteBuffer.allocateDirect(maximumBytes);
|
||||
while (output.hasRemaining() && !closed) {
|
||||
if (pendingOffset < pending.length) {
|
||||
int length = Math.min(output.remaining(), pending.length - pendingOffset);
|
||||
output.put(pending, pendingOffset, length);
|
||||
pendingOffset += length;
|
||||
continue;
|
||||
}
|
||||
AudioFrame frame = nextFrame();
|
||||
if (frame == null) {
|
||||
if (ended) break;
|
||||
int silence = Math.min(output.remaining(), FRAME_SAMPLES * BYTES_PER_SAMPLE);
|
||||
for (int index = 0; index < silence; index++) output.put((byte) 0);
|
||||
continue;
|
||||
}
|
||||
if (frame.isTerminator()) {
|
||||
ended = true;
|
||||
break;
|
||||
}
|
||||
pending = frame.getData();
|
||||
pendingOffset = 0;
|
||||
}
|
||||
if (output.position() == 0 && ended) return null;
|
||||
output.flip();
|
||||
return output;
|
||||
}
|
||||
|
||||
private AudioFrame nextFrame() throws IOException {
|
||||
try {
|
||||
AudioFrame frame = player.provide(2, TimeUnit.SECONDS);
|
||||
if (frame == null && player.getPlayingTrack() == null) ended = true;
|
||||
return frame;
|
||||
} catch (TimeoutException ignored) {
|
||||
return null;
|
||||
} catch (InterruptedException interrupted) {
|
||||
Thread.currentThread().interrupt();
|
||||
throw new IOException("Interrupted while buffering the white disc", interrupted);
|
||||
}
|
||||
}
|
||||
|
||||
boolean ended() {
|
||||
return ended;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() {
|
||||
if (closed) return;
|
||||
closed = true;
|
||||
player.destroy();
|
||||
}
|
||||
}
|
||||
+213
@@ -0,0 +1,213 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.client.audio;
|
||||
|
||||
import com.mojang.blaze3d.audio.Library;
|
||||
import com.sedmelluq.discord.lavaplayer.format.Pcm16AudioDataFormat;
|
||||
import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
|
||||
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
|
||||
import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
|
||||
import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
|
||||
import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
|
||||
import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
|
||||
import dev.lavalink.youtube.YoutubeAudioSourceManager;
|
||||
import fr.koka99cab.sanctuary26.ambiance.AmbianceMod;
|
||||
import fr.koka99cab.sanctuary26.ambiance.mixin.client.SoundEngineAccessor;
|
||||
import fr.koka99cab.sanctuary26.ambiance.mixin.client.SoundManagerAccessor;
|
||||
import fr.koka99cab.sanctuary26.ambiance.white_disc.WhiteDiscUrl;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.sounds.ChannelAccess;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.sounds.SoundSource;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.JukeboxBlock;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
/** Client-only, positional and resource-bounded YouTube playback for white discs. */
|
||||
public final class WhiteDiscAudioPlayer {
|
||||
private static final int MAXIMUM_SIMULTANEOUS_DISCS = 4;
|
||||
private static final long MAXIMUM_TRACK_MILLIS = 30L * 60L * 1_000L;
|
||||
private static final long FINISHED_GRACE_NANOS = 5_000_000_000L;
|
||||
private static final float ATTENUATION_DISTANCE = 64.0F;
|
||||
private static final DefaultAudioPlayerManager MANAGER = createManager();
|
||||
private static final Map<Long, Long> REQUESTS = new HashMap<>();
|
||||
private static final LinkedHashMap<Long, Playback> PLAYBACKS = new LinkedHashMap<>();
|
||||
private static long requestSequence;
|
||||
private static boolean shutdown;
|
||||
|
||||
private WhiteDiscAudioPlayer() {
|
||||
}
|
||||
|
||||
public static void play(Minecraft client, BlockPos pos, String videoId) {
|
||||
if (shutdown || !WhiteDiscUrl.validVideoId(videoId) || !validTarget(client, pos)) return;
|
||||
long key = pos.asLong();
|
||||
if (REQUESTS.containsKey(key)) return;
|
||||
boolean replacingPlayback = PLAYBACKS.containsKey(key);
|
||||
if (!replacingPlayback
|
||||
&& REQUESTS.size() + PLAYBACKS.size() >= MAXIMUM_SIMULTANEOUS_DISCS) return;
|
||||
stop(key);
|
||||
long request = ++requestSequence;
|
||||
REQUESTS.put(key, request);
|
||||
client.player.sendOverlayMessage(Component.translatable("message.ambiance.white_disc.loading"));
|
||||
MANAGER.loadItemOrdered(key, WhiteDiscUrl.canonicalUrl(videoId), new AudioLoadResultHandler() {
|
||||
@Override
|
||||
public void trackLoaded(AudioTrack track) {
|
||||
client.execute(() -> acceptTrack(client, pos, request, track));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void playlistLoaded(AudioPlaylist playlist) {
|
||||
AudioTrack selected = playlist.getSelectedTrack();
|
||||
if (selected == null && !playlist.getTracks().isEmpty()) selected = playlist.getTracks().getFirst();
|
||||
if (selected == null) noMatches();
|
||||
else trackLoaded(selected);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void noMatches() {
|
||||
client.execute(() -> fail(client, key, request));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void loadFailed(FriendlyException exception) {
|
||||
AmbianceMod.LOGGER.warn("Unable to load white-disc YouTube video {}: {}", videoId,
|
||||
exception.getMessage());
|
||||
client.execute(() -> fail(client, key, request));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private static void acceptTrack(Minecraft client, BlockPos pos, long request, AudioTrack track) {
|
||||
long key = pos.asLong();
|
||||
if (REQUESTS.getOrDefault(key, -1L) != request) return;
|
||||
if (!validTarget(client, pos)) {
|
||||
REQUESTS.remove(key);
|
||||
return;
|
||||
}
|
||||
if (track.getInfo().isStream || track.getDuration() <= 0L
|
||||
|| track.getDuration() > MAXIMUM_TRACK_MILLIS) {
|
||||
REQUESTS.remove(key);
|
||||
if (client.player != null) client.player.sendOverlayMessage(
|
||||
Component.translatable("message.ambiance.white_disc.too_long"));
|
||||
return;
|
||||
}
|
||||
while (PLAYBACKS.size() >= MAXIMUM_SIMULTANEOUS_DISCS) {
|
||||
stop(PLAYBACKS.keySet().iterator().next());
|
||||
}
|
||||
ChannelAccess channels = ((SoundEngineAccessor) ((SoundManagerAccessor) client.getSoundManager())
|
||||
.ambiance$getSoundEngine()).ambiance$getChannelAccess();
|
||||
channels.createHandle(Library.Pool.STREAMING).thenAccept(handle -> client.execute(() -> {
|
||||
if (handle == null || REQUESTS.getOrDefault(key, -1L) != request) {
|
||||
if (handle != null) handle.release();
|
||||
return;
|
||||
}
|
||||
AudioPlayer player = MANAGER.createPlayer();
|
||||
player.playTrack(track);
|
||||
LavaplayerAudioStream stream = new LavaplayerAudioStream(player);
|
||||
Playback playback = new Playback(pos.immutable(), client.level.dimension(), handle, stream);
|
||||
PLAYBACKS.put(key, playback);
|
||||
REQUESTS.remove(key);
|
||||
float volume = client.options.getFinalSoundSourceVolume(SoundSource.RECORDS);
|
||||
handle.execute(channel -> {
|
||||
channel.setSelfPosition(Vec3.atCenterOf(pos));
|
||||
channel.setRelative(false);
|
||||
channel.linearAttenuation(ATTENUATION_DISTANCE);
|
||||
channel.setVolume(volume);
|
||||
channel.attachBufferStream(stream);
|
||||
channel.play();
|
||||
});
|
||||
if (client.player != null) client.player.sendOverlayMessage(
|
||||
Component.translatable("message.ambiance.white_disc.playing", track.getInfo().title));
|
||||
}));
|
||||
}
|
||||
|
||||
private static void fail(Minecraft client, long key, long request) {
|
||||
if (REQUESTS.getOrDefault(key, -1L) != request) return;
|
||||
REQUESTS.remove(key);
|
||||
if (client.player != null) client.player.sendOverlayMessage(
|
||||
Component.translatable("message.ambiance.white_disc.failed"));
|
||||
}
|
||||
|
||||
public static void stop(BlockPos pos) {
|
||||
stop(pos.asLong());
|
||||
}
|
||||
|
||||
private static void stop(long key) {
|
||||
REQUESTS.remove(key);
|
||||
Playback playback = PLAYBACKS.remove(key);
|
||||
if (playback == null) return;
|
||||
playback.stream().close();
|
||||
playback.handle().execute(channel -> channel.stop());
|
||||
playback.handle().release();
|
||||
}
|
||||
|
||||
public static void tick(Minecraft client) {
|
||||
if (client.level == null) {
|
||||
clear();
|
||||
return;
|
||||
}
|
||||
long now = System.nanoTime();
|
||||
for (Map.Entry<Long, Playback> entry : Map.copyOf(PLAYBACKS).entrySet()) {
|
||||
Playback playback = entry.getValue();
|
||||
boolean missing = !client.level.dimension().equals(playback.dimension())
|
||||
|| !client.level.hasChunkAt(playback.pos())
|
||||
|| !client.level.getBlockState(playback.pos()).is(Blocks.JUKEBOX)
|
||||
|| !client.level.getBlockState(playback.pos()).getValue(JukeboxBlock.HAS_RECORD);
|
||||
if (missing || playback.finishedFor(now) >= FINISHED_GRACE_NANOS) {
|
||||
stop(entry.getKey());
|
||||
continue;
|
||||
}
|
||||
float volume = client.options.getFinalSoundSourceVolume(SoundSource.RECORDS);
|
||||
playback.handle().execute(channel -> channel.setVolume(volume));
|
||||
}
|
||||
}
|
||||
|
||||
public static void clear() {
|
||||
REQUESTS.clear();
|
||||
for (long key : PLAYBACKS.keySet().stream().mapToLong(Long::longValue).toArray()) stop(key);
|
||||
}
|
||||
|
||||
public static void shutdown() {
|
||||
if (shutdown) return;
|
||||
shutdown = true;
|
||||
clear();
|
||||
MANAGER.shutdown();
|
||||
}
|
||||
|
||||
private static DefaultAudioPlayerManager createManager() {
|
||||
DefaultAudioPlayerManager manager = new DefaultAudioPlayerManager();
|
||||
manager.getConfiguration().setOutputFormat(
|
||||
new Pcm16AudioDataFormat(1, LavaplayerAudioStream.SAMPLE_RATE, 960, false));
|
||||
manager.setFrameBufferDuration(5_000);
|
||||
manager.setItemLoaderThreadPoolSize(2);
|
||||
manager.registerSourceManager(new YoutubeAudioSourceManager(false));
|
||||
return manager;
|
||||
}
|
||||
|
||||
private static boolean validTarget(Minecraft client, BlockPos pos) {
|
||||
return client.player != null && client.level != null
|
||||
&& client.player.distanceToSqr(Vec3.atCenterOf(pos))
|
||||
<= ATTENUATION_DISTANCE * ATTENUATION_DISTANCE * 4.0D
|
||||
&& client.level.getBlockState(pos).is(Blocks.JUKEBOX)
|
||||
&& client.level.getBlockState(pos).getValue(JukeboxBlock.HAS_RECORD);
|
||||
}
|
||||
|
||||
private record Playback(BlockPos pos, ResourceKey<Level> dimension,
|
||||
ChannelAccess.ChannelHandle handle,
|
||||
LavaplayerAudioStream stream, long[] finishedAt) {
|
||||
private Playback(BlockPos pos, ResourceKey<Level> dimension,
|
||||
ChannelAccess.ChannelHandle handle, LavaplayerAudioStream stream) {
|
||||
this(pos, dimension, handle, stream, new long[1]);
|
||||
}
|
||||
|
||||
private long finishedFor(long now) {
|
||||
if (!stream.ended()) return 0L;
|
||||
if (finishedAt[0] == 0L) finishedAt[0] = now;
|
||||
return now - finishedAt[0];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.item;
|
||||
|
||||
import java.util.function.Consumer;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.TooltipFlag;
|
||||
import net.minecraft.world.item.component.TooltipDisplay;
|
||||
|
||||
/** Blank disc whose custom name may hold a validated YouTube URL. */
|
||||
public final class WhiteDiscItem extends Item {
|
||||
public WhiteDiscItem(Properties properties) {
|
||||
super(properties);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisplay display,
|
||||
Consumer<Component> tooltip, TooltipFlag flag) {
|
||||
tooltip.accept(Component.translatable("tooltip.ambiance.white_disc")
|
||||
.withStyle(ChatFormatting.GRAY));
|
||||
}
|
||||
}
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.mixin.client;
|
||||
|
||||
import fr.koka99cab.sanctuary26.ambiance.client.audio.WhiteDiscAudioPlayer;
|
||||
import net.minecraft.client.renderer.LevelRenderer;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(LevelRenderer.class)
|
||||
public abstract class LevelRendererMixin {
|
||||
@Inject(method = "levelEvent", at = @At("HEAD"))
|
||||
private void ambiance$stopWhiteDisc(Entity source, int type, BlockPos pos, int data,
|
||||
CallbackInfo callback) {
|
||||
if (type == 1011) WhiteDiscAudioPlayer.stop(pos);
|
||||
}
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.mixin.client;
|
||||
|
||||
import net.minecraft.client.sounds.ChannelAccess;
|
||||
import net.minecraft.client.sounds.SoundEngine;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
@Mixin(SoundEngine.class)
|
||||
public interface SoundEngineAccessor {
|
||||
@Accessor("channelAccess")
|
||||
ChannelAccess ambiance$getChannelAccess();
|
||||
}
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.mixin.client;
|
||||
|
||||
import net.minecraft.client.sounds.SoundEngine;
|
||||
import net.minecraft.client.sounds.SoundManager;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
@Mixin(SoundManager.class)
|
||||
public interface SoundManagerAccessor {
|
||||
@Accessor("soundEngine")
|
||||
SoundEngine ambiance$getSoundEngine();
|
||||
}
|
||||
+3
-1
@@ -13,7 +13,7 @@ import net.minecraft.server.level.ServerPlayer;
|
||||
* Networking contract for Ambiance. Payload IDs must use the module namespace.
|
||||
*/
|
||||
public final class AmbianceNetworking {
|
||||
public static final int PROTOCOL_VERSION = 5;
|
||||
public static final int PROTOCOL_VERSION = 6;
|
||||
private static boolean initialized;
|
||||
|
||||
private AmbianceNetworking() {
|
||||
@@ -34,6 +34,8 @@ public final class AmbianceNetworking {
|
||||
AmbianceCanapliaVisualPayloads.BadTrip.ID, AmbianceCanapliaVisualPayloads.BadTrip.CODEC);
|
||||
PayloadTypeRegistry.clientboundPlay().register(
|
||||
AmbianceCanapliaVisualPayloads.Clear.ID, AmbianceCanapliaVisualPayloads.Clear.CODEC);
|
||||
PayloadTypeRegistry.clientboundPlay().register(
|
||||
WhiteDiscPlaybackPayload.ID, WhiteDiscPlaybackPayload.CODEC);
|
||||
ServerPlayConnectionEvents.JOIN.register((handler, sender, server) ->
|
||||
send(handler.player, AmbianceEnvironmentController.snapshot(server))
|
||||
);
|
||||
|
||||
+34
@@ -0,0 +1,34 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.network;
|
||||
|
||||
import fr.koka99cab.sanctuary26.ambiance.AmbianceMod;
|
||||
import fr.koka99cab.sanctuary26.ambiance.white_disc.WhiteDiscUrl;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
import net.minecraft.network.codec.StreamCodec;
|
||||
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
|
||||
|
||||
/** Bounded clientbound intent: a server-resolved jukebox position and an 11-character video ID. */
|
||||
public record WhiteDiscPlaybackPayload(BlockPos pos, String videoId) implements CustomPacketPayload {
|
||||
public static final Type<WhiteDiscPlaybackPayload> ID =
|
||||
new Type<>(AmbianceMod.id("white_disc_playback"));
|
||||
public static final StreamCodec<RegistryFriendlyByteBuf, WhiteDiscPlaybackPayload> CODEC =
|
||||
CustomPacketPayload.codec(WhiteDiscPlaybackPayload::write, WhiteDiscPlaybackPayload::new);
|
||||
|
||||
public WhiteDiscPlaybackPayload {
|
||||
if (!WhiteDiscUrl.validVideoId(videoId)) videoId = "";
|
||||
}
|
||||
|
||||
private WhiteDiscPlaybackPayload(RegistryFriendlyByteBuf buffer) {
|
||||
this(buffer.readBlockPos(), buffer.readUtf(WhiteDiscUrl.VIDEO_ID_LENGTH));
|
||||
}
|
||||
|
||||
private void write(RegistryFriendlyByteBuf buffer) {
|
||||
buffer.writeBlockPos(pos);
|
||||
buffer.writeUtf(videoId, WhiteDiscUrl.VIDEO_ID_LENGTH);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Type<? extends CustomPacketPayload> type() {
|
||||
return ID;
|
||||
}
|
||||
}
|
||||
+23
-2
@@ -1,12 +1,32 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.registry;
|
||||
|
||||
import fr.koka99cab.sanctuary26.ambiance.AmbianceMod;
|
||||
import fr.koka99cab.sanctuary26.ambiance.item.WhiteDiscItem;
|
||||
import net.fabricmc.fabric.api.creativetab.v1.CreativeModeTabEvents;
|
||||
import net.minecraft.core.Registry;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.world.item.CreativeModeTab;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.JukeboxSong;
|
||||
import net.minecraft.world.item.Rarity;
|
||||
|
||||
/**
|
||||
* Single registration entry point for the Ambiance namespace.
|
||||
* Feature registries must be called from here to keep initialization ordering explicit.
|
||||
*/
|
||||
public final class AmbianceRegistries {
|
||||
public static final ResourceKey<JukeboxSong> WHITE_DISC_SONG = ResourceKey.create(
|
||||
Registries.JUKEBOX_SONG, AmbianceMod.id("white_disc"));
|
||||
private static final ResourceKey<Item> WHITE_DISC_KEY = ResourceKey.create(
|
||||
Registries.ITEM, AmbianceMod.id("white_disc"));
|
||||
private static final ResourceKey<CreativeModeTab> TOOLS_TAB = ResourceKey.create(
|
||||
Registries.CREATIVE_MODE_TAB, Identifier.withDefaultNamespace("tools_and_utilities"));
|
||||
public static final Item WHITE_DISC = Registry.register(BuiltInRegistries.ITEM, WHITE_DISC_KEY,
|
||||
new WhiteDiscItem(new Item.Properties().stacksTo(1).rarity(Rarity.UNCOMMON)
|
||||
.jukeboxPlayable(WHITE_DISC_SONG).setId(WHITE_DISC_KEY)));
|
||||
private static boolean initialized;
|
||||
|
||||
private AmbianceRegistries() {
|
||||
@@ -17,7 +37,8 @@ public final class AmbianceRegistries {
|
||||
return;
|
||||
}
|
||||
initialized = true;
|
||||
AmbianceMod.LOGGER.debug("[{}] Empty registry hub initialized.", AmbianceMod.DISPLAY_NAME);
|
||||
CreativeModeTabEvents.modifyOutputEvent(TOOLS_TAB).register(entries -> entries.accept(WHITE_DISC));
|
||||
AmbianceMod.LOGGER.debug("[{}] Registry hub initialized with the white disc.",
|
||||
AmbianceMod.DISPLAY_NAME);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+70
@@ -0,0 +1,70 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.white_disc;
|
||||
|
||||
import fr.koka99cab.sanctuary26.ambiance.network.WhiteDiscPlaybackPayload;
|
||||
import fr.koka99cab.sanctuary26.ambiance.registry.AmbianceRegistries;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import net.fabricmc.fabric.api.event.player.UseBlockCallback;
|
||||
import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
|
||||
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.component.DataComponents;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.world.InteractionResult;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.JukeboxPlayable;
|
||||
import net.minecraft.world.level.block.JukeboxBlock;
|
||||
import net.minecraft.world.level.block.entity.JukeboxBlockEntity;
|
||||
|
||||
/** Server-authoritative insertion and bounded playback dispatch for the white disc. */
|
||||
public final class WhiteDiscService {
|
||||
private static boolean initialized;
|
||||
|
||||
private WhiteDiscService() {
|
||||
}
|
||||
|
||||
public static void initialize() {
|
||||
if (initialized) return;
|
||||
initialized = true;
|
||||
UseBlockCallback.EVENT.register((player, level, hand, hit) -> {
|
||||
BlockPos pos = hit.getBlockPos();
|
||||
if (!(level.getBlockEntity(pos) instanceof JukeboxBlockEntity jukebox)
|
||||
|| jukebox.getBlockState().getValue(JukeboxBlock.HAS_RECORD)) return InteractionResult.PASS;
|
||||
ItemStack held = player.getItemInHand(hand);
|
||||
if (!held.is(AmbianceRegistries.WHITE_DISC)) return InteractionResult.PASS;
|
||||
|
||||
Optional<String> videoId = videoId(held);
|
||||
if (videoId.isEmpty()) {
|
||||
if (!level.isClientSide()) player.sendOverlayMessage(
|
||||
Component.translatable("message.ambiance.white_disc.invalid_url"));
|
||||
return InteractionResult.FAIL;
|
||||
}
|
||||
if (level.isClientSide()) return InteractionResult.SUCCESS;
|
||||
InteractionResult result = JukeboxPlayable.tryInsertIntoJukebox(level, pos, held, player);
|
||||
if (result.consumesAction() && level instanceof ServerLevel serverLevel) {
|
||||
broadcast(serverLevel, pos, videoId.get(), player instanceof ServerPlayer serverPlayer
|
||||
? serverPlayer : null);
|
||||
}
|
||||
return result;
|
||||
});
|
||||
}
|
||||
|
||||
public static Optional<String> videoId(ItemStack stack) {
|
||||
Component name = stack.get(DataComponents.CUSTOM_NAME);
|
||||
return name == null ? Optional.empty() : WhiteDiscUrl.videoId(name.getString());
|
||||
}
|
||||
|
||||
private static void broadcast(ServerLevel level, BlockPos pos, String videoId, ServerPlayer inserter) {
|
||||
WhiteDiscPlaybackPayload payload = new WhiteDiscPlaybackPayload(pos, videoId);
|
||||
Set<ServerPlayer> receivers = new LinkedHashSet<>(PlayerLookup.tracking(level, pos));
|
||||
if (inserter != null) receivers.add(inserter);
|
||||
for (ServerPlayer receiver : receivers) {
|
||||
if (ServerPlayNetworking.canSend(receiver, WhiteDiscPlaybackPayload.ID)) {
|
||||
ServerPlayNetworking.send(receiver, payload);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.white_disc;
|
||||
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.util.Locale;
|
||||
import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/** Strict, side-effect-free YouTube URL parser used before any client network request. */
|
||||
public final class WhiteDiscUrl {
|
||||
public static final int MAXIMUM_URL_LENGTH = 256;
|
||||
public static final int VIDEO_ID_LENGTH = 11;
|
||||
private static final Pattern VIDEO_ID = Pattern.compile("[A-Za-z0-9_-]{11}");
|
||||
private static final Set<String> LONG_HOSTS = Set.of(
|
||||
"youtube.com", "www.youtube.com", "m.youtube.com", "music.youtube.com");
|
||||
|
||||
private WhiteDiscUrl() {
|
||||
}
|
||||
|
||||
public static Optional<String> videoId(String value) {
|
||||
if (value == null || value.isBlank() || value.length() > MAXIMUM_URL_LENGTH) return Optional.empty();
|
||||
try {
|
||||
URI uri = new URI(value.strip());
|
||||
if (!"https".equalsIgnoreCase(uri.getScheme()) || uri.getUserInfo() != null
|
||||
|| (uri.getPort() != -1 && uri.getPort() != 443)) return Optional.empty();
|
||||
String host = uri.getHost();
|
||||
if (host == null) return Optional.empty();
|
||||
host = host.toLowerCase(Locale.ROOT);
|
||||
if ("youtu.be".equals(host)) return valid(singlePathSegment(uri.getRawPath()));
|
||||
if (!LONG_HOSTS.contains(host)) return Optional.empty();
|
||||
|
||||
String path = uri.getRawPath();
|
||||
if ("/watch".equals(path)) return valid(queryParameter(uri.getRawQuery(), "v"));
|
||||
for (String prefix : new String[] {"/shorts/", "/embed/", "/live/"}) {
|
||||
if (path != null && path.startsWith(prefix)) return valid(singlePathSegment(path.substring(prefix.length())));
|
||||
}
|
||||
} catch (URISyntaxException ignored) {
|
||||
// Invalid user text is rejected without network access.
|
||||
}
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
public static boolean validVideoId(String value) {
|
||||
return value != null && VIDEO_ID.matcher(value).matches();
|
||||
}
|
||||
|
||||
public static String canonicalUrl(String videoId) {
|
||||
if (!validVideoId(videoId)) throw new IllegalArgumentException("Invalid YouTube video ID");
|
||||
return "https://www.youtube.com/watch?v=" + videoId;
|
||||
}
|
||||
|
||||
private static String singlePathSegment(String path) {
|
||||
if (path == null || path.isEmpty()) return "";
|
||||
String segment = path.startsWith("/") ? path.substring(1) : path;
|
||||
return segment.contains("/") ? "" : segment;
|
||||
}
|
||||
|
||||
private static String queryParameter(String query, String name) {
|
||||
if (query == null) return "";
|
||||
String found = null;
|
||||
for (String parameter : query.split("&", -1)) {
|
||||
int equals = parameter.indexOf('=');
|
||||
if (equals <= 0 || !name.equals(parameter.substring(0, equals))) continue;
|
||||
if (found != null) return "";
|
||||
found = parameter.substring(equals + 1);
|
||||
}
|
||||
return found == null ? "" : found;
|
||||
}
|
||||
|
||||
private static Optional<String> valid(String candidate) {
|
||||
return validVideoId(candidate) ? Optional.of(candidate) : Optional.empty();
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,9 @@
|
||||
"GameRendererMixin",
|
||||
"LightCoordsUtilMixin",
|
||||
"LightmapRenderStateExtractorMixin",
|
||||
"LevelRendererMixin",
|
||||
"SoundEngineAccessor",
|
||||
"SoundManagerAccessor",
|
||||
"SkyRendererMixin"
|
||||
],
|
||||
"injectors": {
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"model": {
|
||||
"type": "minecraft:model",
|
||||
"model": "ambiance:item/white_disc"
|
||||
}
|
||||
}
|
||||
@@ -24,5 +24,13 @@
|
||||
"options.ambiance.visual.wobble": "Camera wobble",
|
||||
"options.ambiance.visual.ghosting": "Edge ghosting",
|
||||
"key.categories.ambiance.ambiance": "Ambiance",
|
||||
"key.ambiance.visual_settings": "Visual accessibility settings"
|
||||
"key.ambiance.visual_settings": "Visual accessibility settings",
|
||||
"item.ambiance.white_disc": "White Disc",
|
||||
"jukebox_song.ambiance.white_disc": "White Disc",
|
||||
"tooltip.ambiance.white_disc": "Rename it to an HTTPS YouTube URL, then insert it into a jukebox.",
|
||||
"message.ambiance.white_disc.invalid_url": "Rename the white disc to a valid HTTPS YouTube URL.",
|
||||
"message.ambiance.white_disc.loading": "Loading YouTube video…",
|
||||
"message.ambiance.white_disc.playing": "Now playing: %s",
|
||||
"message.ambiance.white_disc.failed": "This YouTube video could not be played.",
|
||||
"message.ambiance.white_disc.too_long": "This video is live or longer than 30 minutes."
|
||||
}
|
||||
|
||||
@@ -24,5 +24,13 @@
|
||||
"options.ambiance.visual.wobble": "Oscillation de la caméra",
|
||||
"options.ambiance.visual.ghosting": "Rémanence sur les bords",
|
||||
"key.categories.ambiance.ambiance": "Ambiance",
|
||||
"key.ambiance.visual_settings": "Réglages d’accessibilité visuelle"
|
||||
"key.ambiance.visual_settings": "Réglages d’accessibilité visuelle",
|
||||
"item.ambiance.white_disc": "Disque blanc",
|
||||
"jukebox_song.ambiance.white_disc": "Disque blanc",
|
||||
"tooltip.ambiance.white_disc": "Renommez-le avec une URL YouTube HTTPS, puis insérez-le dans un jukebox.",
|
||||
"message.ambiance.white_disc.invalid_url": "Renommez le disque blanc avec une URL YouTube HTTPS valide.",
|
||||
"message.ambiance.white_disc.loading": "Chargement de la vidéo YouTube…",
|
||||
"message.ambiance.white_disc.playing": "Lecture : %s",
|
||||
"message.ambiance.white_disc.failed": "Impossible de lire cette vidéo YouTube.",
|
||||
"message.ambiance.white_disc.too_long": "Cette vidéo est en direct ou dépasse 30 minutes."
|
||||
}
|
||||
|
||||
@@ -24,5 +24,13 @@
|
||||
"options.ambiance.visual.wobble": "Покачивание камеры",
|
||||
"options.ambiance.visual.ghosting": "Шлейф по краям",
|
||||
"key.categories.ambiance.ambiance": "Ambiance",
|
||||
"key.ambiance.visual_settings": "Настройки визуальной доступности"
|
||||
"key.ambiance.visual_settings": "Настройки визуальной доступности",
|
||||
"item.ambiance.white_disc": "Белая пластинка",
|
||||
"jukebox_song.ambiance.white_disc": "Белая пластинка",
|
||||
"tooltip.ambiance.white_disc": "Переименуйте её в HTTPS-ссылку YouTube и вставьте в проигрыватель.",
|
||||
"message.ambiance.white_disc.invalid_url": "Переименуйте белую пластинку в допустимую HTTPS-ссылку YouTube.",
|
||||
"message.ambiance.white_disc.loading": "Загрузка видео YouTube…",
|
||||
"message.ambiance.white_disc.playing": "Сейчас играет: %s",
|
||||
"message.ambiance.white_disc.failed": "Не удалось воспроизвести это видео YouTube.",
|
||||
"message.ambiance.white_disc.too_long": "Это прямая трансляция или видео длиннее 30 минут."
|
||||
}
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:item/template_music_disc",
|
||||
"textures": {
|
||||
"layer0": "ambiance:item/white_disc"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 393 B |
@@ -0,0 +1,8 @@
|
||||
{
|
||||
"comparator_output": 15,
|
||||
"description": {
|
||||
"translate": "jukebox_song.ambiance.white_disc"
|
||||
},
|
||||
"length_in_seconds": 1800.0,
|
||||
"sound_event": "minecraft:intentionally_empty"
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"category": "misc",
|
||||
"pattern": [
|
||||
"WWW",
|
||||
"WDW",
|
||||
"WWW"
|
||||
],
|
||||
"key": {
|
||||
"D": "minecraft:music_disc_13",
|
||||
"W": "minecraft:white_dye"
|
||||
},
|
||||
"result": {
|
||||
"id": "ambiance:white_disc"
|
||||
}
|
||||
}
|
||||
@@ -3,7 +3,7 @@
|
||||
"id": "ambiance",
|
||||
"version": "${version}",
|
||||
"name": "Ambiance",
|
||||
"description": "Owns world atmosphere, dynamic lights, the calendar and composable accessible visual effects, including Canaplia.",
|
||||
"description": "Owns world atmosphere, dynamic lights, positional audio, the calendar and composable accessible visual effects, including Canaplia.",
|
||||
"authors": [
|
||||
"KOKA99CAB"
|
||||
],
|
||||
@@ -36,13 +36,13 @@
|
||||
"system_type": "gameplay-system",
|
||||
"namespace": "ambiance",
|
||||
"data_version": 2,
|
||||
"network_protocol": 5,
|
||||
"network_protocol": 6,
|
||||
"lifecycle": "${lifecycle}",
|
||||
"pack_version": "${pack_version}",
|
||||
"descriptions": {
|
||||
"fr_fr": "Gère l'atmosphère, les lumières dynamiques, le calendrier et les effets visuels accessibles et composables, dont Canaplia.",
|
||||
"en_us": "Owns world atmosphere, dynamic lights, the calendar and composable accessible visual effects, including Canaplia.",
|
||||
"ru_ru": "Управляет атмосферой, динамическим освещением, календарём и доступными составными визуальными эффектами, включая Canaplia."
|
||||
"fr_fr": "Gère l'atmosphère, les lumières dynamiques, l'audio positionnel, le calendrier et les effets visuels accessibles et composables, dont Canaplia.",
|
||||
"en_us": "Owns world atmosphere, dynamic lights, positional audio, the calendar and composable accessible visual effects, including Canaplia.",
|
||||
"ru_ru": "Управляет атмосферой, динамическим освещением, позиционным звуком, календарём и доступными составными визуальными эффектами, включая Canaplia."
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+40
@@ -0,0 +1,40 @@
|
||||
package fr.koka99cab.sanctuary26.ambiance.white_disc;
|
||||
|
||||
/** Executable URL-policy regression test, intentionally independent from a running game. */
|
||||
public final class WhiteDiscUrlSmoke {
|
||||
private static final String VIDEO_ID = "dQw4w9WgXcQ";
|
||||
|
||||
private WhiteDiscUrlSmoke() {
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
require(VIDEO_ID.equals(id("https://www.youtube.com/watch?v=" + VIDEO_ID)), "watch URL rejected");
|
||||
require(VIDEO_ID.equals(id("https://youtu.be/" + VIDEO_ID + "?si=abc")), "short URL rejected");
|
||||
require(VIDEO_ID.equals(id("https://music.youtube.com/watch?v=" + VIDEO_ID)), "music URL rejected");
|
||||
require(VIDEO_ID.equals(id("https://www.youtube.com/shorts/" + VIDEO_ID)), "shorts URL rejected");
|
||||
require(VIDEO_ID.equals(id("https://www.youtube.com/embed/" + VIDEO_ID)), "embed URL rejected");
|
||||
|
||||
reject("http://www.youtube.com/watch?v=" + VIDEO_ID);
|
||||
reject("https://youtube.example/watch?v=" + VIDEO_ID);
|
||||
reject("https://youtube.com.evil.example/watch?v=" + VIDEO_ID);
|
||||
reject("https://user@www.youtube.com/watch?v=" + VIDEO_ID);
|
||||
reject("https://www.youtube.com:8443/watch?v=" + VIDEO_ID);
|
||||
reject("https://www.youtube.com/watch?v=too_short");
|
||||
reject("https://www.youtube.com/watch?v=" + VIDEO_ID + "&v=" + VIDEO_ID);
|
||||
reject("https://youtu.be/" + VIDEO_ID + "/extra");
|
||||
reject("https://www.youtube.com/watch?v=dQw4w9WgX%63Q");
|
||||
reject("x".repeat(WhiteDiscUrl.MAXIMUM_URL_LENGTH + 1));
|
||||
}
|
||||
|
||||
private static String id(String url) {
|
||||
return WhiteDiscUrl.videoId(url).orElseThrow();
|
||||
}
|
||||
|
||||
private static void reject(String url) {
|
||||
require(WhiteDiscUrl.videoId(url).isEmpty(), "Unsafe URL accepted: " + url);
|
||||
}
|
||||
|
||||
private static void require(boolean condition, String message) {
|
||||
if (!condition) throw new AssertionError(message);
|
||||
}
|
||||
}
|
||||
+117
-37
@@ -33,6 +33,15 @@ allprojects {
|
||||
}
|
||||
filter { includeGroup "maven.modrinth" }
|
||||
}
|
||||
exclusiveContent {
|
||||
forRepository {
|
||||
maven {
|
||||
name = "Lavalink"
|
||||
url = "https://maven.lavalink.dev/releases"
|
||||
}
|
||||
}
|
||||
filter { includeGroup "dev.lavalink.youtube" }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3429,8 +3438,8 @@ tasks.register("verifyProgressivePauseMenuRelease") {
|
||||
"sanctuary/src/main/resources/assets/sanctuary/lang/${locale}.json"))]
|
||||
}
|
||||
if (rootProject.pack_version != "26.2.0-alpha.210"
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.118"
|
||||
|| rootProject.onlyfun_version != "0.0.0-alpha.21"
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.119"
|
||||
|| rootProject.onlyfun_version != "0.0.0-alpha.24"
|
||||
|| release.pack_version != rootProject.pack_version || index.versionId != rootProject.pack_version
|
||||
|| migration.source?.modules != [sanctuary: "0.0.0-alpha.108", onlyfun: "0.0.0-alpha.17"]
|
||||
|| migration.target?.modules != [sanctuary: "0.0.0-alpha.109", onlyfun: "0.0.0-alpha.17"]
|
||||
@@ -3597,6 +3606,7 @@ project(":ouch") {
|
||||
dependencies {
|
||||
implementation project(":anotherworld")
|
||||
implementation project(":ambiance")
|
||||
implementation project(":onlyfun")
|
||||
implementation project(":sanctuary")
|
||||
}
|
||||
}
|
||||
@@ -3627,9 +3637,25 @@ project(":onlyfun") {
|
||||
mainClass = "fr.koka99cab.sanctuary26.onlyfun.loot.OnlyFunGeneratorSmoke"
|
||||
}
|
||||
|
||||
tasks.register("abjectionActionContractSmoke", JavaExec) {
|
||||
group = "verification"
|
||||
description = "Checks the bounded historical Abjection action contract."
|
||||
dependsOn tasks.named("testClasses")
|
||||
classpath = sourceSets.test.runtimeClasspath
|
||||
mainClass = "fr.koka99cab.sanctuary26.onlyfun.api.abjection.AbjectionActionContractSmoke"
|
||||
}
|
||||
|
||||
tasks.register("shitActionRequestSmoke", JavaExec) {
|
||||
group = "verification"
|
||||
description = "Checks one-shot and same-tick deduplication for the Abjection key request."
|
||||
dependsOn tasks.named("testClasses")
|
||||
classpath = sourceSets.test.runtimeClasspath
|
||||
mainClass = "fr.koka99cab.sanctuary26.onlyfun.abjection.ShitActionRequestSmoke"
|
||||
}
|
||||
|
||||
tasks.register("verifyOnlyFun") {
|
||||
group = "verification"
|
||||
description = "Checks Only Fun alpha.19 lootboxes, CSV Shop catalog and anchored Cobble Dungeons."
|
||||
description = "Checks Only Fun alpha.24, including the bounded configurable Abjection key."
|
||||
inputs.files(fileTree("src/main/java"))
|
||||
inputs.files(fileTree("src/main/resources"))
|
||||
inputs.file(file("art/shop/shop_catalog_editable.csv"))
|
||||
@@ -3712,9 +3738,61 @@ project(":onlyfun") {
|
||||
def shopCsv = file("art/shop/shop_catalog_editable.csv")
|
||||
def shopCsvText = shopCsv.getText("UTF-8")
|
||||
def shopCsvLines = shopCsv.readLines("UTF-8")
|
||||
def abjectionLanguages = ["fr_fr", "en_us", "ru_ru"].collectEntries { locale ->
|
||||
[(locale): new JsonSlurper().parse(file(
|
||||
"src/main/resources/assets/abjection/lang/${locale}.json"))]
|
||||
}
|
||||
def shitCubeTexture = javax.imageio.ImageIO.read(file(
|
||||
"src/main/resources/assets/abjection/textures/block/shit_cube.png"))
|
||||
def shitBallTexture = javax.imageio.ImageIO.read(file(
|
||||
"src/main/resources/assets/abjection/textures/item/shit_ball.png"))
|
||||
def shitCubeRecipe = new JsonSlurper().parse(file(
|
||||
"src/main/resources/data/abjection/recipe/shit_cube.json"))
|
||||
if (manifest.custom.sanctuary26.data_version != 2
|
||||
|| project.version.toString() != "0.0.0-alpha.21"
|
||||
|| project.version.toString() != "0.0.0-alpha.24"
|
||||
|| manifest.depends?.sanctuary != "*"
|
||||
|| manifest.provides != ["abjection"]
|
||||
|| manifest.custom.sanctuary26.network_protocol != 3
|
||||
|| !javaText.contains('NAMESPACE = "abjection"')
|
||||
|| !javaText.contains('public static StartResult start(ServerPlayer player, Action action)')
|
||||
|| !javaText.contains('PISS(15 * 20, "piss")')
|
||||
|| !javaText.contains('VOMIT(8 * 20, "vomit")')
|
||||
|| !javaText.contains('SHIT(6 * 20, "shit")')
|
||||
|| !javaText.contains('SMOKE(10 * 20, "smoke")')
|
||||
|| !javaText.contains('ServerPlayConnectionEvents.DISCONNECT')
|
||||
|| !javaText.contains('action == Action.SHIT && !restarted')
|
||||
|| !javaText.contains('new ItemStack(AbjectionRegistries.SHIT_BALL)')
|
||||
|| !javaText.contains('BlockBehaviour.Properties.ofFullCopy(Blocks.MUD)')
|
||||
|| !javaText.contains('class ShitBallItem extends Item implements ProjectileItem')
|
||||
|| !javaText.contains('public static void registerFactory(Factory implementation)')
|
||||
|| !javaText.contains('return AbjectionProjectileApi.create(level, position, stack, direction)')
|
||||
|| !javaText.contains('id("c2s/shit_action")')
|
||||
|| !javaText.contains('CustomPacketPayload.codec((payload, buffer) -> {},')
|
||||
|| !javaText.contains('GLFW.GLFW_KEY_J')
|
||||
|| !javaText.contains('while (shitKey.consumeClick())')
|
||||
|| !javaText.contains('server.getPlayerList().getPlayer(player.getUUID()) != player')
|
||||
|| !javaText.contains('acceptTick(player.getUUID(), server.getTickCount())')
|
||||
|| !javaText.contains('AbjectionActions.start(player, AbjectionActions.Action.SHIT)')
|
||||
|| shitCubeTexture == null || shitCubeTexture.width != 16 || shitCubeTexture.height != 16
|
||||
|| shitBallTexture == null || shitBallTexture.width != 16 || shitBallTexture.height != 16
|
||||
|| shitCubeRecipe.key?.get("#") != "abjection:shit_ball"
|
||||
|| shitCubeRecipe.result?.id != "abjection:shit_cube"
|
||||
|| !file("src/main/resources/data/abjection/loot_table/blocks/shit_cube.json").isFile()
|
||||
|| !file("src/main/resources/data/minecraft/tags/block/mineable/shovel.json").text
|
||||
.contains('"abjection:shit_cube"')
|
||||
|| abjectionLanguages.any { locale, translations ->
|
||||
!["item.abjection.shit_ball", "block.abjection.shit_cube",
|
||||
"command.abjection.piss.started", "command.abjection.vomit.started",
|
||||
"command.abjection.shit.started", "command.abjection.smoke.started"].every {
|
||||
translations.containsKey(it)
|
||||
}
|
||||
}
|
||||
|| ["fr_fr", "en_us", "ru_ru"].any { locale ->
|
||||
def translations = new JsonSlurper().parse(file(
|
||||
"src/main/resources/assets/onlyfun/lang/${locale}.json"))
|
||||
!translations.containsKey("key.categories.onlyfun.onlyfun")
|
||||
|| !translations.containsKey("key.onlyfun.shit")
|
||||
}
|
||||
|| !javaText.contains("ANOMALY_DENOMINATOR = 256")
|
||||
|| !javaText.contains("PITY_START = 24")
|
||||
|| !javaText.contains("class LootboxItem")
|
||||
@@ -3861,6 +3939,8 @@ project(":onlyfun") {
|
||||
}
|
||||
|
||||
tasks.named("check") {
|
||||
dependsOn tasks.named("abjectionActionContractSmoke")
|
||||
dependsOn tasks.named("shitActionRequestSmoke")
|
||||
dependsOn tasks.named("onlyFunGeneratorSmoke")
|
||||
dependsOn tasks.named("verifyOnlyFun")
|
||||
}
|
||||
@@ -4127,8 +4207,8 @@ tasks.register("verifyShopPricingLayoutRelease") {
|
||||
def release = new JsonSlurper().parse(file("pack/release.json"))
|
||||
def index = new JsonSlurper().parse(file("pack/prism/modrinth.index.json"))
|
||||
if (rootProject.pack_version != "26.2.0-alpha.210"
|
||||
|| rootProject.onlyfun_version != "0.0.0-alpha.21"
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.118"
|
||||
|| rootProject.onlyfun_version != "0.0.0-alpha.24"
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.119"
|
||||
|| release.pack_version != rootProject.pack_version || index.versionId != rootProject.pack_version
|
||||
|| migration.source?.pack_version != "26.2.0-alpha.192"
|
||||
|| migration.target?.pack_version != "26.2.0-alpha.193"
|
||||
@@ -4172,7 +4252,7 @@ tasks.register("verifyCuisineCropsRelease") {
|
||||
def rice = file("itsalive/src/main/java/fr/koka99cab/sanctuary26/itsalive/agriculture/RiceCropBlock.java").text
|
||||
def bean = file("itsalive/src/main/java/fr/koka99cab/sanctuary26/itsalive/agriculture/BeanCropBlock.java").text
|
||||
if (rootProject.pack_version != "26.2.0-alpha.210"
|
||||
|| rootProject.itsalive_version != "0.0.0-alpha.35"
|
||||
|| rootProject.itsalive_version != "0.0.0-alpha.36"
|
||||
|| release.pack_version != rootProject.pack_version || index.versionId != rootProject.pack_version
|
||||
|| migration.source?.pack_version != "26.2.0-alpha.193"
|
||||
|| migration.source?.modules != [itsalive: "0.0.0-alpha.26"]
|
||||
@@ -4221,8 +4301,8 @@ tasks.register("verifyShopCsvBossGatesRelease") {
|
||||
def catalog = file("onlyfun/src/main/java/fr/koka99cab/sanctuary26/onlyfun/shop/OnlyFunShopCatalog.java").text
|
||||
def offerCatalog = file("sanctuary/src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/ShopOfferCatalog.java").text
|
||||
if (rootProject.pack_version != "26.2.0-alpha.210"
|
||||
|| rootProject.onlyfun_version != "0.0.0-alpha.21"
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.118"
|
||||
|| rootProject.onlyfun_version != "0.0.0-alpha.24"
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.119"
|
||||
|| release.pack_version != rootProject.pack_version || index.versionId != rootProject.pack_version
|
||||
|| migration.source?.pack_version != "26.2.0-alpha.194"
|
||||
|| migration.source?.modules != [onlyfun: "0.0.0-alpha.18", sanctuary: "0.0.0-alpha.110"]
|
||||
@@ -4313,8 +4393,8 @@ tasks.register("verifyQuestRequestsCauldronBatchesRelease") {
|
||||
def packwiz = file("pack/packwiz/pack.toml").text
|
||||
def sanctuaryManifest = new JsonSlurper().parse(file("sanctuary/src/main/resources/fabric.mod.json"))
|
||||
if (rootProject.pack_version != "26.2.0-alpha.210"
|
||||
|| rootProject.itsalive_version != "0.0.0-alpha.35"
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.118"
|
||||
|| rootProject.itsalive_version != "0.0.0-alpha.36"
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.119"
|
||||
|| migration.source?.pack_version != "26.2.0-alpha.196"
|
||||
|| migration.target?.pack_version != "26.2.0-alpha.197"
|
||||
|| migration.target?.modules != [itsalive: "0.0.0-alpha.29", sanctuary: "0.0.0-alpha.113"]
|
||||
@@ -4331,7 +4411,7 @@ tasks.register("verifyQuestRequestsCauldronBatchesRelease") {
|
||||
|| migration.distribution?.jei?.prism_source != "30.24.0.176"
|
||||
|| migration.distribution?.jei?.target != "30.26.0.186"
|
||||
|| migration.compatibility?.sanctuary_target_network_protocol != 19
|
||||
|| sanctuaryManifest.custom?.sanctuary26?.network_protocol != 21
|
||||
|| sanctuaryManifest.custom?.sanctuary26?.network_protocol != 22
|
||||
|| release.pack_version != "26.2.0-alpha.210"
|
||||
|| release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.210.mrpack"
|
||||
|| prism.versionId != "26.2.0-alpha.210"
|
||||
@@ -4363,7 +4443,7 @@ tasks.register("verifyFermentationBarrelAutomationRelease") {
|
||||
def packwizIndex = file("pack/packwiz/index.toml").text
|
||||
def itsAliveManifest = new JsonSlurper().parse(file("itsalive/src/main/resources/fabric.mod.json"))
|
||||
if (rootProject.pack_version != "26.2.0-alpha.210"
|
||||
|| rootProject.itsalive_version != "0.0.0-alpha.35"
|
||||
|| rootProject.itsalive_version != "0.0.0-alpha.36"
|
||||
|| migration.source?.pack_version != "26.2.0-alpha.197"
|
||||
|| migration.target?.pack_version != "26.2.0-alpha.198"
|
||||
|| migration.target?.modules != [itsalive: "0.0.0-alpha.30", sanctuary: "0.0.0-alpha.114"]
|
||||
@@ -4413,8 +4493,8 @@ tasks.register("verifyQuestRequestContractsRelease") {
|
||||
def packwizIndex = file("pack/packwiz/index.toml").text
|
||||
def sanctuaryManifest = new JsonSlurper().parse(file("sanctuary/src/main/resources/fabric.mod.json"))
|
||||
if (rootProject.pack_version != "26.2.0-alpha.210"
|
||||
|| rootProject.itsalive_version != "0.0.0-alpha.35"
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.118"
|
||||
|| rootProject.itsalive_version != "0.0.0-alpha.36"
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.119"
|
||||
|| migration.source?.pack_version != "26.2.0-alpha.198"
|
||||
|| migration.source?.modules?.sanctuary != "0.0.0-alpha.114"
|
||||
|| migration.target?.pack_version != "26.2.0-alpha.199"
|
||||
@@ -4425,7 +4505,7 @@ tasks.register("verifyQuestRequestContractsRelease") {
|
||||
|| migration.quest_request_contracts?.right_click_shows_details_before_claim != true
|
||||
|| migration.quest_request_contracts?.chat_accept_revalidates_distance_owner_sign_and_claim != true
|
||||
|| migration.compatibility?.sanctuary_target_network_protocol != 20
|
||||
|| sanctuaryManifest.custom?.sanctuary26?.network_protocol != 21
|
||||
|| sanctuaryManifest.custom?.sanctuary26?.network_protocol != 22
|
||||
|| release.pack_version != "26.2.0-alpha.210"
|
||||
|| release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.210.mrpack"
|
||||
|| prism.versionId != "26.2.0-alpha.210"
|
||||
@@ -4468,8 +4548,8 @@ tasks.register("verifyWeatherTntAmbianceRelease") {
|
||||
def ouchManifest = new JsonSlurper().parse(file("ouch/src/main/resources/fabric.mod.json"))
|
||||
def rootBuild = file("build.gradle").text
|
||||
if (rootProject.pack_version != "26.2.0-alpha.210"
|
||||
|| rootProject.ambiance_version != "0.0.0-alpha.14"
|
||||
|| rootProject.ouch_version != "0.0.0-alpha.9"
|
||||
|| rootProject.ambiance_version != "0.0.0-alpha.15"
|
||||
|| rootProject.ouch_version != "0.0.0-alpha.10"
|
||||
|| migration.source?.pack_version != "26.2.0-alpha.199"
|
||||
|| migration.source?.modules != [ambiance: "0.0.0-alpha.11", ouch: "0.0.0-alpha.8"]
|
||||
|| migration.target?.pack_version != "26.2.0-alpha.200"
|
||||
@@ -4488,7 +4568,7 @@ tasks.register("verifyWeatherTntAmbianceRelease") {
|
||||
|| migration.compatibility?.ouch_network_protocol != 1
|
||||
|| migration.compatibility?.save_migration_required != false
|
||||
|| ambianceManifest.custom?.sanctuary26?.data_version != 2
|
||||
|| ambianceManifest.custom?.sanctuary26?.network_protocol != 5
|
||||
|| ambianceManifest.custom?.sanctuary26?.network_protocol != 6
|
||||
|| ouchManifest.custom?.sanctuary26?.data_version != 1
|
||||
|| ouchManifest.custom?.sanctuary26?.network_protocol != 1
|
||||
|| ouchManifest.depends?.ambiance != ">=0.0.0-alpha.12"
|
||||
@@ -4534,7 +4614,7 @@ tasks.register("verifyQuestRequestEscrowRelease") {
|
||||
def packwizIndex = file("pack/packwiz/index.toml").text
|
||||
def sanctuaryManifest = new JsonSlurper().parse(file("sanctuary/src/main/resources/fabric.mod.json"))
|
||||
if (rootProject.pack_version != "26.2.0-alpha.210"
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.118"
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.119"
|
||||
|| migration.source?.pack_version != "26.2.0-alpha.200"
|
||||
|| migration.source?.modules?.sanctuary != "0.0.0-alpha.115"
|
||||
|| migration.target?.pack_version != "26.2.0-alpha.201"
|
||||
@@ -4547,7 +4627,7 @@ tasks.register("verifyQuestRequestEscrowRelease") {
|
||||
|| migration.quest_request_escrow?.reward_delivery_to_claimant_mailbox != true
|
||||
|| migration.compatibility?.sanctuary_target_network_protocol != 21
|
||||
|| sanctuaryManifest.custom?.sanctuary26?.data_version != 11
|
||||
|| sanctuaryManifest.custom?.sanctuary26?.network_protocol != 21
|
||||
|| sanctuaryManifest.custom?.sanctuary26?.network_protocol != 22
|
||||
|| release.pack_version != "26.2.0-alpha.210"
|
||||
|| release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.210.mrpack"
|
||||
|| prism.versionId != "26.2.0-alpha.210"
|
||||
@@ -4589,9 +4669,9 @@ tasks.register("verifyWaystoneShopCulinaryAlpha202Release") {
|
||||
"sanctuary/src/main/resources/fabric.mod.json"))
|
||||
if (rootProject.pack_version != "26.2.0-alpha.210"
|
||||
|| rootProject.anotherworld_version != "0.0.0-alpha.55"
|
||||
|| rootProject.itsalive_version != "0.0.0-alpha.35"
|
||||
|| rootProject.itsalive_version != "0.0.0-alpha.36"
|
||||
|| rootProject.iliketomoveit_version != "0.0.0-alpha.15"
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.118"
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.119"
|
||||
|| migration.source?.pack_version != "26.2.0-alpha.201"
|
||||
|| migration.source?.modules != [
|
||||
itsalive: "0.0.0-alpha.30",
|
||||
@@ -4626,7 +4706,7 @@ tasks.register("verifyWaystoneShopCulinaryAlpha202Release") {
|
||||
|| moveItManifest.custom?.sanctuary26?.data_version != 3
|
||||
|| moveItManifest.custom?.sanctuary26?.network_protocol != 5
|
||||
|| sanctuaryManifest.custom?.sanctuary26?.data_version != 11
|
||||
|| sanctuaryManifest.custom?.sanctuary26?.network_protocol != 21
|
||||
|| sanctuaryManifest.custom?.sanctuary26?.network_protocol != 22
|
||||
|| release.pack_version != "26.2.0-alpha.210"
|
||||
|| release.modrinth?.primary_file != "sanctuary-26.2.0-alpha.210.mrpack"
|
||||
|| prism.versionId != "26.2.0-alpha.210"
|
||||
@@ -4749,7 +4829,7 @@ tasks.register("verifySafeVaultFeature") {
|
||||
}.keySet()
|
||||
if (rootProject.pack_version != "26.2.0-alpha.210"
|
||||
|| rootProject.anotherworld_version != "0.0.0-alpha.55"
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.118"
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.119"
|
||||
|| migration.schema_version != 1
|
||||
|| migration.source?.pack_version != "26.2.0-alpha.201"
|
||||
|| migration.target?.pack_version != "26.2.0-alpha.202"
|
||||
@@ -5238,8 +5318,8 @@ tasks.register("verifyCanapliaFoundation") {
|
||||
def visualApiSource = file(
|
||||
"ambiance/src/main/java/fr/koka99cab/sanctuary26/ambiance/api/visual/AmbianceVisualEffectApi.java").text
|
||||
if (rootProject.pack_version != "26.2.0-alpha.210"
|
||||
|| rootProject.itsalive_version != "0.0.0-alpha.35"
|
||||
|| rootProject.ambiance_version != "0.0.0-alpha.14"
|
||||
|| rootProject.itsalive_version != "0.0.0-alpha.36"
|
||||
|| rootProject.ambiance_version != "0.0.0-alpha.15"
|
||||
|| migration.issue != 35
|
||||
|| migration.source?.fabric_id != "canaplia"
|
||||
|| migration.source?.version != "2.0.0"
|
||||
@@ -5285,7 +5365,7 @@ tasks.register("verifyCanapliaFoundation") {
|
||||
|| itsAliveManifest.custom?.sanctuary26?.data_version != 3
|
||||
|| itsAliveManifest.custom?.sanctuary26?.network_protocol != 4
|
||||
|| ambianceManifest.custom?.sanctuary26?.data_version != 2
|
||||
|| ambianceManifest.custom?.sanctuary26?.network_protocol != 5
|
||||
|| ambianceManifest.custom?.sanctuary26?.network_protocol != 6
|
||||
|| !itsAliveDependencies.contains('implementation project(":ambiance")')
|
||||
|| !itsAliveDependencies.contains('implementation project(":sanctuary")')
|
||||
|| settingsText.contains('"canaplia"')
|
||||
@@ -5417,7 +5497,7 @@ tasks.register("verifyCanapliaGameplay") {
|
||||
|| migration.compatibility?.pack_release_updated != false
|
||||
|| itsAliveManifest.custom?.sanctuary26?.data_version != 3
|
||||
|| itsAliveManifest.custom?.sanctuary26?.network_protocol != 4
|
||||
|| ambianceManifest.custom?.sanctuary26?.network_protocol != 5
|
||||
|| ambianceManifest.custom?.sanctuary26?.network_protocol != 6
|
||||
|| discovery.schema_version != 1 || discovery.sources.size() > 128
|
||||
|| discovery.sources.any {
|
||||
it.chance_numerator < 1 || it.chance_numerator >= it.chance_denominator
|
||||
@@ -5488,9 +5568,9 @@ tasks.register("verifyCanapliaAlpha209Release") {
|
||||
itsalive: "0.0.0-alpha.33",
|
||||
onlyfun: "0.0.0-alpha.20"]
|
||||
if (rootProject.pack_version != "26.2.0-alpha.210"
|
||||
|| rootProject.ambiance_version != expectedTarget.ambiance
|
||||
|| rootProject.itsalive_version != "0.0.0-alpha.35"
|
||||
|| rootProject.onlyfun_version != "0.0.0-alpha.21"
|
||||
|| rootProject.ambiance_version != "0.0.0-alpha.15"
|
||||
|| rootProject.itsalive_version != "0.0.0-alpha.36"
|
||||
|| rootProject.onlyfun_version != "0.0.0-alpha.24"
|
||||
|| migration.source?.pack_version != "26.2.0-alpha.207"
|
||||
|| migration.source?.modules != expectedSource
|
||||
|| migration.target?.pack_version != "26.2.0-alpha.208"
|
||||
@@ -5597,10 +5677,10 @@ tasks.register("verifyAlpha210Release") {
|
||||
it.path == "mods/jei-26.2-fabric-30.28.0.193.jar"
|
||||
}
|
||||
if (rootProject.pack_version != "26.2.0-alpha.210"
|
||||
|| rootProject.sanctuary_version != expectedTarget.sanctuary
|
||||
|| rootProject.onlyfun_version != expectedTarget.onlyfun
|
||||
|| rootProject.sanctuary_version != "0.0.0-alpha.119"
|
||||
|| rootProject.onlyfun_version != "0.0.0-alpha.24"
|
||||
|| rootProject.iliketomoveit_version != expectedTarget.iliketomoveit
|
||||
|| rootProject.itsalive_version != expectedTarget.itsalive
|
||||
|| rootProject.itsalive_version != "0.0.0-alpha.36"
|
||||
|| migration.source?.pack_version != "26.2.0-alpha.209"
|
||||
|| migration.source?.modules != expectedSource
|
||||
|| migration.target?.pack_version != "26.2.0-alpha.210"
|
||||
@@ -5635,9 +5715,9 @@ tasks.register("verifyAlpha210Release") {
|
||||
|| migration.distribution?.jei?.modrinth_version_id != "qaCQ7LGO"
|
||||
|| migration.distribution?.jei?.packwiz_and_prism_synchronized != true
|
||||
|| manifests.sanctuary.custom?.sanctuary26?.data_version != 11
|
||||
|| manifests.sanctuary.custom?.sanctuary26?.network_protocol != 21
|
||||
|| manifests.sanctuary.custom?.sanctuary26?.network_protocol != 22
|
||||
|| manifests.onlyfun.custom?.sanctuary26?.data_version != 2
|
||||
|| manifests.onlyfun.custom?.sanctuary26?.network_protocol != 2
|
||||
|| manifests.onlyfun.custom?.sanctuary26?.network_protocol != 3
|
||||
|| manifests.iliketomoveit.custom?.sanctuary26?.data_version != 3
|
||||
|| manifests.iliketomoveit.custom?.sanctuary26?.network_protocol != 5
|
||||
|| manifests.itsalive.custom?.sanctuary26?.data_version != 3
|
||||
|
||||
+5
-5
@@ -12,23 +12,23 @@ fabric_api_version=0.158.0+26.2
|
||||
# Standby modules stay at zero until their migration really begins.
|
||||
mod_version=0.0.0-alpha.0
|
||||
module_lifecycle=standby
|
||||
ambiance_version=0.0.0-alpha.14
|
||||
ambiance_version=0.0.0-alpha.15
|
||||
ambiance_lifecycle=active
|
||||
redstoner_version=0.0.0-alpha.10
|
||||
redstoner_lifecycle=active
|
||||
anotherworld_version=0.0.0-alpha.55
|
||||
anotherworld_lifecycle=active
|
||||
itsalive_version=0.0.0-alpha.35
|
||||
itsalive_version=0.0.0-alpha.36
|
||||
itsalive_lifecycle=active
|
||||
ouch_version=0.0.0-alpha.9
|
||||
ouch_version=0.0.0-alpha.10
|
||||
ouch_lifecycle=active
|
||||
masterkey_version=0.0.0-alpha.8
|
||||
masterkey_lifecycle=active
|
||||
iliketomoveit_version=0.0.0-alpha.15
|
||||
iliketomoveit_lifecycle=active
|
||||
onlyfun_version=0.0.0-alpha.21
|
||||
onlyfun_version=0.0.0-alpha.24
|
||||
onlyfun_lifecycle=active
|
||||
sanctuary_version=0.0.0-alpha.118
|
||||
sanctuary_version=0.0.0-alpha.119
|
||||
sanctuary_lifecycle=active
|
||||
pack_version=26.2.0-alpha.210
|
||||
maven_group=fr.koka99cab.sanctuary26
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
It's Alive possède le vivant de Sanctuary. Il enrichit directement le Creeper vanilla et accueille désormais les papillons de Pipallon, les Mooblooms fleuries et les créatures de Real Ghost — baleine volante comprise — sous un référencement unifié `itsalive:*`.
|
||||
|
||||
## Version courante — `0.0.0-alpha.35`
|
||||
## Version courante — `0.0.0-alpha.36`
|
||||
|
||||
## Creepers
|
||||
|
||||
|
||||
+11
-7
@@ -556,7 +556,7 @@ tasks.register("verifyItsAlive") {
|
||||
def climateSource = file("src/main/java/fr/koka99cab/sanctuary26/itsalive/agriculture/ClimateCropForaging.java").text
|
||||
def pineappleSource = file("src/main/java/fr/koka99cab/sanctuary26/itsalive/agriculture/PineappleItem.java").text
|
||||
def worldgenSource = file("src/main/java/fr/koka99cab/sanctuary26/itsalive/agriculture/ItsAliveAgricultureWorldGeneration.java").text
|
||||
if (project.version.toString() != "0.0.0-alpha.35"
|
||||
if (project.version.toString() != "0.0.0-alpha.36"
|
||||
|| climateMigration.target?.pack_version != "26.2.0-alpha.157"
|
||||
|| climateMigration.target?.modules?.itsalive != "0.0.0-alpha.24"
|
||||
|| !climateSource.contains("PlayerBlockBreakEvents.AFTER.register")
|
||||
@@ -1313,7 +1313,7 @@ tasks.register("verifyCulinaryReliability") {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (project.version.toString() != "0.0.0-alpha.35"
|
||||
if (project.version.toString() != "0.0.0-alpha.36"
|
||||
|| migration.target?.modules?.itsalive != "0.0.0-alpha.28"
|
||||
|| migration.culinary_fixes?.food_press_contents_destroyed_on_break != true
|
||||
|| migration.culinary_fixes?.comparator_contract?.blocks?.size() != 6
|
||||
@@ -1351,7 +1351,7 @@ tasks.register("verifyCauldronBatching") {
|
||||
def recipe = file("src/main/java/fr/koka99cab/sanctuary26/itsalive/culinary/recipe/CulinaryProcessRecipe.java").text
|
||||
def cauldron = file("src/main/java/fr/koka99cab/sanctuary26/itsalive/culinary/block/entity/CookingCauldronBlockEntity.java").text
|
||||
def timed = file("src/main/java/fr/koka99cab/sanctuary26/itsalive/culinary/block/entity/AbstractTimedCulinaryBlockEntity.java").text
|
||||
if (project.version.toString() != "0.0.0-alpha.35"
|
||||
if (project.version.toString() != "0.0.0-alpha.36"
|
||||
|| migration.target?.modules?.itsalive != "0.0.0-alpha.29"
|
||||
|| migration.cauldron_batches?.logical_stack_limit != 64
|
||||
|| migration.cauldron_batches?.identity != "same_item_same_components"
|
||||
@@ -1389,7 +1389,7 @@ tasks.register("verifyFermentationBarrelAutomation") {
|
||||
def partialMatching = file("src/main/java/fr/koka99cab/sanctuary26/itsalive/culinary/recipe/CulinaryPartialMatching.java").text
|
||||
def blockstate = new JsonSlurper().parse(
|
||||
file("src/main/resources/assets/itsalive/blockstates/fermentation_barrel.json"))
|
||||
if (project.version.toString() != "0.0.0-alpha.35"
|
||||
if (project.version.toString() != "0.0.0-alpha.36"
|
||||
|| migration.source?.modules?.itsalive != "0.0.0-alpha.29"
|
||||
|| migration.target?.modules?.itsalive != "0.0.0-alpha.30"
|
||||
|| migration.fermentation_barrel?.maximum_units_per_input_slot != 1
|
||||
@@ -1437,7 +1437,7 @@ tasks.register("verifyCulinaryLecternRelease") {
|
||||
[(locale): new JsonSlurper().parse(file(
|
||||
"src/main/resources/assets/itsalive/lang/${locale}.json"))]
|
||||
}
|
||||
if (project.version.toString() != "0.0.0-alpha.35"
|
||||
if (project.version.toString() != "0.0.0-alpha.36"
|
||||
|| migration.target?.modules?.itsalive != "0.0.0-alpha.31"
|
||||
|| migration.culinary_lectern?.book_tag != "minecraft:lectern_books"
|
||||
|| migration.culinary_lectern?.owner_catalog_shared_while_placed != true
|
||||
@@ -1500,7 +1500,7 @@ tasks.register("verifyCanapliaForbiddenBook") {
|
||||
fr_fr: "Livre interdit",
|
||||
en_us: "Forbidden Book",
|
||||
ru_ru: "Запретная книга"]
|
||||
if (project.version.toString() != "0.0.0-alpha.35"
|
||||
if (project.version.toString() != "0.0.0-alpha.36"
|
||||
|| !pageItem.contains("CanapliaKnowledge.learnRandomUnknown(serverPlayer)")
|
||||
|| !knowledge.contains("unknownVariants(data.personal(player.getUUID()))")
|
||||
|| !knowledge.contains("data.personal(inscription.ownerId())")
|
||||
@@ -1510,7 +1510,11 @@ tasks.register("verifyCanapliaForbiddenBook") {
|
||||
|| !lectern.contains("PlayerBlockBreakEvents.BEFORE.register")
|
||||
|| !lectern.contains("CanapliaKnowledge.open(serverPlayer, book)")
|
||||
|| !lectern.contains("CanapliaKnowledge.forgetInscription(taken)")
|
||||
|| !screen.contains("PAGE_BACKGROUND = 0xFF09070E")
|
||||
|| screen.contains("PAGE_BACKGROUND")
|
||||
|| screen.contains("extractBackground(GuiGraphicsExtractor")
|
||||
|| screen.contains("extractRenderState(GuiGraphicsExtractor")
|
||||
|| !screen.contains("ChatFormatting.DARK_GRAY")
|
||||
|| !screen.contains("ChatFormatting.DARK_GREEN")
|
||||
|| screen.contains("screen.canaplia.codex.introduction")
|
||||
|| !components.contains('ItsAliveMod.id("canaplia_codex")')
|
||||
|| lecternBooks["values"] != ["itsalive:culinary_recipe_book", "canaplia:codex"]
|
||||
|
||||
+4
-43
@@ -5,17 +5,12 @@ import fr.koka99cab.sanctuary26.itsalive.network.CanapliaCodexPayload;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import net.minecraft.ChatFormatting;
|
||||
import net.minecraft.client.gui.GuiGraphicsExtractor;
|
||||
import net.minecraft.client.gui.screens.inventory.BookViewScreen;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.chat.MutableComponent;
|
||||
|
||||
/** Vanilla book presentation of the server-authored Canaplia catalogue. */
|
||||
public final class CanapliaCodexScreen extends BookViewScreen {
|
||||
private static final int PAGE_BACKGROUND = 0xFF09070E;
|
||||
private static final int PAGE_BORDER = 0xFF5B3268;
|
||||
private int displayedPage;
|
||||
|
||||
public CanapliaCodexScreen(CanapliaCodexPayload snapshot) {
|
||||
super(new BookAccess(pages(snapshot)));
|
||||
}
|
||||
@@ -29,40 +24,6 @@ public final class CanapliaCodexScreen extends BookViewScreen {
|
||||
return List.copyOf(pages);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void extractBackground(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTick) {
|
||||
super.extractBackground(graphics, mouseX, mouseY, partialTick);
|
||||
int left = (this.width - IMAGE_WIDTH) / 2;
|
||||
graphics.fill(left + 18, 14, left + 174, 177, PAGE_BACKGROUND);
|
||||
graphics.outline(left + 18, 14, 156, 163, PAGE_BORDER);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void extractRenderState(GuiGraphicsExtractor graphics, int mouseX, int mouseY, float partialTick) {
|
||||
super.extractRenderState(graphics, mouseX, mouseY, partialTick);
|
||||
graphics.nextStratum();
|
||||
int left = (this.width - IMAGE_WIDTH) / 2;
|
||||
graphics.fill(left + 94, 14, left + 174, 27, PAGE_BACKGROUND);
|
||||
graphics.text(this.font, Component.translatable("screen.canaplia.codex.page",
|
||||
displayedPage + 1, CanapliaVariantKey.values().length), left + 99, 18, 0xFFE3C7ED);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean setPage(int page) {
|
||||
displayedPage = Math.clamp(page, 0, CanapliaVariantKey.values().length - 1);
|
||||
return super.setPage(page);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void pageBack() {
|
||||
setPage(displayedPage - 1);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void pageForward() {
|
||||
setPage(displayedPage + 1);
|
||||
}
|
||||
|
||||
private static Component variantPage(CanapliaCodexPayload snapshot,
|
||||
CanapliaVariantKey variant, int index) {
|
||||
boolean personal = bit(snapshot.personalMask(), index);
|
||||
@@ -71,22 +32,22 @@ public final class CanapliaCodexScreen extends BookViewScreen {
|
||||
boolean conditionHint = bit(snapshot.conditionHintMask(), index);
|
||||
|
||||
MutableComponent page = Component.translatable("screen.canaplia.codex.entry_number", index + 1)
|
||||
.withStyle(ChatFormatting.LIGHT_PURPLE).append("\n\n");
|
||||
.withStyle(ChatFormatting.DARK_GRAY).append("\n\n");
|
||||
if (!personal && !shared) {
|
||||
return page.append(Component.translatable("screen.canaplia.codex.hidden")
|
||||
.withStyle(ChatFormatting.GRAY));
|
||||
}
|
||||
|
||||
page.append(Component.translatable("variant.canaplia." + variant.key())
|
||||
.withStyle(personal ? ChatFormatting.GREEN : ChatFormatting.LIGHT_PURPLE));
|
||||
.withStyle(personal ? ChatFormatting.DARK_GREEN : ChatFormatting.DARK_PURPLE));
|
||||
if (personal || shared || originHint) {
|
||||
page.append("\n\n").append(Component.translatable("screen.canaplia.codex.origin",
|
||||
Component.translatable("origin.canaplia." + variant.key()))
|
||||
.withStyle(ChatFormatting.GRAY));
|
||||
.withStyle(ChatFormatting.DARK_GRAY));
|
||||
}
|
||||
if (personal || shared || conditionHint) {
|
||||
page.append("\n\n").append(Component.translatable("hint.canaplia." + variant.key())
|
||||
.withStyle(ChatFormatting.GRAY));
|
||||
.withStyle(ChatFormatting.DARK_GRAY));
|
||||
}
|
||||
return page;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
# Abjection dans Only Fun
|
||||
|
||||
Le runtime historique GPL-3.0-or-later de `Fun/abjection` est intégré au JAR **Only Fun**. Le
|
||||
namespace `abjection` et les IDs `abjection:shit_ball` et `abjection:shit_cube` sont conservés ; le
|
||||
manifeste Only Fun fournit l’alias Fabric `abjection`, sans créer un onzième module.
|
||||
|
||||
## ABJ-01 — actions serveur
|
||||
|
||||
- `/piss` émet son jet pendant 15 secondes et peut activer un bouton touché ;
|
||||
- `/vomit` émet son jet pendant 8 secondes ;
|
||||
- `/shit` émet son jet pendant 6 secondes et crée régulièrement la même
|
||||
`abjection:shit_ball` que les lots suivants ;
|
||||
- `/smoke` émet de la fumée pendant 10 secondes.
|
||||
|
||||
`AbjectionActions.start` est l’unique API publique de déclenchement. Chaque nouvelle demande
|
||||
redémarre seulement l’action correspondante, sans dupliquer la boule initiale de `/shit`. L’état
|
||||
reste en mémoire serveur, n’est jamais sauvegardé et est supprimé à la mort, au passage spectateur
|
||||
ou à la déconnexion.
|
||||
|
||||
Le bloc `abjection:shit_cube` reprend les propriétés de la boue, l’apparence 16×16, la recette
|
||||
neuf boules, le butin et l’outil pelle historiques. Les textes sont disponibles en français,
|
||||
anglais et russe. Only Fun reste en données v2 et protocole réseau 2 pour ABJ-01.
|
||||
|
||||
## ABJ-02 — projectile Ouch
|
||||
|
||||
Only Fun expose l’objet et le point d’installation `AbjectionProjectileApi`. Ouch, qui dépend
|
||||
explicitement d’Only Fun sans cycle inverse, enregistre le type d’entité sous le même ID historique
|
||||
`abjection:shit_ball` et installe la fabrique commune au lancer manuel et au dispenser. Le
|
||||
projectile mesure 0,25 bloc, consomme une unité hors créatif, joue le son de boue à l’impact et
|
||||
ajoute sept secondes à la nausée déjà présente sans dupliquer d’objet.
|
||||
|
||||
## ABJ-03 — raccourci configurable
|
||||
|
||||
La catégorie de contrôles Only Fun expose « Chier », assigné à `J` par défaut. Le client utilise
|
||||
`consumeClick`, puis envoie un payload vide `onlyfun:c2s/shit_action`. Le serveur accepte au plus
|
||||
une demande par joueur et par tick, revalide que le joueur est toujours connecté, vivant et non
|
||||
spectateur, puis appelle le même `AbjectionActions.start(SHIT)` que `/shit`. Maintenir la touche
|
||||
ne produit donc pas de répétition par tick et la commande reste disponible. Only Fun conserve ses
|
||||
données v2 et passe son protocole réseau de 2 à 3.
|
||||
@@ -1,6 +1,9 @@
|
||||
package fr.koka99cab.sanctuary26.onlyfun;
|
||||
|
||||
import fr.koka99cab.sanctuary26.onlyfun.chickencarry.ChickenCarryController;
|
||||
import fr.koka99cab.sanctuary26.onlyfun.abjection.AbjectionRegistries;
|
||||
import fr.koka99cab.sanctuary26.onlyfun.api.abjection.AbjectionActions;
|
||||
import fr.koka99cab.sanctuary26.onlyfun.command.AbjectionCommands;
|
||||
import fr.koka99cab.sanctuary26.onlyfun.network.OnlyFunNetworking;
|
||||
import fr.koka99cab.sanctuary26.onlyfun.registry.OnlyFunRegistries;
|
||||
import fr.koka99cab.sanctuary26.onlyfun.registry.OnlyFunCreativeTab;
|
||||
@@ -31,6 +34,7 @@ public final class OnlyFunMod implements ModInitializer {
|
||||
|
||||
@Override
|
||||
public void onInitialize() {
|
||||
AbjectionRegistries.initialize();
|
||||
OnlyFunRegistries.initialize();
|
||||
OnlyFunCreativeTab.initialize();
|
||||
OnlyFunGenerator.initialize();
|
||||
@@ -42,6 +46,8 @@ public final class OnlyFunMod implements ModInitializer {
|
||||
OnlyFunNetworking.initialize();
|
||||
ChickenCarryController.register();
|
||||
OnlyFunCommands.register();
|
||||
AbjectionActions.initialize();
|
||||
AbjectionCommands.register();
|
||||
LOGGER.info("[{}] Loot generator, natural Lucky Blocks, mob lootboxes and chicken rules ready (data v{}, network v{}).",
|
||||
DISPLAY_NAME, CURRENT_DATA_VERSION, OnlyFunNetworking.PROTOCOL_VERSION);
|
||||
}
|
||||
|
||||
+52
@@ -0,0 +1,52 @@
|
||||
package fr.koka99cab.sanctuary26.onlyfun.abjection;
|
||||
|
||||
import java.util.function.Function;
|
||||
import net.minecraft.core.Registry;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.world.item.BlockItem;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.state.BlockBehaviour;
|
||||
|
||||
/** Historical Abjection registry IDs, owned and distributed by Only Fun. */
|
||||
public final class AbjectionRegistries {
|
||||
public static final String NAMESPACE = "abjection";
|
||||
public static final Block SHIT_CUBE = registerBlock("shit_cube", Block::new,
|
||||
BlockBehaviour.Properties.ofFullCopy(Blocks.MUD));
|
||||
public static final Item SHIT_BALL = registerItem("shit_ball",
|
||||
properties -> new ShitBallItem(properties.stacksTo(16).useItemDescriptionPrefix()));
|
||||
public static final Item SHIT_CUBE_ITEM = registerBlockItem("shit_cube", SHIT_CUBE);
|
||||
|
||||
private AbjectionRegistries() {
|
||||
}
|
||||
|
||||
public static Identifier id(String path) {
|
||||
return Identifier.fromNamespaceAndPath(NAMESPACE, path);
|
||||
}
|
||||
|
||||
public static void initialize() {
|
||||
// Class initialization owns registration; this method makes the startup order explicit.
|
||||
}
|
||||
|
||||
private static Item registerItem(String path, Function<Item.Properties, Item> factory) {
|
||||
ResourceKey<Item> key = ResourceKey.create(Registries.ITEM, id(path));
|
||||
return Registry.register(BuiltInRegistries.ITEM, key,
|
||||
factory.apply(new Item.Properties().setId(key)));
|
||||
}
|
||||
|
||||
private static Block registerBlock(String path, Function<BlockBehaviour.Properties, Block> factory,
|
||||
BlockBehaviour.Properties properties) {
|
||||
ResourceKey<Block> key = ResourceKey.create(Registries.BLOCK, id(path));
|
||||
return Registry.register(BuiltInRegistries.BLOCK, key, factory.apply(properties.setId(key)));
|
||||
}
|
||||
|
||||
private static Item registerBlockItem(String path, Block block) {
|
||||
ResourceKey<Item> key = ResourceKey.create(Registries.ITEM, id(path));
|
||||
return Registry.register(BuiltInRegistries.ITEM, key,
|
||||
new BlockItem(block, new Item.Properties().setId(key).useBlockDescriptionPrefix()));
|
||||
}
|
||||
}
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
package fr.koka99cab.sanctuary26.onlyfun.abjection;
|
||||
|
||||
import fr.koka99cab.sanctuary26.onlyfun.api.abjection.AbjectionActions;
|
||||
import fr.koka99cab.sanctuary26.onlyfun.network.ShitActionRequestPayload;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
|
||||
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
|
||||
/** Validates connection/player state and deduplicates malicious same-tick key requests. */
|
||||
public final class ShitActionRequestHandler {
|
||||
private static final Map<UUID, Integer> LAST_REQUEST_TICK = new HashMap<>();
|
||||
|
||||
private ShitActionRequestHandler() {
|
||||
}
|
||||
|
||||
public static void register() {
|
||||
ServerPlayNetworking.registerGlobalReceiver(ShitActionRequestPayload.ID,
|
||||
(payload, context) -> handle(context.player()));
|
||||
ServerPlayConnectionEvents.DISCONNECT.register((handler, server) ->
|
||||
clear(handler.player.getUUID()));
|
||||
}
|
||||
|
||||
private static void handle(ServerPlayer player) {
|
||||
MinecraftServer server = player.level().getServer();
|
||||
if (server == null || server.getPlayerList().getPlayer(player.getUUID()) != player
|
||||
|| !player.isAlive() || player.isSpectator()
|
||||
|| !acceptTick(player.getUUID(), server.getTickCount())) return;
|
||||
AbjectionActions.start(player, AbjectionActions.Action.SHIT);
|
||||
}
|
||||
|
||||
static boolean acceptTick(UUID playerId, int tick) {
|
||||
Integer previous = LAST_REQUEST_TICK.put(playerId, tick);
|
||||
return previous == null || previous != tick;
|
||||
}
|
||||
|
||||
static void clear(UUID playerId) {
|
||||
LAST_REQUEST_TICK.remove(playerId);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package fr.koka99cab.sanctuary26.onlyfun.abjection;
|
||||
|
||||
import fr.koka99cab.sanctuary26.onlyfun.api.abjection.AbjectionProjectileApi;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.Position;
|
||||
import net.minecraft.world.entity.projectile.Projectile;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.ProjectileItem;
|
||||
import net.minecraft.world.level.Level;
|
||||
|
||||
/** Historical item identity with a projectile contract implemented by the owning Ouch module. */
|
||||
public final class ShitBallItem extends Item implements ProjectileItem {
|
||||
public ShitBallItem(Properties properties) {
|
||||
super(properties);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Projectile asProjectile(Level level, Position position, ItemStack stack, Direction direction) {
|
||||
return AbjectionProjectileApi.create(level, position, stack, direction);
|
||||
}
|
||||
}
|
||||
+383
@@ -0,0 +1,383 @@
|
||||
package fr.koka99cab.sanctuary26.onlyfun.api.abjection;
|
||||
|
||||
import fr.koka99cab.sanctuary26.onlyfun.abjection.AbjectionRegistries;
|
||||
import java.util.EnumMap;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
|
||||
import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.particles.ColorParticleOption;
|
||||
import net.minecraft.core.particles.DustParticleOptions;
|
||||
import net.minecraft.core.particles.ItemParticleOption;
|
||||
import net.minecraft.core.particles.ParticleTypes;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.util.Mth;
|
||||
import net.minecraft.world.entity.HumanoidArm;
|
||||
import net.minecraft.world.entity.item.ItemEntity;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.minecraft.world.level.ClipContext;
|
||||
import net.minecraft.world.level.block.ButtonBlock;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
import net.minecraft.world.phys.HitResult;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
/** Public server API shared by Abjection commands and bounded client requests. */
|
||||
public final class AbjectionActions {
|
||||
public enum Action {
|
||||
PISS(15 * 20, "piss"),
|
||||
VOMIT(8 * 20, "vomit"),
|
||||
SHIT(6 * 20, "shit"),
|
||||
SMOKE(10 * 20, "smoke");
|
||||
|
||||
private final int durationTicks;
|
||||
private final String id;
|
||||
|
||||
Action(int durationTicks, String id) {
|
||||
this.durationTicks = durationTicks;
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public int durationTicks() {
|
||||
return durationTicks;
|
||||
}
|
||||
|
||||
public String id() {
|
||||
return id;
|
||||
}
|
||||
}
|
||||
|
||||
public enum StartResult {
|
||||
STARTED,
|
||||
RESTARTED,
|
||||
REJECTED
|
||||
}
|
||||
|
||||
private static final Map<UUID, EnumMap<Action, Integer>> ACTIVE = new HashMap<>();
|
||||
private static final int STREAM_SEGMENTS = 64;
|
||||
private static final double STREAM_STEP_LENGTH = 0.05D;
|
||||
private static final double STREAM_STEP_SCALE = STREAM_STEP_LENGTH / 0.28D;
|
||||
private static final DustParticleOptions PISS_BRIGHT = new DustParticleOptions(0xEDD62E, 0.24F);
|
||||
private static final DustParticleOptions PISS_GOLD = new DustParticleOptions(0xD8B825, 0.2F);
|
||||
private static final DustParticleOptions PISS_AMBER = new DustParticleOptions(0xC6941A, 0.19F);
|
||||
private static final DustParticleOptions PISS_DEEP_GOLD = new DustParticleOptions(0xB88714, 0.17F);
|
||||
private static final DustParticleOptions VOMIT_GREEN = new DustParticleOptions(0x88A436, 0.24F);
|
||||
private static final DustParticleOptions VOMIT_YELLOW = new DustParticleOptions(0xB6B342, 0.2F);
|
||||
private static final DustParticleOptions VOMIT_ORANGE = new DustParticleOptions(0xA96A32, 0.19F);
|
||||
private static final DustParticleOptions VOMIT_BROWN = new DustParticleOptions(0x6E5828, 0.17F);
|
||||
private static final DustParticleOptions SHIT_SPLAT = new DustParticleOptions(0x4A2B14, 1.4F);
|
||||
private static final DustParticleOptions SHIT_MUD = new DustParticleOptions(0x6A4521, 0.22F);
|
||||
private static final ColorParticleOption PISS_BRIGHT_MIST =
|
||||
ColorParticleOption.create(ParticleTypes.ENTITY_EFFECT, 0xF0E35A);
|
||||
private static final ColorParticleOption PISS_GOLD_MIST =
|
||||
ColorParticleOption.create(ParticleTypes.ENTITY_EFFECT, 0xD8C43A);
|
||||
private static final ColorParticleOption PISS_AMBER_MIST =
|
||||
ColorParticleOption.create(ParticleTypes.ENTITY_EFFECT, 0xCDA128);
|
||||
private static final ColorParticleOption VOMIT_GREEN_MIST =
|
||||
ColorParticleOption.create(ParticleTypes.ENTITY_EFFECT, 0x95B33F);
|
||||
private static final ColorParticleOption VOMIT_YELLOW_MIST =
|
||||
ColorParticleOption.create(ParticleTypes.ENTITY_EFFECT, 0xC4C35B);
|
||||
private static final ColorParticleOption VOMIT_ORANGE_MIST =
|
||||
ColorParticleOption.create(ParticleTypes.ENTITY_EFFECT, 0xB97A3D);
|
||||
private static final ItemParticleOption VOMIT_FLESH =
|
||||
new ItemParticleOption(ParticleTypes.ITEM, Items.ROTTEN_FLESH);
|
||||
private static final ItemParticleOption VOMIT_EYE =
|
||||
new ItemParticleOption(ParticleTypes.ITEM, Items.SPIDER_EYE);
|
||||
private static final ItemParticleOption VOMIT_POTATO =
|
||||
new ItemParticleOption(ParticleTypes.ITEM, Items.POISONOUS_POTATO);
|
||||
private static boolean initialized;
|
||||
|
||||
private AbjectionActions() {
|
||||
}
|
||||
|
||||
public static void initialize() {
|
||||
if (initialized) return;
|
||||
initialized = true;
|
||||
ServerTickEvents.END_SERVER_TICK.register(AbjectionActions::tick);
|
||||
ServerPlayConnectionEvents.DISCONNECT.register((handler, server) -> clear(handler.player.getUUID()));
|
||||
}
|
||||
|
||||
public static StartResult start(ServerPlayer player, Action action) {
|
||||
if (player == null || action == null || !player.isAlive() || player.isSpectator()
|
||||
|| player.level().getServer() == null) return StartResult.REJECTED;
|
||||
boolean restarted = restart(player.getUUID(), action);
|
||||
if (action == Action.SHIT && !restarted) spawnShitDrop(player.level(), player);
|
||||
return restarted ? StartResult.RESTARTED : StartResult.STARTED;
|
||||
}
|
||||
|
||||
static boolean restart(UUID playerId, Action action) {
|
||||
EnumMap<Action, Integer> actions = ACTIVE.computeIfAbsent(playerId, ignored ->
|
||||
new EnumMap<>(Action.class));
|
||||
return actions.put(action, action.durationTicks()) != null;
|
||||
}
|
||||
|
||||
public static void clear(UUID playerId) {
|
||||
ACTIVE.remove(playerId);
|
||||
}
|
||||
|
||||
static int remaining(UUID playerId, Action action) {
|
||||
return ACTIVE.getOrDefault(playerId, new EnumMap<>(Action.class)).getOrDefault(action, 0);
|
||||
}
|
||||
|
||||
private static void tick(MinecraftServer server) {
|
||||
Iterator<Map.Entry<UUID, EnumMap<Action, Integer>>> players = ACTIVE.entrySet().iterator();
|
||||
while (players.hasNext()) {
|
||||
Map.Entry<UUID, EnumMap<Action, Integer>> entry = players.next();
|
||||
ServerPlayer player = server.getPlayerList().getPlayer(entry.getKey());
|
||||
if (player == null || !player.isAlive() || player.isSpectator()) {
|
||||
players.remove();
|
||||
continue;
|
||||
}
|
||||
Iterator<Map.Entry<Action, Integer>> actions = entry.getValue().entrySet().iterator();
|
||||
while (actions.hasNext()) {
|
||||
Map.Entry<Action, Integer> action = actions.next();
|
||||
emit(player, action.getKey(), action.getValue());
|
||||
int remaining = action.getValue() - 1;
|
||||
if (remaining <= 0) actions.remove();
|
||||
else action.setValue(remaining);
|
||||
}
|
||||
if (entry.getValue().isEmpty()) players.remove();
|
||||
}
|
||||
}
|
||||
|
||||
private static void emit(ServerPlayer player, Action action, int remaining) {
|
||||
switch (action) {
|
||||
case PISS -> spawnPissStream(player);
|
||||
case VOMIT -> spawnVomitStream(player);
|
||||
case SHIT -> spawnShitStream(player, remaining);
|
||||
case SMOKE -> spawnSmoke(player);
|
||||
}
|
||||
}
|
||||
|
||||
private static void spawnPissStream(ServerPlayer player) {
|
||||
ServerLevel level = player.level();
|
||||
Vec3 position = pissOrigin(player);
|
||||
Vec3 velocity = pissVelocity(player);
|
||||
for (int step = 0; step < STREAM_SEGMENTS; step++) {
|
||||
Vec3 next = position.add(velocity.scale(STREAM_STEP_LENGTH));
|
||||
Vec3 midpoint = position.lerp(next, 0.5D);
|
||||
level.sendParticles(pissCore(step), midpoint.x, midpoint.y, midpoint.z, 2,
|
||||
0.012D, 0.012D, 0.012D, 0.0D);
|
||||
if ((step & 1) == 0) level.sendParticles(step % 4 == 0 ? PISS_DEEP_GOLD : PISS_BRIGHT,
|
||||
midpoint.x, midpoint.y, midpoint.z, 2, 0.01D, 0.01D, 0.01D, 0.0D);
|
||||
if (step % 3 == 0) level.sendParticles(pissMist(step), midpoint.x, midpoint.y, midpoint.z,
|
||||
2, 0.012D, 0.012D, 0.012D, 0.0D);
|
||||
HitResult hit = clip(level, player, position, next);
|
||||
if (hit.getType() != HitResult.Type.MISS) {
|
||||
activateButton(level, player, hit);
|
||||
pissImpact(level, hit.getLocation());
|
||||
return;
|
||||
}
|
||||
position = next;
|
||||
velocity = velocity.add(0.0D, -0.03D * STREAM_STEP_SCALE, 0.0D)
|
||||
.scale(Math.pow(0.985D, STREAM_STEP_SCALE));
|
||||
if (position.y < level.getMinY()) return;
|
||||
}
|
||||
}
|
||||
|
||||
private static void spawnVomitStream(ServerPlayer player) {
|
||||
ServerLevel level = player.level();
|
||||
Vec3 position = vomitOrigin(player);
|
||||
Vec3 velocity = vomitVelocity(player);
|
||||
level.sendParticles(ParticleTypes.WHITE_SMOKE, position.x, position.y, position.z,
|
||||
2, 0.012D, 0.01D, 0.012D, 0.002D);
|
||||
for (int step = 0; step < STREAM_SEGMENTS; step++) {
|
||||
Vec3 next = position.add(velocity.scale(STREAM_STEP_LENGTH));
|
||||
Vec3 midpoint = position.lerp(next, 0.5D);
|
||||
level.sendParticles(vomitCore(step), midpoint.x, midpoint.y, midpoint.z, 2,
|
||||
0.012D, 0.012D, 0.012D, 0.0D);
|
||||
if ((step & 1) == 0) level.sendParticles(step % 4 == 0 ? VOMIT_BROWN : VOMIT_GREEN,
|
||||
midpoint.x, midpoint.y, midpoint.z, 2, 0.01D, 0.01D, 0.01D, 0.0D);
|
||||
HitResult hit = clip(level, player, position, next);
|
||||
if (hit.getType() != HitResult.Type.MISS) {
|
||||
vomitImpact(level, hit.getLocation());
|
||||
return;
|
||||
}
|
||||
position = next;
|
||||
velocity = velocity.add(0.0D, -0.038D * STREAM_STEP_SCALE, 0.0D)
|
||||
.scale(Math.pow(0.982D, STREAM_STEP_SCALE));
|
||||
if (position.y < level.getMinY()) return;
|
||||
}
|
||||
}
|
||||
|
||||
private static void spawnShitStream(ServerPlayer player, int remaining) {
|
||||
ServerLevel level = player.level();
|
||||
Vec3 position = shitOrigin(player);
|
||||
Vec3 velocity = shitVelocity(player);
|
||||
if (remaining < Action.SHIT.durationTicks() && remaining % 20 == 0) spawnShitDrop(level, player);
|
||||
for (int step = 0; step < STREAM_SEGMENTS; step++) {
|
||||
Vec3 next = position.add(velocity.scale(STREAM_STEP_LENGTH));
|
||||
Vec3 midpoint = position.lerp(next, 0.5D);
|
||||
float progress = step / (float) (STREAM_SEGMENTS - 1);
|
||||
float spread = 0.002F + progress * 0.018F;
|
||||
level.sendParticles(new DustParticleOptions(0x5B3417,
|
||||
Mth.lerp(progress * progress, 0.05F, 1.55F)), midpoint.x, midpoint.y, midpoint.z,
|
||||
1, spread, spread, spread, 0.0D);
|
||||
if ((step & 1) == 0) level.sendParticles(new DustParticleOptions(0x75461F,
|
||||
Mth.lerp(progress * progress, 0.04F, 0.85F)), midpoint.x, midpoint.y, midpoint.z,
|
||||
1, spread, spread, spread, 0.0D);
|
||||
HitResult hit = clip(level, player, position, next);
|
||||
if (hit.getType() != HitResult.Type.MISS) {
|
||||
level.sendParticles(SHIT_SPLAT, hit.getLocation().x, hit.getLocation().y,
|
||||
hit.getLocation().z, 2, 0.03D, 0.02D, 0.03D, 0.0D);
|
||||
level.sendParticles(SHIT_MUD, hit.getLocation().x, hit.getLocation().y,
|
||||
hit.getLocation().z, 4, 0.04D, 0.025D, 0.04D, 0.0D);
|
||||
return;
|
||||
}
|
||||
position = next;
|
||||
velocity = velocity.add(0.0D, -0.032D * STREAM_STEP_SCALE, 0.0D)
|
||||
.scale(Math.pow(0.986D, STREAM_STEP_SCALE));
|
||||
if (position.y < level.getMinY()) return;
|
||||
}
|
||||
}
|
||||
|
||||
private static void spawnSmoke(ServerPlayer player) {
|
||||
ServerLevel level = player.level();
|
||||
Vec3 mouth = mouthOrigin(player);
|
||||
level.sendParticles(ParticleTypes.SMOKE, mouth.x, mouth.y, mouth.z,
|
||||
2, 0.015D, 0.01D, 0.015D, 0.003D);
|
||||
if (level.getRandom().nextInt(3) == 0) level.sendParticles(ParticleTypes.WHITE_SMOKE,
|
||||
mouth.x, mouth.y, mouth.z, 1, 0.01D, 0.008D, 0.01D, 0.002D);
|
||||
}
|
||||
|
||||
private static HitResult clip(ServerLevel level, ServerPlayer player, Vec3 from, Vec3 to) {
|
||||
return level.clip(new ClipContext(from, to, ClipContext.Block.COLLIDER, ClipContext.Fluid.ANY, player));
|
||||
}
|
||||
|
||||
private static Vec3 pissOrigin(ServerPlayer player) {
|
||||
Vec3 forward = Vec3.directionFromRotation(0.0F, player.getYRot()).normalize();
|
||||
Vec3 right = new Vec3(-forward.z, 0.0D, forward.x);
|
||||
double side = player.getMainArm() == HumanoidArm.RIGHT ? -0.12D : 0.12D;
|
||||
return player.position().add(0.0D, player.getBbHeight() * 0.55D, 0.0D)
|
||||
.add(forward.scale(0.24D)).add(right.scale(side));
|
||||
}
|
||||
|
||||
private static Vec3 pissVelocity(ServerPlayer player) {
|
||||
float pitch = Mth.clamp(player.getXRot() + 22.0F, 6.0F, 55.0F);
|
||||
return Vec3.directionFromRotation(pitch, player.getYRot()).normalize().scale(1.05D)
|
||||
.add(player.getDeltaMovement().multiply(0.18D, 0.0D, 0.18D));
|
||||
}
|
||||
|
||||
private static Vec3 vomitOrigin(ServerPlayer player) {
|
||||
Vec3 forward = Vec3.directionFromRotation(player.getXRot(), player.getYRot()).normalize();
|
||||
return player.position().add(0.0D, player.getBbHeight() * 0.82D, 0.0D)
|
||||
.add(forward.scale(0.18D));
|
||||
}
|
||||
|
||||
private static Vec3 vomitVelocity(ServerPlayer player) {
|
||||
float pitch = Mth.clamp(player.getXRot() + 8.0F, -18.0F, 42.0F);
|
||||
return Vec3.directionFromRotation(pitch, player.getYRot()).normalize().scale(0.8D)
|
||||
.add(player.getDeltaMovement().multiply(0.15D, 0.0D, 0.15D));
|
||||
}
|
||||
|
||||
private static Vec3 shitOrigin(ServerPlayer player) {
|
||||
Vec3 backward = Vec3.directionFromRotation(0.0F, player.getYRot()).normalize().scale(-1.0D);
|
||||
return player.position().add(0.0D, player.getBbHeight() * 0.44D, 0.0D)
|
||||
.add(backward.scale(0.16D));
|
||||
}
|
||||
|
||||
private static Vec3 shitVelocity(ServerPlayer player) {
|
||||
Vec3 backward = Vec3.directionFromRotation(0.0F, player.getYRot()).normalize().scale(-1.0D);
|
||||
return backward.scale(0.68D).add(0.0D, 0.08D, 0.0D)
|
||||
.add(player.getDeltaMovement().multiply(0.1D, 0.0D, 0.1D));
|
||||
}
|
||||
|
||||
private static Vec3 mouthOrigin(ServerPlayer player) {
|
||||
Vec3 forward = Vec3.directionFromRotation(player.getXRot(), player.getYRot()).normalize();
|
||||
return player.position().add(0.0D, player.getBbHeight() * 0.82D, 0.0D)
|
||||
.add(forward.scale(0.12D));
|
||||
}
|
||||
|
||||
private static void spawnShitDrop(ServerLevel level, ServerPlayer player) {
|
||||
Vec3 backward = Vec3.directionFromRotation(0.0F, player.getYRot()).normalize().scale(-1.0D);
|
||||
Vec3 position = shitOrigin(player).add(backward.scale(0.08D)).add(0.0D, -0.08D, 0.0D);
|
||||
Vec3 velocity = backward.scale(0.05D).add(0.0D, 0.02D, 0.0D);
|
||||
ItemEntity item = new ItemEntity(level, position.x, position.y, position.z,
|
||||
new ItemStack(AbjectionRegistries.SHIT_BALL), velocity.x, velocity.y, velocity.z);
|
||||
item.setPickUpDelay(10);
|
||||
item.setThrower(player);
|
||||
level.addFreshEntity(item);
|
||||
}
|
||||
|
||||
private static DustParticleOptions pissCore(int step) {
|
||||
return switch (step % 3) {
|
||||
case 0 -> PISS_BRIGHT;
|
||||
case 1 -> PISS_GOLD;
|
||||
default -> PISS_AMBER;
|
||||
};
|
||||
}
|
||||
|
||||
private static ColorParticleOption pissMist(int step) {
|
||||
return switch (step % 3) {
|
||||
case 0 -> PISS_BRIGHT_MIST;
|
||||
case 1 -> PISS_GOLD_MIST;
|
||||
default -> PISS_AMBER_MIST;
|
||||
};
|
||||
}
|
||||
|
||||
private static DustParticleOptions vomitCore(int step) {
|
||||
return switch (step % 3) {
|
||||
case 0 -> VOMIT_GREEN;
|
||||
case 1 -> VOMIT_YELLOW;
|
||||
default -> VOMIT_ORANGE;
|
||||
};
|
||||
}
|
||||
|
||||
private static ItemParticleOption vomitChunk(ServerLevel level) {
|
||||
return switch (level.getRandom().nextInt(3)) {
|
||||
case 0 -> VOMIT_FLESH;
|
||||
case 1 -> VOMIT_EYE;
|
||||
default -> VOMIT_POTATO;
|
||||
};
|
||||
}
|
||||
|
||||
private static void activateButton(ServerLevel level, ServerPlayer player, HitResult hit) {
|
||||
if (!(hit instanceof BlockHitResult blockHit)) return;
|
||||
BlockPos pos = blockHit.getBlockPos();
|
||||
BlockState state = level.getBlockState(pos);
|
||||
if (state.getBlock() instanceof ButtonBlock button && !state.getValue(ButtonBlock.POWERED)) {
|
||||
button.press(state, level, pos, player);
|
||||
}
|
||||
}
|
||||
|
||||
private static void pissImpact(ServerLevel level, Vec3 position) {
|
||||
for (DustParticleOptions particle : new DustParticleOptions[] {PISS_BRIGHT, PISS_GOLD, PISS_AMBER}) {
|
||||
level.sendParticles(particle, position.x, position.y, position.z, 3,
|
||||
0.02D, 0.02D, 0.02D, 0.0D);
|
||||
}
|
||||
for (ColorParticleOption particle : new ColorParticleOption[] {
|
||||
PISS_BRIGHT_MIST, PISS_GOLD_MIST, PISS_AMBER_MIST}) {
|
||||
level.sendParticles(particle, position.x, position.y, position.z, 2,
|
||||
0.03D, 0.022D, 0.03D, 0.0D);
|
||||
}
|
||||
level.sendParticles(ParticleTypes.BUBBLE_POP, position.x, position.y, position.z,
|
||||
8, 0.05D, 0.03D, 0.05D, 0.01D);
|
||||
}
|
||||
|
||||
private static void vomitImpact(ServerLevel level, Vec3 position) {
|
||||
for (DustParticleOptions particle : new DustParticleOptions[] {
|
||||
VOMIT_GREEN, VOMIT_YELLOW, VOMIT_ORANGE, VOMIT_BROWN}) {
|
||||
level.sendParticles(particle, position.x, position.y, position.z, 3,
|
||||
0.02D, 0.02D, 0.02D, 0.0D);
|
||||
}
|
||||
for (ColorParticleOption particle : new ColorParticleOption[] {
|
||||
VOMIT_GREEN_MIST, VOMIT_YELLOW_MIST, VOMIT_ORANGE_MIST}) {
|
||||
level.sendParticles(particle, position.x, position.y, position.z, 2,
|
||||
0.03D, 0.022D, 0.03D, 0.0D);
|
||||
}
|
||||
level.sendParticles(ParticleTypes.SPLASH, position.x, position.y, position.z,
|
||||
4, 0.035D, 0.015D, 0.035D, 0.01D);
|
||||
level.sendParticles(ParticleTypes.SNEEZE, position.x, position.y, position.z,
|
||||
2, 0.03D, 0.02D, 0.03D, 0.0D);
|
||||
level.sendParticles(ParticleTypes.ITEM_SLIME, position.x, position.y, position.z,
|
||||
3, 0.03D, 0.02D, 0.03D, 0.0D);
|
||||
for (int index = 0; index < 2; index++) level.sendParticles(vomitChunk(level),
|
||||
position.x, position.y, position.z, 1, 0.03D, 0.02D, 0.03D, 0.0D);
|
||||
}
|
||||
}
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
package fr.koka99cab.sanctuary26.onlyfun.api.abjection;
|
||||
|
||||
import fr.koka99cab.sanctuary26.onlyfun.abjection.AbjectionRegistries;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
|
||||
/** Minimal public object contract consumed by Ouch's Abjection projectile implementation. */
|
||||
public final class AbjectionItems {
|
||||
private AbjectionItems() {
|
||||
}
|
||||
|
||||
public static Item shitBall() {
|
||||
return AbjectionRegistries.SHIT_BALL;
|
||||
}
|
||||
|
||||
public static Identifier shitBallId() {
|
||||
return Identifier.fromNamespaceAndPath("abjection", "shit_ball");
|
||||
}
|
||||
|
||||
public static boolean isShitBall(ItemStack stack) {
|
||||
return stack.is(AbjectionRegistries.SHIT_BALL);
|
||||
}
|
||||
}
|
||||
+39
@@ -0,0 +1,39 @@
|
||||
package fr.koka99cab.sanctuary26.onlyfun.api.abjection;
|
||||
|
||||
import java.util.Objects;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.Position;
|
||||
import net.minecraft.world.entity.projectile.Projectile;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.level.Level;
|
||||
|
||||
/**
|
||||
* Owner-neutral projectile factory contract: Only Fun owns the item, while Ouch installs its
|
||||
* combat implementation without creating a reverse dependency.
|
||||
*/
|
||||
public final class AbjectionProjectileApi {
|
||||
@FunctionalInterface
|
||||
public interface Factory {
|
||||
Projectile create(Level level, Position position, ItemStack stack, Direction direction);
|
||||
}
|
||||
|
||||
private static Factory factory;
|
||||
|
||||
private AbjectionProjectileApi() {
|
||||
}
|
||||
|
||||
public static void registerFactory(Factory implementation) {
|
||||
Objects.requireNonNull(implementation, "implementation");
|
||||
if (factory != null) throw new IllegalStateException("Abjection projectile factory already registered");
|
||||
factory = implementation;
|
||||
}
|
||||
|
||||
public static Projectile create(Level level, Position position, ItemStack stack, Direction direction) {
|
||||
if (factory == null) throw new IllegalStateException("Ouch has not registered the Abjection projectile factory");
|
||||
return factory.create(level, position, stack, direction);
|
||||
}
|
||||
|
||||
public static boolean isReady() {
|
||||
return factory != null;
|
||||
}
|
||||
}
|
||||
@@ -3,17 +3,34 @@ package fr.koka99cab.sanctuary26.onlyfun.client;
|
||||
import fr.koka99cab.sanctuary26.iliketomoveit.physics.VehicleFlightPhysics;
|
||||
import fr.koka99cab.sanctuary26.onlyfun.chickenboat.ChickenBoatControlPayload;
|
||||
import fr.koka99cab.sanctuary26.onlyfun.chickenboat.ChickenBoatUtil;
|
||||
import fr.koka99cab.sanctuary26.onlyfun.OnlyFunMod;
|
||||
import fr.koka99cab.sanctuary26.onlyfun.network.ShitActionRequestPayload;
|
||||
import com.mojang.blaze3d.platform.InputConstants;
|
||||
import net.fabricmc.api.ClientModInitializer;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
||||
import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper;
|
||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||
import net.minecraft.client.KeyMapping;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.vehicle.boat.AbstractBoat;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
public final class OnlyFunClient implements ClientModInitializer {
|
||||
private static final KeyMapping.Category ONLY_FUN_CATEGORY =
|
||||
KeyMapping.Category.register(OnlyFunMod.id("onlyfun"));
|
||||
private static KeyMapping shitKey;
|
||||
|
||||
@Override
|
||||
public void onInitializeClient() {
|
||||
shitKey = KeyMappingHelper.registerKeyMapping(new KeyMapping(
|
||||
"key.onlyfun.shit", InputConstants.Type.KEYSYM, GLFW.GLFW_KEY_J, ONLY_FUN_CATEGORY));
|
||||
ClientTickEvents.END_CLIENT_TICK.register(client -> {
|
||||
if (client.player == null || client.level == null) return;
|
||||
while (shitKey.consumeClick()) {
|
||||
if (ClientPlayNetworking.canSend(ShitActionRequestPayload.ID)) {
|
||||
ClientPlayNetworking.send(new ShitActionRequestPayload());
|
||||
}
|
||||
}
|
||||
Entity vehicle = client.player.getVehicle();
|
||||
if (!(vehicle instanceof AbstractBoat boat) || !ChickenBoatUtil.hasChickenPassenger(boat)) return;
|
||||
if (!ClientPlayNetworking.canSend(ChickenBoatControlPayload.ID)) return;
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
package fr.koka99cab.sanctuary26.onlyfun.command;
|
||||
|
||||
import com.mojang.brigadier.Command;
|
||||
import com.mojang.brigadier.exceptions.CommandSyntaxException;
|
||||
import fr.koka99cab.sanctuary26.onlyfun.api.abjection.AbjectionActions;
|
||||
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
|
||||
import net.minecraft.commands.CommandSourceStack;
|
||||
import net.minecraft.commands.Commands;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
|
||||
/** Historical root commands, routed through the shared server action API. */
|
||||
public final class AbjectionCommands {
|
||||
private AbjectionCommands() {
|
||||
}
|
||||
|
||||
public static void register() {
|
||||
CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> {
|
||||
for (AbjectionActions.Action action : AbjectionActions.Action.values()) {
|
||||
dispatcher.register(Commands.literal(action.id())
|
||||
.executes(context -> start(context.getSource(), action)));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private static int start(CommandSourceStack source, AbjectionActions.Action action)
|
||||
throws CommandSyntaxException {
|
||||
ServerPlayer player = source.getPlayerOrException();
|
||||
AbjectionActions.StartResult result = AbjectionActions.start(player, action);
|
||||
if (result == AbjectionActions.StartResult.REJECTED) return 0;
|
||||
String suffix = result == AbjectionActions.StartResult.RESTARTED ? "restarted" : "started";
|
||||
source.sendSuccess(() -> Component.translatable(
|
||||
"command.abjection." + action.id() + "." + suffix), false);
|
||||
return Command.SINGLE_SUCCESS;
|
||||
}
|
||||
}
|
||||
+3
-1
@@ -9,7 +9,7 @@ import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
|
||||
* Networking contract for Only Fun. Payload IDs must use the module namespace.
|
||||
*/
|
||||
public final class OnlyFunNetworking {
|
||||
public static final int PROTOCOL_VERSION = 2;
|
||||
public static final int PROTOCOL_VERSION = 3;
|
||||
private static boolean initialized;
|
||||
|
||||
private OnlyFunNetworking() {
|
||||
@@ -21,7 +21,9 @@ public final class OnlyFunNetworking {
|
||||
}
|
||||
initialized = true;
|
||||
PayloadTypeRegistry.serverboundPlay().register(ChickenBoatControlPayload.ID, ChickenBoatControlPayload.CODEC);
|
||||
PayloadTypeRegistry.serverboundPlay().register(ShitActionRequestPayload.ID, ShitActionRequestPayload.CODEC);
|
||||
ChickenBoatServerController.register();
|
||||
fr.koka99cab.sanctuary26.onlyfun.abjection.ShitActionRequestHandler.register();
|
||||
OnlyFunMod.LOGGER.debug("[{}] Networking contract v{} ready; chicken boat controls registered.",
|
||||
OnlyFunMod.DISPLAY_NAME, PROTOCOL_VERSION);
|
||||
}
|
||||
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package fr.koka99cab.sanctuary26.onlyfun.network;
|
||||
|
||||
import fr.koka99cab.sanctuary26.onlyfun.OnlyFunMod;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
import net.minecraft.network.codec.StreamCodec;
|
||||
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
|
||||
|
||||
/** Empty and therefore strictly bounded request to start the existing server-owned action. */
|
||||
public record ShitActionRequestPayload() implements CustomPacketPayload {
|
||||
public static final Type<ShitActionRequestPayload> ID =
|
||||
new Type<>(OnlyFunMod.id("c2s/shit_action"));
|
||||
public static final StreamCodec<RegistryFriendlyByteBuf, ShitActionRequestPayload> CODEC =
|
||||
CustomPacketPayload.codec((payload, buffer) -> {}, buffer -> new ShitActionRequestPayload());
|
||||
|
||||
@Override
|
||||
public Type<? extends CustomPacketPayload> type() {
|
||||
return ID;
|
||||
}
|
||||
}
|
||||
+3
@@ -1,6 +1,7 @@
|
||||
package fr.koka99cab.sanctuary26.onlyfun.registry;
|
||||
|
||||
import fr.koka99cab.sanctuary26.onlyfun.OnlyFunMod;
|
||||
import fr.koka99cab.sanctuary26.onlyfun.abjection.AbjectionRegistries;
|
||||
import net.minecraft.core.Registry;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
@@ -27,6 +28,8 @@ public final class OnlyFunCreativeTab {
|
||||
output.accept(OnlyFunRegistries.CAPE_LOOTBOX);
|
||||
output.accept(OnlyFunRegistries.SPAWN_EGG_LOOTBOX);
|
||||
output.accept(OnlyFunRegistries.ANOMALY_LOOTBOX);
|
||||
output.accept(AbjectionRegistries.SHIT_BALL);
|
||||
output.accept(AbjectionRegistries.SHIT_CUBE_ITEM);
|
||||
})
|
||||
.build()
|
||||
);
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"variants": {
|
||||
"": {
|
||||
"model": "abjection:block/shit_cube"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"model": {
|
||||
"type": "minecraft:model",
|
||||
"model": "abjection:item/shit_ball"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"model": {
|
||||
"type": "minecraft:model",
|
||||
"model": "abjection:item/shit_cube"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"item.abjection.shit_ball": "Shit Ball",
|
||||
"block.abjection.shit_cube": "Shit Cube",
|
||||
"command.abjection.piss.started": "Here we go for 15 seconds.",
|
||||
"command.abjection.piss.restarted": "The timer restarts for 15 seconds.",
|
||||
"command.abjection.vomit.started": "Yuck. You vomit for 8 seconds.",
|
||||
"command.abjection.vomit.restarted": "You vomit again for 8 seconds.",
|
||||
"command.abjection.shit.started": "You shit in a stream for 6 seconds.",
|
||||
"command.abjection.shit.restarted": "The shit stream restarts for 6 seconds.",
|
||||
"command.abjection.smoke.started": "You blow smoke for 10 seconds.",
|
||||
"command.abjection.smoke.restarted": "You keep smoking for 10 seconds."
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"item.abjection.shit_ball": "Boule de merde",
|
||||
"block.abjection.shit_cube": "Cube de merde",
|
||||
"command.abjection.piss.started": "C'est parti pour 15 secondes.",
|
||||
"command.abjection.piss.restarted": "Le timer repart pour 15 secondes.",
|
||||
"command.abjection.vomit.started": "Beurk. Tu vomis pendant 8 secondes.",
|
||||
"command.abjection.vomit.restarted": "Tu revomis pour 8 secondes.",
|
||||
"command.abjection.shit.started": "Tu chies en jet pendant 6 secondes.",
|
||||
"command.abjection.shit.restarted": "Le jet de merde repart pour 6 secondes.",
|
||||
"command.abjection.smoke.started": "Tu souffles de la fumée pendant 10 secondes.",
|
||||
"command.abjection.smoke.restarted": "Tu continues de fumer pendant 10 secondes."
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"item.abjection.shit_ball": "Шарик дерьма",
|
||||
"block.abjection.shit_cube": "Куб дерьма",
|
||||
"command.abjection.piss.started": "Струя запущена на 15 секунд.",
|
||||
"command.abjection.piss.restarted": "Таймер струи перезапущен на 15 секунд.",
|
||||
"command.abjection.vomit.started": "Фу. Тебя рвёт 8 секунд.",
|
||||
"command.abjection.vomit.restarted": "Тебя снова рвёт 8 секунд.",
|
||||
"command.abjection.shit.started": "Ты испражняешься струёй 6 секунд.",
|
||||
"command.abjection.shit.restarted": "Струя дерьма перезапущена на 6 секунд.",
|
||||
"command.abjection.smoke.started": "Ты выпускаешь дым 10 секунд.",
|
||||
"command.abjection.smoke.restarted": "Ты продолжаешь курить ещё 10 секунд."
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:block/cube_all",
|
||||
"textures": {
|
||||
"all": "abjection:block/shit_cube"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:item/generated",
|
||||
"textures": {
|
||||
"layer0": "abjection:item/shit_ball"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"parent": "abjection:block/shit_cube"
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 852 B |
Binary file not shown.
|
After Width: | Height: | Size: 261 B |
@@ -41,5 +41,7 @@
|
||||
"command.onlyfun.history": "Rolls: %s | dry streak: %s | anomalies: %s | last: %s",
|
||||
"command.onlyfun.give": "Granted Only Fun source: %s",
|
||||
"command.onlyfun.roll": "Outcome: %s (%s)",
|
||||
"command.onlyfun.simulate": "Simulation %s × %s: %s"
|
||||
"command.onlyfun.simulate": "Simulation %s × %s: %s",
|
||||
"key.categories.onlyfun.onlyfun": "Only Fun",
|
||||
"key.onlyfun.shit": "Shit"
|
||||
}
|
||||
|
||||
@@ -41,5 +41,7 @@
|
||||
"command.onlyfun.history": "Tirages : %s | série sèche : %s | anomalies : %s | dernier : %s",
|
||||
"command.onlyfun.give": "Source Only Fun donnée : %s",
|
||||
"command.onlyfun.roll": "Résultat : %s (%s)",
|
||||
"command.onlyfun.simulate": "Simulation %s × %s : %s"
|
||||
"command.onlyfun.simulate": "Simulation %s × %s : %s",
|
||||
"key.categories.onlyfun.onlyfun": "Only Fun",
|
||||
"key.onlyfun.shit": "Chier"
|
||||
}
|
||||
|
||||
@@ -41,5 +41,7 @@
|
||||
"command.onlyfun.history": "Розыгрыши: %s | серия: %s | аномалии: %s | последнее: %s",
|
||||
"command.onlyfun.give": "Выдан источник Only Fun: %s",
|
||||
"command.onlyfun.roll": "Результат: %s (%s)",
|
||||
"command.onlyfun.simulate": "Симуляция %s × %s: %s"
|
||||
"command.onlyfun.simulate": "Симуляция %s × %s: %s",
|
||||
"key.categories.onlyfun.onlyfun": "Only Fun",
|
||||
"key.onlyfun.shit": "Испражниться"
|
||||
}
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"type": "minecraft:block",
|
||||
"pools": [
|
||||
{
|
||||
"bonus_rolls": 0.0,
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:survives_explosion"
|
||||
}
|
||||
],
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "abjection:shit_cube"
|
||||
}
|
||||
],
|
||||
"rolls": 1.0
|
||||
}
|
||||
],
|
||||
"random_sequence": "abjection:blocks/shit_cube"
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"category": "building",
|
||||
"key": {
|
||||
"#": "abjection:shit_ball"
|
||||
},
|
||||
"pattern": [
|
||||
"###",
|
||||
"###",
|
||||
"###"
|
||||
],
|
||||
"result": {
|
||||
"count": 1,
|
||||
"id": "abjection:shit_cube"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"abjection:shit_cube"
|
||||
]
|
||||
}
|
||||
@@ -8,6 +8,9 @@
|
||||
"KOKA99CAB"
|
||||
],
|
||||
"license": "GPL-3.0-or-later",
|
||||
"provides": [
|
||||
"abjection"
|
||||
],
|
||||
"icon": "assets/onlyfun/icon.png",
|
||||
"environment": "*",
|
||||
"entrypoints": {
|
||||
@@ -31,7 +34,7 @@
|
||||
"system_type": "gameplay-system",
|
||||
"namespace": "onlyfun",
|
||||
"data_version": 2,
|
||||
"network_protocol": 2,
|
||||
"network_protocol": 3,
|
||||
"lifecycle": "${lifecycle}",
|
||||
"pack_version": "${pack_version}",
|
||||
"descriptions": {
|
||||
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
package fr.koka99cab.sanctuary26.onlyfun.abjection;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/** Executable check for one physical press and same-tick spam deduplication. */
|
||||
public final class ShitActionRequestSmoke {
|
||||
private ShitActionRequestSmoke() {
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
UUID playerId = UUID.fromString("00000000-0000-0000-0000-000000000059");
|
||||
require(ShitActionRequestHandler.acceptTick(playerId, 100), "first press was rejected");
|
||||
require(!ShitActionRequestHandler.acceptTick(playerId, 100), "same-tick spam was accepted");
|
||||
require(ShitActionRequestHandler.acceptTick(playerId, 101), "next physical press was rejected");
|
||||
ShitActionRequestHandler.clear(playerId);
|
||||
require(ShitActionRequestHandler.acceptTick(playerId, 101), "disconnect cleanup retained input state");
|
||||
ShitActionRequestHandler.clear(playerId);
|
||||
}
|
||||
|
||||
private static void require(boolean condition, String message) {
|
||||
if (!condition) throw new AssertionError(message);
|
||||
}
|
||||
}
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
package fr.koka99cab.sanctuary26.onlyfun.api.abjection;
|
||||
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import net.minecraft.SharedConstants;
|
||||
import net.minecraft.server.Bootstrap;
|
||||
|
||||
/** Executable regression check for the bounded historical action contract. */
|
||||
public final class AbjectionActionContractSmoke {
|
||||
private AbjectionActionContractSmoke() {
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
SharedConstants.tryDetectVersion();
|
||||
Bootstrap.bootStrap();
|
||||
require(AbjectionActions.Action.PISS.durationTicks() == 300, "piss duration changed");
|
||||
require(AbjectionActions.Action.VOMIT.durationTicks() == 160, "vomit duration changed");
|
||||
require(AbjectionActions.Action.SHIT.durationTicks() == 120, "shit duration changed");
|
||||
require(AbjectionActions.Action.SMOKE.durationTicks() == 200, "smoke duration changed");
|
||||
require(Set.of("piss", "vomit", "shit", "smoke").equals(Set.of(
|
||||
AbjectionActions.Action.PISS.id(), AbjectionActions.Action.VOMIT.id(),
|
||||
AbjectionActions.Action.SHIT.id(), AbjectionActions.Action.SMOKE.id())),
|
||||
"historical command surface changed");
|
||||
|
||||
UUID playerId = UUID.fromString("00000000-0000-0000-0000-000000000057");
|
||||
require(!AbjectionActions.restart(playerId, AbjectionActions.Action.SHIT),
|
||||
"first action incorrectly marked as a restart");
|
||||
require(AbjectionActions.remaining(playerId, AbjectionActions.Action.SHIT) == 120,
|
||||
"initial duration was not installed");
|
||||
require(AbjectionActions.restart(playerId, AbjectionActions.Action.SHIT),
|
||||
"second action was not marked as a restart");
|
||||
require(AbjectionActions.remaining(playerId, AbjectionActions.Action.SHIT) == 120,
|
||||
"restart did not reset the full duration");
|
||||
AbjectionActions.clear(playerId);
|
||||
require(AbjectionActions.remaining(playerId, AbjectionActions.Action.SHIT) == 0,
|
||||
"cleanup left a temporary action behind");
|
||||
}
|
||||
|
||||
private static void require(boolean condition, String message) {
|
||||
if (!condition) throw new AssertionError(message);
|
||||
}
|
||||
}
|
||||
+45
-3
@@ -12,9 +12,10 @@ def miningRifleTextureHash = "4e4295c5c8a8f71d03307809448ff64363eec2d2aefdc538c4
|
||||
|
||||
tasks.register("verifyOuch") {
|
||||
group = "verification"
|
||||
description = "Checks Ouch alpha.9, including the Ambiance-backed Weather TNT and migrated Gunz arsenal."
|
||||
description = "Checks Ouch alpha.10, including the shared Abjection projectile implementation."
|
||||
inputs.files(fileTree("src/main/java"))
|
||||
inputs.files(fileTree("src/main/resources"))
|
||||
inputs.files(rootProject.fileTree("onlyfun/src/main/java"))
|
||||
inputs.file(rootProject.file("pack/migrations/26.1.2-gunz-to-26.2.0-alpha.41.json"))
|
||||
inputs.file(rootProject.file("pack/migrations/26.2.0-alpha.99-canon-weather-ownership-to-alpha.100.json"))
|
||||
inputs.file(rootProject.file("pack/migrations/26.2.0-alpha.184-silver-engineering-to-alpha.185.json"))
|
||||
@@ -25,6 +26,34 @@ tasks.register("verifyOuch") {
|
||||
def weatherRegistry = file("src/main/java/fr/koka99cab/sanctuary26/ouch/registry/OuchWeatherTnt.java").text
|
||||
def weatherEntity = file("src/main/java/fr/koka99cab/sanctuary26/ouch/entity/WeatherTntEntity.java").text
|
||||
def manifest = new JsonSlurper().parse(file("src/main/resources/fabric.mod.json"))
|
||||
def abjectionRegistry = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/ouch/registry/OuchAbjectionProjectiles.java").text
|
||||
def abjectionEntity = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/ouch/entity/ShitBallEntity.java").text
|
||||
def abjectionClient = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/ouch/client/OuchClient.java").text
|
||||
def onlyFunProjectileApi = rootProject.file(
|
||||
"onlyfun/src/main/java/fr/koka99cab/sanctuary26/onlyfun/api/abjection/AbjectionProjectileApi.java").text
|
||||
if (manifest.depends?.onlyfun != ">=0.0.0-alpha.23"
|
||||
|| manifest.custom?.sanctuary26?.data_version != 1
|
||||
|| manifest.custom?.sanctuary26?.network_protocol != 1
|
||||
|| !rootProject.file("build.gradle").text.contains('implementation project(":onlyfun")')
|
||||
|| !onlyFunProjectileApi.contains("public interface Factory")
|
||||
|| !abjectionRegistry.contains('AbjectionProjectileApi.registerFactory(')
|
||||
|| !abjectionRegistry.contains('AbjectionItems.shitBallId()')
|
||||
|| abjectionRegistry.contains('AbjectionRegistries')
|
||||
|| !abjectionRegistry.contains('DispenserBlock.registerProjectileBehavior(AbjectionItems.shitBall())')
|
||||
|| !abjectionRegistry.contains('UseItemCallback.EVENT.register')
|
||||
|| !abjectionRegistry.contains('stack.consume(1, player)')
|
||||
|| !abjectionRegistry.contains('Projectile.spawnProjectileFromRotation(')
|
||||
|| !abjectionRegistry.contains('.sized(0.25F, 0.25F)')
|
||||
|| !abjectionEntity.contains('NAUSEA_DURATION_TICKS = 7 * 20')
|
||||
|| !abjectionEntity.contains('current == null ? 0 : current.getDuration()')
|
||||
|| !abjectionEntity.contains('SoundEvents.MUD_PLACE')
|
||||
|| !abjectionEntity.contains('discard()')
|
||||
|| !abjectionClient.contains('new ThrownItemRenderer<>(context)')) {
|
||||
throw new GradleException("Ouch alpha.10 Abjection projectile contract is incomplete")
|
||||
}
|
||||
if (!itemRegistry.contains("MIGRATED_WEAPONS = List.of(CREEPERLOCK, MITRAILLETTE, EXPULSEUR, ASPIRATEUR)")
|
||||
|| !itemRegistry.contains("WEAPONS = List.of(CREEPERLOCK, MITRAILLETTE, EXPULSEUR, ASPIRATEUR, MINING_RIFLE, BETA_BOW)")
|
||||
|| !creativeTab.contains('OuchMod.id("arsenal")')
|
||||
@@ -89,7 +118,7 @@ tasks.register("verifyOuch") {
|
||||
def creeperlockRecipe = new JsonSlurper().parse(file("src/main/resources/data/ouch/recipe/creeperlock.json"))
|
||||
def silverEngineeringMigration = new JsonSlurper().parse(rootProject.file(
|
||||
"pack/migrations/26.2.0-alpha.184-silver-engineering-to-alpha.185.json"))
|
||||
if (project.version.toString() != "0.0.0-alpha.9"
|
||||
if (project.version.toString() != "0.0.0-alpha.10"
|
||||
|| mitrailletteRecipe.pattern != ["RRP", "IGI", " B "]
|
||||
|| mitrailletteRecipe.key != [B: "minecraft:stone_button", G: "minecraft:redstone",
|
||||
I: "anotherworld:silver_ingot", P: "anotherworld:silver_plate", R: "anotherworld:silver_rod"]
|
||||
@@ -317,10 +346,23 @@ tasks.register("verifyOuch") {
|
||||
throw new GradleException("Runtime Ouch resources must not re-register the legacy gunz namespace: ${forbiddenNamespaceReferences}")
|
||||
}
|
||||
|
||||
logger.lifecycle("Ouch verified: 6 enchantable items, 4 custom enchantments, debuffed bases, shared headshots, 6 recipes and FR/EN/RU translations.")
|
||||
logger.lifecycle("Ouch verified: arsenal, Weather TNT and shared Abjection projectile contract.")
|
||||
}
|
||||
}
|
||||
|
||||
tasks.named("test") {
|
||||
failOnNoDiscoveredTests = false
|
||||
}
|
||||
|
||||
tasks.register("shitBallContractSmoke", JavaExec) {
|
||||
group = "verification"
|
||||
description = "Checks additive and overflow-safe Shit Ball nausea."
|
||||
dependsOn tasks.named("testClasses")
|
||||
classpath = sourceSets.test.runtimeClasspath
|
||||
mainClass = "fr.koka99cab.sanctuary26.ouch.entity.ShitBallContractSmoke"
|
||||
}
|
||||
|
||||
tasks.named("check") {
|
||||
dependsOn tasks.named("shitBallContractSmoke")
|
||||
dependsOn tasks.named("verifyOuch")
|
||||
}
|
||||
|
||||
@@ -2,16 +2,20 @@ package fr.koka99cab.sanctuary26.ouch.client;
|
||||
|
||||
import fr.koka99cab.sanctuary26.ouch.OuchMod;
|
||||
import fr.koka99cab.sanctuary26.ouch.entity.WeatherTntEntity;
|
||||
import fr.koka99cab.sanctuary26.ouch.registry.OuchAbjectionProjectiles;
|
||||
import fr.koka99cab.sanctuary26.ouch.registry.OuchWeatherTnt;
|
||||
import net.fabricmc.api.ClientModInitializer;
|
||||
import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
|
||||
import net.minecraft.client.renderer.entity.EntityRenderer;
|
||||
import net.minecraft.client.renderer.entity.TntRenderer;
|
||||
import net.minecraft.client.renderer.entity.ThrownItemRenderer;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
|
||||
public final class OuchClient implements ClientModInitializer {
|
||||
@Override
|
||||
public void onInitializeClient() {
|
||||
EntityRendererRegistry.register(OuchAbjectionProjectiles.ENTITY,
|
||||
context -> new ThrownItemRenderer<>(context));
|
||||
registerWeatherRenderer(OuchWeatherTnt.ENTITY);
|
||||
registerWeatherRenderer(OuchWeatherTnt.REDSTONER_COMPAT_ENTITY);
|
||||
registerWeatherRenderer(OuchWeatherTnt.LEGACY_ENTITY);
|
||||
|
||||
@@ -0,0 +1,62 @@
|
||||
package fr.koka99cab.sanctuary26.ouch.entity;
|
||||
|
||||
import fr.koka99cab.sanctuary26.onlyfun.api.abjection.AbjectionItems;
|
||||
import fr.koka99cab.sanctuary26.ouch.registry.OuchAbjectionProjectiles;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.sounds.SoundEvents;
|
||||
import net.minecraft.sounds.SoundSource;
|
||||
import net.minecraft.world.effect.MobEffectInstance;
|
||||
import net.minecraft.world.effect.MobEffects;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.entity.projectile.throwableitemprojectile.ThrowableItemProjectile;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.phys.EntityHitResult;
|
||||
import net.minecraft.world.phys.HitResult;
|
||||
|
||||
/** Server-authoritative historical Abjection projectile, owned by Ouch. */
|
||||
public final class ShitBallEntity extends ThrowableItemProjectile {
|
||||
public static final int NAUSEA_DURATION_TICKS = 7 * 20;
|
||||
|
||||
public ShitBallEntity(EntityType<? extends ShitBallEntity> type, Level level) {
|
||||
super(type, level);
|
||||
}
|
||||
|
||||
public ShitBallEntity(Level level, LivingEntity owner, ItemStack stack) {
|
||||
super(OuchAbjectionProjectiles.ENTITY, owner, level, stack.copyWithCount(1));
|
||||
}
|
||||
|
||||
public ShitBallEntity(Level level, double x, double y, double z, ItemStack stack) {
|
||||
super(OuchAbjectionProjectiles.ENTITY, x, y, z, level, stack.copyWithCount(1));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Item getDefaultItem() {
|
||||
return AbjectionItems.shitBall();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onHitEntity(EntityHitResult hit) {
|
||||
super.onHitEntity(hit);
|
||||
if (!(level() instanceof ServerLevel) || !(hit.getEntity() instanceof LivingEntity target)) return;
|
||||
MobEffectInstance current = target.getEffect(MobEffects.NAUSEA);
|
||||
int duration = extendedNauseaDuration(current == null ? 0 : current.getDuration());
|
||||
target.addEffect(new MobEffectInstance(MobEffects.NAUSEA, duration), getOwner());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onHit(HitResult hit) {
|
||||
super.onHit(hit);
|
||||
if (level() instanceof ServerLevel level) {
|
||||
level.playSound(null, getX(), getY(), getZ(), SoundEvents.MUD_PLACE,
|
||||
SoundSource.PLAYERS, 1.0F, 0.75F);
|
||||
discard();
|
||||
}
|
||||
}
|
||||
|
||||
static int extendedNauseaDuration(int currentDuration) {
|
||||
return (int) Math.min(Integer.MAX_VALUE, Math.max(0L, currentDuration) + NAUSEA_DURATION_TICKS);
|
||||
}
|
||||
}
|
||||
+69
@@ -0,0 +1,69 @@
|
||||
package fr.koka99cab.sanctuary26.ouch.registry;
|
||||
|
||||
import fr.koka99cab.sanctuary26.onlyfun.api.abjection.AbjectionItems;
|
||||
import fr.koka99cab.sanctuary26.onlyfun.api.abjection.AbjectionProjectileApi;
|
||||
import fr.koka99cab.sanctuary26.ouch.entity.ShitBallEntity;
|
||||
import net.fabricmc.fabric.api.event.player.UseItemCallback;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.Position;
|
||||
import net.minecraft.core.Registry;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.sounds.SoundEvents;
|
||||
import net.minecraft.sounds.SoundSource;
|
||||
import net.minecraft.stats.Stats;
|
||||
import net.minecraft.world.InteractionResult;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.entity.MobCategory;
|
||||
import net.minecraft.world.entity.projectile.Projectile;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.block.DispenserBlock;
|
||||
|
||||
/** Shared manual/dispenser creation path for {@code abjection:shit_ball}. */
|
||||
public final class OuchAbjectionProjectiles {
|
||||
private static final float SHOOT_POWER = 1.5F;
|
||||
private static final ResourceKey<EntityType<?>> KEY = ResourceKey.create(
|
||||
Registries.ENTITY_TYPE, AbjectionItems.shitBallId());
|
||||
public static final EntityType<ShitBallEntity> ENTITY = Registry.register(
|
||||
BuiltInRegistries.ENTITY_TYPE, KEY,
|
||||
EntityType.Builder.<ShitBallEntity>of(ShitBallEntity::new, MobCategory.MISC)
|
||||
.sized(0.25F, 0.25F).clientTrackingRange(4).updateInterval(10).build(KEY));
|
||||
private static boolean initialized;
|
||||
|
||||
private OuchAbjectionProjectiles() {
|
||||
}
|
||||
|
||||
public static void initialize() {
|
||||
if (initialized) return;
|
||||
initialized = true;
|
||||
AbjectionProjectileApi.registerFactory(OuchAbjectionProjectiles::createFromDispenser);
|
||||
DispenserBlock.registerProjectileBehavior(AbjectionItems.shitBall());
|
||||
UseItemCallback.EVENT.register((player, level, hand) -> {
|
||||
ItemStack stack = player.getItemInHand(hand);
|
||||
if (!AbjectionItems.isShitBall(stack) || player.isSpectator()) return InteractionResult.PASS;
|
||||
if (level.isClientSide()) return InteractionResult.SUCCESS;
|
||||
if (!(level instanceof ServerLevel serverLevel)) return InteractionResult.FAIL;
|
||||
serverLevel.playSound(null, player.getX(), player.getY(), player.getZ(),
|
||||
SoundEvents.SNOWBALL_THROW, SoundSource.NEUTRAL, 0.5F,
|
||||
0.4F / (serverLevel.getRandom().nextFloat() * 0.4F + 0.8F));
|
||||
Projectile.spawnProjectileFromRotation(OuchAbjectionProjectiles::createFromPlayer,
|
||||
serverLevel, stack, player, 0.0F, SHOOT_POWER, 1.0F);
|
||||
player.awardStat(Stats.ITEM_USED.get(AbjectionItems.shitBall()));
|
||||
stack.consume(1, player);
|
||||
return InteractionResult.SUCCESS_SERVER;
|
||||
});
|
||||
}
|
||||
|
||||
public static ShitBallEntity createFromPlayer(ServerLevel level, LivingEntity owner, ItemStack stack) {
|
||||
return new ShitBallEntity(level, owner, stack);
|
||||
}
|
||||
|
||||
public static Projectile createFromDispenser(Level level, Position position, ItemStack stack,
|
||||
Direction direction) {
|
||||
return new ShitBallEntity(level, position.x(), position.y(), position.z(), stack);
|
||||
}
|
||||
}
|
||||
@@ -19,6 +19,7 @@ public final class OuchRegistries {
|
||||
initialized = true;
|
||||
OuchItems.initialize();
|
||||
OuchWeatherTnt.initialize();
|
||||
OuchAbjectionProjectiles.initialize();
|
||||
OuchCreativeTab.initialize();
|
||||
OuchMod.LOGGER.debug("[{}] Weapon registry hub initialized.", OuchMod.DISPLAY_NAME);
|
||||
}
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
"fabric-api": ">=0.154.2+26.2",
|
||||
"anotherworld": ">=0.0.0-alpha.46",
|
||||
"ambiance": ">=0.0.0-alpha.12",
|
||||
"onlyfun": ">=0.0.0-alpha.23",
|
||||
"sanctuary": ">=0.0.0-alpha.110"
|
||||
},
|
||||
"custom": {
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
package fr.koka99cab.sanctuary26.ouch.entity;
|
||||
|
||||
import net.minecraft.SharedConstants;
|
||||
import net.minecraft.server.Bootstrap;
|
||||
|
||||
/** Executable regression test for additive and overflow-safe nausea duration. */
|
||||
public final class ShitBallContractSmoke {
|
||||
private ShitBallContractSmoke() {
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
SharedConstants.tryDetectVersion();
|
||||
Bootstrap.bootStrap();
|
||||
require(ShitBallEntity.NAUSEA_DURATION_TICKS == 140, "historical duration changed");
|
||||
require(ShitBallEntity.extendedNauseaDuration(0) == 140, "first hit duration is wrong");
|
||||
require(ShitBallEntity.extendedNauseaDuration(60) == 200,
|
||||
"a new impact did not add seven seconds");
|
||||
require(ShitBallEntity.extendedNauseaDuration(-10) == 140,
|
||||
"negative input was not normalized");
|
||||
require(ShitBallEntity.extendedNauseaDuration(Integer.MAX_VALUE) == Integer.MAX_VALUE,
|
||||
"duration overflow was not saturated");
|
||||
}
|
||||
|
||||
private static void require(boolean condition, String message) {
|
||||
if (!condition) throw new AssertionError(message);
|
||||
}
|
||||
}
|
||||
@@ -9,18 +9,23 @@ n'importe aucune donnée du Shop.
|
||||
## Utilisation
|
||||
|
||||
1. Le vendeur pose une Mailbox dans sa dimension et reste dans un rayon de 256 blocs.
|
||||
2. Il tient le stack à vendre, s'accroupit et fait clic droit sur un panneau libre.
|
||||
2. Il tient le stack à vendre et fait un clic molette sur un panneau libre. L'ancien
|
||||
raccourci accroupi + clic droit reste accepté pour les habitudes existantes.
|
||||
3. L'éditeur du panneau choisit quantité, prix libre et devise (`ruby` ou `sapphire`).
|
||||
4. Un clic droit du vendeur rouvre l'éditeur. Il peut modifier prix, devise et quantité.
|
||||
4. Un clic molette du vendeur rouvre l'éditeur. Il peut modifier prix, devise et quantité.
|
||||
Pour augmenter la quantité, il doit tenir des objets aux composants strictement
|
||||
identiques. La diminution retourne par colis. Shift + clic droit annule l'annonce.
|
||||
5. Un autre joueur fait clic droit pour acheter. Paiement, retrait de l'annonce,
|
||||
5. Un autre joueur fait clic molette pour acheter. Paiement, retrait de l'annonce,
|
||||
séquestre et création des colis s'exécutent atomiquement sur le thread serveur.
|
||||
|
||||
Le panneau affiche l'objet, le prix et le pseudonyme coloré du vendeur. Il est protégé :
|
||||
seuls le vendeur et un opérateur peuvent le casser. Il n'existe aucune limite arbitraire
|
||||
d'annonces et aucune expiration tant que le panneau existe.
|
||||
|
||||
Le clic molette remplace uniquement l'action vanilla « choisir le bloc » lorsque la cible
|
||||
est un panneau. Le client n'envoie ni position, ni objet, ni prix : le serveur refait son
|
||||
propre rayon, vérifie la portée et résout le panneau avant toute opération.
|
||||
|
||||
## Économie et livraison
|
||||
|
||||
- Mise en vente : 1 rubis versé à la trésorerie serveur.
|
||||
|
||||
+41
-15
@@ -92,7 +92,12 @@ tasks.register("verifyBlackMarket") {
|
||||
inputs.file(file("BLACK_MARKET.md"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/BlackMarketData.java"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/BlackMarketService.java"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/BlackMarketInteractionRules.java"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/BlackMarketItemPolicy.java"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/client/SanctuaryClient.java"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/mixin/client/MinecraftMixin.java"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/network/BlackMarketInteractPayload.java"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/network/SanctuaryNetworking.java"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/ShopService.java"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/QuestBoardData.java"))
|
||||
inputs.file(file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/QuestBoardGenerator.java"))
|
||||
@@ -102,15 +107,36 @@ tasks.register("verifyBlackMarket") {
|
||||
doLast {
|
||||
def data = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/BlackMarketData.java").text
|
||||
def service = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/BlackMarketService.java").text
|
||||
def interactionRules = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/BlackMarketInteractionRules.java").text
|
||||
def policy = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/BlackMarketItemPolicy.java").text
|
||||
def client = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/client/SanctuaryClient.java").text
|
||||
def minecraftMixin = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/mixin/client/MinecraftMixin.java").text
|
||||
def middleClickPayload = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/network/BlackMarketInteractPayload.java").text
|
||||
def network = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/network/SanctuaryNetworking.java").text
|
||||
def shop = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/ShopService.java").text
|
||||
def questData = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/QuestBoardData.java").text
|
||||
def quests = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/QuestBoardService.java").text
|
||||
def inventoryView = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/api/inventory/SanctuaryPlayerInventoryView.java").text
|
||||
if (!data.contains('SAVE_KEY = "black_market"') || !data.contains("DATA_VERSION = 2")
|
||||
if (project.version.toString() != "0.0.0-alpha.119"
|
||||
|| !data.contains('SAVE_KEY = "black_market"') || !data.contains("DATA_VERSION = 2")
|
||||
|| !data.contains("ItemStack.CODEC.fieldOf(\"item\")") || !data.contains("replaceListing")
|
||||
|| !service.contains("LISTING_FEE_RUBIES = 1") || !service.contains("COMMISSION_PERCENT = 5")
|
||||
|| !service.contains("PlayerBlockBreakEvents.BEFORE") || !service.contains('"modify"')
|
||||
|| !service.contains("public static void middleClick(ServerPlayer player)")
|
||||
|| !service.contains("player.pick(")
|
||||
|| !service.contains("player.blockInteractionRange() + 1.0D")
|
||||
|| !interactionRules.contains("middleClick || secondaryUse")
|
||||
|| !client.contains("handleBlackMarketMiddleClick")
|
||||
|| !client.contains("ClientPlayNetworking.send(new BlackMarketInteractPayload())")
|
||||
|| !minecraftMixin.contains('method = "pickBlock"')
|
||||
|| !middleClickPayload.contains('SanctuaryMod.id("c2s/black_market_interact")')
|
||||
|| !middleClickPayload.contains("No client position, listing ID, item or price is trusted")
|
||||
|| !network.contains("PROTOCOL_VERSION = 22")
|
||||
|| !network.contains("BlackMarketService.middleClick(context.player())")
|
||||
|| !service.contains("loadedDeliveryBox") || !service.contains("PARCEL_RETENTION_MILLIS")
|
||||
|| !policy.contains("DataComponents.CONTAINER") || !policy.contains("DataComponents.BUNDLE_CONTENTS")
|
||||
|| !shop.contains("public static final boolean OPEN = true")
|
||||
@@ -1086,12 +1112,12 @@ tasks.register("verifySanctuary") {
|
||||
|
||||
def manifest = new JsonSlurper().parse(file("src/main/resources/fabric.mod.json"))
|
||||
if (manifest.custom?.sanctuary26?.data_version != 11
|
||||
|| manifest.custom?.sanctuary26?.network_protocol != 21
|
||||
|| manifest.custom?.sanctuary26?.network_protocol != 22
|
||||
|| manifest.depends?.jei != ">=30.24.0.176"
|
||||
|| manifest.depends?."fabric-api" != ">=0.155.0+26.2"
|
||||
|| !manifest.entrypoints?.client?.contains("fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryClient")
|
||||
|| !manifest.mixins?.contains("sanctuary.mixins.json")) {
|
||||
throw new GradleException("Sanctuary must expose data v11, protocol 21, JEI and the client entrypoint")
|
||||
throw new GradleException("Sanctuary must expose data v11, protocol 22, JEI and the client entrypoint")
|
||||
}
|
||||
def capeMigration = new JsonSlurper().parse(rootProject.file(
|
||||
"pack/migrations/26.2.0-alpha.155-cape-equipment-to-alpha.156.json"))
|
||||
@@ -2792,7 +2818,7 @@ tasks.register("verifyShopCurrencyRowsRelease") {
|
||||
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/BlackMarketService.java").text
|
||||
def shop = file(
|
||||
"src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/ShopService.java").text
|
||||
if (project.version.toString() != "0.0.0-alpha.118"
|
||||
if (project.version.toString() != "0.0.0-alpha.119"
|
||||
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.117"
|
||||
|| migration.shop_currency_inventory?.all_unlocked_rows_counted != true
|
||||
|| migration.shop_currency_inventory?.overflow_rows_counted != true
|
||||
@@ -2958,7 +2984,7 @@ tasks.register("verifyProgressivePauseMenu") {
|
||||
"pack/migrations/26.2.0-alpha.190-progressive-pause-menu-to-alpha.191.json"))
|
||||
def pauseMenu = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/mixin/client/PauseScreenMixin.java").text
|
||||
def costs = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/progression/SanctuaryProgressionCosts.java").text
|
||||
if (project.version.toString() != "0.0.0-alpha.118"
|
||||
if (project.version.toString() != "0.0.0-alpha.119"
|
||||
|| migration.target?.pack_version != "26.2.0-alpha.191"
|
||||
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.109"
|
||||
|| migration.pause_menu?.progression_full_width != true
|
||||
@@ -2996,7 +3022,7 @@ tasks.register("verifyShopPricingLayout") {
|
||||
"pack/migrations/26.2.0-alpha.192-shop-pricing-layout-to-alpha.193.json"))
|
||||
def screen = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/client/SanctuaryShopScreen.java").text
|
||||
def progression = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/ShopProgression.java").text
|
||||
if (project.version.toString() != "0.0.0-alpha.118"
|
||||
if (project.version.toString() != "0.0.0-alpha.119"
|
||||
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.110"
|
||||
|| migration.shop_layout?.locked_offer_buttons != 6
|
||||
|| migration.shop_layout?.button_slots != [4, 5, 6, 7, 8, 9]
|
||||
@@ -3027,7 +3053,7 @@ tasks.register("verifyShopCsvBossGates") {
|
||||
"pack/migrations/26.2.0-alpha.194-shop-csv-boss-gates-to-alpha.195.json"))
|
||||
def provider = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/ShopCatalogProvider.java").text
|
||||
def catalog = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/shop/ShopOfferCatalog.java").text
|
||||
if (project.version.toString() != "0.0.0-alpha.118"
|
||||
if (project.version.toString() != "0.0.0-alpha.119"
|
||||
|| migration.target?.pack_version != "26.2.0-alpha.195"
|
||||
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.111"
|
||||
|| migration.compatibility?.sanctuary_data_version != 11
|
||||
@@ -3058,7 +3084,7 @@ tasks.register("verifyDeliveryBoxOrientation") {
|
||||
def blockstate = new JsonSlurper().parse(
|
||||
file("src/main/resources/assets/sanctuary/blockstates/delivery_box.json"))
|
||||
def expectedVariants = ["facing=north", "facing=east", "facing=south", "facing=west"].toSet()
|
||||
if (project.version.toString() != "0.0.0-alpha.118"
|
||||
if (project.version.toString() != "0.0.0-alpha.119"
|
||||
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.112"
|
||||
|| migration.mailbox?.id != "sanctuary:delivery_box"
|
||||
|| migration.mailbox?.horizontal_facing != true
|
||||
@@ -3086,7 +3112,7 @@ tasks.register("verifyInventoryShiftClick") {
|
||||
def mixin = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/mixin/AbstractContainerMenuMixin.java").text
|
||||
def screen = file("src/main/java/fr/koka99cab/sanctuary26/sanctuary/mixin/client/AbstractContainerScreenMixin.java").text
|
||||
def gui = file("INVENTORY_GUI.md").text
|
||||
if (project.version.toString() != "0.0.0-alpha.118"
|
||||
if (project.version.toString() != "0.0.0-alpha.119"
|
||||
|| !transfer.contains("shouldAppendOverflow")
|
||||
|| !transfer.contains("isVanillaStorageRange")
|
||||
|| !transfer.contains("hotbarStart")
|
||||
@@ -3132,7 +3158,7 @@ tasks.register("verifyQuestRequests") {
|
||||
new JsonSlurper().parse(file("src/main/resources/data/sanctuary/loot_table/blocks/${path}.json"))
|
||||
.pools[0].entries[0].name
|
||||
}
|
||||
if (project.version.toString() != "0.0.0-alpha.118"
|
||||
if (project.version.toString() != "0.0.0-alpha.119"
|
||||
|| migration.target?.modules?.sanctuary != "0.0.0-alpha.113"
|
||||
|| migration.quest_requests?.save_key != "quest_requests"
|
||||
|| migration.quest_requests?.data_version != 1
|
||||
@@ -3144,7 +3170,7 @@ tasks.register("verifyQuestRequests") {
|
||||
|| !data.contains('SAVE_KEY = "quest_requests"') || !data.contains("DATA_VERSION = 3")
|
||||
|| !service.contains("PlayerBlockBreakEvents.BEFORE")
|
||||
|| !service.contains("player.blockPosition().distSqr(payload.pos()) > 64.0D")
|
||||
|| !network.contains("PROTOCOL_VERSION = 21")
|
||||
|| !network.contains("PROTOCOL_VERSION = 22")
|
||||
|| !network.contains("QuestRequestSubmitPayload.ID")
|
||||
|| !network.contains("QuestRequestAcceptPayload.ID")
|
||||
|| !registry.contains('SanctuaryMod.id("quest_request_sign")')
|
||||
@@ -3190,7 +3216,7 @@ tasks.register("verifyQuestRequestContracts") {
|
||||
def locales = ["fr_fr", "en_us", "ru_ru"].collectEntries { locale ->
|
||||
[(locale): new JsonSlurper().parse(file("src/main/resources/assets/sanctuary/lang/${locale}.json"))]
|
||||
}
|
||||
if (project.version.toString() != "0.0.0-alpha.118"
|
||||
if (project.version.toString() != "0.0.0-alpha.119"
|
||||
|| migration.source?.pack_version != "26.2.0-alpha.198"
|
||||
|| migration.source?.modules?.sanctuary != "0.0.0-alpha.114"
|
||||
|| migration.target?.pack_version != "26.2.0-alpha.199"
|
||||
@@ -3210,7 +3236,7 @@ tasks.register("verifyQuestRequestContracts") {
|
||||
|| !service.contains('REWARD_LOAN = "loan"')
|
||||
|| !service.contains('PLAYER.equals(targetKind)')
|
||||
|| !screen.contains("rewardQuantity") || !screen.contains("killTargetIndex")
|
||||
|| !network.contains("PROTOCOL_VERSION = 21")
|
||||
|| !network.contains("PROTOCOL_VERSION = 22")
|
||||
|| standingModel.textures?.all != "sanctuary:block/pink_quest_request_sign"
|
||||
|| itemModel.textures?.layer0 != "sanctuary:item/pink_quest_request_sign"
|
||||
|| blockTexture == null || blockTexture.width != 32 || blockTexture.height != 32
|
||||
@@ -3259,7 +3285,7 @@ tasks.register("verifyQuestRequestEscrow") {
|
||||
def locales = ["fr_fr", "en_us", "ru_ru"].collectEntries { locale ->
|
||||
[(locale): new JsonSlurper().parse(file("src/main/resources/assets/sanctuary/lang/${locale}.json"))]
|
||||
}
|
||||
if (project.version.toString() != "0.0.0-alpha.118"
|
||||
if (project.version.toString() != "0.0.0-alpha.119"
|
||||
|| migration.source?.pack_version != "26.2.0-alpha.200"
|
||||
|| migration.source?.modules?.sanctuary != "0.0.0-alpha.115"
|
||||
|| migration.target?.pack_version != "26.2.0-alpha.201"
|
||||
@@ -3280,7 +3306,7 @@ tasks.register("verifyQuestRequestEscrow") {
|
||||
|| !service.contains('"quest_request_reward"')
|
||||
|| !service.contains('"quest_request_delivery"')
|
||||
|| service.contains("sanctuary_quest_accept")
|
||||
|| !network.contains("PROTOCOL_VERSION = 21")
|
||||
|| !network.contains("PROTOCOL_VERSION = 22")
|
||||
|| !network.contains("QuestRequestAcceptPayload.ID")
|
||||
|| !network.contains("QuestRequestConfirmPayload.ID")
|
||||
|| !acceptPayload.contains("readUtf(36)")
|
||||
|
||||
+12
@@ -11,6 +11,7 @@ import fr.koka99cab.sanctuary26.sanctuary.network.CelestialSkySnapshotPayload;
|
||||
import fr.koka99cab.sanctuary26.sanctuary.network.ShopSnapshotPayload;
|
||||
import fr.koka99cab.sanctuary26.sanctuary.network.CapeSyncPayload;
|
||||
import fr.koka99cab.sanctuary26.sanctuary.network.BlackMarketEditorPayload;
|
||||
import fr.koka99cab.sanctuary26.sanctuary.network.BlackMarketInteractPayload;
|
||||
import fr.koka99cab.sanctuary26.sanctuary.network.QuestRequestEditorPayload;
|
||||
import fr.koka99cab.sanctuary26.sanctuary.network.QuestRequestConfirmPayload;
|
||||
import fr.koka99cab.sanctuary26.sanctuary.progression.SanctuaryProgressionCosts;
|
||||
@@ -34,6 +35,8 @@ import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.world.SimpleContainer;
|
||||
import net.minecraft.world.inventory.ChestMenu;
|
||||
import net.minecraft.world.inventory.CraftingMenu;
|
||||
import net.minecraft.world.level.block.entity.SignBlockEntity;
|
||||
import net.minecraft.world.phys.BlockHitResult;
|
||||
import org.lwjgl.glfw.GLFW;
|
||||
|
||||
public final class SanctuaryClient implements ClientModInitializer {
|
||||
@@ -202,6 +205,15 @@ public final class SanctuaryClient implements ClientModInitializer {
|
||||
return switchHotbarRowKey != null && switchHotbarRowKey.matches(event);
|
||||
}
|
||||
|
||||
public static boolean handleBlackMarketMiddleClick(Minecraft client) {
|
||||
if (client.player == null || client.level == null || client.gui.screen() != null
|
||||
|| !(client.hitResult instanceof BlockHitResult hit)
|
||||
|| !(client.level.getBlockEntity(hit.getBlockPos()) instanceof SignBlockEntity)
|
||||
|| !ClientPlayNetworking.canSend(BlackMarketInteractPayload.ID)) return false;
|
||||
ClientPlayNetworking.send(new BlackMarketInteractPayload());
|
||||
return true;
|
||||
}
|
||||
|
||||
private static void openInventorySmokeScreen(Minecraft client) {
|
||||
inventorySmokeScreenOpened = true;
|
||||
inventorySmokeOpenDelay = -1;
|
||||
|
||||
+7
@@ -1,14 +1,21 @@
|
||||
package fr.koka99cab.sanctuary26.sanctuary.mixin.client;
|
||||
|
||||
import fr.koka99cab.sanctuary26.sanctuary.client.SanctuaryClient;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
/** Gives the game window the Sanctuary identity while preserving its connection suffix. */
|
||||
@Mixin(Minecraft.class)
|
||||
public abstract class MinecraftMixin {
|
||||
@Inject(method = "pickBlock", at = @At("HEAD"), cancellable = true)
|
||||
private void sanctuary$blackMarketMiddleClick(CallbackInfo callback) {
|
||||
if (SanctuaryClient.handleBlackMarketMiddleClick((Minecraft) (Object) this)) callback.cancel();
|
||||
}
|
||||
|
||||
@Inject(method = "createTitle", at = @At("RETURN"), cancellable = true)
|
||||
private void sanctuary$replaceMinecraftWindowTitle(CallbackInfoReturnable<String> callback) {
|
||||
callback.setReturnValue(callback.getReturnValue().replaceFirst("^Minecraft\\*?", "Sanctuary"));
|
||||
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
package fr.koka99cab.sanctuary26.sanctuary.network;
|
||||
|
||||
import fr.koka99cab.sanctuary26.sanctuary.SanctuaryMod;
|
||||
import net.minecraft.network.RegistryFriendlyByteBuf;
|
||||
import net.minecraft.network.codec.StreamCodec;
|
||||
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
|
||||
|
||||
/** Empty middle-click intent; the server resolves and validates the targeted sign. */
|
||||
public record BlackMarketInteractPayload() implements CustomPacketPayload {
|
||||
public static final Type<BlackMarketInteractPayload> ID =
|
||||
new Type<>(SanctuaryMod.id("c2s/black_market_interact"));
|
||||
public static final StreamCodec<RegistryFriendlyByteBuf, BlackMarketInteractPayload> CODEC =
|
||||
CustomPacketPayload.codec(BlackMarketInteractPayload::write, BlackMarketInteractPayload::new);
|
||||
|
||||
private BlackMarketInteractPayload(RegistryFriendlyByteBuf buffer) {
|
||||
this();
|
||||
}
|
||||
|
||||
private void write(RegistryFriendlyByteBuf buffer) {
|
||||
// No client position, listing ID, item or price is trusted.
|
||||
}
|
||||
|
||||
@Override
|
||||
public Type<? extends CustomPacketPayload> type() {
|
||||
return ID;
|
||||
}
|
||||
}
|
||||
+4
-1
@@ -22,7 +22,7 @@ import net.minecraft.server.level.ServerPlayer;
|
||||
* Networking contract for Sanctuary. Payload IDs must use the module namespace.
|
||||
*/
|
||||
public final class SanctuaryNetworking {
|
||||
public static final int PROTOCOL_VERSION = 21;
|
||||
public static final int PROTOCOL_VERSION = 22;
|
||||
private static boolean initialized;
|
||||
|
||||
private SanctuaryNetworking() {
|
||||
@@ -53,6 +53,7 @@ public final class SanctuaryNetworking {
|
||||
PayloadTypeRegistry.serverboundPlay().register(ShopRequestPayload.ID, ShopRequestPayload.CODEC);
|
||||
PayloadTypeRegistry.serverboundPlay().register(ShopActionPayload.ID, ShopActionPayload.CODEC);
|
||||
PayloadTypeRegistry.serverboundPlay().register(BlackMarketCreatePayload.ID, BlackMarketCreatePayload.CODEC);
|
||||
PayloadTypeRegistry.serverboundPlay().register(BlackMarketInteractPayload.ID, BlackMarketInteractPayload.CODEC);
|
||||
PayloadTypeRegistry.serverboundPlay().register(QuestRequestSubmitPayload.ID, QuestRequestSubmitPayload.CODEC);
|
||||
PayloadTypeRegistry.serverboundPlay().register(QuestRequestAcceptPayload.ID, QuestRequestAcceptPayload.CODEC);
|
||||
ServerPlayNetworking.registerGlobalReceiver(PurchaseProgressionPayload.ID, (payload, context) ->
|
||||
@@ -83,6 +84,8 @@ public final class SanctuaryNetworking {
|
||||
context.server().execute(() -> ShopService.handle(context.player(), payload)));
|
||||
ServerPlayNetworking.registerGlobalReceiver(BlackMarketCreatePayload.ID, (payload, context) ->
|
||||
context.server().execute(() -> BlackMarketService.create(context.player(), payload)));
|
||||
ServerPlayNetworking.registerGlobalReceiver(BlackMarketInteractPayload.ID, (payload, context) ->
|
||||
context.server().execute(() -> BlackMarketService.middleClick(context.player())));
|
||||
ServerPlayNetworking.registerGlobalReceiver(QuestRequestSubmitPayload.ID, (payload, context) ->
|
||||
context.server().execute(() -> QuestRequestService.submit(context.player(), payload)));
|
||||
ServerPlayNetworking.registerGlobalReceiver(QuestRequestAcceptPayload.ID, (payload, context) ->
|
||||
|
||||
+16
@@ -0,0 +1,16 @@
|
||||
package fr.koka99cab.sanctuary26.sanctuary.shop;
|
||||
|
||||
/** Pure interaction gates shared by the server implementation and smoke tests. */
|
||||
final class BlackMarketInteractionRules {
|
||||
private BlackMarketInteractionRules() {
|
||||
}
|
||||
|
||||
static boolean acceptsMiddleClick(boolean alive, boolean spectator,
|
||||
boolean targetsSign, boolean mayInteract) {
|
||||
return alive && !spectator && targetsSign && mayInteract;
|
||||
}
|
||||
|
||||
static boolean opensBlankListing(boolean middleClick, boolean secondaryUse, boolean heldItem) {
|
||||
return heldItem && (middleClick || secondaryUse);
|
||||
}
|
||||
}
|
||||
+18
-3
@@ -75,7 +75,7 @@ public final class BlackMarketService {
|
||||
? InteractionResult.SUCCESS : InteractionResult.PASS;
|
||||
}
|
||||
return player instanceof ServerPlayer serverPlayer
|
||||
? interact(serverPlayer, (ServerLevel) level, hit.getBlockPos(), sign)
|
||||
? interact(serverPlayer, (ServerLevel) level, hit.getBlockPos(), sign, false)
|
||||
: InteractionResult.PASS;
|
||||
});
|
||||
PlayerBlockBreakEvents.BEFORE.register((level, player, pos, state, blockEntity) -> {
|
||||
@@ -101,8 +101,22 @@ public final class BlackMarketService {
|
||||
BlackMarketCommands.register(dispatcher));
|
||||
}
|
||||
|
||||
public static void middleClick(ServerPlayer player) {
|
||||
net.minecraft.world.phys.HitResult hit = player.pick(
|
||||
player.blockInteractionRange() + 1.0D, 1.0F, false);
|
||||
boolean targetsSign = hit instanceof net.minecraft.world.phys.BlockHitResult blockHit
|
||||
&& player.level().getBlockEntity(blockHit.getBlockPos()) instanceof SignBlockEntity;
|
||||
BlockPos pos = targetsSign
|
||||
? ((net.minecraft.world.phys.BlockHitResult) hit).getBlockPos() : BlockPos.ZERO;
|
||||
boolean mayInteract = targetsSign && player.level().mayInteract(player, pos);
|
||||
if (!BlackMarketInteractionRules.acceptsMiddleClick(
|
||||
player.isAlive(), player.isSpectator(), targetsSign, mayInteract)) return;
|
||||
SignBlockEntity sign = (SignBlockEntity) player.level().getBlockEntity(pos);
|
||||
interact(player, (ServerLevel) player.level(), pos, sign, true);
|
||||
}
|
||||
|
||||
private static InteractionResult interact(ServerPlayer player, ServerLevel level, BlockPos pos,
|
||||
SignBlockEntity sign) {
|
||||
SignBlockEntity sign, boolean middleClick) {
|
||||
BlackMarketData data = BlackMarketData.get(level.getServer());
|
||||
Optional<BlackMarketData.Listing> existing = data.listingAt(dimension(level), pos.asLong());
|
||||
if (existing.isPresent()) {
|
||||
@@ -115,7 +129,8 @@ public final class BlackMarketService {
|
||||
}
|
||||
return InteractionResult.SUCCESS_SERVER;
|
||||
}
|
||||
if (!player.isSecondaryUseActive() || player.getMainHandItem().isEmpty()) return InteractionResult.PASS;
|
||||
if (!BlackMarketInteractionRules.opensBlankListing(middleClick,
|
||||
player.isSecondaryUseActive(), !player.getMainHandItem().isEmpty())) return InteractionResult.PASS;
|
||||
if (data.isBanned(player.getUUID())) {
|
||||
player.sendSystemMessage(Component.translatable("message.sanctuary.black_market.banned"));
|
||||
return InteractionResult.CONSUME;
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
"system_type": "gameplay-system",
|
||||
"namespace": "sanctuary",
|
||||
"data_version": 11,
|
||||
"network_protocol": 21,
|
||||
"network_protocol": 22,
|
||||
"lifecycle": "${lifecycle}",
|
||||
"pack_version": "${pack_version}",
|
||||
"descriptions": {
|
||||
|
||||
+13
@@ -8,6 +8,19 @@ public final class BlackMarketModelSmoke {
|
||||
private BlackMarketModelSmoke() {}
|
||||
|
||||
public static void main(String[] args) {
|
||||
require(BlackMarketInteractionRules.acceptsMiddleClick(true, false, true, true),
|
||||
"A valid middle-click sign target was rejected");
|
||||
require(!BlackMarketInteractionRules.acceptsMiddleClick(false, false, true, true),
|
||||
"A dead player may middle-click the Black Market");
|
||||
require(!BlackMarketInteractionRules.acceptsMiddleClick(true, true, true, true),
|
||||
"A spectator may middle-click the Black Market");
|
||||
require(!BlackMarketInteractionRules.acceptsMiddleClick(true, false, false, true),
|
||||
"A non-sign target may open the Black Market");
|
||||
require(BlackMarketInteractionRules.opensBlankListing(true, false, true),
|
||||
"Middle-click should create a listing without crouching");
|
||||
require(!BlackMarketInteractionRules.opensBlankListing(true, false, false),
|
||||
"An empty hand should not create a listing");
|
||||
|
||||
UUID seller = UUID.fromString("6c43c35a-3498-41bb-a77e-10c679e635d1");
|
||||
ItemStack escrow = ItemStack.EMPTY;
|
||||
BlackMarketData data = new BlackMarketData();
|
||||
|
||||
Reference in New Issue
Block a user