diff options
| -rw-r--r-- | build.gradle | 93 | ||||
| -rw-r--r-- | gradle.properties | 2 | ||||
| -rw-r--r-- | src/main/java/moe/nea/potatocrime/mixin/ShillCarrotsToVillagerPatch.java | 3 | ||||
| -rw-r--r-- | src/main/kotlin/moe/nea/potatocrime/PotatoCrime.kt | 4 |
4 files changed, 51 insertions, 51 deletions
diff --git a/build.gradle b/build.gradle index 70d830f..dfa1184 100644 --- a/build.gradle +++ b/build.gradle @@ -1,92 +1,91 @@ plugins { - id 'fabric-loom' version '1.5-SNAPSHOT' - id 'maven-publish' - id "org.jetbrains.kotlin.jvm" version "1.9.23" + id 'fabric-loom' version '1.5-SNAPSHOT' + id 'maven-publish' + id "org.jetbrains.kotlin.jvm" version "1.9.23" } version = project.mod_version group = project.maven_group base { - archivesName = project.archives_base_name + archivesName = project.archives_base_name } repositories { - mavenLocal() + mavenLocal() } loom { splitEnvironmentSourceSets() - mods { - "potato-crime" { - sourceSet sourceSets.main - sourceSet sourceSets.client - } - } + mods { + "potato-crime" { + sourceSet sourceSets.main + sourceSet sourceSets.client + } + } } fabricApi { - configureDataGeneration() + configureDataGeneration() } dependencies { - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + 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}" - modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}" } processResources { - inputs.property "version", project.version + inputs.property "version", project.version - filesMatching("fabric.mod.json") { - expand "version": project.version - } + filesMatching("fabric.mod.json") { + expand "version": project.version + } } tasks.withType(JavaCompile).configureEach { - it.options.release = 17 + it.options.release = 17 } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - jvmTarget = 17 - } + kotlinOptions { + jvmTarget = 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() + // 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. - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } jar { - from("LICENSE") { - rename { "${it}_${project.base.archivesName.get()}"} - } + 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. - } + 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/gradle.properties b/gradle.properties index 3870ec8..eb3491a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop minecraft_version=24w14potato -yarn_mappings=24w14potato+build.local +yarn_mappings=24w14potato+build.3 loader_version=0.15.9 #Fabric api diff --git a/src/main/java/moe/nea/potatocrime/mixin/ShillCarrotsToVillagerPatch.java b/src/main/java/moe/nea/potatocrime/mixin/ShillCarrotsToVillagerPatch.java index e091069..f4e3079 100644 --- a/src/main/java/moe/nea/potatocrime/mixin/ShillCarrotsToVillagerPatch.java +++ b/src/main/java/moe/nea/potatocrime/mixin/ShillCarrotsToVillagerPatch.java @@ -7,6 +7,7 @@ import net.minecraft.entity.passive.VillagerEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.sound.SoundEvents; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.world.World; @@ -32,6 +33,7 @@ public abstract class ShillCarrotsToVillagerPatch extends MerchantEntity { if (this.isAlive() && !this.hasCustomer() && !this.isSleeping()) { if (itemInHand.isOf(Items.CARROT)) { if (!isClient()) { + playSound(SoundEvents.ENTITY_VILLAGER_TRADE); itemInHand.setCount(itemInHand.getCount() - 1); player.giveItemStack(new ItemStack(Items.EMERALD)); player.sendMessage(PotatoTranslations.INSTANCE.getVillagerTrade().format()); @@ -40,6 +42,7 @@ public abstract class ShillCarrotsToVillagerPatch extends MerchantEntity { } if (itemInHand.isOf(Items.GOLDEN_CARROT)) { if (!isClient()) { + playSound(SoundEvents.ENTITY_VILLAGER_TRADE); itemInHand.setCount(itemInHand.getCount() - 1); player.giveItemStack(new ItemStack(Items.EMERALD_BLOCK)); player.sendMessage(PotatoTranslations.INSTANCE.getVillagerTrade().format()); diff --git a/src/main/kotlin/moe/nea/potatocrime/PotatoCrime.kt b/src/main/kotlin/moe/nea/potatocrime/PotatoCrime.kt index 9aec040..c59b76c 100644 --- a/src/main/kotlin/moe/nea/potatocrime/PotatoCrime.kt +++ b/src/main/kotlin/moe/nea/potatocrime/PotatoCrime.kt @@ -54,8 +54,6 @@ object PotatoCrime : ModInitializer { fun hasContraband(entity: ServerPlayerEntity): Boolean { return entity.inventory - .getMatchingStacks { it.isIn(PotatoRegistry.carrotIshItems) } - .isNotEmpty() - + .contains { it.isIn(PotatoRegistry.carrotIshItems) } } }
\ No newline at end of file |