diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..097f9f9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..b01da52 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,37 @@ +# Automatically build the project and run any configured tests for every push +# and submitted pull request. This can help catch issues that only occur on +# certain platforms or Java versions, and provides a first line of defence +# against bad commits. + +name: build +on: [pull_request, push] + +jobs: + build: + strategy: + matrix: + # Use these Java versions + java: [ + 21, # Current Java LTS + ] + runs-on: ubuntu-22.04 + steps: + - name: checkout repository + uses: actions/checkout@v4 + - name: validate gradle wrapper + uses: gradle/wrapper-validation-action@v2 + - name: setup jdk ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java }} + distribution: 'microsoft' + - name: make gradle wrapper executable + run: chmod +x ./gradlew + - name: build + run: ./gradlew build + - name: capture build artifacts + if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java + uses: actions/upload-artifact@v4 + with: + name: Artifacts + path: build/libs/ \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c476faf --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ + +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE diff --git a/build.gradle b/build.gradle index 55da85d..b9af75b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,57 +1,88 @@ plugins { - id 'fabric-loom' version '1.4-SNAPSHOT' + id 'fabric-loom' version '1.7-SNAPSHOT' + id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 +version = project.mod_version +group = project.maven_group -archivesBaseName = 'modid' -version = '1.0.0' -group = 'com.yourname.modid' -actualmodid = 'purediscstrickytrials' +base { + archivesName = project.archives_base_name +} + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. +} loom { - mixin { - defaultRefmapName = actualmodid + ".refmap.json" - } + splitEnvironmentSourceSets() + + mods { + "purediscstrickytrials" { + sourceSet sourceSets.main + sourceSet sourceSets.client + } + } + } dependencies { - minecraft "com.mojang:minecraft:1.20.1" - mappings loom.officialMojangMappings() - modImplementation "net.fabricmc:fabric-loader:0.14.21" + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - //Fabric api - modImplementation "net.fabricmc.fabric-api:fabric-api:0.83.1+1.20.1" + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + } processResources { - inputs.property "version", project.version + inputs.property "version", project.version - filesMatching("fabric.mod.json") { - expand "version": project.version - } + filesMatching("fabric.mod.json") { + expand "version": project.version + } } tasks.withType(JavaCompile).configureEach { - it.options.release = 17 + it.options.release = 21 } java { - withSourcesJar() + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + // withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } jar { - from "LICENSE" + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}"} + } } -loom { - mixin { - defaultRefmapName = actualmodid + ".refmap.json" +// configure the maven publication +publishing { + publications { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name + from components.java + } } -} -apply from: 'mcreator.gradle' \ No newline at end of file + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 6456ddc..2ea1bfb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,17 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G org.gradle.parallel=true -actualmodid=potatoesAreBetterThanEggs \ No newline at end of file + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=1.21 +yarn_mappings=1.21+build.9 +loader_version=0.15.11 + +# Mod Properties +mod_version=v2.0.0-1.21-fabric +maven_group=net.purejosh.purediscstrickytrials +archives_base_name=purediscstrickytrials + +# Dependencies +fabric_version=0.100.8+1.21 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a7..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1b298ae..a441313 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fcb6fca..b740cf1 100644 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -201,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 93e3f59..25da30d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/settings.gradle b/settings.gradle index 2875cde..75c4d72 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,10 @@ pluginManagement { - repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - gradlePluginPortal() - } + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } } \ No newline at end of file diff --git a/src/client/java/net/purejosh/purediscstrickytrials/PureDiscsTrickyTrialsClient.java b/src/client/java/net/purejosh/purediscstrickytrials/PureDiscsTrickyTrialsClient.java new file mode 100644 index 0000000..cdc99b7 --- /dev/null +++ b/src/client/java/net/purejosh/purediscstrickytrials/PureDiscsTrickyTrialsClient.java @@ -0,0 +1,10 @@ +package net.purejosh.purediscstrickytrials; + +import net.fabricmc.api.ClientModInitializer; + +public class PureDiscsTrickyTrialsClient implements ClientModInitializer { + @Override + public void onInitializeClient() { + // This entrypoint is suitable for setting up client-specific logic, such as rendering. + } +} \ No newline at end of file diff --git a/src/client/java/net/purejosh/purediscstrickytrials/mixin/client/ExampleClientMixin.java b/src/client/java/net/purejosh/purediscstrickytrials/mixin/client/ExampleClientMixin.java new file mode 100644 index 0000000..995eec7 --- /dev/null +++ b/src/client/java/net/purejosh/purediscstrickytrials/mixin/client/ExampleClientMixin.java @@ -0,0 +1,15 @@ +package net.purejosh.purediscstrickytrials.mixin.client; + +import net.minecraft.client.MinecraftClient; +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(MinecraftClient.class) +public class ExampleClientMixin { + @Inject(at = @At("HEAD"), method = "run") + private void init(CallbackInfo info) { + // This code is injected into the start of MinecraftClient.run()V + } +} \ No newline at end of file diff --git a/src/client/resources/purediscstrickytrials.client.mixins.json b/src/client/resources/purediscstrickytrials.client.mixins.json new file mode 100644 index 0000000..d0e0198 --- /dev/null +++ b/src/client/resources/purediscstrickytrials.client.mixins.json @@ -0,0 +1,11 @@ +{ + "required": true, + "package": "net.purejosh.purediscstrickytrials.mixin.client", + "compatibilityLevel": "JAVA_21", + "client": [ + "ExampleClientMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/src/main/java/net/purejosh/purediscstrickytrials/ClientInit.java b/src/main/java/net/purejosh/purediscstrickytrials/ClientInit.java deleted file mode 100644 index d340406..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/ClientInit.java +++ /dev/null @@ -1,25 +0,0 @@ -/* -* MCreator note: -* -* If you lock base mod element files, you can edit this file and the proxy files -* and they won't get overwritten. If you change your mod package or modid, you -* need to apply these changes to this file MANUALLY. -* -* -* If you do not lock base mod element files in Workspace settings, this file -* will be REGENERATED on each build. -* -*/ -package net.purejosh.purediscstrickytrials; - -import net.fabricmc.api.Environment; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.ClientModInitializer; - -@Environment(EnvType.CLIENT) -public class ClientInit implements ClientModInitializer { - @Override - public void onInitializeClient() { - - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/PureDiscsTrickyTrials.java b/src/main/java/net/purejosh/purediscstrickytrials/PureDiscsTrickyTrials.java new file mode 100644 index 0000000..b5818c3 --- /dev/null +++ b/src/main/java/net/purejosh/purediscstrickytrials/PureDiscsTrickyTrials.java @@ -0,0 +1,22 @@ +package net.purejosh.purediscstrickytrials; + +import net.fabricmc.api.ModInitializer; +import net.purejosh.purediscstrickytrials.item.ModItemGroups; +import net.purejosh.purediscstrickytrials.item.ModItems; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class PureDiscsTrickyTrials implements ModInitializer { + public static final String MOD_ID = "purediscstrickytrials"; + public static final Logger LOGGER = LogManager.getLogger(MOD_ID); + + // This code is executed when the mod is loaded. + @Override + public void onInitialize() { + // This is the log line that gets printed when the mod is loaded. + LOGGER.info("Pure Discs - Tricky Trials by purejosh has been loaded!"); + // Now, I call the init methods in the registry classes. + ModItems.init(); + ModItemGroups.init(); + } +} \ No newline at end of file diff --git a/src/main/java/net/purejosh/purediscstrickytrials/PurediscstrickytrialsMod.java b/src/main/java/net/purejosh/purediscstrickytrials/PurediscstrickytrialsMod.java deleted file mode 100644 index 1c4b310..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/PurediscstrickytrialsMod.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * MCreator note: - * - * If you lock base mod element files, you can edit this file and the proxy files - * and they won't get overwritten. If you change your mod package or modid, you - * need to apply these changes to this file MANUALLY. - * - * - * If you do not lock base mod element files in Workspace settings, this file - * will be REGENERATED on each build. - * - */ -package net.purejosh.purediscstrickytrials; - -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; - -import net.purejosh.purediscstrickytrials.init.PurediscstrickytrialsModSounds; -import net.purejosh.purediscstrickytrials.init.PurediscstrickytrialsModItems; - -import net.fabricmc.api.ModInitializer; - -public class PurediscstrickytrialsMod implements ModInitializer { - public static final Logger LOGGER = LogManager.getLogger(); - public static final String MODID = "purediscstrickytrials"; - - @Override - public void onInitialize() { - LOGGER.info("Initializing PurediscstrickytrialsMod"); - - PurediscstrickytrialsModItems.load(); - - PurediscstrickytrialsModSounds.load(); - - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/init/PurediscstrickytrialsModItems.java b/src/main/java/net/purejosh/purediscstrickytrials/init/PurediscstrickytrialsModItems.java deleted file mode 100644 index f07cbe9..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/init/PurediscstrickytrialsModItems.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * MCreator note: This file will be REGENERATED on each build. - */ -package net.purejosh.purediscstrickytrials.init; - -import net.purejosh.purediscstrickytrials.item.MusicDiscYakusokuItem; -import net.purejosh.purediscstrickytrials.item.MusicDiscWatcherItem; -import net.purejosh.purediscstrickytrials.item.MusicDiscPuzzleboxItem; -import net.purejosh.purediscstrickytrials.item.MusicDiscPrecipiceItem; -import net.purejosh.purediscstrickytrials.item.MusicDiscPokopokoItem; -import net.purejosh.purediscstrickytrials.item.MusicDiscKomorebiItem; -import net.purejosh.purediscstrickytrials.item.MusicDiscFeatherfallItem; -import net.purejosh.purediscstrickytrials.item.MusicDiscEndlessItem; -import net.purejosh.purediscstrickytrials.item.MusicDiscEldUnknownItem; -import net.purejosh.purediscstrickytrials.item.MusicDiscDeeperItem; -import net.purejosh.purediscstrickytrials.item.MusicDiscCreatorMusicBoxItem; -import net.purejosh.purediscstrickytrials.item.MusicDiscCreatorItem; -import net.purejosh.purediscstrickytrials.PurediscstrickytrialsMod; - -import net.minecraft.world.item.Item; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.Registry; - -public class PurediscstrickytrialsModItems { - public static Item MUSIC_DISC_CREATOR; - public static Item MUSIC_DISC_CREATOR_MUSIC_BOX; - public static Item MUSIC_DISC_DEEPER; - public static Item MUSIC_DISC_ELD_UNKNOWN; - public static Item MUSIC_DISC_ENDLESS; - public static Item MUSIC_DISC_FEATHERFALL; - public static Item MUSIC_DISC_KOMOREBI; - public static Item MUSIC_DISC_POKOPOKO; - public static Item MUSIC_DISC_PRECIPICE; - public static Item MUSIC_DISC_PUZZLEBOX; - public static Item MUSIC_DISC_WATCHER; - public static Item MUSIC_DISC_YAKUSOKU; - - public static void load() { - MUSIC_DISC_CREATOR = Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(PurediscstrickytrialsMod.MODID, "music_disc_creator"), new MusicDiscCreatorItem()); - MUSIC_DISC_CREATOR_MUSIC_BOX = Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(PurediscstrickytrialsMod.MODID, "music_disc_creator_music_box"), new MusicDiscCreatorMusicBoxItem()); - MUSIC_DISC_DEEPER = Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(PurediscstrickytrialsMod.MODID, "music_disc_deeper"), new MusicDiscDeeperItem()); - MUSIC_DISC_ELD_UNKNOWN = Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(PurediscstrickytrialsMod.MODID, "music_disc_eld_unknown"), new MusicDiscEldUnknownItem()); - MUSIC_DISC_ENDLESS = Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(PurediscstrickytrialsMod.MODID, "music_disc_endless"), new MusicDiscEndlessItem()); - MUSIC_DISC_FEATHERFALL = Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(PurediscstrickytrialsMod.MODID, "music_disc_featherfall"), new MusicDiscFeatherfallItem()); - MUSIC_DISC_KOMOREBI = Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(PurediscstrickytrialsMod.MODID, "music_disc_komorebi"), new MusicDiscKomorebiItem()); - MUSIC_DISC_POKOPOKO = Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(PurediscstrickytrialsMod.MODID, "music_disc_pokopoko"), new MusicDiscPokopokoItem()); - MUSIC_DISC_PRECIPICE = Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(PurediscstrickytrialsMod.MODID, "music_disc_precipice"), new MusicDiscPrecipiceItem()); - MUSIC_DISC_PUZZLEBOX = Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(PurediscstrickytrialsMod.MODID, "music_disc_puzzlebox"), new MusicDiscPuzzleboxItem()); - MUSIC_DISC_WATCHER = Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(PurediscstrickytrialsMod.MODID, "music_disc_watcher"), new MusicDiscWatcherItem()); - MUSIC_DISC_YAKUSOKU = Registry.register(BuiltInRegistries.ITEM, new ResourceLocation(PurediscstrickytrialsMod.MODID, "music_disc_yakusoku"), new MusicDiscYakusokuItem()); - } - - public static void clientLoad() { - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/init/PurediscstrickytrialsModSounds.java b/src/main/java/net/purejosh/purediscstrickytrials/init/PurediscstrickytrialsModSounds.java deleted file mode 100644 index e2809e9..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/init/PurediscstrickytrialsModSounds.java +++ /dev/null @@ -1,40 +0,0 @@ - -/* - * MCreator note: This file will be REGENERATED on each build. - */ -package net.purejosh.purediscstrickytrials.init; - -import net.minecraft.sounds.SoundEvent; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.Registry; - -public class PurediscstrickytrialsModSounds { - public static SoundEvent CREATOR = SoundEvent.createVariableRangeEvent(new ResourceLocation("purediscstrickytrials", "creator")); - public static SoundEvent CREATOR_MUSIC_BOX = SoundEvent.createVariableRangeEvent(new ResourceLocation("purediscstrickytrials", "creator_music_box")); - public static SoundEvent DEEPER = SoundEvent.createVariableRangeEvent(new ResourceLocation("purediscstrickytrials", "deeper")); - public static SoundEvent ELD_UNKNOWN = SoundEvent.createVariableRangeEvent(new ResourceLocation("purediscstrickytrials", "eld_unknown")); - public static SoundEvent ENDLESS = SoundEvent.createVariableRangeEvent(new ResourceLocation("purediscstrickytrials", "endless")); - public static SoundEvent FEATHERFALL = SoundEvent.createVariableRangeEvent(new ResourceLocation("purediscstrickytrials", "featherfall")); - public static SoundEvent KOMOREBI = SoundEvent.createVariableRangeEvent(new ResourceLocation("purediscstrickytrials", "komorebi")); - public static SoundEvent POKOPOKO = SoundEvent.createVariableRangeEvent(new ResourceLocation("purediscstrickytrials", "pokopoko")); - public static SoundEvent PRECIPICE = SoundEvent.createVariableRangeEvent(new ResourceLocation("purediscstrickytrials", "precipice")); - public static SoundEvent PUZZLEBOX = SoundEvent.createVariableRangeEvent(new ResourceLocation("purediscstrickytrials", "puzzlebox")); - public static SoundEvent WATCHER = SoundEvent.createVariableRangeEvent(new ResourceLocation("purediscstrickytrials", "watcher")); - public static SoundEvent YAKUSOKU = SoundEvent.createVariableRangeEvent(new ResourceLocation("purediscstrickytrials", "yakusoku")); - - public static void load() { - Registry.register(BuiltInRegistries.SOUND_EVENT, new ResourceLocation("purediscstrickytrials", "creator"), CREATOR); - Registry.register(BuiltInRegistries.SOUND_EVENT, new ResourceLocation("purediscstrickytrials", "creator_music_box"), CREATOR_MUSIC_BOX); - Registry.register(BuiltInRegistries.SOUND_EVENT, new ResourceLocation("purediscstrickytrials", "deeper"), DEEPER); - Registry.register(BuiltInRegistries.SOUND_EVENT, new ResourceLocation("purediscstrickytrials", "eld_unknown"), ELD_UNKNOWN); - Registry.register(BuiltInRegistries.SOUND_EVENT, new ResourceLocation("purediscstrickytrials", "endless"), ENDLESS); - Registry.register(BuiltInRegistries.SOUND_EVENT, new ResourceLocation("purediscstrickytrials", "featherfall"), FEATHERFALL); - Registry.register(BuiltInRegistries.SOUND_EVENT, new ResourceLocation("purediscstrickytrials", "komorebi"), KOMOREBI); - Registry.register(BuiltInRegistries.SOUND_EVENT, new ResourceLocation("purediscstrickytrials", "pokopoko"), POKOPOKO); - Registry.register(BuiltInRegistries.SOUND_EVENT, new ResourceLocation("purediscstrickytrials", "precipice"), PRECIPICE); - Registry.register(BuiltInRegistries.SOUND_EVENT, new ResourceLocation("purediscstrickytrials", "puzzlebox"), PUZZLEBOX); - Registry.register(BuiltInRegistries.SOUND_EVENT, new ResourceLocation("purediscstrickytrials", "watcher"), WATCHER); - Registry.register(BuiltInRegistries.SOUND_EVENT, new ResourceLocation("purediscstrickytrials", "yakusoku"), YAKUSOKU); - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/item/ModItemGroups.java b/src/main/java/net/purejosh/purediscstrickytrials/item/ModItemGroups.java new file mode 100644 index 0000000..69ab19e --- /dev/null +++ b/src/main/java/net/purejosh/purediscstrickytrials/item/ModItemGroups.java @@ -0,0 +1,30 @@ +package net.purejosh.purediscstrickytrials.item; + +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; +import net.minecraft.item.ItemGroups; +import net.minecraft.item.Items; + +public class ModItemGroups { + + public static void init() { + // Discs + ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((itemGroup) -> itemGroup.addAfter( + Items.MUSIC_DISC_PIGSTEP.getDefaultStack(), ModItems.MUSIC_DISC_DEEPER.getDefaultStack())); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((itemGroup) -> itemGroup.addAfter( + ModItems.MUSIC_DISC_DEEPER.getDefaultStack(), ModItems.MUSIC_DISC_ELD_UNKNOWN.getDefaultStack())); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((itemGroup) -> itemGroup.addAfter( + ModItems.MUSIC_DISC_ELD_UNKNOWN.getDefaultStack(), ModItems.MUSIC_DISC_ENDLESS.getDefaultStack())); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((itemGroup) -> itemGroup.addAfter( + ModItems.MUSIC_DISC_ENDLESS.getDefaultStack(), ModItems.MUSIC_DISC_FEATHERFALL.getDefaultStack())); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((itemGroup) -> itemGroup.addAfter( + ModItems.MUSIC_DISC_FEATHERFALL.getDefaultStack(), ModItems.MUSIC_DISC_KOMOREBI.getDefaultStack())); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((itemGroup) -> itemGroup.addAfter( + ModItems.MUSIC_DISC_KOMOREBI.getDefaultStack(), ModItems.MUSIC_DISC_POKOPOKO.getDefaultStack())); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((itemGroup) -> itemGroup.addAfter( + ModItems.MUSIC_DISC_POKOPOKO.getDefaultStack(), ModItems.MUSIC_DISC_PUZZLEBOX.getDefaultStack())); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((itemGroup) -> itemGroup.addAfter( + ModItems.MUSIC_DISC_PUZZLEBOX.getDefaultStack(), ModItems.MUSIC_DISC_WATCHER.getDefaultStack())); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register((itemGroup) -> itemGroup.addAfter( + ModItems.MUSIC_DISC_WATCHER.getDefaultStack(), ModItems.MUSIC_DISC_YAKUSOKU.getDefaultStack())); + } +} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/item/ModItems.java b/src/main/java/net/purejosh/purediscstrickytrials/item/ModItems.java new file mode 100644 index 0000000..3408ee9 --- /dev/null +++ b/src/main/java/net/purejosh/purediscstrickytrials/item/ModItems.java @@ -0,0 +1,31 @@ +package net.purejosh.purediscstrickytrials.item; + +import net.minecraft.item.Item; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; +import net.minecraft.util.Rarity; +import net.purejosh.purediscstrickytrials.PureDiscsTrickyTrials; +import net.purejosh.purediscstrickytrials.sound.ModJukeboxSongs; + +public class ModItems { + // Discs + public static final Item MUSIC_DISC_DEEPER = register("music_disc_deeper", new Item(new Item.Settings().maxCount(1).rarity(Rarity.RARE).jukeboxPlayable(ModJukeboxSongs.DEEPER))); + public static final Item MUSIC_DISC_ELD_UNKNOWN = register("music_disc_eld_unknown", new Item(new Item.Settings().maxCount(1).rarity(Rarity.RARE).jukeboxPlayable(ModJukeboxSongs.ELD_UNKNOWN))); + public static final Item MUSIC_DISC_ENDLESS = register("music_disc_endless", new Item(new Item.Settings().maxCount(1).rarity(Rarity.RARE).jukeboxPlayable(ModJukeboxSongs.ENDLESS))); + public static final Item MUSIC_DISC_FEATHERFALL = register("music_disc_featherfall", new Item(new Item.Settings().maxCount(1).rarity(Rarity.RARE).jukeboxPlayable(ModJukeboxSongs.FEATHERFALL))); + public static final Item MUSIC_DISC_KOMOREBI = register("music_disc_komorebi", new Item(new Item.Settings().maxCount(1).rarity(Rarity.RARE).jukeboxPlayable(ModJukeboxSongs.KOMOREBI))); + public static final Item MUSIC_DISC_POKOPOKO = register("music_disc_pokopoko", new Item(new Item.Settings().maxCount(1).rarity(Rarity.RARE).jukeboxPlayable(ModJukeboxSongs.POKOPOKO))); + public static final Item MUSIC_DISC_PUZZLEBOX = register("music_disc_puzzlebox", new Item(new Item.Settings().maxCount(1).rarity(Rarity.RARE).jukeboxPlayable(ModJukeboxSongs.PUZZLEBOX))); + public static final Item MUSIC_DISC_WATCHER = register("music_disc_watcher", new Item(new Item.Settings().maxCount(1).rarity(Rarity.RARE).jukeboxPlayable(ModJukeboxSongs.WATCHER))); + public static final Item MUSIC_DISC_YAKUSOKU = register("music_disc_yakusoku", new Item(new Item.Settings().maxCount(1).rarity(Rarity.RARE).jukeboxPlayable(ModJukeboxSongs.YAKUSOKU))); + + // Helper method for registering an item. + public static Item register(String id, Item item) { + return Registry.register(Registries.ITEM, Identifier.of(PureDiscsTrickyTrials.MOD_ID, id), item); + } + + // Class initializer called from the entrypoint. + public static void init() { + } +} \ No newline at end of file diff --git a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscCreatorItem.java b/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscCreatorItem.java deleted file mode 100644 index 82f72fb..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscCreatorItem.java +++ /dev/null @@ -1,18 +0,0 @@ - -package net.purejosh.purediscstrickytrials.item; - -import net.purejosh.purediscstrickytrials.init.PurediscstrickytrialsModSounds; - -import net.minecraft.world.item.RecordItem; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.CreativeModeTabs; - -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; - -public class MusicDiscCreatorItem extends RecordItem { - public MusicDiscCreatorItem() { - super(1, PurediscstrickytrialsModSounds.CREATOR, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), 3480); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(content -> content.accept(this)); - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscCreatorMusicBoxItem.java b/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscCreatorMusicBoxItem.java deleted file mode 100644 index 07aa088..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscCreatorMusicBoxItem.java +++ /dev/null @@ -1,18 +0,0 @@ - -package net.purejosh.purediscstrickytrials.item; - -import net.purejosh.purediscstrickytrials.init.PurediscstrickytrialsModSounds; - -import net.minecraft.world.item.RecordItem; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.CreativeModeTabs; - -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; - -public class MusicDiscCreatorMusicBoxItem extends RecordItem { - public MusicDiscCreatorMusicBoxItem() { - super(2, PurediscstrickytrialsModSounds.CREATOR_MUSIC_BOX, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), 1440); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(content -> content.accept(this)); - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscDeeperItem.java b/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscDeeperItem.java deleted file mode 100644 index 3ade6f5..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscDeeperItem.java +++ /dev/null @@ -1,18 +0,0 @@ - -package net.purejosh.purediscstrickytrials.item; - -import net.purejosh.purediscstrickytrials.init.PurediscstrickytrialsModSounds; - -import net.minecraft.world.item.RecordItem; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.CreativeModeTabs; - -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; - -public class MusicDiscDeeperItem extends RecordItem { - public MusicDiscDeeperItem() { - super(3, PurediscstrickytrialsModSounds.DEEPER, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), 5980); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(content -> content.accept(this)); - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscEldUnknownItem.java b/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscEldUnknownItem.java deleted file mode 100644 index 71b5cd8..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscEldUnknownItem.java +++ /dev/null @@ -1,18 +0,0 @@ - -package net.purejosh.purediscstrickytrials.item; - -import net.purejosh.purediscstrickytrials.init.PurediscstrickytrialsModSounds; - -import net.minecraft.world.item.RecordItem; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.CreativeModeTabs; - -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; - -public class MusicDiscEldUnknownItem extends RecordItem { - public MusicDiscEldUnknownItem() { - super(4, PurediscstrickytrialsModSounds.ELD_UNKNOWN, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), 5840); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(content -> content.accept(this)); - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscEndlessItem.java b/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscEndlessItem.java deleted file mode 100644 index cbeb707..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscEndlessItem.java +++ /dev/null @@ -1,18 +0,0 @@ - -package net.purejosh.purediscstrickytrials.item; - -import net.purejosh.purediscstrickytrials.init.PurediscstrickytrialsModSounds; - -import net.minecraft.world.item.RecordItem; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.CreativeModeTabs; - -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; - -public class MusicDiscEndlessItem extends RecordItem { - public MusicDiscEndlessItem() { - super(5, PurediscstrickytrialsModSounds.ENDLESS, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), 7940); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(content -> content.accept(this)); - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscFeatherfallItem.java b/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscFeatherfallItem.java deleted file mode 100644 index 597b3a0..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscFeatherfallItem.java +++ /dev/null @@ -1,18 +0,0 @@ - -package net.purejosh.purediscstrickytrials.item; - -import net.purejosh.purediscstrickytrials.init.PurediscstrickytrialsModSounds; - -import net.minecraft.world.item.RecordItem; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.CreativeModeTabs; - -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; - -public class MusicDiscFeatherfallItem extends RecordItem { - public MusicDiscFeatherfallItem() { - super(6, PurediscstrickytrialsModSounds.FEATHERFALL, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), 6780); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(content -> content.accept(this)); - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscKomorebiItem.java b/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscKomorebiItem.java deleted file mode 100644 index b02fc12..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscKomorebiItem.java +++ /dev/null @@ -1,18 +0,0 @@ - -package net.purejosh.purediscstrickytrials.item; - -import net.purejosh.purediscstrickytrials.init.PurediscstrickytrialsModSounds; - -import net.minecraft.world.item.RecordItem; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.CreativeModeTabs; - -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; - -public class MusicDiscKomorebiItem extends RecordItem { - public MusicDiscKomorebiItem() { - super(7, PurediscstrickytrialsModSounds.KOMOREBI, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), 5620); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(content -> content.accept(this)); - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscPokopokoItem.java b/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscPokopokoItem.java deleted file mode 100644 index afe7c53..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscPokopokoItem.java +++ /dev/null @@ -1,18 +0,0 @@ - -package net.purejosh.purediscstrickytrials.item; - -import net.purejosh.purediscstrickytrials.init.PurediscstrickytrialsModSounds; - -import net.minecraft.world.item.RecordItem; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.CreativeModeTabs; - -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; - -public class MusicDiscPokopokoItem extends RecordItem { - public MusicDiscPokopokoItem() { - super(8, PurediscstrickytrialsModSounds.POKOPOKO, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), 5760); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(content -> content.accept(this)); - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscPrecipiceItem.java b/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscPrecipiceItem.java deleted file mode 100644 index 800ce6d..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscPrecipiceItem.java +++ /dev/null @@ -1,18 +0,0 @@ - -package net.purejosh.purediscstrickytrials.item; - -import net.purejosh.purediscstrickytrials.init.PurediscstrickytrialsModSounds; - -import net.minecraft.world.item.RecordItem; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.CreativeModeTabs; - -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; - -public class MusicDiscPrecipiceItem extends RecordItem { - public MusicDiscPrecipiceItem() { - super(9, PurediscstrickytrialsModSounds.PRECIPICE, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), 100); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(content -> content.accept(this)); - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscPuzzleboxItem.java b/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscPuzzleboxItem.java deleted file mode 100644 index 80c3411..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscPuzzleboxItem.java +++ /dev/null @@ -1,18 +0,0 @@ - -package net.purejosh.purediscstrickytrials.item; - -import net.purejosh.purediscstrickytrials.init.PurediscstrickytrialsModSounds; - -import net.minecraft.world.item.RecordItem; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.CreativeModeTabs; - -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; - -public class MusicDiscPuzzleboxItem extends RecordItem { - public MusicDiscPuzzleboxItem() { - super(10, PurediscstrickytrialsModSounds.PUZZLEBOX, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), 5900); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(content -> content.accept(this)); - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscWatcherItem.java b/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscWatcherItem.java deleted file mode 100644 index f7fcf83..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscWatcherItem.java +++ /dev/null @@ -1,18 +0,0 @@ - -package net.purejosh.purediscstrickytrials.item; - -import net.purejosh.purediscstrickytrials.init.PurediscstrickytrialsModSounds; - -import net.minecraft.world.item.RecordItem; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.CreativeModeTabs; - -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; - -public class MusicDiscWatcherItem extends RecordItem { - public MusicDiscWatcherItem() { - super(11, PurediscstrickytrialsModSounds.WATCHER, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), 6580); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(content -> content.accept(this)); - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscYakusokuItem.java b/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscYakusokuItem.java deleted file mode 100644 index bb827bb..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/item/MusicDiscYakusokuItem.java +++ /dev/null @@ -1,18 +0,0 @@ - -package net.purejosh.purediscstrickytrials.item; - -import net.purejosh.purediscstrickytrials.init.PurediscstrickytrialsModSounds; - -import net.minecraft.world.item.RecordItem; -import net.minecraft.world.item.Rarity; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.CreativeModeTabs; - -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; - -public class MusicDiscYakusokuItem extends RecordItem { - public MusicDiscYakusokuItem() { - super(12, PurediscstrickytrialsModSounds.YAKUSOKU, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), 5300); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register(content -> content.accept(this)); - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/mixin/ExampleMixin.java b/src/main/java/net/purejosh/purediscstrickytrials/mixin/ExampleMixin.java new file mode 100644 index 0000000..1557daf --- /dev/null +++ b/src/main/java/net/purejosh/purediscstrickytrials/mixin/ExampleMixin.java @@ -0,0 +1,15 @@ +package net.purejosh.purediscstrickytrials.mixin; + +import net.minecraft.server.MinecraftServer; +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(MinecraftServer.class) +public class ExampleMixin { + @Inject(at = @At("HEAD"), method = "loadWorld") + private void init(CallbackInfo info) { + // This code is injected into the start of MinecraftServer.loadWorld()V + } +} \ No newline at end of file diff --git a/src/main/java/net/purejosh/purediscstrickytrials/mixins/PurediscstrickytrialsModRepairItemRecipeMixin.java b/src/main/java/net/purejosh/purediscstrickytrials/mixins/PurediscstrickytrialsModRepairItemRecipeMixin.java deleted file mode 100644 index 3efba64..0000000 --- a/src/main/java/net/purejosh/purediscstrickytrials/mixins/PurediscstrickytrialsModRepairItemRecipeMixin.java +++ /dev/null @@ -1,32 +0,0 @@ -package net.purejosh.purediscstrickytrials.mixins; - -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.Mixin; - -import net.minecraft.world.item.crafting.RepairItemRecipe; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.inventory.CraftingContainer; -import net.minecraft.core.RegistryAccess; - -import java.util.ArrayList; - -import com.google.common.collect.Lists; - -@Mixin(RepairItemRecipe.class) -public abstract class PurediscstrickytrialsModRepairItemRecipeMixin { - @Inject(method = "assemble", at = @At("HEAD"), cancellable = true) - public void assemble(CraftingContainer craftingContainer, RegistryAccess registryAccess, CallbackInfoReturnable cir) { - ItemStack itemStack3; - ItemStack itemStack; - ArrayList list = Lists.newArrayList(); - for (int i = 0; i < craftingContainer.getContainerSize(); ++i) { - ItemStack itemStack2; - itemStack = craftingContainer.getItem(i); - if (itemStack.isEmpty()) - continue; - list.add(itemStack); - } - } -} diff --git a/src/main/java/net/purejosh/purediscstrickytrials/sound/ModJukeboxSongs.java b/src/main/java/net/purejosh/purediscstrickytrials/sound/ModJukeboxSongs.java new file mode 100644 index 0000000..f13b728 --- /dev/null +++ b/src/main/java/net/purejosh/purediscstrickytrials/sound/ModJukeboxSongs.java @@ -0,0 +1,24 @@ +package net.purejosh.purediscstrickytrials.sound; + +import net.minecraft.block.jukebox.JukeboxSong; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; +import net.purejosh.purediscstrickytrials.PureDiscsTrickyTrials; + +public interface ModJukeboxSongs { + + RegistryKey DEEPER = of("deeper"); + RegistryKey ELD_UNKNOWN = of("eld_unknown"); + RegistryKey ENDLESS = of("endless"); + RegistryKey FEATHERFALL = of("featherfall"); + RegistryKey KOMOREBI = of("komorebi"); + RegistryKey POKOPOKO = of("pokopoko"); + RegistryKey PUZZLEBOX = of("puzzlebox"); + RegistryKey WATCHER = of("watcher"); + RegistryKey YAKUSOKU = of("yakusoku"); + + private static RegistryKey of(String id) { + return RegistryKey.of(RegistryKeys.JUKEBOX_SONG, Identifier.of(PureDiscsTrickyTrials.MOD_ID, id)); + } +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml deleted file mode 100644 index eae3262..0000000 --- a/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,24 +0,0 @@ -modLoader="javafml" -loaderVersion="[47,)" -license="Custom license" - -[[mods]] -modId="purediscstrickytrials" -version="1.0.0" -displayName="Pure Discs - Tricky Trials" -credits="Made by purejosh" -displayURL="https://legacy.curseforge.com/minecraft/mc-mods/purediscstrickytrials" -logoFile="logo.png" -authors="purejosh" -description="Adds twelve new songs that were added to the game with the 1.21 Tricky Trials update!" - -[[dependencies.purediscstrickytrials]] - modId="minecraft" - mandatory=true - versionRange="[1.20.1]" - ordering="NONE" - side="BOTH" - - - - diff --git a/src/main/resources/assets/purediscstrickytrials/icon.png b/src/main/resources/assets/purediscstrickytrials/icon.png index f8ee796..69fa982 100644 Binary files a/src/main/resources/assets/purediscstrickytrials/icon.png and b/src/main/resources/assets/purediscstrickytrials/icon.png differ diff --git a/src/main/resources/assets/purediscstrickytrials/lang/en_us.json b/src/main/resources/assets/purediscstrickytrials/lang/en_us.json index ac58ca6..0284244 100644 --- a/src/main/resources/assets/purediscstrickytrials/lang/en_us.json +++ b/src/main/resources/assets/purediscstrickytrials/lang/en_us.json @@ -1,41 +1,20 @@ { - "subtitles.pokopoko": "", - "item.purediscstrickytrials.music_disc_eld_unknown": "Music Disc", - "item.purediscstrickytrials.music_disc_precipice.desc": "Aaron Cherof - Precipice", - "subtitles.creator_music_box_version": "", - "item.purediscstrickytrials.music_disc_watcher.desc": "Aaron Cherof - Watcher", - "subtitles.precipice": "", - "item.purediscstrickytrials.music_disc_featherfall.desc": "Aaron Cherof - Featherfall", - "item.purediscstrickytrials.music_disc_creator": "Music Disc", - "subtitles.yakusoku": "", + "item.purediscstrickytrials.music_disc_deeper": "Music Disc", "item.purediscstrickytrials.music_disc_deeper.desc": "Lena Raine - Deeper", - "subtitles.komorebi": "", - "subtitles.creator_music_box": "", - "subtitles.featherfall": "", - "item.purediscstrickytrials.music_disc_yakusoku.desc": "Kumi Tanioka - yakusoku", - "advancements.adv_give_recipe_creator_music_box.descr": "Adv Give Recipe Creator Music Box", - "item.purediscstrickytrials.music_disc_watcher": "Music Disc", - "subtitles.watcher": "", - "item.purediscstrickytrials.music_disc_precipice": "Music Disc", - "item.purediscstrickytrials.music_disc_puzzlebox": "Music Disc", - "item.purediscstrickytrials.music_disc_komorebi.desc": "Kumi Tanioka - komorebi", - "item.purediscstrickytrials.music_disc_komorebi": "Music Disc", - "item.purediscstrickytrials.music_disc_pokopoko": "Music Disc", - "item.purediscstrickytrials.music_disc_endless": "Music Disc", + "item.purediscstrickytrials.music_disc_eld_unknown": "Music Disc", "item.purediscstrickytrials.music_disc_eld_unknown.desc": "Lena Raine - Eld Unknown", - "item.purediscstrickytrials.music_disc_puzzlebox.desc": "Aaron Cherof - Puzzlebox", - "subtitles.eld_unknown": "", - "subtitles.creator": "", - "item.purediscstrickytrials.music_disc_deeper": "Music Disc", - "advancements.adv_give_recipe_creator_music_box.title": "Adv Give Recipe Creator Music Box", + "item.purediscstrickytrials.music_disc_endless": "Music Disc", "item.purediscstrickytrials.music_disc_endless.desc": "Lena Raine - Endless", "item.purediscstrickytrials.music_disc_featherfall": "Music Disc", - "subtitles.puzzlebox": "", - "item.purediscstrickytrials.music_disc_creator.desc": "Lena Raine - Creator", + "item.purediscstrickytrials.music_disc_featherfall.desc": "Aaron Cherof - Featherfall", + "item.purediscstrickytrials.music_disc_komorebi": "Music Disc", + "item.purediscstrickytrials.music_disc_komorebi.desc": "Kumi Tanioka - komorebi", + "item.purediscstrickytrials.music_disc_pokopoko": "Music Disc", "item.purediscstrickytrials.music_disc_pokopoko.desc": "Kumi Tanioka - pokopoko", - "subtitles.endless": "", + "item.purediscstrickytrials.music_disc_puzzlebox": "Music Disc", + "item.purediscstrickytrials.music_disc_puzzlebox.desc": "Aaron Cherof - Puzzlebox", + "item.purediscstrickytrials.music_disc_watcher": "Music Disc", + "item.purediscstrickytrials.music_disc_watcher.desc": "Aaron Cherof - Watcher", "item.purediscstrickytrials.music_disc_yakusoku": "Music Disc", - "subtitles.deeper": "", - "item.purediscstrickytrials.music_disc_creator_music_box.desc": "Lena Raine - Creator (Music Box Version)", - "item.purediscstrickytrials.music_disc_creator_music_box": "Music Disc" + "item.purediscstrickytrials.music_disc_yakusoku.desc": "Kumi Tanioka - yakusoku" } \ No newline at end of file diff --git a/src/main/resources/assets/purediscstrickytrials/lang/lol_us.json b/src/main/resources/assets/purediscstrickytrials/lang/lol_us.json new file mode 100644 index 0000000..ab661dc --- /dev/null +++ b/src/main/resources/assets/purediscstrickytrials/lang/lol_us.json @@ -0,0 +1,20 @@ +{ + "item.purediscstrickytrials.music_disc_deeper": "Round loud thing", + "item.purediscstrickytrials.music_disc_deeper.desc": "Lena Raine - Deepurr", + "item.purediscstrickytrials.music_disc_eld_unknown": "Round loud thing", + "item.purediscstrickytrials.music_disc_eld_unknown.desc": "Lena Raine - Eld Unknown", + "item.purediscstrickytrials.music_disc_endless": "Round loud thing", + "item.purediscstrickytrials.music_disc_endless.desc": "Lena Raine - Endless", + "item.purediscstrickytrials.music_disc_featherfall": "Round loud thing", + "item.purediscstrickytrials.music_disc_featherfall.desc": "Aaron Cherof - Fevverfall", + "item.purediscstrickytrials.music_disc_komorebi": "Round loud thing", + "item.purediscstrickytrials.music_disc_komorebi.desc": "Kumi Tanioka - komorebi", + "item.purediscstrickytrials.music_disc_pokopoko": "Round loud thing", + "item.purediscstrickytrials.music_disc_pokopoko.desc": "Kumi Tanioka - pokopoko", + "item.purediscstrickytrials.music_disc_puzzlebox": "Round loud thing", + "item.purediscstrickytrials.music_disc_puzzlebox.desc": "Aaron Cherof - Puzzlebox", + "item.purediscstrickytrials.music_disc_watcher": "Round loud thing", + "item.purediscstrickytrials.music_disc_watcher.desc": "Aaron Cherof - Watchurr", + "item.purediscstrickytrials.music_disc_yakusoku": "Round loud thing", + "item.purediscstrickytrials.music_disc_yakusoku.desc": "Kumi Tanioka - yakusoku" +} \ No newline at end of file diff --git a/src/main/resources/assets/purediscstrickytrials/models/item/music_disc_creator.json b/src/main/resources/assets/purediscstrickytrials/models/item/music_disc_creator.json deleted file mode 100644 index f42da48..0000000 --- a/src/main/resources/assets/purediscstrickytrials/models/item/music_disc_creator.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "purediscstrickytrials:item/music_disc_creator" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/purediscstrickytrials/models/item/music_disc_creator_music_box.json b/src/main/resources/assets/purediscstrickytrials/models/item/music_disc_creator_music_box.json deleted file mode 100644 index 9f850be..0000000 --- a/src/main/resources/assets/purediscstrickytrials/models/item/music_disc_creator_music_box.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "purediscstrickytrials:item/music_disc_creator_music_box" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/purediscstrickytrials/models/item/music_disc_precipice.json b/src/main/resources/assets/purediscstrickytrials/models/item/music_disc_precipice.json deleted file mode 100644 index 889378f..0000000 --- a/src/main/resources/assets/purediscstrickytrials/models/item/music_disc_precipice.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "purediscstrickytrials:item/music_disc_precipice" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/purediscstrickytrials/sounds.json b/src/main/resources/assets/purediscstrickytrials/sounds.json index 09b5325..bccc25c 100644 --- a/src/main/resources/assets/purediscstrickytrials/sounds.json +++ b/src/main/resources/assets/purediscstrickytrials/sounds.json @@ -1,109 +1,64 @@ { - "creator": { - "category": "record", + "music_disc.deeper": { "sounds": [ { - "name": "purediscstrickytrials:lena_raine_-_creator", - "stream": true + "name": "purediscstrickytrials:deeper" } ] }, - "creator_music_box": { - "category": "record", + "music_disc.eld_unknown": { "sounds": [ { - "name": "purediscstrickytrials:lena_raine_-_creator_music_box_version", - "stream": true + "name": "purediscstrickytrials:eld_unknown" } ] }, - "deeper": { - "category": "record", + "music_disc.endless": { "sounds": [ { - "name": "purediscstrickytrials:lena_raine_-_deeper", - "stream": true + "name": "purediscstrickytrials:endless" } ] }, - "eld_unknown": { - "category": "record", + "music_disc.featherfall": { "sounds": [ { - "name": "purediscstrickytrials:lena_raine_-_eld_unknown", - "stream": true + "name": "purediscstrickytrials:featherfall" } ] }, - "endless": { - "category": "record", + "music_disc.komorebi": { "sounds": [ { - "name": "purediscstrickytrials:lena_raine_-_endless", - "stream": true + "name": "purediscstrickytrials:komorebi" } ] }, - "featherfall": { - "category": "record", + "music_disc.pokopoko": { "sounds": [ { - "name": "purediscstrickytrials:aaron_cherof_-_featherfall", - "stream": true + "name": "purediscstrickytrials:pokopoko" } ] }, - "komorebi": { - "category": "record", + "music_disc.puzzlebox": { "sounds": [ { - "name": "purediscstrickytrials:kumi_tanioka_-_komorebi", - "stream": true + "name": "purediscstrickytrials:puzzlebox" } ] }, - "pokopoko": { - "category": "record", + "music_disc.watcher": { "sounds": [ { - "name": "purediscstrickytrials:kumi_tanioka_-_pokopoko", - "stream": true + "name": "purediscstrickytrials:watcher" } ] }, - "precipice": { - "category": "record", + "music_disc.yakusoku": { "sounds": [ { - "name": "purediscstrickytrials:aaron_cherof_-_precipice", - "stream": true - } - ] - }, - "puzzlebox": { - "category": "record", - "sounds": [ - { - "name": "purediscstrickytrials:aaron_cherof_-_puzzlebox", - "stream": true - } - ] - }, - "watcher": { - "category": "record", - "sounds": [ - { - "name": "purediscstrickytrials:aaron_cherof_-_watcher", - "stream": true - } - ] - }, - "yakusoku": { - "category": "record", - "sounds": [ - { - "name": "purediscstrickytrials:kumi_tanioka_-_yakusoku", - "stream": true + "name": "purediscstrickytrials:yakusoku" } ] } diff --git a/src/main/resources/assets/purediscstrickytrials/sounds/aaron_cherof_-_precipice.ogg b/src/main/resources/assets/purediscstrickytrials/sounds/aaron_cherof_-_precipice.ogg deleted file mode 100644 index e14250e..0000000 Binary files a/src/main/resources/assets/purediscstrickytrials/sounds/aaron_cherof_-_precipice.ogg and /dev/null differ diff --git a/src/main/resources/assets/purediscstrickytrials/sounds/lena_raine_-_deeper.ogg b/src/main/resources/assets/purediscstrickytrials/sounds/deeper.ogg similarity index 100% rename from src/main/resources/assets/purediscstrickytrials/sounds/lena_raine_-_deeper.ogg rename to src/main/resources/assets/purediscstrickytrials/sounds/deeper.ogg diff --git a/src/main/resources/assets/purediscstrickytrials/sounds/desktop.ini b/src/main/resources/assets/purediscstrickytrials/sounds/desktop.ini deleted file mode 100644 index d957fd1..0000000 --- a/src/main/resources/assets/purediscstrickytrials/sounds/desktop.ini +++ /dev/null @@ -1,4 +0,0 @@ -[ViewState] -Mode= -Vid= -FolderType=Generic diff --git a/src/main/resources/assets/purediscstrickytrials/sounds/lena_raine_-_eld_unknown.ogg b/src/main/resources/assets/purediscstrickytrials/sounds/eld_unknown.ogg similarity index 100% rename from src/main/resources/assets/purediscstrickytrials/sounds/lena_raine_-_eld_unknown.ogg rename to src/main/resources/assets/purediscstrickytrials/sounds/eld_unknown.ogg diff --git a/src/main/resources/assets/purediscstrickytrials/sounds/lena_raine_-_endless.ogg b/src/main/resources/assets/purediscstrickytrials/sounds/endless.ogg similarity index 100% rename from src/main/resources/assets/purediscstrickytrials/sounds/lena_raine_-_endless.ogg rename to src/main/resources/assets/purediscstrickytrials/sounds/endless.ogg diff --git a/src/main/resources/assets/purediscstrickytrials/sounds/aaron_cherof_-_featherfall.ogg b/src/main/resources/assets/purediscstrickytrials/sounds/featherfall.ogg similarity index 100% rename from src/main/resources/assets/purediscstrickytrials/sounds/aaron_cherof_-_featherfall.ogg rename to src/main/resources/assets/purediscstrickytrials/sounds/featherfall.ogg diff --git a/src/main/resources/assets/purediscstrickytrials/sounds/kumi_tanioka_-_komorebi.ogg b/src/main/resources/assets/purediscstrickytrials/sounds/komorebi.ogg similarity index 100% rename from src/main/resources/assets/purediscstrickytrials/sounds/kumi_tanioka_-_komorebi.ogg rename to src/main/resources/assets/purediscstrickytrials/sounds/komorebi.ogg diff --git a/src/main/resources/assets/purediscstrickytrials/sounds/lena_raine_-_creator.ogg b/src/main/resources/assets/purediscstrickytrials/sounds/lena_raine_-_creator.ogg deleted file mode 100644 index 186da8a..0000000 Binary files a/src/main/resources/assets/purediscstrickytrials/sounds/lena_raine_-_creator.ogg and /dev/null differ diff --git a/src/main/resources/assets/purediscstrickytrials/sounds/lena_raine_-_creator_music_box_version.ogg b/src/main/resources/assets/purediscstrickytrials/sounds/lena_raine_-_creator_music_box_version.ogg deleted file mode 100644 index 9a58bfe..0000000 Binary files a/src/main/resources/assets/purediscstrickytrials/sounds/lena_raine_-_creator_music_box_version.ogg and /dev/null differ diff --git a/src/main/resources/assets/purediscstrickytrials/sounds/kumi_tanioka_-_pokopoko.ogg b/src/main/resources/assets/purediscstrickytrials/sounds/pokopoko.ogg similarity index 100% rename from src/main/resources/assets/purediscstrickytrials/sounds/kumi_tanioka_-_pokopoko.ogg rename to src/main/resources/assets/purediscstrickytrials/sounds/pokopoko.ogg diff --git a/src/main/resources/assets/purediscstrickytrials/sounds/aaron_cherof_-_puzzlebox.ogg b/src/main/resources/assets/purediscstrickytrials/sounds/puzzlebox.ogg similarity index 100% rename from src/main/resources/assets/purediscstrickytrials/sounds/aaron_cherof_-_puzzlebox.ogg rename to src/main/resources/assets/purediscstrickytrials/sounds/puzzlebox.ogg diff --git a/src/main/resources/assets/purediscstrickytrials/sounds/aaron_cherof_-_watcher.ogg b/src/main/resources/assets/purediscstrickytrials/sounds/watcher.ogg similarity index 100% rename from src/main/resources/assets/purediscstrickytrials/sounds/aaron_cherof_-_watcher.ogg rename to src/main/resources/assets/purediscstrickytrials/sounds/watcher.ogg diff --git a/src/main/resources/assets/purediscstrickytrials/sounds/kumi_tanioka_-_yakusoku.ogg b/src/main/resources/assets/purediscstrickytrials/sounds/yakusoku.ogg similarity index 100% rename from src/main/resources/assets/purediscstrickytrials/sounds/kumi_tanioka_-_yakusoku.ogg rename to src/main/resources/assets/purediscstrickytrials/sounds/yakusoku.ogg diff --git a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_creator.png b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_creator.png deleted file mode 100644 index 5b8127c..0000000 Binary files a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_creator.png and /dev/null differ diff --git a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_creator_music_box.png b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_creator_music_box.png deleted file mode 100644 index f8ee796..0000000 Binary files a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_creator_music_box.png and /dev/null differ diff --git a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_deeper.png b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_deeper.png index 3647f07..4161793 100644 Binary files a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_deeper.png and b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_deeper.png differ diff --git a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_eld_unknown.png b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_eld_unknown.png index 644fcf3..2b72939 100644 Binary files a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_eld_unknown.png and b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_eld_unknown.png differ diff --git a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_endless.png b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_endless.png index ef2de10..3bd64ad 100644 Binary files a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_endless.png and b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_endless.png differ diff --git a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_featherfall.png b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_featherfall.png index 33d6568..347815d 100644 Binary files a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_featherfall.png and b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_featherfall.png differ diff --git a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_komorebi.png b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_komorebi.png index 87ea8aa..e24ce08 100644 Binary files a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_komorebi.png and b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_komorebi.png differ diff --git a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_pokopoko.png b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_pokopoko.png index f0ec449..e9bbd77 100644 Binary files a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_pokopoko.png and b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_pokopoko.png differ diff --git a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_precipice.png b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_precipice.png deleted file mode 100644 index ade8b83..0000000 Binary files a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_precipice.png and /dev/null differ diff --git a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_puzzlebox.png b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_puzzlebox.png index cdfa08d..911425f 100644 Binary files a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_puzzlebox.png and b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_puzzlebox.png differ diff --git a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_watcher.png b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_watcher.png index b16117c..78dda9b 100644 Binary files a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_watcher.png and b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_watcher.png differ diff --git a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_yakusoku.png b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_yakusoku.png index 4ccf2e9..0b77469 100644 Binary files a/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_yakusoku.png and b/src/main/resources/assets/purediscstrickytrials/textures/item/music_disc_yakusoku.png differ diff --git a/src/main/resources/assets/purediscstrickytrials/textures/music_disc_creator_music_box.png b/src/main/resources/assets/purediscstrickytrials/textures/music_disc_creator_music_box.png deleted file mode 100644 index f8ee796..0000000 Binary files a/src/main/resources/assets/purediscstrickytrials/textures/music_disc_creator_music_box.png and /dev/null differ diff --git a/src/main/resources/data/minecraft/tags/items/music_discs.json b/src/main/resources/data/c/tags/item/music_discs.json similarity index 75% rename from src/main/resources/data/minecraft/tags/items/music_discs.json rename to src/main/resources/data/c/tags/item/music_discs.json index 0970784..680b11f 100644 --- a/src/main/resources/data/minecraft/tags/items/music_discs.json +++ b/src/main/resources/data/c/tags/item/music_discs.json @@ -1,15 +1,12 @@ { "replace": false, "values": [ - "purediscstrickytrials:music_disc_creator", - "purediscstrickytrials:music_disc_creator_music_box", "purediscstrickytrials:music_disc_deeper", "purediscstrickytrials:music_disc_eld_unknown", "purediscstrickytrials:music_disc_endless", "purediscstrickytrials:music_disc_featherfall", "purediscstrickytrials:music_disc_komorebi", "purediscstrickytrials:music_disc_pokopoko", - "purediscstrickytrials:music_disc_precipice", "purediscstrickytrials:music_disc_puzzlebox", "purediscstrickytrials:music_disc_watcher", "purediscstrickytrials:music_disc_yakusoku" diff --git a/src/main/resources/data/minecraft/tags/items/creeper_drop_music_discs.json b/src/main/resources/data/minecraft/tags/item/creeper_drop_music_discs.json similarity index 72% rename from src/main/resources/data/minecraft/tags/items/creeper_drop_music_discs.json rename to src/main/resources/data/minecraft/tags/item/creeper_drop_music_discs.json index 9eb2f0f..f7b8154 100644 --- a/src/main/resources/data/minecraft/tags/items/creeper_drop_music_discs.json +++ b/src/main/resources/data/minecraft/tags/item/creeper_drop_music_discs.json @@ -5,12 +5,13 @@ "purediscstrickytrials:music_disc_endless", "purediscstrickytrials:music_disc_puzzlebox", "purediscstrickytrials:music_disc_featherfall", - "purediscstrickytrials:music_disc_creator", "purediscstrickytrials:music_disc_pokopoko", - "purediscstrickytrials:music_disc_precipice", "purediscstrickytrials:music_disc_yakusoku", "purediscstrickytrials:music_disc_deeper", "purediscstrickytrials:music_disc_komorebi", - "purediscstrickytrials:music_disc_watcher" + "purediscstrickytrials:music_disc_watcher", + "minecraft:music_disc_precipice", + "minecraft:music_disc_creator", + "minecraft:music_disc_creator_music_box" ] } \ No newline at end of file diff --git a/src/main/resources/data/purediscstrickytrials/advancements/adv_give_recipe_creator_music_box.json b/src/main/resources/data/purediscstrickytrials/advancements/adv_give_recipe_creator_music_box.json deleted file mode 100644 index e63e988..0000000 --- a/src/main/resources/data/purediscstrickytrials/advancements/adv_give_recipe_creator_music_box.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "criteria": { - "adv_give_recipe_creator_music_box": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": [ - "purediscstrickytrials:music_disc_creator" - ], - "count": { - "min": 1, - "max": 64 - } - } - ] - } - } - }, - "rewards": { - "experience": 0, - "recipes": [ - "purediscstrickytrials:music_disc_creator_music_box_craft" - ] - } -} \ No newline at end of file diff --git a/src/main/resources/data/purediscstrickytrials/jukebox_song/deeper.json b/src/main/resources/data/purediscstrickytrials/jukebox_song/deeper.json new file mode 100644 index 0000000..ae1c7b0 --- /dev/null +++ b/src/main/resources/data/purediscstrickytrials/jukebox_song/deeper.json @@ -0,0 +1,10 @@ +{ + "comparator_output": 1, + "description": { + "translate": "item.purediscstrickytrials.music_disc_deeper.desc" + }, + "length_in_seconds": 299, + "sound_event": { + "sound_id": "purediscstrickytrials:music_disc.deeper" + } +} diff --git a/src/main/resources/data/purediscstrickytrials/jukebox_song/eld_unknown.json b/src/main/resources/data/purediscstrickytrials/jukebox_song/eld_unknown.json new file mode 100644 index 0000000..d8ba250 --- /dev/null +++ b/src/main/resources/data/purediscstrickytrials/jukebox_song/eld_unknown.json @@ -0,0 +1,10 @@ +{ + "comparator_output": 2, + "description": { + "translate": "item.purediscstrickytrials.music_disc_eld_unknown.desc" + }, + "length_in_seconds": 292, + "sound_event": { + "sound_id": "purediscstrickytrials:music_disc.eld_unknown" + } +} diff --git a/src/main/resources/data/purediscstrickytrials/jukebox_song/endless.json b/src/main/resources/data/purediscstrickytrials/jukebox_song/endless.json new file mode 100644 index 0000000..45aaddc --- /dev/null +++ b/src/main/resources/data/purediscstrickytrials/jukebox_song/endless.json @@ -0,0 +1,10 @@ +{ + "comparator_output": 3, + "description": { + "translate": "item.purediscstrickytrials.music_disc_endless.desc" + }, + "length_in_seconds": 396, + "sound_event": { + "sound_id": "purediscstrickytrials:music_disc.endless" + } +} diff --git a/src/main/resources/data/purediscstrickytrials/jukebox_song/featherfall.json b/src/main/resources/data/purediscstrickytrials/jukebox_song/featherfall.json new file mode 100644 index 0000000..0458e66 --- /dev/null +++ b/src/main/resources/data/purediscstrickytrials/jukebox_song/featherfall.json @@ -0,0 +1,10 @@ +{ + "comparator_output": 4, + "description": { + "translate": "item.purediscstrickytrials.music_disc_featherfall.desc" + }, + "length_in_seconds": 339, + "sound_event": { + "sound_id": "purediscstrickytrials:music_disc.featherfall" + } +} diff --git a/src/main/resources/data/purediscstrickytrials/jukebox_song/komorebi.json b/src/main/resources/data/purediscstrickytrials/jukebox_song/komorebi.json new file mode 100644 index 0000000..15c9813 --- /dev/null +++ b/src/main/resources/data/purediscstrickytrials/jukebox_song/komorebi.json @@ -0,0 +1,10 @@ +{ + "comparator_output": 5, + "description": { + "translate": "item.purediscstrickytrials.music_disc_komorebi.desc" + }, + "length_in_seconds": 281, + "sound_event": { + "sound_id": "purediscstrickytrials:music_disc.komorebi" + } +} diff --git a/src/main/resources/data/purediscstrickytrials/jukebox_song/pokopoko.json b/src/main/resources/data/purediscstrickytrials/jukebox_song/pokopoko.json new file mode 100644 index 0000000..293e685 --- /dev/null +++ b/src/main/resources/data/purediscstrickytrials/jukebox_song/pokopoko.json @@ -0,0 +1,10 @@ +{ + "comparator_output": 6, + "description": { + "translate": "item.purediscstrickytrials.music_disc_pokopoko.desc" + }, + "length_in_seconds": 288, + "sound_event": { + "sound_id": "purediscstrickytrials:music_disc.pokopoko" + } +} diff --git a/src/main/resources/data/purediscstrickytrials/jukebox_song/puzzlebox.json b/src/main/resources/data/purediscstrickytrials/jukebox_song/puzzlebox.json new file mode 100644 index 0000000..02aa456 --- /dev/null +++ b/src/main/resources/data/purediscstrickytrials/jukebox_song/puzzlebox.json @@ -0,0 +1,10 @@ +{ + "comparator_output": 7, + "description": { + "translate": "item.purediscstrickytrials.music_disc_puzzlebox.desc" + }, + "length_in_seconds": 295, + "sound_event": { + "sound_id": "purediscstrickytrials:music_disc.puzzlebox" + } +} diff --git a/src/main/resources/data/purediscstrickytrials/jukebox_song/watcher.json b/src/main/resources/data/purediscstrickytrials/jukebox_song/watcher.json new file mode 100644 index 0000000..587e430 --- /dev/null +++ b/src/main/resources/data/purediscstrickytrials/jukebox_song/watcher.json @@ -0,0 +1,10 @@ +{ + "comparator_output": 8, + "description": { + "translate": "item.purediscstrickytrials.music_disc_watcher.desc" + }, + "length_in_seconds": 328, + "sound_event": { + "sound_id": "purediscstrickytrials:music_disc.watcher" + } +} diff --git a/src/main/resources/data/purediscstrickytrials/jukebox_song/yakusoku.json b/src/main/resources/data/purediscstrickytrials/jukebox_song/yakusoku.json new file mode 100644 index 0000000..533b81f --- /dev/null +++ b/src/main/resources/data/purediscstrickytrials/jukebox_song/yakusoku.json @@ -0,0 +1,10 @@ +{ + "comparator_output": 9, + "description": { + "translate": "item.purediscstrickytrials.music_disc_yakusoku.desc" + }, + "length_in_seconds": 265, + "sound_event": { + "sound_id": "purediscstrickytrials:music_disc.yakusoku" + } +} diff --git a/src/main/resources/data/purediscstrickytrials/recipes/music_disc_creator_music_box_craft.json b/src/main/resources/data/purediscstrickytrials/recipes/music_disc_creator_music_box_craft.json deleted file mode 100644 index 32563cf..0000000 --- a/src/main/resources/data/purediscstrickytrials/recipes/music_disc_creator_music_box_craft.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "purediscstrickytrials:music_disc_creator" - }, - { - "item": "minecraft:jukebox" - } - ], - "result": { - "item": "purediscstrickytrials:music_disc_creator_music_box", - "count": 1 - } -} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 9e15367..65de7e2 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,34 +1,42 @@ { - "schemaVersion": 1, - "id": "purediscstrickytrials", - "version": "1.0.0", - "name": "Pure Discs - Tricky Trials", - "description": "Adds twelve new songs that were added to the game with the 1.21 Tricky Trials update!", - "authors": [ - "purejosh" - ], - "contact": { - "homepage": "https://legacy.curseforge.com/minecraft/mc-mods/purediscstrickytrials", - "sources": "" - }, - "license": "Custom license", - "icon": "assets/purediscstrickytrials/icon.png", - "environment": "*", - "entrypoints": { - "main": [ - "net.purejosh.purediscstrickytrials.PurediscstrickytrialsMod" - ], - "client": [ - "net.purejosh.purediscstrickytrials.ClientInit" - ] - }, - "depends": { - "fabricloader": ">=0.14.21", - "fabric": "*", - "minecraft": "~1.20", - "java": ">=17" - }, - "mixins": [ - "purediscstrickytrials.mixins.json" - ] + "schemaVersion": 1, + "id": "purediscstrickytrials", + "version": "2.0.0", + "name": "Pure Discs - Tricky Trials", + "description": "Adds nine new discs from songs that were added in the 1.21 Tricky Trials update!", + "authors": [ + "purejosh" + ], + "contact": { + "homepage": "https://www.curseforge.com/minecraft/mc-mods/purediscstrickytrials", + "sources": "https://github.com/purejosh/purediscstrickytrials", + "issues": "https://github.com/purejosh/purediscstrickytrials/issues" + }, + "license": "MIT-R-NR", + "icon": "assets/purediscstrickytrials/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "net.purejosh.purediscstrickytrials.PureDiscsTrickyTrials" + ], + "client": [ + "net.purejosh.purediscstrickytrials.PureDiscsTrickyTrialsClient" + ] + }, + "mixins": [ + "purediscstrickytrials.mixins.json", + { + "config": "purediscstrickytrials.client.mixins.json", + "environment": "client" + } + ], + "depends": { + "fabricloader": ">=0.15.11", + "minecraft": "~1.21", + "java": ">=21", + "fabric-api": "*" + }, + "suggests": { + "another-mod": "*" + } } \ No newline at end of file diff --git a/src/main/resources/logo.png b/src/main/resources/logo.png deleted file mode 100644 index f8ee796..0000000 Binary files a/src/main/resources/logo.png and /dev/null differ diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta deleted file mode 100644 index 406c1ed..0000000 --- a/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 15, - "description": "purediscstrickytrials resources" - } -} \ No newline at end of file diff --git a/src/main/resources/purediscstrickytrials.mixins.json b/src/main/resources/purediscstrickytrials.mixins.json index 839c647..ed3b3f1 100644 --- a/src/main/resources/purediscstrickytrials.mixins.json +++ b/src/main/resources/purediscstrickytrials.mixins.json @@ -1,11 +1,11 @@ { - "required": true, - "minVersion": "0.8", - "package": "net.purejosh.purediscstrickytrials.mixins", - "compatibilityLevel": "JAVA_17", - "mixins": [ - "PurediscstrickytrialsModRepairItemRecipeMixin" ], - "injectors": { - "defaultRequire": 1 - } + "required": true, + "package": "net.purejosh.purediscstrickytrials.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "ExampleMixin" + ], + "injectors": { + "defaultRequire": 1 + } } \ No newline at end of file