Skip to content

Commit

Permalink
style: Change Code Indent to 2
Browse files Browse the repository at this point in the history
  • Loading branch information
Cierra-Runis committed Dec 23, 2024
1 parent a161fe7 commit 7bcb179
Show file tree
Hide file tree
Showing 5 changed files with 138 additions and 135 deletions.
113 changes: 57 additions & 56 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,99 +1,100 @@
plugins {
id 'fabric-loom' version '1.8-SNAPSHOT'
id 'maven-publish'
id "org.jetbrains.kotlin.jvm" version "2.0.21"
id 'fabric-loom' version '1.8-SNAPSHOT'
id 'maven-publish'
id "org.jetbrains.kotlin.jvm" version "2.0.21"
}

version = project.mod_version
group = project.maven_group

base {
archivesName = project.archives_base_name
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.
// Add repositories to retrieve artifacts from in here.
// You should only use this when depending on other mods because
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
// for more information about repositories.
}

loom {
splitEnvironmentSourceSets()
splitEnvironmentSourceSets()

mods {
"survired" {
sourceSet sourceSets.main
sourceSet sourceSets.client
}
}
mods {
"survired" {
sourceSet sourceSets.main
sourceSet sourceSets.client
}
}

}

fabricApi {
configureDataGeneration()
configureDataGeneration()
}

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}"
modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}"
// 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}"
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.
withSourcesJar()

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()}"}
}
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
from("LICENSE") {
rename { "${it}_${project.base.archivesName.get()}" }
}
}

// 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.
}
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.
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

@Mixin(MinecraftClient.class)
public class ExampleClientMixin {
@Inject(at = @At("HEAD"), method = "run")
private void init(CallbackInfo info) {
// This code is injected into the start of MinecraftClient.run()V
}
@Inject(at = @At("HEAD"), method = "run")
private void init(CallbackInfo info) {
// This code is injected into the start of MinecraftClient.run()V
}
}
18 changes: 9 additions & 9 deletions src/client/resources/survired.client.mixins.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"required": true,
"package": "pers.cierra_runis.survired.mixin.client",
"compatibilityLevel": "JAVA_17",
"client": [
"ExampleClientMixin"
],
"injectors": {
"defaultRequire": 1
}
"required": true,
"package": "pers.cierra_runis.survired.mixin.client",
"compatibilityLevel": "JAVA_17",
"client": [
"ExampleClientMixin"
],
"injectors": {
"defaultRequire": 1
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,29 @@ import net.minecraft.nbt.NbtCompound
import net.minecraft.util.ActionResult
import pers.cierra_runis.survired.common.SurviRedRegister


object SurviRedPickup : SurviRedRegister {
override fun register() {
UseEntityCallback.EVENT.register(UseEntityCallback { playerEntity, world, hand, entity, entityHitResult ->
if (!playerEntity.isSneaking) return@UseEntityCallback ActionResult.PASS

val spawnEgg = SpawnEggItem.forEntity(entity.type) ?: return@UseEntityCallback ActionResult.FAIL
override fun surviRedRegister() {
UseEntityCallback.EVENT.register { playerEntity, world, hand, entity, entityHitResult ->
if (!playerEntity.isSneaking) return@register ActionResult.PASS

val spawnEgg = SpawnEggItem.forEntity(entity.type) ?: return@register ActionResult.FAIL

val entityNbt = entity.writeNbt(NbtCompound())
for (key in arrayOf("Pos", "Motion", "Rotation", "UUID")) entityNbt.remove(key)
val entityNbt = entity.writeNbt(NbtCompound())
for (key in arrayOf("Pos", "Motion", "Rotation", "UUID")) entityNbt.remove(key)

val stack = ItemStack(spawnEgg).apply {
nbt = NbtCompound().apply {
put("EntityTag", entityNbt)
}
}
val stack = ItemStack(spawnEgg).apply {
nbt = NbtCompound().apply {
put("EntityTag", entityNbt)
}
}

if (playerEntity.inventory.emptySlot != -1) playerEntity.giveItemStack(stack)
else playerEntity.dropItem(stack, true)
if (playerEntity.inventory.emptySlot != -1) playerEntity.giveItemStack(stack)
else playerEntity.dropItem(stack, true)

entity.remove(Entity.RemovalReason.DISCARDED)
return@UseEntityCallback ActionResult.SUCCESS
})
entity.remove(Entity.RemovalReason.DISCARDED)
return@register ActionResult.SUCCESS
}
}
}
100 changes: 50 additions & 50 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
{
"schemaVersion": 1,
"id": "survired",
"version": "${version}",
"name": "SurviRed",
"description": "This is an example description! Tell everyone what your mod is about!",
"authors": [
"Me!"
],
"contact": {
"homepage": "https://github.com/Cierra-Runis",
"sources": "https://github.com/Cierra-Runis/Survired"
},
"license": "CC0-1.0",
"icon": "assets/survired/icon.png",
"environment": "*",
"entrypoints": {
"main": [
{
"value": "pers.cierra_runis.survired.SurviRed",
"adapter": "kotlin"
}
],
"client": [
{
"value": "pers.cierra_runis.survired.SurviRedClient",
"adapter": "kotlin"
}
],
"fabric-datagen": [
{
"value": "pers.cierra_runis.survired.SurviRedDataGenerator",
"adapter": "kotlin"
}
]
},
"mixins": [
"survired.mixins.json",
{
"config": "survired.client.mixins.json",
"environment": "client"
}
],
"depends": {
"fabricloader": ">=0.16.9",
"minecraft": "~1.20.1",
"java": ">=17",
"fabric-api": "*",
"fabric-language-kotlin": "*"
},
"suggests": {}
"schemaVersion": 1,
"id": "survired",
"version": "${version}",
"name": "SurviRed",
"description": "This is an example description! Tell everyone what your mod is about!",
"authors": [
"Me!"
],
"contact": {
"homepage": "https://github.com/Cierra-Runis",
"sources": "https://github.com/Cierra-Runis/Survired"
},
"license": "CC0-1.0",
"icon": "assets/survired/icon.png",
"environment": "*",
"entrypoints": {
"main": [
{
"value": "pers.cierra_runis.survired.SurviRed",
"adapter": "kotlin"
}
],
"client": [
{
"value": "pers.cierra_runis.survired.SurviRedClient",
"adapter": "kotlin"
}
],
"fabric-datagen": [
{
"value": "pers.cierra_runis.survired.SurviRedDataGenerator",
"adapter": "kotlin"
}
]
},
"mixins": [
"survired.mixins.json",
{
"config": "survired.client.mixins.json",
"environment": "client"
}
],
"depends": {
"fabricloader": ">=0.16.9",
"minecraft": "~1.20.1",
"java": ">=17",
"fabric-api": "*",
"fabric-language-kotlin": "*"
},
"suggests": {}
}

0 comments on commit 7bcb179

Please sign in to comment.