diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..923730a --- /dev/null +++ b/build.gradle @@ -0,0 +1,107 @@ +plugins { + id 'fabric-loom' version '1.12-SNAPSHOT' + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +base { + archivesName = project.archives_base_name +} + +loom { + splitEnvironmentSourceSets() + + mods { + "running_around" { + sourceSet sourceSets.main + sourceSet sourceSets.client + } + } +} + +fabricApi { + configureDataGeneration { + client = true + } +} + +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. +} + +dependencies { + implementation 'org.yaml:snakeyaml:2.2' + include 'org.yaml:snakeyaml:2.2' + // 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}" + + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" +} + +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 = 21 +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.set(targetJavaVersion) + } +} + +java { + def javaVersion = JavaVersion.toVersion(targetJavaVersion) + if (JavaVersion.current() < javaVersion) { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + } + // 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 { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name + 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..4fe9adf --- /dev/null +++ b/gradle.properties @@ -0,0 +1,14 @@ +# 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.21.1 +yarn_mappings=1.21.1+build.3 +loader_version=0.17.3 +# Mod Properties +mod_version=1.0.1 +maven_group=de.bly +archives_base_name=running-around +# Dependencies +# check this on https://modmuss50.me/fabric.html +fabric_version=0.116.7+1.21.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1b33c55 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..002b867 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..23d15a9 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# 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/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/. +# +############################################################################## + +# 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || 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="\\\"\\\"" + + +# 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=SC2039,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=SC2039,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 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" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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..5eed7ee --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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. 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 + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +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 + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +: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/client/java/de/bly/running_around/client/Running_aroundClient.java b/src/client/java/de/bly/running_around/client/Running_aroundClient.java new file mode 100644 index 0000000..90a9ed6 --- /dev/null +++ b/src/client/java/de/bly/running_around/client/Running_aroundClient.java @@ -0,0 +1,10 @@ +package de.bly.running_around.client; + +import net.fabricmc.api.ClientModInitializer; + +public class Running_aroundClient implements ClientModInitializer { + + @Override + public void onInitializeClient() { + } +} diff --git a/src/client/java/de/bly/running_around/client/Running_aroundDataGenerator.java b/src/client/java/de/bly/running_around/client/Running_aroundDataGenerator.java new file mode 100644 index 0000000..2057dc1 --- /dev/null +++ b/src/client/java/de/bly/running_around/client/Running_aroundDataGenerator.java @@ -0,0 +1,12 @@ +package de.bly.running_around.client; + +import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; +import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; + +public class Running_aroundDataGenerator implements DataGeneratorEntrypoint { + + @Override + public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { + FabricDataGenerator.Pack pack = fabricDataGenerator.createPack(); + } +} diff --git a/src/client/resources/running_around.client.mixins.json b/src/client/resources/running_around.client.mixins.json new file mode 100644 index 0000000..f74ae55 --- /dev/null +++ b/src/client/resources/running_around.client.mixins.json @@ -0,0 +1,14 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "de.bly.running_around.mixin.client", + "compatibilityLevel": "JAVA_21", + "client": [ + ], + "injectors": { + "defaultRequire": 1 + }, + "overwrites": { + "requireAnnotations": true + } +} diff --git a/src/main/java/de/bly/running_around/Running_around.java b/src/main/java/de/bly/running_around/Running_around.java new file mode 100644 index 0000000..cfc9939 --- /dev/null +++ b/src/main/java/de/bly/running_around/Running_around.java @@ -0,0 +1,132 @@ +package de.bly.running_around; + +import de.bly.running_around.block.RunningAroundBlocks; +import de.bly.running_around.item.RunningAwayItems; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents; +import net.fabricmc.fabric.api.event.player.*; +import net.minecraft.block.Blocks; +import net.minecraft.registry.Registries; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.BlockPos; +import org.yaml.snakeyaml.Yaml; + +import java.io.*; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ThreadLocalRandom; + + +public class Running_around implements ModInitializer { + + public static int[] randomCoords() { + ThreadLocalRandom rnd = ThreadLocalRandom.current(); + int x = rnd.nextInt(-50000, 50001); // inclusive -50000 to 50000 + int y = 100; + int z = rnd.nextInt(-50000, 50001); + return new int[] { x, y, z }; + } + + public static final String MOD_ID = "running_around"; + + public static final String ItemsListFile = "config/items.yml"; + @Override + public void onInitialize() { + + + + + + + //register Items + RunningAwayItems.registerModItems(); + RunningAroundBlocks.registerModBlocks(); + + //events + ServerWorldEvents.LOAD.register((minecraftServer, serverWorld) -> { + + + if (serverWorld.getDimension().bedWorks() && !java.nio.file.Files.exists(java.nio.file.Path.of(ItemsListFile))) { + + + //write + List items = new ArrayList<>(); + Registries.BLOCK.forEach(block -> items.add(block.toString())); + + Yaml yaml = new Yaml(); + try (FileWriter writer = new FileWriter(ItemsListFile)) { + yaml.dump(items, writer); + } catch (IOException e) { + e.printStackTrace(); + } + + //remove + + try (FileReader reader = new FileReader(ItemsListFile)) { + List itemsfromfile = yaml.load(reader); + if (itemsfromfile == null) itemsfromfile = new ArrayList<>(); + else itemsfromfile = new ArrayList<>(itemsfromfile); + + + itemsfromfile.remove("Block{minecraft:air}"); + itemsfromfile.remove("Block{minecraft:command_block}"); + itemsfromfile.remove("Block{minecraft:chain_command_block}"); + itemsfromfile.remove("Block{minecraft:repeating_command_block}"); + itemsfromfile.remove("Block{minecraft:structure_block}"); + itemsfromfile.remove("Block{minecraft:structure_void}"); + itemsfromfile.remove("Block{minecraft:lava}"); + itemsfromfile.remove("Block{minecraft:water}"); + + + // write back + try (FileWriter writer = new FileWriter(ItemsListFile)) { + yaml.dump(itemsfromfile, writer); + } + } catch (IOException e) { + e.printStackTrace(); + } + + + Yaml yamlcoords = new Yaml(); + for (int i = 1; i <= 7; i++) { + int[] c = randomCoords(); + + serverWorld.setBlockState(new BlockPos(c[2],c[1],c[0]), RunningAroundBlocks.Collectable.getDefaultState()); + System.out.println(c[2]+" "+ c[1]+" " + c[0]); + + Map coordMap = Map.of( + "x", c[0], + "y", c[1], + "z", c[2] + ); + String filename = "config/coords" + i + ".yml"; + try (FileWriter writer = new FileWriter(filename)) { + yamlcoords.dump(coordMap, writer); + } catch (IOException e) { + e.printStackTrace(); + } + } + + + + + + + + + + + serverWorld.setBlockState(new BlockPos(98765,100, 98765), RunningAroundBlocks.Collectable.getDefaultState()); + } + + } + ); + + } + + + + +} diff --git a/src/main/java/de/bly/running_around/YamlConfig.java b/src/main/java/de/bly/running_around/YamlConfig.java new file mode 100644 index 0000000..e69de29 diff --git a/src/main/java/de/bly/running_around/block/RunningAroundBlocks.java b/src/main/java/de/bly/running_around/block/RunningAroundBlocks.java new file mode 100644 index 0000000..1e96c31 --- /dev/null +++ b/src/main/java/de/bly/running_around/block/RunningAroundBlocks.java @@ -0,0 +1,40 @@ + +package de.bly.running_around.block; + + +import de.bly.running_around.Running_around; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroups; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.util.Identifier; +import net.minecraft.util.Rarity; + +public class RunningAroundBlocks { + public static final Block Collectable = registerBlock("collectable", + new Block(AbstractBlock.Settings.create().strength(2f) + .sounds(BlockSoundGroup.AMETHYST_BLOCK))); + + + private static Block registerBlock(String name, Block block) { + registerBlockItem(name, block); + return Registry.register(Registries.BLOCK, Identifier.of(Running_around.MOD_ID, name), block); + } + + private static void registerBlockItem(String name, Block block) { + Registry.register(Registries.ITEM, Identifier.of(Running_around.MOD_ID, name), + new BlockItem(block, new Item.Settings().rarity(Rarity.EPIC))); + } + + public static void registerModBlocks() { + + ItemGroupEvents.modifyEntriesEvent(ItemGroups.BUILDING_BLOCKS).register(entries -> { + entries.add(RunningAroundBlocks.Collectable); + }); + } +} \ No newline at end of file diff --git a/src/main/java/de/bly/running_around/item/Analyzer.java b/src/main/java/de/bly/running_around/item/Analyzer.java new file mode 100644 index 0000000..94692b3 --- /dev/null +++ b/src/main/java/de/bly/running_around/item/Analyzer.java @@ -0,0 +1,118 @@ +package de.bly.running_around.item; + + +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.projectile.FireworkRocketEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.item.Items; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtInt; +import net.minecraft.nbt.NbtList; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; +import org.yaml.snakeyaml.Yaml; + +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import static de.bly.running_around.Running_around.ItemsListFile; + +public class Analyzer extends Item { + + public Analyzer(Settings settings) { + super(settings); + } + + + + @Override + public ActionResult useOnBlock(ItemUsageContext context) { + + + + World world = context.getWorld(); + Block clickedBlock = world.getBlockState(context.getBlockPos()).getBlock(); + + assert context.getPlayer() != null; + Yaml yaml = new Yaml(); + + try (FileReader reader = new FileReader(ItemsListFile)) { + List itemsfromfile = yaml.load(reader); + if (itemsfromfile== null) itemsfromfile = new ArrayList<>(); + else itemsfromfile = new ArrayList<>(itemsfromfile); + + if (itemsfromfile.contains(clickedBlock.toString())) { + itemsfromfile.remove(clickedBlock.toString()); + context.getPlayer().addExperience(5); + + context.getPlayer().sendMessage(Text.of("§Analyzed: " + clickedBlock.toString()), true); + + + + + + } + + + + // write back + try (FileWriter writer = new FileWriter(ItemsListFile)) { + yaml.dump(itemsfromfile, writer); + } + } catch (IOException e) { + e.printStackTrace(); + } + + + return super.useOnBlock(context); + } + + @Override + public TypedActionResult use(World world, PlayerEntity user, Hand hand) { + // Ensure we don't spawn the lightning only on the client. + // This is to prevent desync. + Yaml yaml = new Yaml(); + + try (FileReader reader = new FileReader(ItemsListFile)) { + List itemsfromfile = yaml.load(reader); + user.sendMessage(Text.of(itemsfromfile.toString())); + user.sendMessage(Text.of("------------------["+ itemsfromfile.toArray().length +"]-------------------")); + + + + } catch (IOException e) { + e.printStackTrace(); + } + + + + + + // Nothing has changed to the item stack, + // so we just return it how it was. + return super.use(world, user, hand); + } + + + + + + + +} diff --git a/src/main/java/de/bly/running_around/item/RunningAwayItems.java b/src/main/java/de/bly/running_around/item/RunningAwayItems.java new file mode 100644 index 0000000..12c2184 --- /dev/null +++ b/src/main/java/de/bly/running_around/item/RunningAwayItems.java @@ -0,0 +1,29 @@ +package de.bly.running_around.item; + +import de.bly.running_around.Running_around; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemGroups; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; +import net.minecraft.util.Rarity; + +public class RunningAwayItems { + + public static final Item Analyzer = registerItem("analyzer", new Analyzer(new Item.Settings())); + public static final Item Scanner = registerItem("scanner", new Scanner(new Item.Settings())); + private static Item registerItem(String name, Item item){ + return Registry.register(Registries.ITEM, Identifier.of(Running_around.MOD_ID, name), item); + } + + public static void registerModItems() { + + ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register(entries -> { + entries.add(Analyzer); + entries.add(Scanner); + + }); + } +} diff --git a/src/main/java/de/bly/running_around/item/Scanner.java b/src/main/java/de/bly/running_around/item/Scanner.java new file mode 100644 index 0000000..3b2600a --- /dev/null +++ b/src/main/java/de/bly/running_around/item/Scanner.java @@ -0,0 +1,129 @@ +package de.bly.running_around.item; + + +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.projectile.FireworkRocketEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.item.Items; +import net.minecraft.nbt.NbtCompound; +import net.minecraft.nbt.NbtInt; +import net.minecraft.nbt.NbtList; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.text.Text; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; +import org.yaml.snakeyaml.Yaml; + +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import static de.bly.running_around.Running_around.ItemsListFile; + + + +public class Scanner extends Item { + + public Scanner(Settings settings) { + super(settings); + } + + private int getNumb() { + + + + Yaml yaml = new Yaml(); + + try (FileReader reader = new FileReader(ItemsListFile)) { + List itemsfromfile = yaml.load(reader); + if (itemsfromfile== null) itemsfromfile = new ArrayList<>(); + else itemsfromfile = new ArrayList<>(itemsfromfile); + + return itemsfromfile.size(); + + + + + } catch (IOException e) { + e.printStackTrace(); + } + return 0; + } + + + + @Override + public TypedActionResult use(World world, PlayerEntity user, Hand hand) { + + + + + int B = 0; + + if (getNumb() <= 900) { + B = 1; + } + if (getNumb() <= 700) { + B = 2; + } + if (getNumb() <= 600) { + B = 3; + } + if (getNumb() <= 500) { + B = 4; + } + if (getNumb() <= 400) { + B = 5; + } + if (getNumb() <= 300) { + B = 6; + } + if (getNumb() <= 100) { + B = 7; + } + + + + + for (int i = 1; i <= B; i++) { + try ( FileReader r = new FileReader("config/coords"+ i +".yml")) { + Map m = new Yaml().load(r); + int x = ((Number)m.get("x")).intValue(); + int y = ((Number)m.get("y")).intValue(); + int z = ((Number)m.get("z")).intValue(); + user.sendMessage(Text.literal("#"+ i +" x=" + z + " y=" + y + " z=" + x), false); + } catch (FileNotFoundException e) { + throw new RuntimeException(e); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + //user.sendMessage(Text.of("X" + x + " Y" + y + " Z" + z)); + + return super.use(world, user, hand); + } + + + + + + + + +} diff --git a/src/main/resources/assets/running_around/blockstates/collectable.json b/src/main/resources/assets/running_around/blockstates/collectable.json new file mode 100644 index 0000000..4969fed --- /dev/null +++ b/src/main/resources/assets/running_around/blockstates/collectable.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "running_around:block/collectable" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/running_around/lang/en_us.json b/src/main/resources/assets/running_around/lang/en_us.json new file mode 100644 index 0000000..5585ece --- /dev/null +++ b/src/main/resources/assets/running_around/lang/en_us.json @@ -0,0 +1,5 @@ +{ + "item.running_around.analyzer": "Analyzer", + "item.running_around.scanner": "Scanner", + "block.running_around.collectable": "Collectable" +} \ No newline at end of file diff --git a/src/main/resources/assets/running_around/models/block/collectable.json b/src/main/resources/assets/running_around/models/block/collectable.json new file mode 100644 index 0000000..57df162 --- /dev/null +++ b/src/main/resources/assets/running_around/models/block/collectable.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "running_around:block/collectable" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/running_around/models/item/analyzer.json b/src/main/resources/assets/running_around/models/item/analyzer.json new file mode 100644 index 0000000..6d1bc3e --- /dev/null +++ b/src/main/resources/assets/running_around/models/item/analyzer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "running_around:item/analyzer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/running_around/models/item/collectable.json b/src/main/resources/assets/running_around/models/item/collectable.json new file mode 100644 index 0000000..9bdcff3 --- /dev/null +++ b/src/main/resources/assets/running_around/models/item/collectable.json @@ -0,0 +1,3 @@ +{ + "parent": "running_around:block/collectable" +} \ No newline at end of file diff --git a/src/main/resources/assets/running_around/models/item/scanner.json b/src/main/resources/assets/running_around/models/item/scanner.json new file mode 100644 index 0000000..1303a59 --- /dev/null +++ b/src/main/resources/assets/running_around/models/item/scanner.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "running_around:item/scanner" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/running_around/textures/block/collectable.png b/src/main/resources/assets/running_around/textures/block/collectable.png new file mode 100644 index 0000000..3a5af8d Binary files /dev/null and b/src/main/resources/assets/running_around/textures/block/collectable.png differ diff --git a/src/main/resources/assets/running_around/textures/item/analyzer.png b/src/main/resources/assets/running_around/textures/item/analyzer.png new file mode 100644 index 0000000..e613404 Binary files /dev/null and b/src/main/resources/assets/running_around/textures/item/analyzer.png differ diff --git a/src/main/resources/assets/running_around/textures/item/scanner.png b/src/main/resources/assets/running_around/textures/item/scanner.png new file mode 100644 index 0000000..af34bb6 Binary files /dev/null and b/src/main/resources/assets/running_around/textures/item/scanner.png differ diff --git a/src/main/resources/data/minecraft/tags/block/minable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/minable/pickaxe.json new file mode 100644 index 0000000..3941225 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/block/minable/pickaxe.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "running_around:collectable" + + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/block/needs_diamond_tool.json b/src/main/resources/data/minecraft/tags/block/needs_diamond_tool.json new file mode 100644 index 0000000..b05bd8a --- /dev/null +++ b/src/main/resources/data/minecraft/tags/block/needs_diamond_tool.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "running_around:collectable" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/running_around/loot_table/blocks/collectable.json b/src/main/resources/data/running_around/loot_table/blocks/collectable.json new file mode 100644 index 0000000..805db8f --- /dev/null +++ b/src/main/resources/data/running_around/loot_table/blocks/collectable.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "running_around:collectable" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/running_around/recipe/collectable.json b/src/main/resources/data/running_around/recipe/collectable.json new file mode 100644 index 0000000..00c5036 --- /dev/null +++ b/src/main/resources/data/running_around/recipe/collectable.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "#i#", + "i i", + "#i#" + ], + "key": { + "#": { + "item": "minecraft:redstone" + }, + "i": { + "item": "minecraft:iron_ingot" + } + }, + "result": { + "count": 1, + "id": "running_around:analyzer" + } +} \ No newline at end of file diff --git a/src/main/resources/data/running_around/recipe/scanner.json b/src/main/resources/data/running_around/recipe/scanner.json new file mode 100644 index 0000000..264b184 --- /dev/null +++ b/src/main/resources/data/running_around/recipe/scanner.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " i ", + "iRi", + "ini" + ], + "key": { + "i": { + "item": "minecraft:iron_ingot" + }, + "R": { + "item": "minecraft:redstone_torch" + }, + "n": { + "item": "minecraft:netherite_ingot" + } + }, + "result": { + "count": 1, + "id": "running_around:scanner" + } +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..f157030 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,35 @@ +{ + "schemaVersion": 1, + "id": "running_around", + "version": "${version}", + "name": "Running Around", + "description": "", + "authors": [], + "contact": {}, + "license": "All-Rights-Reserved", + "icon": "assets/running_around/icon.png", + "environment": "*", + "entrypoints": { + "fabric-datagen": [ + "de.bly.running_around.client.Running_aroundDataGenerator" + ], + "client": [ + "de.bly.running_around.client.Running_aroundClient" + ], + "main": [ + "de.bly.running_around.Running_around" + ] + }, + "mixins": [ + "running_around.mixins.json", + { + "config": "running_around.client.mixins.json", + "environment": "client" + } + ], + "depends": { + "fabricloader": ">=${loader_version}", + "fabric": "*", + "minecraft": "${minecraft_version}" + } +} diff --git a/src/main/resources/running_around.mixins.json b/src/main/resources/running_around.mixins.json new file mode 100644 index 0000000..2113042 --- /dev/null +++ b/src/main/resources/running_around.mixins.json @@ -0,0 +1,14 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "de.bly.running_around.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + ], + "injectors": { + "defaultRequire": 1 + }, + "overwrites": { + "requireAnnotations": true + } +}