From 20da0f14d165d8045f8ba2b8c63a794f18fefd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Ryb=C3=A1rsky?= Date: Thu, 23 May 2024 19:28:15 +0200 Subject: [PATCH] init --- .gitignore | 118 ++++++++++++++++++ LICENSE | 21 ++++ build.gradle | 89 +++++++++++++ gradle.properties | 16 +++ gradle/wrapper/gradle-wrapper.properties | 7 ++ settings.gradle | 9 ++ .../Justteleportalready.java | 16 +++ .../mixin/DontHurtMePearlMixin.java | 23 ++++ .../mixin/JustTeleportAlreadyMixin.java | 32 +++++ src/main/resources/fabric.mod.json | 27 ++++ .../resources/justteleportalready.mixins.json | 12 ++ 11 files changed, 370 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 settings.gradle create mode 100644 src/main/java/systems/brn/justteleportalready/Justteleportalready.java create mode 100644 src/main/java/systems/brn/justteleportalready/mixin/DontHurtMePearlMixin.java create mode 100644 src/main/java/systems/brn/justteleportalready/mixin/JustTeleportAlreadyMixin.java create mode 100644 src/main/resources/fabric.mod.json create mode 100644 src/main/resources/justteleportalready.mixins.json 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 b/LICENSE new file mode 100644 index 0000000..c986429 --- /dev/null +++ b/LICENSE @@ -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..c9a2241 --- /dev/null +++ b/build.gradle @@ -0,0 +1,89 @@ +plugins { + id 'fabric-loom' version '1.6-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. +} + +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}" +} + +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..5999ba5 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,16 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Fabric Properties + # check these on https://modmuss50.me/fabric.html + minecraft_version=1.20.6 + yarn_mappings=1.20.6+build.1 + loader_version=0.15.11 +# Mod Properties + mod_version = 1.0 + maven_group = systems.brn + archives_base_name = justteleportalready + +# Dependencies + # check this on https://modmuss50.me/fabric.html + fabric_version=0.98.0+1.20.6 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..b82aa23 --- /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.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists 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/justteleportalready/Justteleportalready.java b/src/main/java/systems/brn/justteleportalready/Justteleportalready.java new file mode 100644 index 0000000..78177fe --- /dev/null +++ b/src/main/java/systems/brn/justteleportalready/Justteleportalready.java @@ -0,0 +1,16 @@ +package systems.brn.justteleportalready; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.gamerule.v1.GameRuleFactory; +import net.fabricmc.fabric.api.gamerule.v1.GameRuleRegistry; +import net.minecraft.world.GameRules; + +public class Justteleportalready implements ModInitializer { + public static final GameRules.Key Entity_Portal_Cooldown = + GameRuleRegistry.register("entityPortalCooldown", GameRules.Category.MOBS, GameRuleFactory.createIntRule(300)); + public static final GameRules.Key Enderpearl_Damage = + GameRuleRegistry.register("enderpearlDamage", GameRules.Category.PLAYER, GameRuleFactory.createIntRule(5)); + @Override + public void onInitialize() { + } +} diff --git a/src/main/java/systems/brn/justteleportalready/mixin/DontHurtMePearlMixin.java b/src/main/java/systems/brn/justteleportalready/mixin/DontHurtMePearlMixin.java new file mode 100644 index 0000000..0bc63df --- /dev/null +++ b/src/main/java/systems/brn/justteleportalready/mixin/DontHurtMePearlMixin.java @@ -0,0 +1,23 @@ +package systems.brn.justteleportalready.mixin; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.damage.DamageSource; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import static systems.brn.justteleportalready.Justteleportalready.Enderpearl_Damage; + +@Mixin(net.minecraft.entity.projectile.thrown.EnderPearlEntity.class) +public class DontHurtMePearlMixin { + + @Redirect(method = "onCollision(Lnet/minecraft/util/hit/HitResult;)V", + at = @At(value = "INVOKE", + target = "Lnet/minecraft/entity/Entity;damage(Lnet/minecraft/entity/damage/DamageSource;F)Z")) + private boolean redirectDamage(Entity entity, DamageSource source, float amount) { + World world = entity.getWorld(); + entity.damage(source, world.getGameRules().getInt(Enderpearl_Damage)); + return false; + } +} diff --git a/src/main/java/systems/brn/justteleportalready/mixin/JustTeleportAlreadyMixin.java b/src/main/java/systems/brn/justteleportalready/mixin/JustTeleportAlreadyMixin.java new file mode 100644 index 0000000..4d582b4 --- /dev/null +++ b/src/main/java/systems/brn/justteleportalready/mixin/JustTeleportAlreadyMixin.java @@ -0,0 +1,32 @@ +package systems.brn.justteleportalready.mixin; + +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import static systems.brn.justteleportalready.Justteleportalready.Entity_Portal_Cooldown; + +@Mixin(net.minecraft.entity.Entity.class) +public class JustTeleportAlreadyMixin { + @Shadow private World world; + + @Inject(method = "getDefaultPortalCooldown", + at = @At(value = "RETURN"), + cancellable = true) + private void getDefaultPortalCooldown(CallbackInfoReturnable cir) { + cir.setReturnValue(world.getGameRules().getInt(Entity_Portal_Cooldown)); + } + + @Shadow protected int portalCooldown; + @Inject(method = "tickPortalCooldown", at = @At(value = "RETURN")) + private void tickPortalCooldown(CallbackInfo ci) { + int maxCooldown = world.getGameRules().getInt(Entity_Portal_Cooldown); + if (portalCooldown > maxCooldown) { + portalCooldown = maxCooldown; + } + } +} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..6682d37 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,27 @@ +{ + "schemaVersion": 1, + "id": "justteleportalready", + "version": "${version}", + "name": "justteleportalready", + "description": "", + "authors": [], + "contact": { + "repo": "https://git.brn.systems/BRNSystems/justteleportalreadyatencryptor" + }, + "license": "MIT", + "icon": "assets/justteleportalready/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "systems.brn.justteleportalready.Justteleportalready" + ] + }, + "mixins": [ + "justteleportalready.mixins.json" + ], + "depends": { + "fabricloader": ">=${loader_version}", + "fabric": "*", + "minecraft": "${minecraft_version}" + } +} diff --git a/src/main/resources/justteleportalready.mixins.json b/src/main/resources/justteleportalready.mixins.json new file mode 100644 index 0000000..dd99ebe --- /dev/null +++ b/src/main/resources/justteleportalready.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "systems.brn.justteleportalready.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "DontHurtMePearlMixin" + ], + "injectors": { + "defaultRequire": 1 + } +}