diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/discord.xml b/.idea/discord.xml new file mode 100644 index 0000000..30bab2a --- /dev/null +++ b/.idea/discord.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..f9163b4 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..547c5b3 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..fe0b0da --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..ad85eb3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/ClutteredCreative.main.iml b/.idea/modules/ClutteredCreative.main.iml new file mode 100644 index 0000000..2e14514 --- /dev/null +++ b/.idea/modules/ClutteredCreative.main.iml @@ -0,0 +1,17 @@ + + + + + + + FABRIC + MIXIN + MCP + + + + + + + \ No newline at end of file diff --git a/.idea/modules/ClutteredCreative.test.iml b/.idea/modules/ClutteredCreative.test.iml new file mode 100644 index 0000000..2e14514 --- /dev/null +++ b/.idea/modules/ClutteredCreative.test.iml @@ -0,0 +1,17 @@ + + + + + + + FABRIC + MIXIN + MCP + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Minecraft_Client.xml b/.idea/runConfigurations/Minecraft_Client.xml new file mode 100644 index 0000000..fc4a27a --- /dev/null +++ b/.idea/runConfigurations/Minecraft_Client.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Minecraft_Server.xml b/.idea/runConfigurations/Minecraft_Server.xml new file mode 100644 index 0000000..b5dd485 --- /dev/null +++ b/.idea/runConfigurations/Minecraft_Server.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..2b63946 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..3def28b --- /dev/null +++ b/build.gradle @@ -0,0 +1,96 @@ +plugins { + id 'fabric-loom' version '1.2-SNAPSHOT' + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +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. + + maven { + name = "Modrinth" + url = "https://api.modrinth.com/maven" + } +} + +dependencies { + // 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. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + modLocalRuntime("maven.modrinth:modmenu:7.0.1") +} + +loom { + accessWidenerPath = file("src/main/resources/cc.accesswidener") +} + +processResources { + inputs.property "version", project.version + inputs.property "minecraft_version", project.minecraft_version + inputs.property "loader_version", project.loader_version + filteringCharset "UTF-8" + + filesMatching("fabric.mod.json") { + expand "version": project.version, + "minecraft_version": project.minecraft_version, + "loader_version": project.loader_version + } +} + +def targetJavaVersion = 17 +tasks.withType(JavaCompile).configureEach { + // ensure that the encoding is set to UTF-8, no matter what the system default is + // this fixes some edge cases with special characters not displaying correctly + // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html + // If Javadoc is generated, this must be specified in that task too. + it.options.encoding = "UTF-8" + if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { + it.options.release = targetJavaVersion + } +} + +java { + def javaVersion = JavaVersion.toVersion(targetJavaVersion) + if (JavaVersion.current() < javaVersion) { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + } + archivesBaseName = project.archives_base_name + // 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() +} + +jar { + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}"} + } +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + + // 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. + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..997fe34 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Fabric Properties +# check these on https://modmuss50.me/fabric.html +minecraft_version=1.20 +yarn_mappings=1.20+build.1 +loader_version=0.14.22 + +# Mod Properties +mod_version = 1.0.0-test +maven_group = me.theclashfruit +archives_base_name = cc + +# Dependencies +# check this on https://modmuss50.me/fabric.html +fabric_version=0.83.0+1.20 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..c1962a7 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..37aef8d --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..aeb74cb --- /dev/null +++ b/gradlew @@ -0,0 +1,245 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# 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 +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +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 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +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. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +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. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +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. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..f91a4fe --- /dev/null +++ b/settings.gradle @@ -0,0 +1,9 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/me/theclashfruit/cc/ClutteredCreative.java b/src/main/java/me/theclashfruit/cc/ClutteredCreative.java new file mode 100644 index 0000000..89c7b15 --- /dev/null +++ b/src/main/java/me/theclashfruit/cc/ClutteredCreative.java @@ -0,0 +1,103 @@ +package me.theclashfruit.cc; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; +import net.minecraft.item.*; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.text.Text; +import net.minecraft.util.Identifier; + +public class ClutteredCreative implements ModInitializer { + private static final ItemGroup GROUP_BUILDING = FabricItemGroup.builder() + .icon(() -> new ItemStack(Items.BRICKS)) + .displayName(Text.of("Building Blocks")) + .build(); + + private static final ItemGroup GROUP_DECORATION = FabricItemGroup.builder() + .icon(() -> new ItemStack(Items.PEONY)) + .displayName(Text.of("Decoration Blocks")) + .build(); + + private static final ItemGroup GROUP_REDSTONE = FabricItemGroup.builder() + .icon(() -> new ItemStack(Items.REDSTONE)) + .displayName(Text.of("Redstone")) + .build(); + + private static final ItemGroup GROUP_TRANSPORT = FabricItemGroup.builder() + .icon(() -> new ItemStack(Items.POWERED_RAIL)) + .displayName(Text.of("Transportation")) + .build(); + + @Override + public void onInitialize() { + Registry.register(Registries.ITEM_GROUP, new Identifier("cc", "yo"), GROUP_TRANSPORT); + + ItemGroupEvents.modifyEntriesEvent(RegistryKey.of(RegistryKeys.ITEM_GROUP, new Identifier("cc", "yo"))).register(content -> { + content.add(Items.REDSTONE); + }); + + /* + Registry.register(Registries.ITEM_GROUP, new Identifier("cc", "building"), GROUP_BUILDING); + Registry.register(Registries.ITEM_GROUP, new Identifier("cc", "decoration"), GROUP_DECORATION); + Registry.register(Registries.ITEM_GROUP, new Identifier("cc", "redstone"), GROUP_REDSTONE); + Registry.register(Registries.ITEM_GROUP, new Identifier("cc", "yo"), GROUP_TRANSPORT); + + ItemGroupEvents.modifyEntriesEvent(RegistryKey.of(RegistryKeys.ITEM_GROUP, new Identifier("cc", "decoration"))).register(content -> { + content.add(Items.OAK_SAPLING); + }); + + ItemGroupEvents.modifyEntriesEvent(RegistryKey.of(RegistryKeys.ITEM_GROUP, new Identifier("cc", "redstone"))).register(content -> { + content.add(Items.REDSTONE); + }); + + ItemGroupEvents.modifyEntriesEvent(RegistryKey.of(RegistryKeys.ITEM_GROUP, new Identifier("cc", "transport"))).register(content -> { + content.add(Items.POWERED_RAIL); + }); + + ItemGroupEvents.modifyEntriesEvent(RegistryKey.of(RegistryKeys.ITEM_GROUP, new Identifier("cc", "building"))).register(content -> { + content.add(Items.STONE); + content.add(Items.GRANITE); + content.add(Items.POLISHED_GRANITE); + content.add(Items.DIORITE); + content.add(Items.POLISHED_DIORITE); + content.add(Items.ANDESITE); + content.add(Items.POLISHED_ANDESITE); + content.add(Items.DEEPSLATE); + content.add(Items.COBBLED_DEEPSLATE); + content.add(Items.POLISHED_DEEPSLATE); + content.add(Items.CALCITE); + content.add(Items.TUFF); + content.add(Items.DRIPSTONE_BLOCK); + content.add(Items.GRASS_BLOCK); + content.add(Items.DIRT); + content.add(Items.COARSE_DIRT); + content.add(Items.PODZOL); + content.add(Items.ROOTED_DIRT); + content.add(Items.MUD); + content.add(Items.CRIMSON_NYLIUM); + content.add(Items.WARPED_NYLIUM); + content.add(Items.COBBLESTONE); + content.add(Items.OAK_PLANKS); + content.add(Items.SPRUCE_PLANKS); + content.add(Items.BIRCH_PLANKS); + content.add(Items.JUNGLE_PLANKS); + content.add(Items.ACACIA_PLANKS); + content.add(Items.DARK_OAK_PLANKS); + content.add(Items.MANGROVE_PLANKS); + content.add(Items.CHERRY_PLANKS); + content.add(Items.CRIMSON_PLANKS); + content.add(Items.WARPED_PLANKS); + content.add(Items.BEDROCK); + content.add(Items.SAND); + content.add(Items.RED_SAND); + content.add(Items.GRAVEL); + content.add(Items.COAL_ORE); + content.add(Items.DEEPSLATE_COAL_ORE); + }); + */ + } +} diff --git a/src/main/java/me/theclashfruit/cc/client/ClutteredCreativeClient.java b/src/main/java/me/theclashfruit/cc/client/ClutteredCreativeClient.java new file mode 100644 index 0000000..5d58264 --- /dev/null +++ b/src/main/java/me/theclashfruit/cc/client/ClutteredCreativeClient.java @@ -0,0 +1,10 @@ +package me.theclashfruit.cc.client; + +import net.fabricmc.api.ClientModInitializer; + +public class ClutteredCreativeClient implements ClientModInitializer { + @Override + public void onInitializeClient() { + + } +} diff --git a/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java b/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java new file mode 100644 index 0000000..ec6ed12 --- /dev/null +++ b/src/main/java/me/theclashfruit/cc/mixin/ItemGroupsMixin.java @@ -0,0 +1,274 @@ +package me.theclashfruit.cc.mixin; + +import net.minecraft.block.Blocks; +import net.minecraft.item.*; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.*; + +import java.util.Set; + +import static net.minecraft.item.ItemGroups.*; + +@Mixin(ItemGroups.class) +public class ItemGroupsMixin { + + @Shadow @Final public static RegistryKey COLORED_BLOCKS; + @Shadow @Final public static RegistryKey REDSTONE; + @Unique + private static final ItemGroup hotbarGroup = ItemGroup + .create(ItemGroup.Row.TOP, 5) + .displayName(Text.translatable("itemGroup.hotbar")) + .icon(() -> new ItemStack(Blocks.BOOKSHELF)) + .special() + .type(ItemGroup.Type.HOTBAR) + .build(); + + @Unique + private static final ItemGroup inventoryGroup = ItemGroup + .create(ItemGroup.Row.BOTTOM, 6) + .displayName(Text.translatable("itemGroup.inventory")) + .icon(() -> new ItemStack(Blocks.CHEST)) + .texture("inventory.png") + .noRenderedName() + .special() + .type(ItemGroup.Type.INVENTORY) + .noScrollbar() + .build(); + + /** + * @author TheClashFruit + * @reason pre 1.19.4 inventory layout :3 + */ + @Overwrite + public static ItemGroup registerAndGetDefault(Registry registry) { + final ItemGroup searchGroup = ItemGroup + .create(ItemGroup.Row.TOP, 6) + .displayName(Text.translatable("itemGroup.search")) + .icon(() -> new ItemStack(Items.COMPASS)) + .entries((displayContext, content) -> { + Set itemGroupSet = ItemStackSet.create(); + + for (ItemGroup itemGroup : registry) + if (itemGroup.getType() != ItemGroup.Type.SEARCH) + itemGroupSet.addAll(itemGroup.getSearchTabStacks()); + + content.addAll(itemGroupSet); + }) + .texture("item_search.png") + .special() + .type(ItemGroup.Type.SEARCH) + .build(); + + // Add the essential item groups back + Registry.register(registry, HOTBAR, hotbarGroup); + Registry.register(registry, SEARCH, searchGroup); + + // Add the "new" item groups from the old inventory style + Registry.register( + registry, + BUILDING_BLOCKS, + ItemGroup + .create(ItemGroup.Row.TOP, 0) + .displayName(Text.translatable("itemGroup.buildingBlocks")) + .icon(() -> new ItemStack(Blocks.BRICKS)) + .entries((displayContext, content) -> { + content.add(Items.STONE); + content.add(Items.GRANITE); + content.add(Items.POLISHED_GRANITE); + content.add(Items.DIORITE); + content.add(Items.POLISHED_DIORITE); + content.add(Items.ANDESITE); + content.add(Items.POLISHED_ANDESITE); + content.add(Items.DEEPSLATE); + content.add(Items.COBBLED_DEEPSLATE); + content.add(Items.POLISHED_DEEPSLATE); + content.add(Items.CALCITE); + content.add(Items.TUFF); + content.add(Items.DRIPSTONE_BLOCK); + content.add(Items.GRASS_BLOCK); + content.add(Items.DIRT); + content.add(Items.COARSE_DIRT); + content.add(Items.PODZOL); + content.add(Items.ROOTED_DIRT); + content.add(Items.MUD); + content.add(Items.CRIMSON_NYLIUM); + content.add(Items.WARPED_NYLIUM); + content.add(Items.COBBLESTONE); + content.add(Items.OAK_PLANKS); + content.add(Items.SPRUCE_PLANKS); + content.add(Items.BIRCH_PLANKS); + content.add(Items.JUNGLE_PLANKS); + content.add(Items.ACACIA_PLANKS); + content.add(Items.DARK_OAK_PLANKS); + content.add(Items.MANGROVE_PLANKS); + content.add(Items.CHERRY_PLANKS); + content.add(Items.CRIMSON_PLANKS); + content.add(Items.WARPED_PLANKS); + content.add(Items.BEDROCK); + content.add(Items.SAND); + content.add(Items.RED_SAND); + content.add(Items.GRAVEL); + content.add(Items.COAL_ORE); + content.add(Items.DEEPSLATE_COAL_ORE); + content.add(Items.IRON_ORE); + content.add(Items.DEEPSLATE_IRON_ORE); + content.add(Items.COPPER_ORE); + content.add(Items.DEEPSLATE_COPPER_ORE); + content.add(Items.GOLD_ORE); + content.add(Items.DEEPSLATE_GOLD_ORE); + content.add(Items.REDSTONE_ORE); + content.add(Items.DEEPSLATE_REDSTONE_ORE); + content.add(Items.EMERALD_ORE); + content.add(Items.DEEPSLATE_EMERALD_ORE); + content.add(Items.LAPIS_ORE); + content.add(Items.DEEPSLATE_LAPIS_ORE); + content.add(Items.DIAMOND_ORE); + content.add(Items.DEEPSLATE_DIAMOND_ORE); + content.add(Items.NETHER_GOLD_ORE); + content.add(Items.NETHER_QUARTZ_ORE); + content.add(Items.ANCIENT_DEBRIS); + }) + .build() + ); + + Registry.register( + registry, + NATURAL, + ItemGroup + .create(ItemGroup.Row.TOP, 1) + .displayName(Text.translatable("itemGroup.decorations")) + .icon(() -> new ItemStack(Blocks.PEONY)) + .entries((displayContext, content) -> { + content.add(Items.OAK_SAPLING); + content.add(Items.SPRUCE_SAPLING); + content.add(Items.BIRCH_SAPLING); + content.add(Items.JUNGLE_SAPLING); + content.add(Items.ACACIA_SAPLING); + content.add(Items.DARK_OAK_SAPLING); + content.add(Items.MANGROVE_PROPAGULE); + content.add(Items.CHERRY_SAPLING); + }) + .build() + ); + + Registry.register( + registry, + REDSTONE, + ItemGroup + .create(ItemGroup.Row.TOP, 2) + .displayName(Text.translatable("itemGroup.redstone")) + .icon(() -> new ItemStack(Items.REDSTONE)) + .entries((displayContext, content) -> { + content.add(Items.REDSTONE); + content.add(Items.REDSTONE_TORCH); + content.add(Items.REDSTONE_BLOCK); + content.add(Items.REPEATER); + content.add(Items.COMPARATOR); + content.add(Items.PISTON); + content.add(Items.STICKY_PISTON); + content.add(Items.SLIME_BLOCK); + content.add(Items.HONEY_BLOCK); + content.add(Items.OBSERVER); + content.add(Items.HOPPER); + content.add(Items.DISPENSER); + content.add(Items.DROPPER); + content.add(Items.LECTERN); + content.add(Items.TARGET); + content.add(Items.LEVER); + content.add(Items.LIGHTNING_ROD); + content.add(Items.DAYLIGHT_DETECTOR); + content.add(Items.SCULK_SENSOR); + content.add(Items.CALIBRATED_SCULK_SENSOR); + content.add(Items.TRIPWIRE_HOOK); + content.add(Items.TRAPPED_CHEST); + content.add(Items.TNT); + content.add(Items.REDSTONE_LAMP); + content.add(Items.NOTE_BLOCK); + }) + .build() + ); + + Registry.register( + registry, + FUNCTIONAL, + ItemGroup + .create(ItemGroup.Row.TOP, 3) + .displayName(Text.translatable("itemGroup.transportation")) + .icon(() -> new ItemStack(Items.POWERED_RAIL)) + .entries((displayContext, content) -> { + content.add(Items.POWERED_RAIL); + }) + .build() + ); + + Registry.register( + registry, + INGREDIENTS, + ItemGroup + .create(ItemGroup.Row.BOTTOM, 0) + .displayName(Text.translatable("itemGroup.misc")) + .icon(() -> new ItemStack(Items.LAVA_BUCKET)) + .entries((displayContext, content) -> { + content.add(Items.LAVA_BUCKET); + }) + .build() + ); + + Registry.register( + registry, + FOOD_AND_DRINK, + ItemGroup + .create(ItemGroup.Row.BOTTOM, 1) + .displayName(Text.translatable("itemGroup.food")) + .icon(() -> new ItemStack(Items.APPLE)) + .entries((displayContext, content) -> { + content.add(Items.APPLE); + }) + .build() + ); + + Registry.register( + registry, + TOOLS, + ItemGroup + .create(ItemGroup.Row.BOTTOM, 2) + .displayName(Text.translatable("itemGroup.tools")) + .icon(() -> new ItemStack(Items.IRON_AXE)) + .entries((displayContext, content) -> { + content.add(Items.IRON_AXE); + }) + .build() + ); + + Registry.register( + registry, + COMBAT, + ItemGroup + .create(ItemGroup.Row.BOTTOM, 3) + .displayName(Text.translatable("itemGroup.combat")) + .icon(() -> new ItemStack(Items.GOLDEN_SWORD)) + .entries((displayContext, content) -> { + content.add(Items.GOLDEN_SWORD); + }) + .build() + ); + + Registry.register( + registry, + COLORED_BLOCKS, + ItemGroup + .create(ItemGroup.Row.BOTTOM, 4) + .displayName(Text.translatable("itemGroup.brewing")) + .icon(() -> new ItemStack(Items.POTION)) + .entries((displayContext, content) -> { + content.add(Items.POTION); + }) + .build() + ); + + // Return the player inventory as default + return Registry.register(registry, INVENTORY, inventoryGroup); + } +} diff --git a/src/main/java/me/theclashfruit/cc/mixin/TestAccessor.java b/src/main/java/me/theclashfruit/cc/mixin/TestAccessor.java new file mode 100644 index 0000000..53d577d --- /dev/null +++ b/src/main/java/me/theclashfruit/cc/mixin/TestAccessor.java @@ -0,0 +1,4 @@ +package me.theclashfruit.cc.mixin; + +public class TestAccessor { +} diff --git a/src/main/java/me/theclashfruit/cc/util/CustomTypeItemGroupBuilder.java b/src/main/java/me/theclashfruit/cc/util/CustomTypeItemGroupBuilder.java new file mode 100644 index 0000000..049f9df --- /dev/null +++ b/src/main/java/me/theclashfruit/cc/util/CustomTypeItemGroupBuilder.java @@ -0,0 +1,13 @@ +package me.theclashfruit.cc.util; + +import net.minecraft.item.ItemGroup; + +public class CustomTypeItemGroupBuilder extends ItemGroup.Builder { + private final ItemGroup.Type type; + + public CustomTypeItemGroupBuilder(ItemGroup.Row row, int column, ItemGroup.Type iType) { + super(row, column); + + this.type = iType; + } +} diff --git a/src/main/resources/assets/cc/icon.png b/src/main/resources/assets/cc/icon.png new file mode 100644 index 0000000..7d139fe Binary files /dev/null and b/src/main/resources/assets/cc/icon.png differ diff --git a/src/main/resources/assets/cc/lang/en_us.json b/src/main/resources/assets/cc/lang/en_us.json new file mode 100644 index 0000000..fba5642 --- /dev/null +++ b/src/main/resources/assets/cc/lang/en_us.json @@ -0,0 +1,9 @@ +{ + "itemGroup.decorations": "Decoration Blocks", + "itemGroup.redstone": "Redstone", + "itemGroup.transportation": "Transportation", + "itemGroup.misc": "Miscellaneous", + "itemGroup.food": "Foodstuffs", + "itemGroup.brewing": "Brewing", + "itemGroup.materials": "Materials" +} \ No newline at end of file diff --git a/src/main/resources/cc.accesswidener b/src/main/resources/cc.accesswidener new file mode 100644 index 0000000..71e6311 --- /dev/null +++ b/src/main/resources/cc.accesswidener @@ -0,0 +1,3 @@ +accessWidener v1 named + +accessible method net/minecraft/item/ItemGroup$Builder type (Lnet/minecraft/item/ItemGroup$Type;)Lnet/minecraft/item/ItemGroup$Builder; \ No newline at end of file diff --git a/src/main/resources/cc.mixins.json b/src/main/resources/cc.mixins.json new file mode 100644 index 0000000..a4e9a64 --- /dev/null +++ b/src/main/resources/cc.mixins.json @@ -0,0 +1,15 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "me.theclashfruit.cc.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "ItemGroupsMixin" + ], + "client": [ + + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..efbaff9 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,35 @@ +{ + "schemaVersion": 1, + "id": "cc", + "version": "${version}", + "name": "Cluttered Creative", + "description": "Bring back the old cluttered creative inventory.", + "authors": [ + "TheClashFruit" + ], + "contact": { + "repo": "https://git.theclashfruit.me/TheClashFruit/ClutteredCreative", + "issues": "https://git.theclashfruit.me/TheClashFruit/ClutteredCreative/issues", + "homepage": "https://modrinth.com/mod/cluttered-creative" + }, + "license": "MIT", + "icon": "assets/cc/icon.png", + "environment": "*", + "entrypoints": { + "client": [ + "me.theclashfruit.cc.client.ClutteredCreativeClient" + ], + "main": [ + "me.theclashfruit.cc.ClutteredCreative" + ] + }, + "mixins": [ + "cc.mixins.json" + ], + "accessWidener" : "cc.accesswidener", + "depends": { + "fabricloader": ">=${loader_version}", + "fabric": "*", + "minecraft": ">=${minecraft_version}" + } +}