commit 97c2285f77a042407c97c6dc9f36976ab2c3317a Author: bruno Date: Wed Jul 24 09:58:43 2024 +0200 Init diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3c37caf --- /dev/null +++ b/.gitignore @@ -0,0 +1,118 @@ +# User-specific stuff +.idea/ + +*.iml +*.ipr +*.iws + +# IntelliJ +out/ +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Cache of project +.gradletasknamecache + +**/build/ + +# Common working directory +run/ + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..c986429 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2024 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..47e5a52 --- /dev/null +++ b/build.gradle @@ -0,0 +1,100 @@ +plugins { + id 'fabric-loom' version '1.7-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. + maven { url 'https://maven.nucleoid.xyz' } // You should have it +} + +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}" + + modImplementation include("eu.pb4:polymer-core:${project.polymer_version}") + modImplementation include("eu.pb4:polymer-virtual-entity:${project.polymer_version}") + modImplementation include("eu.pb4:polymer-blocks:${project.polymer_version}") + modImplementation include("eu.pb4:polymer-resource-pack:${project.polymer_version}") + modImplementation include("eu.pb4:polymer-autohost:${project.polymer_version}") + + + modImplementation include("xyz.nucleoid:server-translations-api:${project.server_translations_api_version}") + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" +} + +processResources { + inputs.property "version", project.version + inputs.property "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..fba00f3 --- /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.21 +yarn_mappings=1.21+build.9 +loader_version=0.16.0 +# Mod Properties +mod_version=1.0 +maven_group=systems.brn +archives_base_name=plasticgun +# Dependencies +# check this on https://modmuss50.me/fabric.html +fabric_version=0.100.7+1.21 + +polymer_version=0.9.4+1.21 +server_translations_api_version=2.3.1+1.21-pre2 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 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..a441313 --- /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.8-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..b740cf1 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/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/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 "${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=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, 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" \ + 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..7101f8e --- /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. 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=%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/systems/brn/plasticgun/PlasticGun.java b/src/main/java/systems/brn/plasticgun/PlasticGun.java new file mode 100644 index 0000000..64a7a94 --- /dev/null +++ b/src/main/java/systems/brn/plasticgun/PlasticGun.java @@ -0,0 +1,68 @@ +package systems.brn.plasticgun; + +import eu.pb4.polymer.core.api.entity.PolymerEntityUtils; +import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils; +import net.fabricmc.api.ModInitializer; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnGroup; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import systems.brn.plasticgun.bullets.BulletEntity; +import systems.brn.plasticgun.bullets.BulletItem; +import systems.brn.plasticgun.guns.Gun; + +import java.util.ArrayList; + +import static systems.brn.plasticgun.lib.Util.id; + +public class PlasticGun implements ModInitializer { + + public static final String MOD_ID = "plasticgun"; + + public static final ArrayList guns = new ArrayList<>(); + + public static final ArrayList bullets = new ArrayList<>(); + + public static EntityType BULLET_ENTITY_TYPE; + + @Override + public void onInitialize() { + + // Bullets - Batch 1 (Better Bullets First) + bullets.add(new BulletItem("357_magnum", 1.2, 357)); + bullets.add(new BulletItem("32_acp_high_velocity", 0.9, 32)); + bullets.add(new BulletItem("45_acp_hollow_point", 1.1, 45)); + bullets.add(new BulletItem("9mm_jhp", 1.05, 9)); + bullets.add(new BulletItem("38_special_p", 1.1, 38)); + bullets.add(new BulletItem("762_tokarev_ap", 1.2, 762)); + + // Bullets - Batch 2 (Standard Bullets) + bullets.add(new BulletItem("357_standard", 1, 357)); + bullets.add(new BulletItem("32_acp", 0.8, 32)); + bullets.add(new BulletItem("45_acp", 1, 45)); + bullets.add(new BulletItem("9mm_parabellum", 0.9, 9)); + bullets.add(new BulletItem("38_special", 0.95, 38)); + bullets.add(new BulletItem("762_tokarev", 1.1, 762)); + + // Guns + guns.add(new Gun("357_revolver", 0.5, 3, 6, 40, 357)); + guns.add(new Gun("colt_1903", 0.4, 2, 8, 35, 32)); + guns.add(new Gun("colt_45", 0.7, 2, 7, 45, 45)); + guns.add(new Gun("colt_peacemaker", 0.6, 4, 6, 40, 45)); + guns.add(new Gun("p2022", 0.5, 2, 10, 38, 9)); + guns.add(new Gun("snub_nosed_revolver", 0.5, 3, 5, 35, 38)); + guns.add(new Gun("tokarev_tt_33", 0.6, 2, 8, 42, 762)); + + + + BULLET_ENTITY_TYPE = Registry.register( + Registries.ENTITY_TYPE, + id("bullet"), + EntityType.Builder.create(BulletEntity::new, SpawnGroup.MISC).build() + ); + PolymerEntityUtils.registerType(BULLET_ENTITY_TYPE); + + PolymerResourcePackUtils.addModAssets(MOD_ID); + PolymerResourcePackUtils.markAsRequired(); + } +} diff --git a/src/main/java/systems/brn/plasticgun/bullets/BulletEntity.java b/src/main/java/systems/brn/plasticgun/bullets/BulletEntity.java new file mode 100644 index 0000000..16fb584 --- /dev/null +++ b/src/main/java/systems/brn/plasticgun/bullets/BulletEntity.java @@ -0,0 +1,63 @@ +package systems.brn.plasticgun.bullets; + +import net.minecraft.entity.EntityType; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.projectile.PersistentProjectileEntity; +import net.minecraft.item.ItemStack; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.sound.SoundEvents; +import net.minecraft.util.hit.EntityHitResult; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.World; +import eu.pb4.polymer.core.api.entity.PolymerEntity; +import systems.brn.plasticgun.guns.Gun; + +import static net.minecraft.particle.ParticleTypes.CRIT; +import static systems.brn.plasticgun.PlasticGun.BULLET_ENTITY_TYPE; +import static systems.brn.plasticgun.PlasticGun.bullets; + +public class BulletEntity extends PersistentProjectileEntity implements PolymerEntity { + private final Gun gun; + public BulletEntity(Vec3d pos, ServerPlayerEntity player, ItemStack stack, ItemStack weapon, Gun gun, double damage, int speed) { + super(BULLET_ENTITY_TYPE, pos.x, pos.y + 1.5d, pos.z, player.getEntityWorld(), stack, weapon); + this.setVelocity(player, player.getPitch(), player.getYaw(), 0.0F, speed, 0); + this.pickupType = PickupPermission.CREATIVE_ONLY; + player.setPitch(player.getPitch() + 5); + this.setDamage(damage); + this.setSound(SoundEvents.ENTITY_GENERIC_EXPLODE.value()); + this.gun = gun; + } + + public BulletEntity(EntityType entityType, World world) { + super(entityType, world); + this.gun = null; + } + + @Override + protected ItemStack getDefaultItemStack() { + if (gun != null){ + return gun.ammo.getFirst().getDefaultStack(); + } else { + return bullets.getFirst().getDefaultStack(); + } + } + + @Override + public EntityType getPolymerEntityType(ServerPlayerEntity player) { + return EntityType.ARROW; + } + + @Override + protected void onEntityHit(EntityHitResult entityHitResult) { + Vec3d pos = entityHitResult.getPos(); + entityHitResult.getEntity().getEntityWorld().addParticle(CRIT, true, pos.x, pos.y, pos.z, 3, 0, 0); + Vec3d diff = entityHitResult.getPos(); + diff.subtract(entityHitResult.getEntity().getPos()); + double height = diff.y; + if (entityHitResult.getEntity() instanceof PlayerEntity && height >= 1.75 && height <= 2) { + this.setDamage(2); + } + super.onEntityHit(entityHitResult); + } + +} diff --git a/src/main/java/systems/brn/plasticgun/bullets/BulletItem.java b/src/main/java/systems/brn/plasticgun/bullets/BulletItem.java new file mode 100644 index 0000000..cc97090 --- /dev/null +++ b/src/main/java/systems/brn/plasticgun/bullets/BulletItem.java @@ -0,0 +1,22 @@ +package systems.brn.plasticgun.bullets; + +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroups; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import systems.brn.plasticgun.lib.SimpleItem; + +import static systems.brn.plasticgun.lib.Util.id; + +public class BulletItem extends SimpleItem { + public final double damageCoefficient; + public final int caliber; + public BulletItem(String path, double damageCoefficient, int caliber) { + super(new Settings().maxCount(99), id(path)); + this.damageCoefficient = damageCoefficient; + this.caliber = caliber; + Item item = Registry.register(Registries.ITEM, this.identifier, this); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.FUNCTIONAL).register(content -> content.add(item)); + } +} diff --git a/src/main/java/systems/brn/plasticgun/guns/Gun.java b/src/main/java/systems/brn/plasticgun/guns/Gun.java new file mode 100644 index 0000000..23c4dd6 --- /dev/null +++ b/src/main/java/systems/brn/plasticgun/guns/Gun.java @@ -0,0 +1,103 @@ +package systems.brn.plasticgun.guns; + +import eu.pb4.polymer.core.api.item.PolymerItem; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroups; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.TypedActionResult; +import net.minecraft.world.World; +import systems.brn.plasticgun.bullets.BulletEntity; +import systems.brn.plasticgun.bullets.BulletItem; +import systems.brn.plasticgun.lib.SimpleItem; + +import java.util.ArrayList; + +import static systems.brn.plasticgun.PlasticGun.bullets; +import static systems.brn.plasticgun.lib.GunComponents.GUN_AMMO_COMPONENT; +import static systems.brn.plasticgun.lib.GunComponents.GUN_LOADING_COMPONENT; +import static systems.brn.plasticgun.lib.Util.*; + +public class Gun extends SimpleItem implements PolymerItem { + + public final double damage; + public final int reloadCount; + public final int clipSize; + public final int speed; + public final ArrayList ammo; + public final int caliber; + + public Gun(String path, double damage, int reloadCount, int clipSize, int speed, int caliber) { + super(new Settings().maxCount(1).component(GUN_AMMO_COMPONENT, ItemStack.EMPTY).maxDamage(clipSize + 1), id(path)); + Item item = Registry.register(Registries.ITEM, id(path), this); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.COMBAT).register(content -> content.add(item)); + this.damage = damage; + this.reloadCount = reloadCount; + this.clipSize = clipSize; + this.speed = speed; + ArrayList ammo = new ArrayList<>(); + for (BulletItem bullet : bullets) { + if(bullet.caliber == caliber){ + ammo.add(bullet); + } + } + this.ammo = ammo; + this.caliber = caliber; + } + + @Override + public ActionResult useOnBlock(ItemUsageContext context) { + if (context.getPlayer() instanceof ServerPlayerEntity player) { + use(context.getWorld(), player, context.getHand()); + } + return super.useOnBlock(context); + } + + @Override + public TypedActionResult use(World world, PlayerEntity user, Hand hand) { + if (user instanceof ServerPlayerEntity player) { + ItemStack stack = user.getStackInHand(hand); + int currentReload = stack.getOrDefault(GUN_LOADING_COMPONENT, 1); + ItemStack chamber = stack.getOrDefault(GUN_AMMO_COMPONENT, ItemStack.EMPTY).copy(); + int numBullets = chamber.getCount(); + if (numBullets > 0) { + BulletEntity bulletEntity = new BulletEntity(user.getPos(), player, chamber, user.getStackInHand(hand), this, damage, speed); + world.spawnEntity(bulletEntity); + chamber.decrement(1); + stack.set(GUN_AMMO_COMPONENT, chamber); + + } else { + ItemStack bulletStack = findBulletStack(ammo, player); + if (bulletStack != null && !bulletStack.isEmpty() && !isCreative(player)) { + if (currentReload < reloadCount) { + stack.set(GUN_LOADING_COMPONENT, currentReload + 1); + } else if (currentReload == reloadCount) { + int addedBullets = Math.min(bulletStack.getCount(), clipSize); + bulletStack.decrement(addedBullets); + ItemStack clipStack = bulletStack.copy(); + clipStack.setCount(Math.min(clipStack.getCount(), clipSize)); + stack.set(GUN_AMMO_COMPONENT, clipStack); + stack.set(GUN_LOADING_COMPONENT, 1); + } + } + if (player.isCreative()) { + stack.set(GUN_AMMO_COMPONENT, new ItemStack(ammo.getFirst(), clipSize)); + } + } + getDefaultStack().setDamage(clipSize - numBullets); + } + return super.use(world, user, hand); + } + + private static boolean isCreative(ServerPlayerEntity player) { + return player.isCreative(); + } + +} diff --git a/src/main/java/systems/brn/plasticgun/lib/GunComponents.java b/src/main/java/systems/brn/plasticgun/lib/GunComponents.java new file mode 100644 index 0000000..973c192 --- /dev/null +++ b/src/main/java/systems/brn/plasticgun/lib/GunComponents.java @@ -0,0 +1,26 @@ +package systems.brn.plasticgun.lib; + +import com.mojang.serialization.Codec; +import eu.pb4.polymer.core.api.other.PolymerComponent; +import net.minecraft.component.ComponentType; +import net.minecraft.item.ItemStack; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; + +import java.util.function.UnaryOperator; + + +public class GunComponents { + public static final ComponentType GUN_AMMO_COMPONENT = register("gunammo", builder -> builder.codec(ItemStack.CODEC)); + public static final ComponentType GUN_LOADING_COMPONENT = register("gunload", builder -> builder.codec(Codec.INT)); + + private static ComponentType register(String id, UnaryOperator> builderOperator) { + ComponentType componentType = Registry.register( + Registries.DATA_COMPONENT_TYPE, + id, + builderOperator.apply(ComponentType.builder()).build() + ); + PolymerComponent.registerDataComponent(componentType); + return componentType; + } +} \ No newline at end of file diff --git a/src/main/java/systems/brn/plasticgun/lib/SimpleItem.java b/src/main/java/systems/brn/plasticgun/lib/SimpleItem.java new file mode 100644 index 0000000..d00e644 --- /dev/null +++ b/src/main/java/systems/brn/plasticgun/lib/SimpleItem.java @@ -0,0 +1,32 @@ +package systems.brn.plasticgun.lib; + +import eu.pb4.polymer.core.api.item.PolymerItem; +import eu.pb4.polymer.core.api.item.SimplePolymerItem; +import eu.pb4.polymer.resourcepack.api.PolymerModelData; +import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils; +import net.minecraft.item.*; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.util.Identifier; +import org.jetbrains.annotations.Nullable; + +public abstract class SimpleItem extends SimplePolymerItem implements PolymerItem { + private final PolymerModelData polymerModel; + protected final Identifier identifier; + + public SimpleItem(Settings settings, Identifier identifier) { + super(settings, Items.BARRIER); + this.identifier = identifier; + this.polymerModel = PolymerResourcePackUtils.requestModel(Items.BARRIER, identifier.withPath("item/" + identifier.getPath())); + } + + @Override + public Item getPolymerItem(ItemStack itemStack, @Nullable ServerPlayerEntity player) { + return this.polymerModel.item(); + } + + @Override + public int getPolymerCustomModelData(ItemStack itemStack, @Nullable ServerPlayerEntity player) { + return this.polymerModel.value(); + } + +} \ No newline at end of file diff --git a/src/main/java/systems/brn/plasticgun/lib/Util.java b/src/main/java/systems/brn/plasticgun/lib/Util.java new file mode 100644 index 0000000..ee77fd4 --- /dev/null +++ b/src/main/java/systems/brn/plasticgun/lib/Util.java @@ -0,0 +1,31 @@ +package systems.brn.plasticgun.lib; + +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.util.Identifier; + +import java.util.ArrayList; + +import static systems.brn.plasticgun.PlasticGun.MOD_ID; + +public class Util { + + public static Identifier id(String path) { + return Identifier.of(MOD_ID, path); + } + + public static ItemStack findBulletStack(ArrayList bulletItem, ServerPlayerEntity player) { + if (bulletItem == null || bulletItem.isEmpty()) { + return ItemStack.EMPTY; + } + for (ItemStack itemStack : player.getInventory().main) { + for (Item item : bulletItem) { + if (item == itemStack.getItem()) { + return itemStack; + } + } + } + return ItemStack.EMPTY; + } +} diff --git a/src/main/resources/assets/plasticgun/lang/en_us.json b/src/main/resources/assets/plasticgun/lang/en_us.json new file mode 100644 index 0000000..35e3a12 --- /dev/null +++ b/src/main/resources/assets/plasticgun/lang/en_us.json @@ -0,0 +1,3 @@ +{ + "item.plasticgun.arrowhead": "Central Processing Unit" +} \ No newline at end of file diff --git a/src/main/resources/assets/plasticgun/models/item/357_revolver.json b/src/main/resources/assets/plasticgun/models/item/357_revolver.json new file mode 100644 index 0000000..7b14eac --- /dev/null +++ b/src/main/resources/assets/plasticgun/models/item/357_revolver.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "plasticgun:item/357_revolver" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/plasticgun/models/item/colt_1903.json b/src/main/resources/assets/plasticgun/models/item/colt_1903.json new file mode 100644 index 0000000..5b5362c --- /dev/null +++ b/src/main/resources/assets/plasticgun/models/item/colt_1903.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "plasticgun:item/colt_1903" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/plasticgun/models/item/colt_peacemaker.json b/src/main/resources/assets/plasticgun/models/item/colt_peacemaker.json new file mode 100644 index 0000000..60a04b4 --- /dev/null +++ b/src/main/resources/assets/plasticgun/models/item/colt_peacemaker.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "plasticgun:item/colt_peacemaker" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/plasticgun/models/item/p2022.json b/src/main/resources/assets/plasticgun/models/item/p2022.json new file mode 100644 index 0000000..9625504 --- /dev/null +++ b/src/main/resources/assets/plasticgun/models/item/p2022.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "plasticgun:item/p2022" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/plasticgun/models/item/snub_nosed_revolver.json b/src/main/resources/assets/plasticgun/models/item/snub_nosed_revolver.json new file mode 100644 index 0000000..21a08df --- /dev/null +++ b/src/main/resources/assets/plasticgun/models/item/snub_nosed_revolver.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "plasticgun:item/snub_nosed_revolver" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/plasticgun/models/item/tokarev_tt_33.json b/src/main/resources/assets/plasticgun/models/item/tokarev_tt_33.json new file mode 100644 index 0000000..36c500c --- /dev/null +++ b/src/main/resources/assets/plasticgun/models/item/tokarev_tt_33.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "plasticgun:item/tokarev_tt_33" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/plasticgun/textures/item/357_revolver.png b/src/main/resources/assets/plasticgun/textures/item/357_revolver.png new file mode 100644 index 0000000..116c499 Binary files /dev/null and b/src/main/resources/assets/plasticgun/textures/item/357_revolver.png differ diff --git a/src/main/resources/assets/plasticgun/textures/item/colt_1903.png b/src/main/resources/assets/plasticgun/textures/item/colt_1903.png new file mode 100644 index 0000000..2441668 Binary files /dev/null and b/src/main/resources/assets/plasticgun/textures/item/colt_1903.png differ diff --git a/src/main/resources/assets/plasticgun/textures/item/colt_45.png b/src/main/resources/assets/plasticgun/textures/item/colt_45.png new file mode 100644 index 0000000..1bb102d Binary files /dev/null and b/src/main/resources/assets/plasticgun/textures/item/colt_45.png differ diff --git a/src/main/resources/assets/plasticgun/textures/item/colt_peacemaker.png b/src/main/resources/assets/plasticgun/textures/item/colt_peacemaker.png new file mode 100644 index 0000000..d4f1235 Binary files /dev/null and b/src/main/resources/assets/plasticgun/textures/item/colt_peacemaker.png differ diff --git a/src/main/resources/assets/plasticgun/textures/item/p2022.png b/src/main/resources/assets/plasticgun/textures/item/p2022.png new file mode 100644 index 0000000..6664a8a Binary files /dev/null and b/src/main/resources/assets/plasticgun/textures/item/p2022.png differ diff --git a/src/main/resources/assets/plasticgun/textures/item/snub_nosed_revolver.png b/src/main/resources/assets/plasticgun/textures/item/snub_nosed_revolver.png new file mode 100644 index 0000000..981e9d1 Binary files /dev/null and b/src/main/resources/assets/plasticgun/textures/item/snub_nosed_revolver.png differ diff --git a/src/main/resources/assets/plasticgun/textures/item/tokarev_tt_33.png b/src/main/resources/assets/plasticgun/textures/item/tokarev_tt_33.png new file mode 100644 index 0000000..0b0ab41 Binary files /dev/null and b/src/main/resources/assets/plasticgun/textures/item/tokarev_tt_33.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..0a3a559 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,22 @@ +{ + "schemaVersion": 1, + "id": "plasticgun", + "version": "${version}", + "name": "plasticgun", + "description": "", + "authors": [], + "contact": {}, + "license": "MIT", + "icon": "assets/plasticgun/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "systems.brn.plasticgun.PlasticGun" + ] + }, + "depends": { + "fabricloader": ">=${loader_version}", + "fabric": "*", + "minecraft": "${minecraft_version}" + } +}