diff --git a/20231021_Ver1.2/.github/workflows/build.yml b/.github/workflows/build.yml similarity index 100% rename from 20231021_Ver1.2/.github/workflows/build.yml rename to .github/workflows/build.yml diff --git a/.gitignore b/.gitignore index 382b720..9b222ae 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,45 @@ replay_pid* .idea/modules.xml .idea/vcs.xml .idea/workspace.xml + + +# 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/20231021_Ver1.2/.gitignore b/20231021_Ver1.2/.gitignore deleted file mode 100644 index c476faf..0000000 --- a/20231021_Ver1.2/.gitignore +++ /dev/null @@ -1,40 +0,0 @@ -# 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/20231021_Ver1.2/src/main/java/modchest/block/modBlocks.java b/20231021_Ver1.2/src/main/java/modchest/block/modBlocks.java deleted file mode 100644 index 34829f0..0000000 --- a/20231021_Ver1.2/src/main/java/modchest/block/modBlocks.java +++ /dev/null @@ -1,32 +0,0 @@ -package modchest.block; - -import modchest.block.custom.steeringWheelBlock; -import modchest.item.modItemGroup; -import modchest.Maltesmod; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.Block; -import net.minecraft.block.Material; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemGroup; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; - -//setzt die blöcke auf -public class modBlocks { - public static Block steering_wheel; //Block wird erstellt - public static void setBlocks() {//Block wird definiert - steering_wheel = registerBlock("steering_wheel", new steeringWheelBlock(FabricBlockSettings.of(Material.WOOD).strength(1.0f).requiresTool()), modItemGroup.modchest); - - } - - - private static Block registerBlock(String name, Block block, ItemGroup group) { //Nicht verändern! Fügt die oben definierten Blöcke dem Register hinzu - Registry.register(Registry.ITEM, new Identifier(Maltesmod.MOD_ID, name), - new BlockItem(block, new FabricItemSettings().group(group))); - return Registry.register(Registry.BLOCK, new Identifier(Maltesmod.MOD_ID, name), block); - } - public static void registerModBlocks() { //Error Logger halt... - Maltesmod.LOGGER.info("Registering ModBlocks for " + Maltesmod.MOD_ID); - } -} diff --git a/20231021_Ver1.2/src/main/java/modchest/item/modItems.java b/20231021_Ver1.2/src/main/java/modchest/item/modItems.java deleted file mode 100644 index 0e56df6..0000000 --- a/20231021_Ver1.2/src/main/java/modchest/item/modItems.java +++ /dev/null @@ -1,27 +0,0 @@ -package modchest.item; - -import modchest.Maltesmod; -import modchest.item.custom.piratesCoinItem; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; -import net.minecraft.item.Item; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; - - -//Liste der Items die hinzugefügt werden, ausgenommen Blöcke -public class modItems { - public static Item shipblock; //shipblock wird erstellt, sollte man mal umbenenne. Ist eine Zutat die man für das steering_wheel braucht zum craften, mehr macht es bisher nicht - public static Item pirates_coin; //pirates Coin wird erstellt; definition siehe ./custom/piratesCoinItem da ist im detail erklärt was das Item machen soll - public static void setItems() { //Items werden beschrieben, bzw. dem Register hinzugefügt - shipblock = registerItem("shipblock", new Item(new FabricItemSettings().group(modItemGroup.modchest))); - pirates_coin = registerItem("pirates_coin", new piratesCoinItem(new FabricItemSettings().group(modItemGroup.modchest).maxCount(16))); - } - private static Item registerItem(String name, Item item) { //Methode, die die Items dann letztendlich hinzufügt; nicht bearbeiten ist eine generische MEthode - return Registry.register(Registry.ITEM, new Identifier(Maltesmod.MOD_ID, name), item); - } - - public static void registerModItems() { - Maltesmod.LOGGER.info("Registering Mod Items for " + Maltesmod.MOD_ID); - } //und natürlich ein Error logger - -} diff --git a/20231021_Ver1.2/LICENSE b/LICENSE similarity index 100% rename from 20231021_Ver1.2/LICENSE rename to LICENSE diff --git a/README.md b/README.md index 83935d2..0473767 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,10 @@ -# minecraft-mod +# Minecraft-Server-Mod +für den ReentsEntertainment Minecraft Server + +Ändert folgendes: +- nichts + + +TODO: +- Betten auswählen zum spawnen diff --git a/20231021_Ver1.2/build.gradle b/build.gradle similarity index 97% rename from 20231021_Ver1.2/build.gradle rename to build.gradle index c07c16b..503a797 100644 --- a/20231021_Ver1.2/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ loom { splitEnvironmentSourceSets() mods { - "maltesmod" { + "reservermod" { sourceSet sourceSets.main sourceSet sourceSets.client } @@ -34,7 +34,7 @@ loom { name "Data Generation" vmArg "-Dfabric-api.datagen" vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}" - vmArg "-Dfabric-api.datagen.modid=maltesmod" + vmArg "-Dfabric-api.datagen.modid=reservermod" runDir "build/datagen" } diff --git a/20231021_Ver1.2/gradle.properties b/gradle.properties similarity index 84% rename from 20231021_Ver1.2/gradle.properties rename to gradle.properties index 0dfe3e0..388008f 100644 --- a/20231021_Ver1.2/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ loader_version=0.14.23 # Mod Properties mod_version=1.0.0 maven_group=modchest -archives_base_name=maltesmod +archives_base_name=reservermod # Dependencies fabric_version=0.76.1+1.19.2 \ No newline at end of file diff --git a/20231021_Ver1.2/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from 20231021_Ver1.2/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties diff --git a/20231021_Ver1.2/gradlew b/gradlew similarity index 100% rename from 20231021_Ver1.2/gradlew rename to gradlew diff --git a/20231021_Ver1.2/gradlew.bat b/gradlew.bat similarity index 100% rename from 20231021_Ver1.2/gradlew.bat rename to gradlew.bat diff --git a/schiffsmod-template-1.19.2/.gitignore b/schiffsmod-template-1.19.2/.gitignore deleted file mode 100644 index c476faf..0000000 --- a/schiffsmod-template-1.19.2/.gitignore +++ /dev/null @@ -1,40 +0,0 @@ -# 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/schiffsmod-template-1.19.2/build.gradle b/schiffsmod-template-1.19.2/build.gradle deleted file mode 100644 index 2e42539..0000000 --- a/schiffsmod-template-1.19.2/build.gradle +++ /dev/null @@ -1,104 +0,0 @@ -plugins { - id 'fabric-loom' version '1.4-SNAPSHOT' - id 'maven-publish' -} - -version = project.mod_version -group = project.maven_group - -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 { - runs { - // This adds a new gradle task that runs the datagen API: "gradlew runDatagen" - datagen { - inherit server - name "Data Generation" - vmArg "-Dfabric-api.datagen" - vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}" - vmArg "-Dfabric-api.datagen.modid=maltes-schiffsmod" - - runDir "build/datagen" - } - } -} - -// Add the generated resources to the main source set -sourceSets { - main { - resources { - srcDirs += [ - 'src/main/generated' - ] - } - } -} -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}" - - // Uncomment the following line to enable the deprecated Fabric API modules. - // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. - - // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" -} - -processResources { - inputs.property "version", project.version - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(JavaCompile).configureEach { - it.options.release = 17 -} - -java { - // 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 -} - -jar { - from("LICENSE") { - rename { "${it}_${project.base.archivesName.get()}"} - } -} - -// 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. - } -} \ No newline at end of file diff --git a/schiffsmod-template-1.19.2/gradle.properties b/schiffsmod-template-1.19.2/gradle.properties deleted file mode 100644 index 9d95876..0000000 --- a/schiffsmod-template-1.19.2/gradle.properties +++ /dev/null @@ -1,17 +0,0 @@ -# Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G -org.gradle.parallel=true - -# Fabric Properties -# check these on https://fabricmc.net/develop -minecraft_version=1.19.2 -yarn_mappings=1.19.2+build.28 -loader_version=0.14.23 - -# Mod Properties -mod_version=1.0.0 -maven_group=malte.schiffsmod -archives_base_name=maltes-schiffsmod - -# Dependencies -fabric_version=0.76.1+1.19.2 \ No newline at end of file diff --git a/schiffsmod-template-1.19.2/gradle/wrapper/gradle-wrapper.properties b/schiffsmod-template-1.19.2/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index ac72c34..0000000 --- a/schiffsmod-template-1.19.2/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/schiffsmod-template-1.19.2/gradlew b/schiffsmod-template-1.19.2/gradlew deleted file mode 100644 index 0adc8e1..0000000 --- a/schiffsmod-template-1.19.2/gradlew +++ /dev/null @@ -1,249 +0,0 @@ -#!/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##*/} -# 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 - -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 - if ! command -v java >/dev/null 2>&1 - then - 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 -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/schiffsmod-template-1.19.2/gradlew.bat b/schiffsmod-template-1.19.2/gradlew.bat deleted file mode 100644 index 93e3f59..0000000 --- a/schiffsmod-template-1.19.2/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@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/schiffsmod-template-1.19.2/settings.gradle b/schiffsmod-template-1.19.2/settings.gradle deleted file mode 100644 index 75c4d72..0000000 --- a/schiffsmod-template-1.19.2/settings.gradle +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - mavenCentral() - gradlePluginPortal() - } -} \ No newline at end of file diff --git a/schiffsmod-template-1.19.2/src/main/java/malte/schiffsmod/Schiffsmod.java b/schiffsmod-template-1.19.2/src/main/java/malte/schiffsmod/Schiffsmod.java deleted file mode 100644 index ac874a0..0000000 --- a/schiffsmod-template-1.19.2/src/main/java/malte/schiffsmod/Schiffsmod.java +++ /dev/null @@ -1,22 +0,0 @@ -package malte.schiffsmod; - -import net.fabricmc.api.ModInitializer; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class Schiffsmod implements ModInitializer { - // This logger is used to write text to the console and the log file. - // It is considered best practice to use your mod id as the logger's name. - // That way, it's clear which mod wrote info, warnings, and errors. - public static final Logger LOGGER = LoggerFactory.getLogger("maltes-schiffsmod"); - - @Override - public void onInitialize() { - // This code runs as soon as Minecraft is in a mod-load-ready state. - // However, some things (like resources) may still be uninitialized. - // Proceed with mild caution. - - LOGGER.info("Hello Fabric world!"); - } -} \ No newline at end of file diff --git a/schiffsmod-template-1.19.2/src/main/java/malte/schiffsmod/SchiffsmodDataGenerator.java b/schiffsmod-template-1.19.2/src/main/java/malte/schiffsmod/SchiffsmodDataGenerator.java deleted file mode 100644 index a9d76b7..0000000 --- a/schiffsmod-template-1.19.2/src/main/java/malte/schiffsmod/SchiffsmodDataGenerator.java +++ /dev/null @@ -1,11 +0,0 @@ -package malte.schiffsmod; - -import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; -import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; - -public class SchiffsmodDataGenerator implements DataGeneratorEntrypoint { - @Override - public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { - - } -} diff --git a/schiffsmod-template-1.19.2/src/main/java/malte/schiffsmod/mixin/ExampleMixin.java b/schiffsmod-template-1.19.2/src/main/java/malte/schiffsmod/mixin/ExampleMixin.java deleted file mode 100644 index 720367a..0000000 --- a/schiffsmod-template-1.19.2/src/main/java/malte/schiffsmod/mixin/ExampleMixin.java +++ /dev/null @@ -1,15 +0,0 @@ -package malte.schiffsmod.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/schiffsmod-template-1.19.2/src/main/resources/assets/maltes-schiffsmod/icon.png b/schiffsmod-template-1.19.2/src/main/resources/assets/maltes-schiffsmod/icon.png deleted file mode 100644 index 047b91f..0000000 Binary files a/schiffsmod-template-1.19.2/src/main/resources/assets/maltes-schiffsmod/icon.png and /dev/null differ diff --git a/schiffsmod-template-1.19.2/src/main/resources/fabric.mod.json b/schiffsmod-template-1.19.2/src/main/resources/fabric.mod.json deleted file mode 100644 index ae78626..0000000 --- a/schiffsmod-template-1.19.2/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "schemaVersion": 1, - "id": "maltes-schiffsmod", - "version": "${version}", - "name": "Schiffsmod", - "description": "This is an example description! Tell everyone what your mod is about!", - "authors": [ - "Me!" - ], - "contact": { - "homepage": "https://fabricmc.net/", - "sources": "https://github.com/FabricMC/fabric-example-mod" - }, - "license": "CC0-1.0", - "icon": "assets/maltes-schiffsmod/icon.png", - "environment": "*", - "entrypoints": { - "main": [ - "malte.schiffsmod.Schiffsmod" - ], - "fabric-datagen": [ - "malte.schiffsmod.SchiffsmodDataGenerator" - ] - }, - "mixins": [ - "maltes-schiffsmod.mixins.json" - ], - "depends": { - "fabricloader": ">=0.14.23", - "minecraft": "~1.19.2", - "java": ">=17", - "fabric-api": "*" - }, - "suggests": { - "another-mod": "*" - } -} \ No newline at end of file diff --git a/schiffsmod-template-1.19.2/src/main/resources/maltes-schiffsmod.mixins.json b/schiffsmod-template-1.19.2/src/main/resources/maltes-schiffsmod.mixins.json deleted file mode 100644 index 9d4ca83..0000000 --- a/schiffsmod-template-1.19.2/src/main/resources/maltes-schiffsmod.mixins.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "required": true, - "package": "malte.schiffsmod.mixin", - "compatibilityLevel": "JAVA_17", - "mixins": [ - "ExampleMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} \ No newline at end of file diff --git a/20231021_Ver1.2/settings.gradle b/settings.gradle similarity index 100% rename from 20231021_Ver1.2/settings.gradle rename to settings.gradle diff --git a/20231021_Ver1.2/src/client/java/modchest/MaltesmodClient.java b/src/client/java/modchest/REServerModClient.java similarity index 78% rename from 20231021_Ver1.2/src/client/java/modchest/MaltesmodClient.java rename to src/client/java/modchest/REServerModClient.java index 47a39b6..bf03b1b 100644 --- a/20231021_Ver1.2/src/client/java/modchest/MaltesmodClient.java +++ b/src/client/java/modchest/REServerModClient.java @@ -3,7 +3,7 @@ package modchest; import modchest.block.modBlocks; import net.fabricmc.api.ClientModInitializer; -public class MaltesmodClient implements ClientModInitializer { +public class REServerModClient implements ClientModInitializer { @Override public void onInitializeClient() { // This entrypoint is suitable for setting up client-specific logic, such as rendering. diff --git a/20231021_Ver1.2/src/client/java/modchest/mixin/client/ExampleClientMixin.java b/src/client/java/modchest/mixin/client/ExampleClientMixin.java similarity index 100% rename from 20231021_Ver1.2/src/client/java/modchest/mixin/client/ExampleClientMixin.java rename to src/client/java/modchest/mixin/client/ExampleClientMixin.java diff --git a/20231021_Ver1.2/src/client/resources/maltesmod.client.mixins.json b/src/client/resources/reservermod.client.mixins.json similarity index 100% rename from 20231021_Ver1.2/src/client/resources/maltesmod.client.mixins.json rename to src/client/resources/reservermod.client.mixins.json diff --git a/20231021_Ver1.2/src/documentation/Development b/src/documentation/Development similarity index 100% rename from 20231021_Ver1.2/src/documentation/Development rename to src/documentation/Development diff --git a/20231021_Ver1.2/src/documentation/Documentation b/src/documentation/Documentation similarity index 87% rename from 20231021_Ver1.2/src/documentation/Documentation rename to src/documentation/Documentation index 1066c6e..676ea17 100644 --- a/20231021_Ver1.2/src/documentation/Documentation +++ b/src/documentation/Documentation @@ -1,6 +1,6 @@ client-folder: Derzeit leer, dinge die nur auf dem Client gerendert werden sollen main-folder: Dinge die auf dem Server gerendert werden sollen - main/java/modchest/Maltesmod.java: Initiale datei; Diese Datei wird beim starten von Miencraft ausgeführt; hier werden Dinge wie Blöcke etc. aufgerufen + main/java/modchest/REServerMod.java: Initiale datei; Diese Datei wird beim starten von Miencraft ausgeführt; hier werden Dinge wie Blöcke etc. aufgerufen zum initialisieren main/java/modchest/block: In diesem Ordner ist, you guessed it, alles was man braucht um die Blöcke von ihrer Programmierstruktur aufzusetzen main/java/modchest/item: Dat gleiche wie für die Blöcke nur für Items dieses mal diff --git a/20231021_Ver1.2/src/documentation/Features b/src/documentation/Features similarity index 100% rename from 20231021_Ver1.2/src/documentation/Features rename to src/documentation/Features diff --git a/20231021_Ver1.2/src/main/java/modchest/Maltesmod.java b/src/main/java/modchest/REServerMod.java similarity index 51% rename from 20231021_Ver1.2/src/main/java/modchest/Maltesmod.java rename to src/main/java/modchest/REServerMod.java index c366bd6..32c7533 100644 --- a/20231021_Ver1.2/src/main/java/modchest/Maltesmod.java +++ b/src/main/java/modchest/REServerMod.java @@ -10,16 +10,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; //Main file; Hier wird alles aufgesetzt -public class Maltesmod implements ModInitializer { +public class REServerMod implements ModInitializer { public static final String MOD_ID = "modchest"; - public static final Logger LOGGER = LoggerFactory.getLogger("modchest"); //Erster Error Logger + public static final Logger LOGGER = LoggerFactory.getLogger("modchest"); // Erster Error Logger @Override public void onInitialize() { - modItemGroup.modchest(); //Item Gruppe fürs Creative-Inventar wird erstellt; In dieser Gruppe sollen dann alle Items und Blöcke dieser Mod angezeigt werden - modItems.setItems(); //die Items werden erstellt - modBlocks.setBlocks(); //Hier werden die Blöcke erstellt - modBlockEntities.registerBlockEntities(); //Die Interaktionsmenüs für die Blöcke werden erstellt + modItemGroup.modchest(); // Item Gruppe fürs Creative-Inventar wird erstellt; In dieser Gruppe sollen + // dann alle Items und Blöcke dieser Mod angezeigt werden + modItems.setItems(); // die Items werden erstellt + modBlocks.setBlocks(); // Hier werden die Blöcke erstellt + modBlockEntities.registerBlockEntities(); // Die Interaktionsmenüs für die Blöcke werden erstellt LOGGER.info("Modchest erfolgreich geladen!"); } diff --git a/20231021_Ver1.2/src/main/java/modchest/MaltesmodDataGenerator.java b/src/main/java/modchest/REServerModDataGenerator.java similarity index 76% rename from 20231021_Ver1.2/src/main/java/modchest/MaltesmodDataGenerator.java rename to src/main/java/modchest/REServerModDataGenerator.java index 0311d93..4823b98 100644 --- a/20231021_Ver1.2/src/main/java/modchest/MaltesmodDataGenerator.java +++ b/src/main/java/modchest/REServerModDataGenerator.java @@ -3,7 +3,7 @@ package modchest; import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; -public class MaltesmodDataGenerator implements DataGeneratorEntrypoint { +public class REServerModDataGenerator implements DataGeneratorEntrypoint { @Override public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { diff --git a/20231021_Ver1.2/src/main/java/modchest/block/custom/steeringWheelBlock.java b/src/main/java/modchest/block/custom/steeringWheelBlock.java similarity index 100% rename from 20231021_Ver1.2/src/main/java/modchest/block/custom/steeringWheelBlock.java rename to src/main/java/modchest/block/custom/steeringWheelBlock.java diff --git a/20231021_Ver1.2/src/main/java/modchest/block/entity/ImplementedInventory.java b/src/main/java/modchest/block/entity/ImplementedInventory.java similarity index 100% rename from 20231021_Ver1.2/src/main/java/modchest/block/entity/ImplementedInventory.java rename to src/main/java/modchest/block/entity/ImplementedInventory.java diff --git a/20231021_Ver1.2/src/main/java/modchest/block/entity/modBlockEntities.java b/src/main/java/modchest/block/entity/modBlockEntities.java similarity index 76% rename from 20231021_Ver1.2/src/main/java/modchest/block/entity/modBlockEntities.java rename to src/main/java/modchest/block/entity/modBlockEntities.java index 63ade25..27f4323 100644 --- a/20231021_Ver1.2/src/main/java/modchest/block/entity/modBlockEntities.java +++ b/src/main/java/modchest/block/entity/modBlockEntities.java @@ -1,19 +1,19 @@ package modchest.block.entity; -import modchest.Maltesmod; +import modchest.REServerMod; import modchest.block.modBlocks; import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; import net.minecraft.block.entity.BlockEntityType; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; - //rendert letztendlich die Interaktionsmenüs der Blöcke public class modBlockEntities { - public static BlockEntityType steering_wheel_interface; //Interaktionsmenü wird erstellt + public static BlockEntityType steering_wheel_interface; // Interaktionsmenü wird erstellt public static void registerBlockEntities() { - steering_wheel_interface = Registry.register(Registry.BLOCK_ENTITY_TYPE, new Identifier(Maltesmod.MOD_ID, "steering_wheel_interface"), //Interkationsmenü wird gerendert + steering_wheel_interface = Registry.register(Registry.BLOCK_ENTITY_TYPE, + new Identifier(REServerMod.MOD_ID, "steering_wheel_interface"), // Interkationsmenü wird gerendert FabricBlockEntityTypeBuilder.create(steeringWheelEntity::new, modBlocks.steering_wheel).build(null)); } } diff --git a/20231021_Ver1.2/src/main/java/modchest/block/entity/steeringWheelEntity.java b/src/main/java/modchest/block/entity/steeringWheelEntity.java similarity index 100% rename from 20231021_Ver1.2/src/main/java/modchest/block/entity/steeringWheelEntity.java rename to src/main/java/modchest/block/entity/steeringWheelEntity.java diff --git a/src/main/java/modchest/block/modBlocks.java b/src/main/java/modchest/block/modBlocks.java new file mode 100644 index 0000000..c31f7f3 --- /dev/null +++ b/src/main/java/modchest/block/modBlocks.java @@ -0,0 +1,37 @@ +package modchest.block; + +import modchest.block.custom.steeringWheelBlock; +import modchest.item.modItemGroup; +import modchest.REServerMod; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Block; +import net.minecraft.block.Material; +import net.minecraft.item.BlockItem; +import net.minecraft.item.ItemGroup; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +//setzt die blöcke auf +public class modBlocks { + public static Block steering_wheel; // Block wird erstellt + + public static void setBlocks() {// Block wird definiert + steering_wheel = registerBlock("steering_wheel", + new steeringWheelBlock(FabricBlockSettings.of(Material.WOOD).strength(1.0f).requiresTool()), + modItemGroup.modchest); + + } + + private static Block registerBlock(String name, Block block, ItemGroup group) { // Nicht verändern! Fügt die oben + // definierten Blöcke dem Register + // hinzu + Registry.register(Registry.ITEM, new Identifier(REServerMod.MOD_ID, name), + new BlockItem(block, new FabricItemSettings().group(group))); + return Registry.register(Registry.BLOCK, new Identifier(REServerMod.MOD_ID, name), block); + } + + public static void registerModBlocks() { // Error Logger halt... + REServerMod.LOGGER.info("Registering ModBlocks for " + REServerMod.MOD_ID); + } +} diff --git a/20231021_Ver1.2/src/main/java/modchest/data/ModLootTableGenerator.java b/src/main/java/modchest/data/ModLootTableGenerator.java similarity index 100% rename from 20231021_Ver1.2/src/main/java/modchest/data/ModLootTableGenerator.java rename to src/main/java/modchest/data/ModLootTableGenerator.java diff --git a/20231021_Ver1.2/src/main/java/modchest/data/ModModelProvider.java b/src/main/java/modchest/data/ModModelProvider.java similarity index 100% rename from 20231021_Ver1.2/src/main/java/modchest/data/ModModelProvider.java rename to src/main/java/modchest/data/ModModelProvider.java diff --git a/20231021_Ver1.2/src/main/java/modchest/data/ModRecipeGenerator.java b/src/main/java/modchest/data/ModRecipeGenerator.java similarity index 100% rename from 20231021_Ver1.2/src/main/java/modchest/data/ModRecipeGenerator.java rename to src/main/java/modchest/data/ModRecipeGenerator.java diff --git a/20231021_Ver1.2/src/main/java/modchest/data/ModWorldGenerator.java b/src/main/java/modchest/data/ModWorldGenerator.java similarity index 100% rename from 20231021_Ver1.2/src/main/java/modchest/data/ModWorldGenerator.java rename to src/main/java/modchest/data/ModWorldGenerator.java diff --git a/20231021_Ver1.2/src/main/java/modchest/item/custom/piratesCoinItem.java b/src/main/java/modchest/item/custom/piratesCoinItem.java similarity index 100% rename from 20231021_Ver1.2/src/main/java/modchest/item/custom/piratesCoinItem.java rename to src/main/java/modchest/item/custom/piratesCoinItem.java diff --git a/20231021_Ver1.2/src/main/java/modchest/item/modItemGroup.java b/src/main/java/modchest/item/modItemGroup.java similarity index 100% rename from 20231021_Ver1.2/src/main/java/modchest/item/modItemGroup.java rename to src/main/java/modchest/item/modItemGroup.java diff --git a/src/main/java/modchest/item/modItems.java b/src/main/java/modchest/item/modItems.java new file mode 100644 index 0000000..92e9596 --- /dev/null +++ b/src/main/java/modchest/item/modItems.java @@ -0,0 +1,32 @@ +package modchest.item; + +import modchest.REServerMod; +import modchest.item.custom.piratesCoinItem; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.minecraft.item.Item; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; + +//Liste der Items die hinzugefügt werden, ausgenommen Blöcke +public class modItems { + public static Item shipblock; // shipblock wird erstellt, sollte man mal umbenenne. Ist eine Zutat die man für + // das steering_wheel braucht zum craften, mehr macht es bisher nicht + public static Item pirates_coin; // pirates Coin wird erstellt; definition siehe ./custom/piratesCoinItem da ist + // im detail erklärt was das Item machen soll + + public static void setItems() { // Items werden beschrieben, bzw. dem Register hinzugefügt + shipblock = registerItem("shipblock", new Item(new FabricItemSettings().group(modItemGroup.modchest))); + pirates_coin = registerItem("pirates_coin", + new piratesCoinItem(new FabricItemSettings().group(modItemGroup.modchest).maxCount(16))); + } + + private static Item registerItem(String name, Item item) { // Methode, die die Items dann letztendlich hinzufügt; + // nicht bearbeiten ist eine generische MEthode + return Registry.register(Registry.ITEM, new Identifier(REServerMod.MOD_ID, name), item); + } + + public static void registerModItems() { + REServerMod.LOGGER.info("Registering Mod Items for " + REServerMod.MOD_ID); + } // und natürlich ein Error logger + +} diff --git a/20231021_Ver1.2/src/main/java/modchest/mixin/ExampleMixin.java b/src/main/java/modchest/mixin/ExampleMixin.java similarity index 100% rename from 20231021_Ver1.2/src/main/java/modchest/mixin/ExampleMixin.java rename to src/main/java/modchest/mixin/ExampleMixin.java diff --git a/20231021_Ver1.2/src/main/resources/assets/modchest/blockstates/steering_wheel.json b/src/main/resources/assets/modchest/blockstates/steering_wheel.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/assets/modchest/blockstates/steering_wheel.json rename to src/main/resources/assets/modchest/blockstates/steering_wheel.json diff --git a/20231021_Ver1.2/src/main/resources/assets/modchest/icon.png b/src/main/resources/assets/modchest/icon.png similarity index 100% rename from 20231021_Ver1.2/src/main/resources/assets/modchest/icon.png rename to src/main/resources/assets/modchest/icon.png diff --git a/20231021_Ver1.2/src/main/resources/assets/modchest/lang/de_de.json b/src/main/resources/assets/modchest/lang/de_de.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/assets/modchest/lang/de_de.json rename to src/main/resources/assets/modchest/lang/de_de.json diff --git a/20231021_Ver1.2/src/main/resources/assets/modchest/lang/en_pt.json b/src/main/resources/assets/modchest/lang/en_pt.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/assets/modchest/lang/en_pt.json rename to src/main/resources/assets/modchest/lang/en_pt.json diff --git a/20231021_Ver1.2/src/main/resources/assets/modchest/lang/en_us.json b/src/main/resources/assets/modchest/lang/en_us.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/assets/modchest/lang/en_us.json rename to src/main/resources/assets/modchest/lang/en_us.json diff --git a/20231021_Ver1.2/src/main/resources/assets/modchest/models/block/steering_wheel.json b/src/main/resources/assets/modchest/models/block/steering_wheel.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/assets/modchest/models/block/steering_wheel.json rename to src/main/resources/assets/modchest/models/block/steering_wheel.json diff --git a/20231021_Ver1.2/src/main/resources/assets/modchest/models/item/pirates_coin.json b/src/main/resources/assets/modchest/models/item/pirates_coin.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/assets/modchest/models/item/pirates_coin.json rename to src/main/resources/assets/modchest/models/item/pirates_coin.json diff --git a/20231021_Ver1.2/src/main/resources/assets/modchest/models/item/shipblock.json b/src/main/resources/assets/modchest/models/item/shipblock.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/assets/modchest/models/item/shipblock.json rename to src/main/resources/assets/modchest/models/item/shipblock.json diff --git a/20231021_Ver1.2/src/main/resources/assets/modchest/models/item/steering_wheel.json b/src/main/resources/assets/modchest/models/item/steering_wheel.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/assets/modchest/models/item/steering_wheel.json rename to src/main/resources/assets/modchest/models/item/steering_wheel.json diff --git a/20231021_Ver1.2/src/main/resources/assets/modchest/textures/item/pirates_coin.png b/src/main/resources/assets/modchest/textures/item/pirates_coin.png similarity index 100% rename from 20231021_Ver1.2/src/main/resources/assets/modchest/textures/item/pirates_coin.png rename to src/main/resources/assets/modchest/textures/item/pirates_coin.png diff --git a/20231021_Ver1.2/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/data/minecraft/tags/blocks/mineable/axe.json rename to src/main/resources/data/minecraft/tags/blocks/mineable/axe.json diff --git a/20231021_Ver1.2/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json rename to src/main/resources/data/minecraft/tags/blocks/mineable/hoe.json diff --git a/20231021_Ver1.2/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json diff --git a/20231021_Ver1.2/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json b/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json rename to src/main/resources/data/minecraft/tags/blocks/mineable/shovel.json diff --git a/20231021_Ver1.2/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json rename to src/main/resources/data/minecraft/tags/blocks/needs_diamond_tool.json diff --git a/20231021_Ver1.2/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json rename to src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json diff --git a/20231021_Ver1.2/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json rename to src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json diff --git a/20231021_Ver1.2/src/main/resources/data/modchest/loot_tables/blocks/steering_wheel.json b/src/main/resources/data/modchest/loot_tables/blocks/steering_wheel.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/data/modchest/loot_tables/blocks/steering_wheel.json rename to src/main/resources/data/modchest/loot_tables/blocks/steering_wheel.json diff --git a/20231021_Ver1.2/src/main/resources/data/modchest/recipes/pirates_coin.json b/src/main/resources/data/modchest/recipes/pirates_coin.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/data/modchest/recipes/pirates_coin.json rename to src/main/resources/data/modchest/recipes/pirates_coin.json diff --git a/20231021_Ver1.2/src/main/resources/data/modchest/recipes/shipblock.json b/src/main/resources/data/modchest/recipes/shipblock.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/data/modchest/recipes/shipblock.json rename to src/main/resources/data/modchest/recipes/shipblock.json diff --git a/20231021_Ver1.2/src/main/resources/data/modchest/recipes/steering_wheel.json b/src/main/resources/data/modchest/recipes/steering_wheel.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/data/modchest/recipes/steering_wheel.json rename to src/main/resources/data/modchest/recipes/steering_wheel.json diff --git a/20231021_Ver1.2/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json similarity index 71% rename from 20231021_Ver1.2/src/main/resources/fabric.mod.json rename to src/main/resources/fabric.mod.json index 448e057..ad0d2aa 100644 --- a/20231021_Ver1.2/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,8 +1,8 @@ { "schemaVersion": 1, - "id": "maltesmod", + "id": "reservermod", "version": "${version}", - "name": "maltesmod", + "name": "reservermod", "description": "This mod is a chest full of fun Ideas!", "authors": [ "Malte Reents", @@ -16,23 +16,23 @@ "sources": "https://github.com/FabricMC/fabric-example-mod" }, "license": "CC0-1.0", - "icon": "assets/maltesmod/icon.png", + "icon": "assets/reservermod/icon.png", "environment": "*", "entrypoints": { "main": [ - "modchest.Maltesmod" + "modchest.REServerMod" ], "client": [ - "modchest.MaltesmodClient" + "modchest.REServerModClient" ], "fabric-datagen": [ - "modchest.MaltesmodDataGenerator" + "modchest.REServerModDataGenerator" ] }, "mixins": [ - "maltesmod.mixins.json", + "reservermod.mixins.json", { - "config": "maltesmod.client.mixins.json", + "config": "reservermod.client.mixins.json", "environment": "client" } ], diff --git a/20231021_Ver1.2/src/main/resources/maltesmod.mixins.json b/src/main/resources/reservermod.mixins.json similarity index 100% rename from 20231021_Ver1.2/src/main/resources/maltesmod.mixins.json rename to src/main/resources/reservermod.mixins.json