diff --git a/.github/workflows/build_and_publish.yaml b/.github/workflows/build_and_publish.yaml index c66fb0457..ceb4b849a 100644 --- a/.github/workflows/build_and_publish.yaml +++ b/.github/workflows/build_and_publish.yaml @@ -48,7 +48,8 @@ jobs: with: arguments: build env: - VERSION: ${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }} + MOD_VERSION: ${{ steps.get_version.outputs.result }} + MINECRAFT_VERSION: ${{ steps.get_mc_version.outputs.result }} GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true - name: Update CHANGELOG id: changelog @@ -73,7 +74,7 @@ jobs: uses: stefanzweifel/git-auto-commit-action@v4 if: ${{ steps.get_release_type.outputs.result != 'test' }} with: - branch: version/1.19.4 + branch: version/1.20.0 commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]' file_pattern: CHANGELOG.md - name: Upload to Curseforge @@ -90,7 +91,7 @@ jobs: ${{ steps.changelog.outputs.changes }} Find changes for all versions at https://github.com/klikli-dev/occultism/releases - game_versions: Forge,Minecraft 1.19:${{ steps.get_mc_version.outputs.result }} + game_versions: Forge,Minecraft 1.20:${{ steps.get_mc_version.outputs.result }} display_name: occultism-${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}.jar release_type: ${{ steps.get_release_type.outputs.result }} relations: modonomicon:requiredDependency,curios:requiredDependency,geckolib:requiredDependency,smartbrainlib:requiredDependency,theurgy:optionalDependency,jei:optionalDependency,almost-unified:optionalDependency,perviaminvenire:optionalDependency \ No newline at end of file diff --git a/build.gradle b/build.gradle index 4eb51afcf..738a5bf6f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,23 @@ plugins { id 'idea' id 'maven-publish' - id 'net.minecraftforge.gradle' version '5.+' + id 'net.minecraftforge.gradle' version '[6.0,6.2)' id 'org.parchmentmc.librarian.forgegradle' version '1.+' } -if (System.getenv('VERSION') != null) { - version = System.getenv('VERSION') -} else { - version = "${mc_version}-${mod_version}" +if (System.getenv('MOD_VERSION') != null) { + mod_version = System.getenv('MOD_VERSION') } +if (System.getenv('MINECRAFT_VERSION') != null) { + minecraft_version = System.getenv('MINECRAFT_VERSION') +} +version = "${minecraft_version}-${mod_version}" + +group = mod_group_id -group = "com.github.klikli_dev" -archivesBaseName = "occultism" +base { + archivesName = mod_id +} java.toolchain.languageVersion = JavaLanguageVersion.of(17) @@ -44,7 +49,7 @@ minecraft { jvmArgs '-XX:+AllowEnhancedClassRedefinition', '-XX:+IgnoreUnrecognizedVMOptions' mods { - occultism { + "${mod_id}" { source sourceSets.main } } @@ -73,7 +78,7 @@ minecraft { jvmArgs '-XX:+AllowEnhancedClassRedefinition', '-XX:+IgnoreUnrecognizedVMOptions' mods { - occultism { + "${mod_id}" { source sourceSets.main } } @@ -95,7 +100,7 @@ minecraft { args '--mod', 'occultism', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') mods { - occultism { + "${mod_id}" { source sourceSets.main } } @@ -168,36 +173,40 @@ dependencies { minecraft "net.minecraftforge:forge:${forge_version}" //Jei - compileOnly fg.deobf("mezz.jei:jei-${jei_mc_version}-common-api:${jei_version}") - compileOnly fg.deobf("mezz.jei:jei-${jei_mc_version}-forge-api:${jei_version}") - runtimeOnly fg.deobf("mezz.jei:jei-${jei_mc_version}-forge:${jei_version}") + compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}") + compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}") + runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}") //curios - compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_mc_version}-${curios_version}:api") - runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_mc_version}-${curios_version}") + //TODO: reenable once updated + compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}+${minecraft_version}:api") + runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}+${minecraft_version}") + //geckolib - implementation fg.deobf("software.bernie.geckolib:geckolib-forge-${geckolib_mc_version}:${geckolib_version}") + implementation fg.deobf("software.bernie.geckolib:geckolib-forge-${minecraft_version}:${geckolib_version}") //smartbrainlib - implementation fg.deobf("net.tslat.smartbrainlib:SmartBrainLib-forge-${smartbrainlib_mc_version}:${smartbrainlib_version}") + implementation fg.deobf("net.tslat.smartbrainlib:SmartBrainLib-forge-${minecraft_version}:${smartbrainlib_version}") //almostunified - compileOnly fg.deobf("com.almostreliable.mods:almostunified-forge:${almostunified_version}") - runtimeOnly fg.deobf("com.almostreliable.mods:almostunified-forge:${almostunified_version}") + //TODO: reenable once updated +// compileOnly fg.deobf("com.almostreliable.mods:almostunified-forge:${almostunified_version}") +// runtimeOnly fg.deobf("com.almostreliable.mods:almostunified-forge:${almostunified_version}") //modonomicon - implementation fg.deobf("com.klikli_dev:modonomicon:${modonomicon_mc_version}-${modonomicon_version}") //we build against full jar because we NEED IT ALL + implementation fg.deobf("com.klikli_dev:modonomicon:${minecraft_version}-${modonomicon_version}") + //we build against full jar because we NEED IT ALL //theurgy - compileOnly fg.deobf("com.klikli_dev:theurgy:${theurgy_mc_version}-${theurgy_version}") - runtimeOnly fg.deobf("com.klikli_dev:theurgy:${theurgy_mc_version}-${theurgy_version}") + compileOnly fg.deobf("com.klikli_dev:theurgy:${minecraft_version}-${theurgy_version}") + runtimeOnly fg.deobf("com.klikli_dev:theurgy:${minecraft_version}-${theurgy_version}") //runtime only helper mods for dev env, placed in ./runtime-mods, example: Hwyla-forge-1.10.11-B78_1.16.2.jar //runtimeOnly fg.deobf("ignoredvalue:Hwyla:forge-1.10.11-B78_1.16.2") //alltheores - for recipe testing - //enable once available for 1.19.3 + //enable once available for 1.20 //runtimeOnly fg.deobf("curse.maven:alltheores-405593:xyz") // //Ma for crafting issue testing @@ -206,28 +215,64 @@ dependencies { //PerViamInvenire - for AI integration testing //runtimeOnly fg.deobf("curse.maven:perviaminvenire-449945:xyz") // - //enable once available for 1.19.3 + //enable once available for 1.20 //runtimeOnly fg.deobf("com.ldtteam:per_viam_invenire:1.19.3-XYZ-RELEASE:universal") } + +// This block of code expands all declared replace properties in the specified resource targets. +// A missing property will result in an error. Properties are expanded using ${} Groovy notation. +// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. +// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html +def resourceTargets = ['META-INF/mods.toml', 'pack.mcmeta'] +def replaceProperties = [ + minecraft_version : minecraft_version, + minecraft_version_range : minecraft_version_range, + forge_version : forge_version, + forge_version_range : forge_version_range, + loader_version_range : loader_version_range, + mod_id : mod_id, + mod_name : mod_name, + mod_license : mod_license, + mod_version : mod_version, + mod_authors : mod_authors, + mod_description : mod_description, + jei_version_range : jei_version_range, + curios_version_range : curios_version_range, + geckolib_version_range : geckolib_version_range, + smartbrainlib_version_range : smartbrainlib_version_range, + almostunified_version_range : almostunified_version_range, + modonomicon_version_range : modonomicon_version_range, + theurgy_version_range : theurgy_version_range, + per_viam_invenire_version_range: per_viam_invenire_version_range, +] +processResources { + inputs.properties replaceProperties + replaceProperties.put 'project', project + + filesMatching(resourceTargets) { + expand replaceProperties + } +} + // Example for how to get properties into the manifest for reading by the runtime.. jar { manifest { attributes([ - "Specification-Title": "occultism", - "Specification-Vendor": "Kli Kli", - "Specification-Version": "1", // We are version 1 of ourselves - "Implementation-Title": project.name, - "Implementation-Version": "${version}", - "Implementation-Vendor" :"Kli Kli", - "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + "Specification-Title" : mod_id, + "Specification-Vendor" : mod_authors, + "Specification-Version" : "1", // We are version 1 of ourselves + "Implementation-Title" : project.name, + "Implementation-Version" : mod_version, + "Implementation-Vendor" : mod_authors, + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } } // Example configuration to allow publishing using the maven-publish task // This is the preferred method to reobfuscate your jar file -jar.finalizedBy('reobfJar') +jar.finalizedBy('reobfJar') // However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing //publish.dependsOn('reobfJar') @@ -251,9 +296,8 @@ afterEvaluate { } } -compileJava.options.encoding = 'UTF-8' -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation } processResources.setDuplicatesStrategy(DuplicatesStrategy.WARN) \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 54f95e069..085cc7383 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,28 +3,48 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -mod_version=0.0.1 -mc_version=1.19.4 -forge_version=1.19.4-45.0.43 +## Environment Properties + +# The Minecraft version must agree with the Forge version to get a valid artifact +minecraft_version=1.20 +# The Minecraft version range can use any release version of Minecraft as bounds. +# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly +# as they do not follow standard versioning conventions. +minecraft_version_range=[1.20,1.21) +# The Forge version must agree with the Minecraft version to get a valid artifact +forge_version=1.20-46.0.1 +# The Forge version range can use any version of Forge as bounds or match the loader version range +forge_version_range=[46,) +# The loader version range can only use the major version of Forge/FML as bounds +loader_version_range=[46,) mapping_channel=parchment #postfix is target mc version, optional prefix is source parchment mc version -mapping_version=1.19.3-2023.03.12-1.19.4 - -jei_mc_version=1.19.4 -jei_version=13.1.0.7 -curios_mc_version=1.19.4 -curios_version=5.1.4.2 -geckolib_mc_version=1.19.4 -geckolib_version=4.1.2 -smartbrainlib_mc_version=1.19.4 -smartbrainlib_version=1.9 +mapping_version=1.19.3-2023.03.12-1.20 -# Almost Unified vTODO -almostunified_version=1.19.4-0.3.8 +## Mod Properties -modonomicon_mc_version=1.19.4 -modonomicon_version=1.30.1 +mod_id=occultism +mod_name=Occultism +mod_license=MIT +mod_version=1.80.1 +mod_group_id=com.klikli_dev +mod_authors=Kli Kli +mod_description=A magic mod inspired by the world of Jonathan Stroud's Bartimaeus. With the help of occult rituals players can summon entities from the "Other Side" to perform magic. -theurgy_mc_version=1.19.4 -theurgy_version=1.3.0 \ No newline at end of file +## Dependency Properties +jei_version=14.0.0.4 +jei_version_range=[14.0.0.4,) +curios_version=5.2.0-beta.2 +curios_version_range=[5.2.0-beta.1,) +geckolib_version=4.2 +geckolib_version_range=[4.2,) +smartbrainlib_version=1.11 +smartbrainlib_version_range=[1.11,) +almostunified_version=XYZ +almostunified_version_range=[0,) +modonomicon_version=1.32.2 +modonomicon_version_range=[1.32.2,) +theurgy_version=1.3.5 +theurgy_version_range=[1.3.5,) +per_viam_invenire_version_range=[0.1.57,) \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832f..943f0cbfa 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 574724f44..37aef8d3f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,9 +1,6 @@ -# SPDX-FileCopyrightText: 2022 klikli-dev -# -# SPDX-License-Identifier: MIT - distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 053450811..ad9053e30 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,4 +12,8 @@ pluginManagement { url = 'https://maven.parchmentmc.org' } } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/empty.json b/src/generated/resources/data/minecraft/loot_tables/empty.json index 42fa5befa..29f1f28ba 100644 --- a/src/generated/resources/data/minecraft/loot_tables/empty.json +++ b/src/generated/resources/data/minecraft/loot_tables/empty.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "minecraft:empty" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_dimensional_matrix.json b/src/generated/resources/data/occultism/advancements/occultism/craft_dimensional_matrix.json index 6eb8d4bf0..9ab56c538 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_dimensional_matrix.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_dimensional_matrix.json @@ -29,5 +29,6 @@ [ "craft_dimensional_matrix" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_dimensional_mineshaft.json b/src/generated/resources/data/occultism/advancements/occultism/craft_dimensional_mineshaft.json index 361dfe973..f4cfa4750 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_dimensional_mineshaft.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_dimensional_mineshaft.json @@ -29,5 +29,6 @@ [ "craft_dimensional_mineshaft" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_familiar_ring.json b/src/generated/resources/data/occultism/advancements/occultism/craft_familiar_ring.json index a676664af..b60050ded 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_familiar_ring.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_familiar_ring.json @@ -29,5 +29,6 @@ [ "craft_familiar_ring" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_infused_lenses.json b/src/generated/resources/data/occultism/advancements/occultism/craft_infused_lenses.json index 3c23b9cc3..0201d6626 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_infused_lenses.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_infused_lenses.json @@ -29,5 +29,6 @@ [ "craft_infused_lenses" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_infused_pickaxe.json b/src/generated/resources/data/occultism/advancements/occultism/craft_infused_pickaxe.json index 846eadaa2..9f723b1d6 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_infused_pickaxe.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_infused_pickaxe.json @@ -29,5 +29,6 @@ [ "craft_infused_pickaxe" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_miner_afrit_deeps.json b/src/generated/resources/data/occultism/advancements/occultism/craft_miner_afrit_deeps.json index a498ab915..afe4c5142 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_miner_afrit_deeps.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_miner_afrit_deeps.json @@ -29,5 +29,6 @@ [ "craft_miner_afrit_deeps" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_miner_djinni_ores.json b/src/generated/resources/data/occultism/advancements/occultism/craft_miner_djinni_ores.json index 5fac4d0c8..a3d0b39a9 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_miner_djinni_ores.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_miner_djinni_ores.json @@ -29,5 +29,6 @@ [ "craft_miner_djinni_ores" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_miner_foliot_unspecialized.json b/src/generated/resources/data/occultism/advancements/occultism/craft_miner_foliot_unspecialized.json index 3379b760a..2337946a4 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_miner_foliot_unspecialized.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_miner_foliot_unspecialized.json @@ -29,5 +29,6 @@ [ "craft_miner_foliot_unspecialized" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_miner_marid_master.json b/src/generated/resources/data/occultism/advancements/occultism/craft_miner_marid_master.json index ec7e641e4..fbaee0adf 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_miner_marid_master.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_miner_marid_master.json @@ -29,5 +29,6 @@ [ "craft_miner_marid_master" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_satchel.json b/src/generated/resources/data/occultism/advancements/occultism/craft_satchel.json index ebb41aff6..1f2715a22 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_satchel.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_satchel.json @@ -29,5 +29,6 @@ [ "craft_satchel" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_soul_gem.json b/src/generated/resources/data/occultism/advancements/occultism/craft_soul_gem.json index 6bf414d12..80876a9e8 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_soul_gem.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_soul_gem.json @@ -29,5 +29,6 @@ [ "craft_soul_gem" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_stabilizer_tier1.json b/src/generated/resources/data/occultism/advancements/occultism/craft_stabilizer_tier1.json index f5042c4e2..a89de6c2c 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_stabilizer_tier1.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_stabilizer_tier1.json @@ -29,5 +29,6 @@ [ "craft_stabilizer_tier1" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_stabilizer_tier2.json b/src/generated/resources/data/occultism/advancements/occultism/craft_stabilizer_tier2.json index af652ab3c..593a2a996 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_stabilizer_tier2.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_stabilizer_tier2.json @@ -29,5 +29,6 @@ [ "craft_stabilizer_tier2" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_stabilizer_tier3.json b/src/generated/resources/data/occultism/advancements/occultism/craft_stabilizer_tier3.json index 0d2fc3dcd..62a781e00 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_stabilizer_tier3.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_stabilizer_tier3.json @@ -29,5 +29,6 @@ [ "craft_stabilizer_tier3" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_stabilizer_tier4.json b/src/generated/resources/data/occultism/advancements/occultism/craft_stabilizer_tier4.json index 169745bb4..d4622b1cf 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_stabilizer_tier4.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_stabilizer_tier4.json @@ -29,5 +29,6 @@ [ "craft_stabilizer_tier4" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_stable_wormhole.json b/src/generated/resources/data/occultism/advancements/occultism/craft_stable_wormhole.json index e67d0e220..e7b17a255 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_stable_wormhole.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_stable_wormhole.json @@ -29,5 +29,6 @@ [ "craft_stable_wormhole" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_storage_controller_base.json b/src/generated/resources/data/occultism/advancements/occultism/craft_storage_controller_base.json index de0378f22..3ed4ff75d 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_storage_controller_base.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_storage_controller_base.json @@ -29,5 +29,6 @@ [ "craft_storage_controller_base" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/craft_storage_remote.json b/src/generated/resources/data/occultism/advancements/occultism/craft_storage_remote.json index e44fc612b..1cfeccfb1 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/craft_storage_remote.json +++ b/src/generated/resources/data/occultism/advancements/occultism/craft_storage_remote.json @@ -29,5 +29,6 @@ [ "craft_storage_remote" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/bat.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/bat.json index 247393ad7..06d462ee9 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/bat.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/bat.json @@ -28,5 +28,6 @@ [ "bat_eat" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/beaver_woodchop.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/beaver_woodchop.json index d11a7e313..a387f2af7 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/beaver_woodchop.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/beaver_woodchop.json @@ -28,5 +28,6 @@ [ "beaver_woodchop" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/beholder_eat.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/beholder_eat.json index 04fe5e13d..74f3762ae 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/beholder_eat.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/beholder_eat.json @@ -27,5 +27,6 @@ [ "beholder_eat" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/beholder_ray.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/beholder_ray.json index 9db8e52bc..d1084133d 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/beholder_ray.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/beholder_ray.json @@ -28,5 +28,6 @@ [ "beholder_ray" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/blacksmith_upgrade.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/blacksmith_upgrade.json index 855d9dea4..e5695edfb 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/blacksmith_upgrade.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/blacksmith_upgrade.json @@ -28,5 +28,6 @@ [ "blacksmith_upgrade" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/capture.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/capture.json index 74dace6e2..06203ff44 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/capture.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/capture.json @@ -27,5 +27,6 @@ [ "capture" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/chimera_ride.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/chimera_ride.json index 503849fcc..f06c4940c 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/chimera_ride.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/chimera_ride.json @@ -28,5 +28,6 @@ [ "chimera_ride" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/cthulhu.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/cthulhu.json index 145a0af5b..fc0c05a7d 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/cthulhu.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/cthulhu.json @@ -28,5 +28,6 @@ [ "cthulhu_sad" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/deer.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/deer.json index 171e17dab..bc8424689 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/deer.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/deer.json @@ -28,5 +28,6 @@ [ "deer_poop" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/devil.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/devil.json index f3b5449e0..d234b0f1b 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/devil.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/devil.json @@ -28,5 +28,6 @@ [ "devil_fire" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/dragon_nugget.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/dragon_nugget.json index 417bd22ed..124f157e8 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/dragon_nugget.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/dragon_nugget.json @@ -27,5 +27,6 @@ [ "dragon_nugget" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/dragon_ride.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/dragon_ride.json index 007d83376..2265413f1 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/dragon_ride.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/dragon_ride.json @@ -28,5 +28,6 @@ [ "dragon_ride" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/fairy_save.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/fairy_save.json index b0564d9de..44b747ded 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/fairy_save.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/fairy_save.json @@ -28,5 +28,6 @@ [ "fairy_save" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/goat_detach.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/goat_detach.json index a8fe178ea..b4a01130e 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/goat_detach.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/goat_detach.json @@ -27,5 +27,6 @@ [ "goat_detach" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/greedy.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/greedy.json index 49ce6212b..0b3d7208a 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/greedy.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/greedy.json @@ -28,5 +28,6 @@ [ "greedy_item" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/guardian_ultimate_sacrifice.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/guardian_ultimate_sacrifice.json index 41810ec28..aca33092e 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/guardian_ultimate_sacrifice.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/guardian_ultimate_sacrifice.json @@ -28,5 +28,6 @@ [ "guardian_ultimate_sacrifice" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/headless_cthulhu_head.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/headless_cthulhu_head.json index a00f79095..e3be4edc2 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/headless_cthulhu_head.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/headless_cthulhu_head.json @@ -28,5 +28,6 @@ [ "headless_cthulhu_head" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/headless_rebuilt.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/headless_rebuilt.json index 0e85007da..beefea2b5 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/headless_rebuilt.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/headless_rebuilt.json @@ -27,5 +27,6 @@ [ "headless_rebuilt" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/mans_best_friend.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/mans_best_friend.json index d02a5fbce..5b0f1523b 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/mans_best_friend.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/mans_best_friend.json @@ -36,5 +36,6 @@ [ "dragon_fetch" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/mummy_dodge.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/mummy_dodge.json index 14ee32782..1c7fed933 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/mummy_dodge.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/mummy_dodge.json @@ -28,5 +28,6 @@ [ "mummy_dodge" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/party.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/party.json index 908252f21..aed39dce0 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/party.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/party.json @@ -27,5 +27,6 @@ [ "party" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/rare.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/rare.json index 557f9b5f3..597804b9a 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/rare.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/rare.json @@ -28,5 +28,6 @@ [ "rare_variant" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/root.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/root.json index 076d295b4..a67a0648f 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/root.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/root.json @@ -29,5 +29,6 @@ [ "summon_familiar" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/shub_cthulhu_friends.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/shub_cthulhu_friends.json index 561308260..c988768d4 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/shub_cthulhu_friends.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/shub_cthulhu_friends.json @@ -27,5 +27,6 @@ [ "shub_cthulhu_friends" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/shub_niggurath_spawn.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/shub_niggurath_spawn.json index 681d91279..8df23eaeb 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/shub_niggurath_spawn.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/shub_niggurath_spawn.json @@ -28,5 +28,6 @@ [ "shub_niggurath_spawn" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar/shub_niggurath_summon.json b/src/generated/resources/data/occultism/advancements/occultism/familiar/shub_niggurath_summon.json index 49b701dbc..8c80d33f2 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar/shub_niggurath_summon.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar/shub_niggurath_summon.json @@ -28,5 +28,6 @@ [ "shub_niggurath_summon" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar_bat.json b/src/generated/resources/data/occultism/advancements/occultism/familiar_bat.json index 0013519b5..8ea888697 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar_bat.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar_bat.json @@ -29,5 +29,6 @@ [ "familiar_bat" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar_beaver.json b/src/generated/resources/data/occultism/advancements/occultism/familiar_beaver.json index d9bf1a1fb..e182aa198 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar_beaver.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar_beaver.json @@ -29,5 +29,6 @@ [ "familiar_beaver" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar_beholder.json b/src/generated/resources/data/occultism/advancements/occultism/familiar_beholder.json index adcce130c..7f8ee6876 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar_beholder.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar_beholder.json @@ -29,5 +29,6 @@ [ "familiar_beholder" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar_blacksmith.json b/src/generated/resources/data/occultism/advancements/occultism/familiar_blacksmith.json index 4b5e40c79..357e9858a 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar_blacksmith.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar_blacksmith.json @@ -29,5 +29,6 @@ [ "familiar_blacksmith" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar_chimera.json b/src/generated/resources/data/occultism/advancements/occultism/familiar_chimera.json index 4cae1106f..1237708ed 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar_chimera.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar_chimera.json @@ -29,5 +29,6 @@ [ "familiar_chimera" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar_cthulhu.json b/src/generated/resources/data/occultism/advancements/occultism/familiar_cthulhu.json index 2af3b4657..482d42922 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar_cthulhu.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar_cthulhu.json @@ -29,5 +29,6 @@ [ "familiar_cthulhu" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar_deer.json b/src/generated/resources/data/occultism/advancements/occultism/familiar_deer.json index ddb7412ce..c7cf6cb01 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar_deer.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar_deer.json @@ -29,5 +29,6 @@ [ "familiar_deer" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar_devil.json b/src/generated/resources/data/occultism/advancements/occultism/familiar_devil.json index cfbd5f0f0..a5fda6a2b 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar_devil.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar_devil.json @@ -29,5 +29,6 @@ [ "familiar_devil" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar_dragon.json b/src/generated/resources/data/occultism/advancements/occultism/familiar_dragon.json index f78c7fbaa..97c271af1 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar_dragon.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar_dragon.json @@ -29,5 +29,6 @@ [ "familiar_dragon" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar_fairy.json b/src/generated/resources/data/occultism/advancements/occultism/familiar_fairy.json index d5aaa28d9..e6ed0bb01 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar_fairy.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar_fairy.json @@ -29,5 +29,6 @@ [ "familiar_fairy" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar_greedy.json b/src/generated/resources/data/occultism/advancements/occultism/familiar_greedy.json index f826171be..89058b98a 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar_greedy.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar_greedy.json @@ -29,5 +29,6 @@ [ "familiar_greedy" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar_guardian.json b/src/generated/resources/data/occultism/advancements/occultism/familiar_guardian.json index a4a7cfda1..37403bae3 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar_guardian.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar_guardian.json @@ -29,5 +29,6 @@ [ "familiar_guardian" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar_headless.json b/src/generated/resources/data/occultism/advancements/occultism/familiar_headless.json index 0bd71ce8c..308212a3b 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar_headless.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar_headless.json @@ -29,5 +29,6 @@ [ "familiar_headless" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar_mummy.json b/src/generated/resources/data/occultism/advancements/occultism/familiar_mummy.json index 68b45b465..7f838d21a 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar_mummy.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar_mummy.json @@ -29,5 +29,6 @@ [ "familiar_mummy" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar_otherworld_bird.json b/src/generated/resources/data/occultism/advancements/occultism/familiar_otherworld_bird.json index ce584c1b0..1e4253753 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar_otherworld_bird.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar_otherworld_bird.json @@ -29,5 +29,6 @@ [ "familiar_otherworld_bird" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/familiar_parrot.json b/src/generated/resources/data/occultism/advancements/occultism/familiar_parrot.json index 1c38f34ac..82161157d 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/familiar_parrot.json +++ b/src/generated/resources/data/occultism/advancements/occultism/familiar_parrot.json @@ -29,5 +29,6 @@ [ "familiar_parrot" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/possess_enderman.json b/src/generated/resources/data/occultism/advancements/occultism/possess_enderman.json index a0ddfd390..f8952bb1f 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/possess_enderman.json +++ b/src/generated/resources/data/occultism/advancements/occultism/possess_enderman.json @@ -29,5 +29,6 @@ [ "possess_enderman" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/possess_endermite.json b/src/generated/resources/data/occultism/advancements/occultism/possess_endermite.json index 749ec10ae..720c437b8 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/possess_endermite.json +++ b/src/generated/resources/data/occultism/advancements/occultism/possess_endermite.json @@ -29,5 +29,6 @@ [ "possess_endermite" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/possess_ghast.json b/src/generated/resources/data/occultism/advancements/occultism/possess_ghast.json index ae58537a3..7309b91f9 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/possess_ghast.json +++ b/src/generated/resources/data/occultism/advancements/occultism/possess_ghast.json @@ -29,5 +29,6 @@ [ "possess_ghast" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/possess_skeleton.json b/src/generated/resources/data/occultism/advancements/occultism/possess_skeleton.json index 802350335..da6c1eade 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/possess_skeleton.json +++ b/src/generated/resources/data/occultism/advancements/occultism/possess_skeleton.json @@ -29,5 +29,6 @@ [ "possess_skeleton" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/root.json b/src/generated/resources/data/occultism/advancements/occultism/root.json index d8f4b2780..81741bffc 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/root.json +++ b/src/generated/resources/data/occultism/advancements/occultism/root.json @@ -9,5 +9,6 @@ [ "occultism_present" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_afrit_crusher.json b/src/generated/resources/data/occultism/advancements/occultism/summon_afrit_crusher.json index ff152d5b9..cd28c16b0 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_afrit_crusher.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_afrit_crusher.json @@ -29,5 +29,6 @@ [ "summon_afrit_crusher" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_afrit_rain_weather.json b/src/generated/resources/data/occultism/advancements/occultism/summon_afrit_rain_weather.json index 912417718..4bed2f92a 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_afrit_rain_weather.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_afrit_rain_weather.json @@ -29,5 +29,6 @@ [ "summon_afrit_rain_weather" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_afrit_thunder_weather.json b/src/generated/resources/data/occultism/advancements/occultism/summon_afrit_thunder_weather.json index 0821cc356..964d02d86 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_afrit_thunder_weather.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_afrit_thunder_weather.json @@ -29,5 +29,6 @@ [ "summon_afrit_thunder_weather" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_clear_weather.json b/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_clear_weather.json index 7318570b2..349e30210 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_clear_weather.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_clear_weather.json @@ -29,5 +29,6 @@ [ "summon_djinni_clear_weather" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_crusher.json b/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_crusher.json index 51b666c2b..145107266 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_crusher.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_crusher.json @@ -29,5 +29,6 @@ [ "summon_djinni_crusher" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_day_time.json b/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_day_time.json index 944eb33ab..77430be62 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_day_time.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_day_time.json @@ -29,5 +29,6 @@ [ "summon_djinni_day_time" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_manage_machine.json b/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_manage_machine.json index 0ab156699..ecebbb14a 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_manage_machine.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_manage_machine.json @@ -29,5 +29,6 @@ [ "summon_djinni_manage_machine" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_night_time.json b/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_night_time.json index d0756a8a8..eec69c0e5 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_night_time.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_djinni_night_time.json @@ -29,5 +29,6 @@ [ "summon_djinni_night_time" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_cleaner.json b/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_cleaner.json index e6d3b2822..fece21c39 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_cleaner.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_cleaner.json @@ -29,5 +29,6 @@ [ "summon_foliot_cleaner" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_crusher.json b/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_crusher.json index 6606a0e64..59e5f9744 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_crusher.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_crusher.json @@ -29,5 +29,6 @@ [ "summon_foliot_crusher" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_lumberjack.json b/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_lumberjack.json index 8da25177b..ef71d54b7 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_lumberjack.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_lumberjack.json @@ -29,5 +29,6 @@ [ "summon_foliot_lumberjack" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_otherstone_trader.json b/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_otherstone_trader.json index 8fad1ee1c..493b210b6 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_otherstone_trader.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_otherstone_trader.json @@ -29,5 +29,6 @@ [ "summon_foliot_otherstone_trader" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_sapling_trader.json b/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_sapling_trader.json index 7e9d9b1ea..d86bc6889 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_sapling_trader.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_sapling_trader.json @@ -29,5 +29,6 @@ [ "summon_foliot_sapling_trader" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_transport_items.json b/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_transport_items.json index fdb882dc5..ca87a02c3 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_transport_items.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_foliot_transport_items.json @@ -29,5 +29,6 @@ [ "summon_foliot_transport_items" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_marid_crusher.json b/src/generated/resources/data/occultism/advancements/occultism/summon_marid_crusher.json index 19e23372e..33d2f9eef 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_marid_crusher.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_marid_crusher.json @@ -29,5 +29,6 @@ [ "summon_marid_crusher" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_wild_afrit.json b/src/generated/resources/data/occultism/advancements/occultism/summon_wild_afrit.json index c4263b66a..2b673b7d9 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_wild_afrit.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_wild_afrit.json @@ -29,5 +29,6 @@ [ "summon_wild_afrit" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/advancements/occultism/summon_wild_hunt.json b/src/generated/resources/data/occultism/advancements/occultism/summon_wild_hunt.json index b34216873..fa05d49d9 100644 --- a/src/generated/resources/data/occultism/advancements/occultism/summon_wild_hunt.json +++ b/src/generated/resources/data/occultism/advancements/occultism/summon_wild_hunt.json @@ -29,5 +29,6 @@ [ "summon_wild_hunt" ] - ] + ], + "sends_telemetry_event": true } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/candle_white.json b/src/generated/resources/data/occultism/loot_tables/blocks/candle_white.json index 84c923c67..6535f2a9d 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/candle_white.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/candle_white.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/candle_white" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/chalk_glyph_gold.json b/src/generated/resources/data/occultism/loot_tables/blocks/chalk_glyph_gold.json index cd7e5e358..376a7a457 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/chalk_glyph_gold.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/chalk_glyph_gold.json @@ -6,5 +6,6 @@ "entries": [], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/chalk_glyph_gold" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/chalk_glyph_purple.json b/src/generated/resources/data/occultism/loot_tables/blocks/chalk_glyph_purple.json index cd7e5e358..74ee1a25d 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/chalk_glyph_purple.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/chalk_glyph_purple.json @@ -6,5 +6,6 @@ "entries": [], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/chalk_glyph_purple" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/chalk_glyph_red.json b/src/generated/resources/data/occultism/loot_tables/blocks/chalk_glyph_red.json index cd7e5e358..bf6ff7fc4 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/chalk_glyph_red.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/chalk_glyph_red.json @@ -6,5 +6,6 @@ "entries": [], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/chalk_glyph_red" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/chalk_glyph_white.json b/src/generated/resources/data/occultism/loot_tables/blocks/chalk_glyph_white.json index cd7e5e358..72b6c6c50 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/chalk_glyph_white.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/chalk_glyph_white.json @@ -6,5 +6,6 @@ "entries": [], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/chalk_glyph_white" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/datura.json b/src/generated/resources/data/occultism/loot_tables/blocks/datura.json index 89a495f27..19881c974 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/datura.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/datura.json @@ -64,5 +64,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/datura" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/dimensional_mineshaft.json b/src/generated/resources/data/occultism/loot_tables/blocks/dimensional_mineshaft.json index fb98035ba..7c2d954c8 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/dimensional_mineshaft.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/dimensional_mineshaft.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/dimensional_mineshaft" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/golden_sacrificial_bowl.json b/src/generated/resources/data/occultism/loot_tables/blocks/golden_sacrificial_bowl.json index 8dd11d7c9..1221d4820 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/golden_sacrificial_bowl.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/golden_sacrificial_bowl.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/golden_sacrificial_bowl" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/iesnium_block.json b/src/generated/resources/data/occultism/loot_tables/blocks/iesnium_block.json index 9c0b5f0b5..784d5f5f3 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/iesnium_block.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/iesnium_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/iesnium_block" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/iesnium_ore.json b/src/generated/resources/data/occultism/loot_tables/blocks/iesnium_ore.json index 66b39c6a3..6bf78345b 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/iesnium_ore.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/iesnium_ore.json @@ -45,5 +45,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/iesnium_ore" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/iesnium_ore_natural.json b/src/generated/resources/data/occultism/loot_tables/blocks/iesnium_ore_natural.json index a7fa8a189..7582c1bb9 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/iesnium_ore_natural.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/iesnium_ore_natural.json @@ -29,5 +29,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/iesnium_ore_natural" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/otherstone.json b/src/generated/resources/data/occultism/loot_tables/blocks/otherstone.json index b1a0ac00b..f7c3f8c48 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/otherstone.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/otherstone.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/otherstone" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/otherstone_natural.json b/src/generated/resources/data/occultism/loot_tables/blocks/otherstone_natural.json index 03129162c..2581ebabb 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/otherstone_natural.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/otherstone_natural.json @@ -29,5 +29,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/otherstone_natural" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/otherstone_pedestal.json b/src/generated/resources/data/occultism/loot_tables/blocks/otherstone_pedestal.json index 2edf757db..05798dff9 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/otherstone_pedestal.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/otherstone_pedestal.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/otherstone_pedestal" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/otherstone_slab.json b/src/generated/resources/data/occultism/loot_tables/blocks/otherstone_slab.json index 5e7f005be..c43cd46fb 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/otherstone_slab.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/otherstone_slab.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/otherstone_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_leaves.json b/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_leaves.json index 1995e5223..ae62cdf13 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_leaves.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_leaves.json @@ -11,7 +11,7 @@ "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:match_tool", @@ -69,7 +69,7 @@ { "condition": "minecraft:inverted", "term": { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:match_tool", @@ -131,5 +131,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/otherworld_leaves" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_leaves_natural.json b/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_leaves_natural.json index b921da075..4609d5387 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_leaves_natural.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_leaves_natural.json @@ -11,7 +11,7 @@ "type": "minecraft:item", "conditions": [ { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:match_tool", @@ -87,7 +87,7 @@ { "condition": "minecraft:inverted", "term": { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:match_tool", @@ -149,5 +149,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/otherworld_leaves_natural" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_log.json b/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_log.json index e9fad1b6b..488f29802 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_log.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_log.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/otherworld_log" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_log_natural.json b/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_log_natural.json index 684074f3b..ff396d2d2 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_log_natural.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_log_natural.json @@ -29,5 +29,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/otherworld_log_natural" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_sapling.json b/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_sapling.json index 06541725d..c34b8713e 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_sapling.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_sapling.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/otherworld_sapling" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_sapling_natural.json b/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_sapling_natural.json index d9634f26a..bb2400fb7 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_sapling_natural.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/otherworld_sapling_natural.json @@ -29,5 +29,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/otherworld_sapling_natural" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/sacrificial_bowl.json b/src/generated/resources/data/occultism/loot_tables/blocks/sacrificial_bowl.json index 896ff6455..cd67a73f0 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/sacrificial_bowl.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/sacrificial_bowl.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/sacrificial_bowl" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/silver_block.json b/src/generated/resources/data/occultism/loot_tables/blocks/silver_block.json index b3b720e8d..3f3f4f7d3 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/silver_block.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/silver_block.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/silver_block" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/silver_ore.json b/src/generated/resources/data/occultism/loot_tables/blocks/silver_ore.json index 702f3056a..0e86cbf44 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/silver_ore.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/silver_ore.json @@ -45,5 +45,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/silver_ore" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/silver_ore_deepslate.json b/src/generated/resources/data/occultism/loot_tables/blocks/silver_ore_deepslate.json index 879241fe6..c0bf5f9e8 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/silver_ore_deepslate.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/silver_ore_deepslate.json @@ -45,5 +45,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/silver_ore_deepslate" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/skeleton_skull_dummy.json b/src/generated/resources/data/occultism/loot_tables/blocks/skeleton_skull_dummy.json index 38fe9914a..b28fa92e3 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/skeleton_skull_dummy.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/skeleton_skull_dummy.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/skeleton_skull_dummy" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/spirit_attuned_crystal.json b/src/generated/resources/data/occultism/loot_tables/blocks/spirit_attuned_crystal.json index cb37d9e3b..5a06873d7 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/spirit_attuned_crystal.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/spirit_attuned_crystal.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/spirit_attuned_crystal" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/spirit_campfire.json b/src/generated/resources/data/occultism/loot_tables/blocks/spirit_campfire.json index ac0e024f3..13624172f 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/spirit_campfire.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/spirit_campfire.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/spirit_campfire" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/spirit_fire.json b/src/generated/resources/data/occultism/loot_tables/blocks/spirit_fire.json index cd7e5e358..051d83e8b 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/spirit_fire.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/spirit_fire.json @@ -6,5 +6,6 @@ "entries": [], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/spirit_fire" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/spirit_lantern.json b/src/generated/resources/data/occultism/loot_tables/blocks/spirit_lantern.json index fdce63b5a..116092046 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/spirit_lantern.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/spirit_lantern.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/spirit_lantern" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/spirit_torch.json b/src/generated/resources/data/occultism/loot_tables/blocks/spirit_torch.json index 4e16ffd55..f7b3526d8 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/spirit_torch.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/spirit_torch.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/spirit_torch" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/stable_wormhole.json b/src/generated/resources/data/occultism/loot_tables/blocks/stable_wormhole.json index cd7e5e358..053cdf6c7 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/stable_wormhole.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/stable_wormhole.json @@ -6,5 +6,6 @@ "entries": [], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/stable_wormhole" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/storage_controller.json b/src/generated/resources/data/occultism/loot_tables/blocks/storage_controller.json index cd7e5e358..0fe26da76 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/storage_controller.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/storage_controller.json @@ -6,5 +6,6 @@ "entries": [], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/storage_controller" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/storage_controller_base.json b/src/generated/resources/data/occultism/loot_tables/blocks/storage_controller_base.json index 4cf516a65..bbee316a6 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/storage_controller_base.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/storage_controller_base.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/storage_controller_base" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/storage_stabilizer_tier1.json b/src/generated/resources/data/occultism/loot_tables/blocks/storage_stabilizer_tier1.json index cacee0cfc..ac489eba7 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/storage_stabilizer_tier1.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/storage_stabilizer_tier1.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/storage_stabilizer_tier1" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/storage_stabilizer_tier2.json b/src/generated/resources/data/occultism/loot_tables/blocks/storage_stabilizer_tier2.json index 8070bf54e..422320963 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/storage_stabilizer_tier2.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/storage_stabilizer_tier2.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/storage_stabilizer_tier2" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/storage_stabilizer_tier3.json b/src/generated/resources/data/occultism/loot_tables/blocks/storage_stabilizer_tier3.json index f0e01014a..03a0df0cd 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/storage_stabilizer_tier3.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/storage_stabilizer_tier3.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/storage_stabilizer_tier3" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/storage_stabilizer_tier4.json b/src/generated/resources/data/occultism/loot_tables/blocks/storage_stabilizer_tier4.json index d4297e242..36ae4ca8f 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/storage_stabilizer_tier4.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/storage_stabilizer_tier4.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/storage_stabilizer_tier4" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/blocks/wither_skeleton_skull_dummy.json b/src/generated/resources/data/occultism/loot_tables/blocks/wither_skeleton_skull_dummy.json index 38fe9914a..7bc50421f 100644 --- a/src/generated/resources/data/occultism/loot_tables/blocks/wither_skeleton_skull_dummy.json +++ b/src/generated/resources/data/occultism/loot_tables/blocks/wither_skeleton_skull_dummy.json @@ -16,5 +16,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:blocks/wither_skeleton_skull_dummy" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/entities/afrit_wild.json b/src/generated/resources/data/occultism/loot_tables/entities/afrit_wild.json index 458b6905e..53228c7e6 100644 --- a/src/generated/resources/data/occultism/loot_tables/entities/afrit_wild.json +++ b/src/generated/resources/data/occultism/loot_tables/entities/afrit_wild.json @@ -30,5 +30,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:entities/afrit_wild" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/entities/possessed_enderman.json b/src/generated/resources/data/occultism/loot_tables/entities/possessed_enderman.json index 590b3e45e..13afefc06 100644 --- a/src/generated/resources/data/occultism/loot_tables/entities/possessed_enderman.json +++ b/src/generated/resources/data/occultism/loot_tables/entities/possessed_enderman.json @@ -30,5 +30,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:entities/possessed_enderman" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/entities/possessed_endermite.json b/src/generated/resources/data/occultism/loot_tables/entities/possessed_endermite.json index 0107659e6..04963e2de 100644 --- a/src/generated/resources/data/occultism/loot_tables/entities/possessed_endermite.json +++ b/src/generated/resources/data/occultism/loot_tables/entities/possessed_endermite.json @@ -30,5 +30,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:entities/possessed_endermite" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/entities/possessed_skeleton.json b/src/generated/resources/data/occultism/loot_tables/entities/possessed_skeleton.json index 76cd7b2d7..f1a7b3d20 100644 --- a/src/generated/resources/data/occultism/loot_tables/entities/possessed_skeleton.json +++ b/src/generated/resources/data/occultism/loot_tables/entities/possessed_skeleton.json @@ -88,5 +88,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:entities/possessed_skeleton" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/entities/wild_hunt_skeleton.json b/src/generated/resources/data/occultism/loot_tables/entities/wild_hunt_skeleton.json index e46b81d46..58f9f9c84 100644 --- a/src/generated/resources/data/occultism/loot_tables/entities/wild_hunt_skeleton.json +++ b/src/generated/resources/data/occultism/loot_tables/entities/wild_hunt_skeleton.json @@ -59,5 +59,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:entities/wild_hunt_skeleton" } \ No newline at end of file diff --git a/src/generated/resources/data/occultism/loot_tables/entities/wild_hunt_wither_skeleton.json b/src/generated/resources/data/occultism/loot_tables/entities/wild_hunt_wither_skeleton.json index b759d9d9b..422bc762c 100644 --- a/src/generated/resources/data/occultism/loot_tables/entities/wild_hunt_wither_skeleton.json +++ b/src/generated/resources/data/occultism/loot_tables/entities/wild_hunt_wither_skeleton.json @@ -93,5 +93,6 @@ ], "rolls": 1.0 } - ] + ], + "random_sequence": "occultism:entities/wild_hunt_wither_skeleton" } \ No newline at end of file diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePageRenderer.java b/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePageRenderer.java deleted file mode 100644 index 5f5b163e2..000000000 --- a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePageRenderer.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2022 klikli-dev - * - * SPDX-License-Identifier: MIT - */ - -package com.github.klikli_dev.occultism.integration.modonomicon.pages; - -import com.klikli_dev.modonomicon.book.page.BookProcessingRecipePage; -import com.klikli_dev.modonomicon.client.gui.book.BookContentScreen; -import com.klikli_dev.modonomicon.client.render.page.BookRecipePageRenderer; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.gui.GuiComponent; -import net.minecraft.world.item.crafting.Recipe; - -public abstract class BookSpiritFireRecipePageRenderer> extends BookRecipePageRenderer> { - public BookSpiritFireRecipePageRenderer(BookProcessingRecipePage page) { - super(page); - } - - @Override - protected int getRecipeHeight() { - return 45; - } - - @Override - protected void drawRecipe(PoseStack poseStack, T recipe, int recipeX, int recipeY, int mouseX, int mouseY, boolean second) { - - recipeY += 10; - - - if(!second){ - if (!this.page.getTitle1().isEmpty()) { - this.renderTitle(this.page.getTitle1(), false, poseStack, BookContentScreen.PAGE_WIDTH / 2, 0); - } - } - else { - if (!this.page.getTitle2().isEmpty()) { - this.renderTitle(this.page.getTitle2(), false, poseStack, BookContentScreen.PAGE_WIDTH / 2, - recipeY - (this.page.getTitle2().getString().isEmpty() ? 10 : 0) - 10); - } - } - - RenderSystem.setShaderTexture(0, this.page.getBook().getCraftingTexture()); - RenderSystem.enableBlend(); - GuiComponent.blit(poseStack, recipeX, recipeY, 11, 71, 24, 24, 128, 256); //first box - GuiComponent.blit(poseStack, recipeX + 22, recipeY + 7, 0, 246, 18, 10, 128, 256); //"throw arrow" - GuiComponent.blit(poseStack, recipeX + 61, recipeY, 72, 71, 36, 24, 128, 256); //straight arrow and second box - - this.parentScreen.renderIngredient(poseStack, recipeX + 4, recipeY + 4, mouseX, mouseY, recipe.getIngredients().get(0)); - this.parentScreen.renderItemStack(poseStack, recipeX + 40, recipeY + 4, mouseX, mouseY, recipe.getToastSymbol()); - this.parentScreen.renderItemStack(poseStack, recipeX + 76, recipeY + 4, mouseX, mouseY, recipe.getResultItem(this.parentScreen.getMinecraft().level.registryAccess())); - } -} diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePageRenderer.java b/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePageRenderer.java deleted file mode 100644 index 6a8b046a0..000000000 --- a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePageRenderer.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2022 klikli-dev - * - * SPDX-License-Identifier: MIT - */ - -package com.github.klikli_dev.occultism.integration.modonomicon.pages; - -import com.klikli_dev.modonomicon.book.page.BookProcessingRecipePage; -import com.klikli_dev.modonomicon.client.gui.book.BookContentScreen; -import com.klikli_dev.modonomicon.client.render.page.BookRecipePageRenderer; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.gui.GuiComponent; -import net.minecraft.world.item.crafting.Recipe; - -public abstract class BookSpiritTradeRecipePageRenderer> extends BookRecipePageRenderer> { - public BookSpiritTradeRecipePageRenderer(BookProcessingRecipePage page) { - super(page); - } - - @Override - protected int getRecipeHeight() { - return 45; - } - - @Override - protected void drawRecipe(PoseStack poseStack, T recipe, int recipeX, int recipeY, int mouseX, int mouseY, boolean second) { - - recipeY += 10; - - - if (!second) { - if (!this.page.getTitle1().isEmpty()) { - this.renderTitle(this.page.getTitle1(), false, poseStack, BookContentScreen.PAGE_WIDTH / 2, 0); - } - } else { - if (!this.page.getTitle2().isEmpty()) { - this.renderTitle(this.page.getTitle2(), false, poseStack, BookContentScreen.PAGE_WIDTH / 2, - recipeY - (this.page.getTitle2().getString().isEmpty() ? 10 : 0) - 10); - } - } - - RenderSystem.setShaderTexture(0, this.page.getBook().getCraftingTexture()); - RenderSystem.enableBlend(); - GuiComponent.blit(poseStack, recipeX, recipeY, 11, 71, 24, 24, 128, 256); //first box - GuiComponent.blit(poseStack, recipeX + 22, recipeY + 7, 0, 246, 18, 10, 128, 256); //"throw arrow" - GuiComponent.blit(poseStack, recipeX + 61, recipeY, 72, 71, 36, 24, 128, 256); //straight arrow and second box - - this.parentScreen.renderIngredient(poseStack, recipeX + 4, recipeY + 4, mouseX, mouseY, recipe.getIngredients().get(0)); - this.parentScreen.renderItemStack(poseStack, recipeX + 40, recipeY + 4, mouseX, mouseY, recipe.getToastSymbol()); - this.parentScreen.renderItemStack(poseStack, recipeX + 76, recipeY + 4, mouseX, mouseY, recipe.getResultItem(this.parentScreen.getMinecraft().level.registryAccess())); - } -} diff --git a/src/main/java/com/github/klikli_dev/occultism/Occultism.java b/src/main/java/com/klikli_dev/occultism/Occultism.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/Occultism.java rename to src/main/java/com/klikli_dev/occultism/Occultism.java index 201c38bcb..0d4bf2fc3 100644 --- a/src/main/java/com/github/klikli_dev/occultism/Occultism.java +++ b/src/main/java/com/klikli_dev/occultism/Occultism.java @@ -20,23 +20,23 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism; - -import com.github.klikli_dev.occultism.client.render.SelectedBlockRenderer; -import com.github.klikli_dev.occultism.client.render.ThirdEyeEffectRenderer; -import com.github.klikli_dev.occultism.common.DebugHelper; -import com.github.klikli_dev.occultism.common.entity.familiar.*; -import com.github.klikli_dev.occultism.common.entity.possessed.PossessedEndermanEntity; -import com.github.klikli_dev.occultism.common.entity.possessed.PossessedEndermiteEntity; -import com.github.klikli_dev.occultism.common.entity.possessed.PossessedGhastEntity; -import com.github.klikli_dev.occultism.common.entity.possessed.PossessedSkeletonEntity; -import com.github.klikli_dev.occultism.common.entity.spirit.*; -import com.github.klikli_dev.occultism.config.OccultismClientConfig; -import com.github.klikli_dev.occultism.config.OccultismCommonConfig; -import com.github.klikli_dev.occultism.config.OccultismServerConfig; -import com.github.klikli_dev.occultism.integration.modonomicon.PageLoaders; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.registry.*; +package com.klikli_dev.occultism; + +import com.klikli_dev.occultism.client.render.SelectedBlockRenderer; +import com.klikli_dev.occultism.client.render.ThirdEyeEffectRenderer; +import com.klikli_dev.occultism.common.DebugHelper; +import com.klikli_dev.occultism.common.entity.familiar.*; +import com.klikli_dev.occultism.common.entity.possessed.PossessedEndermanEntity; +import com.klikli_dev.occultism.common.entity.possessed.PossessedEndermiteEntity; +import com.klikli_dev.occultism.common.entity.possessed.PossessedGhastEntity; +import com.klikli_dev.occultism.common.entity.possessed.PossessedSkeletonEntity; +import com.klikli_dev.occultism.common.entity.spirit.*; +import com.klikli_dev.occultism.config.OccultismClientConfig; +import com.klikli_dev.occultism.config.OccultismCommonConfig; +import com.klikli_dev.occultism.config.OccultismServerConfig; +import com.klikli_dev.occultism.integration.modonomicon.PageLoaders; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.registry.*; import com.mojang.logging.LogUtils; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.EntityAttributeCreationEvent; @@ -80,6 +80,7 @@ public Occultism() { OccultismRecipes.RECIPES.register(modEventBus); OccultismBlocks.BLOCKS.register(modEventBus); OccultismItems.ITEMS.register(modEventBus); + OccultismCreativeModeTabs.CREATIVE_MODE_TABS.register(modEventBus); OccultismTiles.TILES.register(modEventBus); OccultismContainers.CONTAINERS.register(modEventBus); OccultismEntities.ENTITIES.register(modEventBus); @@ -98,7 +99,6 @@ public Occultism() { OccultismAdvancements.register(); //register event buses - modEventBus.addListener(OccultismItems::onRegisterCreativeModeTabs); modEventBus.addListener(OccultismCapabilities::onRegisterCapabilities); modEventBus.addListener(this::commonSetup); modEventBus.addListener(this::onEntityAttributeCreation); diff --git a/src/main/java/com/github/klikli_dev/occultism/OccultismConstants.java b/src/main/java/com/klikli_dev/occultism/OccultismConstants.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/OccultismConstants.java rename to src/main/java/com/klikli_dev/occultism/OccultismConstants.java index 803d7f806..6d2a09f1a 100644 --- a/src/main/java/com/github/klikli_dev/occultism/OccultismConstants.java +++ b/src/main/java/com/klikli_dev/occultism/OccultismConstants.java @@ -1,4 +1,4 @@ -package com.github.klikli_dev.occultism; +package com.klikli_dev.occultism; public class OccultismConstants { public static class Nbt { diff --git a/src/main/java/com/github/klikli_dev/occultism/TranslationKeys.java b/src/main/java/com/klikli_dev/occultism/TranslationKeys.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/TranslationKeys.java rename to src/main/java/com/klikli_dev/occultism/TranslationKeys.java index 26b9d7701..e44efb3c7 100644 --- a/src/main/java/com/github/klikli_dev/occultism/TranslationKeys.java +++ b/src/main/java/com/klikli_dev/occultism/TranslationKeys.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism; +package com.klikli_dev.occultism; public class TranslationKeys { protected static final String ITEM = "item." + Occultism.MODID; diff --git a/src/main/java/com/github/klikli_dev/occultism/api/OccultismAPI.java b/src/main/java/com/klikli_dev/occultism/api/OccultismAPI.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/api/OccultismAPI.java rename to src/main/java/com/klikli_dev/occultism/api/OccultismAPI.java index ed04beac5..b62b6bcfe 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/OccultismAPI.java +++ b/src/main/java/com/klikli_dev/occultism/api/OccultismAPI.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api; +package com.klikli_dev.occultism.api; public class OccultismAPI { diff --git a/src/main/java/com/github/klikli_dev/occultism/api/client/gui/IStorageControllerGui.java b/src/main/java/com/klikli_dev/occultism/api/client/gui/IStorageControllerGui.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/api/client/gui/IStorageControllerGui.java rename to src/main/java/com/klikli_dev/occultism/api/client/gui/IStorageControllerGui.java index e77afdc55..d8980135a 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/client/gui/IStorageControllerGui.java +++ b/src/main/java/com/klikli_dev/occultism/api/client/gui/IStorageControllerGui.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.client.gui; +package com.klikli_dev.occultism.api.client.gui; -import com.github.klikli_dev.occultism.api.common.data.MachineReference; +import com.klikli_dev.occultism.api.common.data.MachineReference; import net.minecraft.world.item.ItemStack; import java.util.List; diff --git a/src/main/java/com/github/klikli_dev/occultism/api/client/gui/IStorageControllerGuiContainer.java b/src/main/java/com/klikli_dev/occultism/api/client/gui/IStorageControllerGuiContainer.java similarity index 71% rename from src/main/java/com/github/klikli_dev/occultism/api/client/gui/IStorageControllerGuiContainer.java rename to src/main/java/com/klikli_dev/occultism/api/client/gui/IStorageControllerGuiContainer.java index 6ad8d26b0..1314dbcce 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/client/gui/IStorageControllerGuiContainer.java +++ b/src/main/java/com/klikli_dev/occultism/api/client/gui/IStorageControllerGuiContainer.java @@ -20,25 +20,21 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.client.gui; +package com.klikli_dev.occultism.api.client.gui; -import com.github.klikli_dev.occultism.api.common.data.MachineReference; -import com.mojang.blaze3d.vertex.PoseStack; +import com.klikli_dev.occultism.api.common.data.MachineReference; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.world.item.ItemStack; public interface IStorageControllerGuiContainer { - //region Getter / Setter Font getFontRenderer(); - //endregion Getter / Setter - //region Methods - void drawGradientRect(PoseStack poseStack, int left, int top, int right, int bottom, int startColor, int endColor); + void drawGradientRect(GuiGraphics guiGraphics, int left, int top, int right, int bottom, int startColor, int endColor); boolean isPointInRegionController(int rectX, int rectY, int rectWidth, int rectHeight, double pointX, double pointY); - void renderToolTip(PoseStack poseStack, ItemStack stack, int x, int y); + void renderToolTip(GuiGraphics guiGraphics, ItemStack stack, int x, int y); - void renderToolTip(PoseStack poseStack, MachineReference machine, int x, int y); - //endregion Methods + void renderToolTip(GuiGraphics guiGraphics, MachineReference machine, int x, int y); } diff --git a/src/main/java/com/github/klikli_dev/occultism/api/common/blockentity/IStorageAccessor.java b/src/main/java/com/klikli_dev/occultism/api/common/blockentity/IStorageAccessor.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/api/common/blockentity/IStorageAccessor.java rename to src/main/java/com/klikli_dev/occultism/api/common/blockentity/IStorageAccessor.java index f2193897d..a0d744f28 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/common/blockentity/IStorageAccessor.java +++ b/src/main/java/com/klikli_dev/occultism/api/common/blockentity/IStorageAccessor.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.common.blockentity; +package com.klikli_dev.occultism.api.common.blockentity; -import com.github.klikli_dev.occultism.api.common.data.SortDirection; -import com.github.klikli_dev.occultism.api.common.data.SortType; +import com.klikli_dev.occultism.api.common.data.SortDirection; +import com.klikli_dev.occultism.api.common.data.SortType; import net.minecraft.world.item.ItemStack; import javax.annotation.Nonnull; diff --git a/src/main/java/com/github/klikli_dev/occultism/api/common/blockentity/IStorageController.java b/src/main/java/com/klikli_dev/occultism/api/common/blockentity/IStorageController.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/api/common/blockentity/IStorageController.java rename to src/main/java/com/klikli_dev/occultism/api/common/blockentity/IStorageController.java index bbf259c11..a92412c01 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/common/blockentity/IStorageController.java +++ b/src/main/java/com/klikli_dev/occultism/api/common/blockentity/IStorageController.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.common.blockentity; +package com.klikli_dev.occultism.api.common.blockentity; -import com.github.klikli_dev.occultism.api.common.container.IItemStackComparator; -import com.github.klikli_dev.occultism.api.common.data.GlobalBlockPos; -import com.github.klikli_dev.occultism.api.common.data.MachineReference; -import com.github.klikli_dev.occultism.network.MessageUpdateStacks; +import com.klikli_dev.occultism.api.common.container.IItemStackComparator; +import com.klikli_dev.occultism.api.common.data.GlobalBlockPos; +import com.klikli_dev.occultism.api.common.data.MachineReference; +import com.klikli_dev.occultism.network.MessageUpdateStacks; import net.minecraft.world.item.ItemStack; import java.util.List; @@ -77,8 +77,6 @@ public interface IStorageController { void setLinkedMachines(Map machines); //endregion Getter / Setter - //region Methods - /** * @param machine the machine to add */ @@ -155,5 +153,5 @@ public interface IStorageController { * Called when the contents of the storage controller change. */ void onContentsChanged(); - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/api/common/blockentity/IStorageControllerProxy.java b/src/main/java/com/klikli_dev/occultism/api/common/blockentity/IStorageControllerProxy.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/api/common/blockentity/IStorageControllerProxy.java rename to src/main/java/com/klikli_dev/occultism/api/common/blockentity/IStorageControllerProxy.java index 79ae2566c..1793a4061 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/common/blockentity/IStorageControllerProxy.java +++ b/src/main/java/com/klikli_dev/occultism/api/common/blockentity/IStorageControllerProxy.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.common.blockentity; +package com.klikli_dev.occultism.api.common.blockentity; -import com.github.klikli_dev.occultism.api.common.data.GlobalBlockPos; +import com.klikli_dev.occultism.api.common.data.GlobalBlockPos; import net.minecraftforge.common.capabilities.ICapabilityProvider; /** diff --git a/src/main/java/com/github/klikli_dev/occultism/api/common/container/IItemStackComparator.java b/src/main/java/com/klikli_dev/occultism/api/common/container/IItemStackComparator.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/api/common/container/IItemStackComparator.java rename to src/main/java/com/klikli_dev/occultism/api/common/container/IItemStackComparator.java index e352eb63a..728c47ca8 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/common/container/IItemStackComparator.java +++ b/src/main/java/com/klikli_dev/occultism/api/common/container/IItemStackComparator.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.common.container; +package com.klikli_dev.occultism.api.common.container; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; @@ -31,8 +31,6 @@ public interface IItemStackComparator extends INBTSerializable, Predicate { - //region Methods - /** * Matches the given stack with the master stack using the rules in the comparator. * @@ -46,5 +44,4 @@ default boolean test(ItemStack stack) { return this.matches(stack); } - //endregion Methods } diff --git a/src/main/java/com/github/klikli_dev/occultism/api/common/container/IStorageControllerContainer.java b/src/main/java/com/klikli_dev/occultism/api/common/container/IStorageControllerContainer.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/api/common/container/IStorageControllerContainer.java rename to src/main/java/com/klikli_dev/occultism/api/common/container/IStorageControllerContainer.java index 6f2ab8495..dadac29ea 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/common/container/IStorageControllerContainer.java +++ b/src/main/java/com/klikli_dev/occultism/api/common/container/IStorageControllerContainer.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.common.container; +package com.klikli_dev.occultism.api.common.container; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.data.GlobalBlockPos; +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.data.GlobalBlockPos; import net.minecraft.world.SimpleContainer; import net.minecraft.world.inventory.CraftingContainer; @@ -43,8 +43,6 @@ public interface IStorageControllerContainer { boolean isContainerItem(); //endregion Getter / Setter - //region Methods - /** * Updates the crafting slots. * @@ -59,5 +57,4 @@ public interface IStorageControllerContainer { */ void updateOrderSlot(boolean force); - //endregion Methods } diff --git a/src/main/java/com/github/klikli_dev/occultism/api/common/data/GlobalBlockPos.java b/src/main/java/com/klikli_dev/occultism/api/common/data/GlobalBlockPos.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/api/common/data/GlobalBlockPos.java rename to src/main/java/com/klikli_dev/occultism/api/common/data/GlobalBlockPos.java index e5dd5febf..c63c233b0 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/common/data/GlobalBlockPos.java +++ b/src/main/java/com/klikli_dev/occultism/api/common/data/GlobalBlockPos.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.common.data; +package com.klikli_dev.occultism.api.common.data; import net.minecraft.core.BlockPos; import net.minecraft.core.registries.Registries; @@ -36,12 +36,10 @@ import java.util.StringJoiner; public class GlobalBlockPos implements INBTSerializable { - //region Fields + protected BlockPos pos; protected ResourceKey dimensionKey; - //endregion Fields - //region Initialization public GlobalBlockPos() { } @@ -54,7 +52,6 @@ public GlobalBlockPos(BlockPos pos, Level level) { this.pos = pos; this.dimensionKey = level.dimension(); } - //endregion Initialization //region Static Methods public static GlobalBlockPos from(CompoundTag compound) { @@ -83,7 +80,6 @@ public BlockPos getPos() { return this.pos; } - //region Overrides @Override public int hashCode() { return Objects.hash(this.dimensionKey, this.pos); @@ -102,11 +98,10 @@ public boolean equals(Object obj) { return false; return this.dimensionKey.equals(other.dimensionKey); } - //endregion Overrides @Override public String toString() { - return new StringJoiner(", ", "[", "]").add( this.dimensionKey.registry().toString()) + return new StringJoiner(", ", "[", "]").add(this.dimensionKey.registry().toString()) .add("x=" + this.pos.getX()).add("y=" + this.pos.getY()) .add("z=" + this.pos.getZ()).toString(); } @@ -122,7 +117,6 @@ public void deserializeNBT(CompoundTag nbt) { } //endregion Static Methods - //region Methods public CompoundTag write(CompoundTag compound) { compound.putLong("pos", this.getPos().asLong()); compound.putString("dimension", this.dimensionKey.location().toString()); @@ -144,5 +138,5 @@ public void decode(FriendlyByteBuf buf) { this.pos = buf.readBlockPos(); this.dimensionKey = ResourceKey.create(Registries.DIMENSION, buf.readResourceLocation()); } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/api/common/data/MachineReference.java b/src/main/java/com/klikli_dev/occultism/api/common/data/MachineReference.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/api/common/data/MachineReference.java rename to src/main/java/com/klikli_dev/occultism/api/common/data/MachineReference.java index c55234cef..0a506e483 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/common/data/MachineReference.java +++ b/src/main/java/com/klikli_dev/occultism/api/common/data/MachineReference.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.common.data; +package com.klikli_dev.occultism.api.common.data; -import com.github.klikli_dev.occultism.util.BlockEntityUtil; +import com.klikli_dev.occultism.util.BlockEntityUtil; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/com/github/klikli_dev/occultism/api/common/data/OtherworldBlockTier.java b/src/main/java/com/klikli_dev/occultism/api/common/data/OtherworldBlockTier.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/api/common/data/OtherworldBlockTier.java rename to src/main/java/com/klikli_dev/occultism/api/common/data/OtherworldBlockTier.java index 01903b3ad..aede4b72f 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/common/data/OtherworldBlockTier.java +++ b/src/main/java/com/klikli_dev/occultism/api/common/data/OtherworldBlockTier.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.common.data; +package com.klikli_dev.occultism.api.common.data; import java.util.HashMap; import java.util.Map; @@ -30,7 +30,6 @@ public enum OtherworldBlockTier { ONE(1), TWO(2); - //region Fields private static final Map lookup = new HashMap(); static { @@ -41,12 +40,9 @@ public enum OtherworldBlockTier { private final int level; - //endregion Fields - //region Initialization OtherworldBlockTier(int level) { this.level = level; } - //endregion Initialization //region Static Methods public static OtherworldBlockTier get(int level) { diff --git a/src/main/java/com/github/klikli_dev/occultism/api/common/data/SortDirection.java b/src/main/java/com/klikli_dev/occultism/api/common/data/SortDirection.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/api/common/data/SortDirection.java rename to src/main/java/com/klikli_dev/occultism/api/common/data/SortDirection.java index 1b3fea4af..1517d584d 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/common/data/SortDirection.java +++ b/src/main/java/com/klikli_dev/occultism/api/common/data/SortDirection.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.common.data; +package com.klikli_dev.occultism.api.common.data; import net.minecraft.util.StringRepresentable; @@ -31,7 +31,6 @@ public enum SortDirection implements StringRepresentable { DOWN(0), UP(1); - //region Fields private static final Map lookup = new HashMap(); static { @@ -42,12 +41,9 @@ public enum SortDirection implements StringRepresentable { private final int value; - //endregion Fields - //region Initialization SortDirection(int value) { this.value = value; } - //endregion Initialization //region Static Methods public static SortDirection get(int value) { @@ -63,18 +59,15 @@ public int getValue() { public boolean isDown() { return this == DOWN; } - //endregion Overrides - //region Overrides @Override public String getSerializedName() { return this.name().toLowerCase(); } //endregion Static Methods - //region Methods public SortDirection next() { return values()[(this.ordinal() + 1) % SortDirection.values().length]; } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/api/common/data/SortType.java b/src/main/java/com/klikli_dev/occultism/api/common/data/SortType.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/api/common/data/SortType.java rename to src/main/java/com/klikli_dev/occultism/api/common/data/SortType.java index 0be80d0b7..876e77129 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/common/data/SortType.java +++ b/src/main/java/com/klikli_dev/occultism/api/common/data/SortType.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.common.data; +package com.klikli_dev.occultism.api.common.data; import net.minecraft.util.StringRepresentable; @@ -33,7 +33,6 @@ public enum SortType implements StringRepresentable { NAME(1), MOD(2); - //region Fields private static final Map lookup = new HashMap(); static { @@ -44,12 +43,9 @@ public enum SortType implements StringRepresentable { private final int value; - //endregion Fields - //region Initialization SortType(int value) { this.value = value; } - //endregion Initialization //region Static Methods public static SortType get(int value) { @@ -61,18 +57,15 @@ public static SortType get(int value) { public int getValue() { return this.value; } - //endregion Overrides - //region Overrides @Override public String getSerializedName() { return this.name().toLowerCase(); } //endregion Static Methods - //region Methods public SortType next() { return values()[(this.ordinal() + 1) % SortType.values().length]; } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/api/common/data/StorageControllerGuiMode.java b/src/main/java/com/klikli_dev/occultism/api/common/data/StorageControllerGuiMode.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/api/common/data/StorageControllerGuiMode.java rename to src/main/java/com/klikli_dev/occultism/api/common/data/StorageControllerGuiMode.java index a0a3085a3..f26f3341f 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/common/data/StorageControllerGuiMode.java +++ b/src/main/java/com/klikli_dev/occultism/api/common/data/StorageControllerGuiMode.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.common.data; +package com.klikli_dev.occultism.api.common.data; import net.minecraft.util.StringRepresentable; @@ -32,7 +32,6 @@ public enum StorageControllerGuiMode implements StringRepresentable { INVENTORY(0), AUTOCRAFTING(1); - //region Fields private static final Map lookup = new HashMap(); static { @@ -43,12 +42,9 @@ public enum StorageControllerGuiMode implements StringRepresentable { private final int value; - //endregion Fields - //region Initialization StorageControllerGuiMode(int value) { this.value = value; } - //endregion Initialization //region Static Methods public static StorageControllerGuiMode get(int value) { @@ -60,18 +56,15 @@ public static StorageControllerGuiMode get(int value) { public int getValue() { return this.value; } - //endregion Overrides - //region Overrides @Override public String getSerializedName() { return this.name().toLowerCase(); } //endregion Static Methods - //region Methods public StorageControllerGuiMode next() { return values()[(this.ordinal() + 1) % StorageControllerGuiMode.values().length]; } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/api/common/data/WorkAreaSize.java b/src/main/java/com/klikli_dev/occultism/api/common/data/WorkAreaSize.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/api/common/data/WorkAreaSize.java rename to src/main/java/com/klikli_dev/occultism/api/common/data/WorkAreaSize.java index e780a6d52..0caf63564 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/common/data/WorkAreaSize.java +++ b/src/main/java/com/klikli_dev/occultism/api/common/data/WorkAreaSize.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.common.data; +package com.klikli_dev.occultism.api.common.data; -import com.github.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.Occultism; import java.util.HashMap; import java.util.Map; @@ -32,7 +32,6 @@ public enum WorkAreaSize { MEDIUM(32, "medium"), LARGE(64, "large"); - //region Fields private static final Map lookup = new HashMap(); private static final String TRANSLATION_KEY_BASE = "enum." + Occultism.MODID + ".work_area_size"; @@ -44,14 +43,11 @@ public enum WorkAreaSize { private final int value; private final String translationKey; - //endregion Fields - //region Initialization WorkAreaSize(int value, String translationKey) { this.value = value; this.translationKey = TRANSLATION_KEY_BASE + "." + translationKey; } - //endregion Initialization //region Static Methods public static WorkAreaSize get(int value) { @@ -69,7 +65,6 @@ public String getDescriptionId() { } //endregion Static Methods - //region Methods public WorkAreaSize next() { return values()[(this.ordinal() + 1) % values().length]; } diff --git a/src/main/java/com/github/klikli_dev/occultism/api/common/item/IHandleItemMode.java b/src/main/java/com/klikli_dev/occultism/api/common/item/IHandleItemMode.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/api/common/item/IHandleItemMode.java rename to src/main/java/com/klikli_dev/occultism/api/common/item/IHandleItemMode.java index cbf649f27..56faa5942 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/common/item/IHandleItemMode.java +++ b/src/main/java/com/klikli_dev/occultism/api/common/item/IHandleItemMode.java @@ -20,14 +20,14 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.common.item; +package com.klikli_dev.occultism.api.common.item; import net.minecraft.world.item.ItemStack; public interface IHandleItemMode { - //region Methods + int getItemMode(ItemStack stack); void setItemMode(ItemStack stack, int mode); - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/api/common/item/IOtherworldTool.java b/src/main/java/com/klikli_dev/occultism/api/common/item/IOtherworldTool.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/api/common/item/IOtherworldTool.java rename to src/main/java/com/klikli_dev/occultism/api/common/item/IOtherworldTool.java index 4cf932c1d..f5209692c 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/common/item/IOtherworldTool.java +++ b/src/main/java/com/klikli_dev/occultism/api/common/item/IOtherworldTool.java @@ -20,13 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.common.item; +package com.klikli_dev.occultism.api.common.item; -import com.github.klikli_dev.occultism.api.common.data.OtherworldBlockTier; +import com.klikli_dev.occultism.api.common.data.OtherworldBlockTier; import net.minecraft.world.item.ItemStack; public interface IOtherworldTool { - //region Methods + OtherworldBlockTier getHarvestTier(ItemStack stack); - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/api/common/misc/IButcherKnifeLoot.java b/src/main/java/com/klikli_dev/occultism/api/common/misc/IButcherKnifeLoot.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/api/common/misc/IButcherKnifeLoot.java rename to src/main/java/com/klikli_dev/occultism/api/common/misc/IButcherKnifeLoot.java index a10a2ddea..5d97d8a19 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/common/misc/IButcherKnifeLoot.java +++ b/src/main/java/com/klikli_dev/occultism/api/common/misc/IButcherKnifeLoot.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.common.misc; +package com.klikli_dev.occultism.api.common.misc; import net.minecraft.world.entity.LivingEntity; @@ -29,7 +29,7 @@ import java.util.List; public interface IButcherKnifeLoot { - //region Methods + List getLoot(LivingEntity killedEntity, ItemStack knife, LivingEntity trueDamageSource); - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/api/common/misc/OccultismItemTier.java b/src/main/java/com/klikli_dev/occultism/api/common/misc/OccultismItemTier.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/api/common/misc/OccultismItemTier.java rename to src/main/java/com/klikli_dev/occultism/api/common/misc/OccultismItemTier.java index 4ec79441b..1a670e836 100644 --- a/src/main/java/com/github/klikli_dev/occultism/api/common/misc/OccultismItemTier.java +++ b/src/main/java/com/klikli_dev/occultism/api/common/misc/OccultismItemTier.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.api.common.misc; +package com.klikli_dev.occultism.api.common.misc; import net.minecraft.world.item.Items; @@ -35,16 +35,13 @@ public enum OccultismItemTier implements Tier { return Ingredient.of(Items.IRON_INGOT); }); - //region Fields private final int level; private final int uses; private final float speed; private final float attackDamageBonus; private final int enchantmentValue; private final Lazy repairIngredient; - //endregion Fields - //region Initialization OccultismItemTier(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, int enchantabilityIn, Supplier repairMaterialIn) { this.level = harvestLevelIn; @@ -54,9 +51,7 @@ public enum OccultismItemTier implements Tier { this.enchantmentValue = enchantabilityIn; this.repairIngredient = Lazy.of(repairMaterialIn); } - //endregion Initialization - //region Overrides @Override public int getUses() { return this.uses; @@ -87,5 +82,4 @@ public Ingredient getRepairIngredient() { return this.repairIngredient.get(); } - //endregion Overrides } \ No newline at end of file diff --git a/src/main/java/com/github/klikli_dev/occultism/client/divination/ScanManager.java b/src/main/java/com/klikli_dev/occultism/client/divination/ScanManager.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/client/divination/ScanManager.java rename to src/main/java/com/klikli_dev/occultism/client/divination/ScanManager.java index bcd38b406..20f138e35 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/divination/ScanManager.java +++ b/src/main/java/com/klikli_dev/occultism/client/divination/ScanManager.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.divination; +package com.klikli_dev.occultism.client.divination; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.integration.theurgy.TheurgyIntegration; -import com.github.klikli_dev.occultism.util.Math3DUtil; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.integration.theurgy.TheurgyIntegration; +import com.klikli_dev.occultism.util.Math3DUtil; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.Block; @@ -50,7 +50,7 @@ public void beginScan(Player player, Block target) { this.scanner = new Scanner(target); this.scanner.initialize(player, player.position(), Occultism.CLIENT_CONFIG.misc.divinationRodScanRange.get(), SCAN_DURATION_TICKS); - if(!TheurgyIntegration.isLoaded()) //only use if theurgy not used, because if it is, we use a particle effect that only goes to the closest target + if (!TheurgyIntegration.isLoaded()) //only use if theurgy not used, because if it is, we use a particle effect that only goes to the closest target this.scanner.setHighlightAllResults(Occultism.CLIENT_CONFIG.misc.divinationRodHighlightAllResults.get()); } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/divination/Scanner.java b/src/main/java/com/klikli_dev/occultism/client/divination/Scanner.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/client/divination/Scanner.java rename to src/main/java/com/klikli_dev/occultism/client/divination/Scanner.java index 4b9069eed..b3fd7dbf3 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/divination/Scanner.java +++ b/src/main/java/com/klikli_dev/occultism/client/divination/Scanner.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.divination; +package com.klikli_dev.occultism.client.divination; -import com.github.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.Occultism; import net.minecraft.core.BlockPos; import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; @@ -53,10 +53,8 @@ public class Scanner { protected int x; protected int y; protected int z; - - private int blocksPerTick; - protected boolean highlightAllResults; + private int blocksPerTick; public Scanner(Block target) { this.target = target; @@ -92,7 +90,7 @@ public void reset() { } public void scan(Consumer resultConsumer) { - Level level = this.player.level; + Level level = this.player.level(); for (int i = 0; i < this.blocksPerTick; i++) { //move to next block if (!this.nextBlock(level)) { diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/DimensionalMineshaftScreen.java b/src/main/java/com/klikli_dev/occultism/client/gui/DimensionalMineshaftScreen.java similarity index 68% rename from src/main/java/com/github/klikli_dev/occultism/client/gui/DimensionalMineshaftScreen.java rename to src/main/java/com/klikli_dev/occultism/client/gui/DimensionalMineshaftScreen.java index 9365596a3..2e2fb52dd 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/gui/DimensionalMineshaftScreen.java +++ b/src/main/java/com/klikli_dev/occultism/client/gui/DimensionalMineshaftScreen.java @@ -20,13 +20,14 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.gui; +package com.klikli_dev.occultism.client.gui; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.blockentity.DimensionalMineshaftBlockEntity; -import com.github.klikli_dev.occultism.common.container.DimensionalMineshaftContainer; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.blockentity.DimensionalMineshaftBlockEntity; +import com.klikli_dev.occultism.common.container.DimensionalMineshaftContainer; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; @@ -34,45 +35,39 @@ import net.minecraft.world.entity.player.Inventory; public class DimensionalMineshaftScreen extends AbstractContainerScreen { - //region Fields + public static final ResourceLocation TEXTURE = new ResourceLocation(Occultism.MODID, "textures/gui/otherworld_miner.png"); public DimensionalMineshaftBlockEntity otherworldMiner; - //endregion Fields - //region Initialization public DimensionalMineshaftScreen(DimensionalMineshaftContainer screenContainer, Inventory inv, Component titleIn) { super(screenContainer, inv, titleIn); this.otherworldMiner = screenContainer.otherworldMiner; } - //endregion Initialization - //region Overrides - public void render(PoseStack stack, int mouseX, int mouseY, float partialTicks) { - this.renderBackground(stack); - super.render(stack, mouseX, mouseY, partialTicks); - this.renderTooltip(stack, mouseX, mouseY); + public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { + this.renderBackground(guiGraphics); + super.render(guiGraphics, mouseX, mouseY, partialTicks); + this.renderTooltip(guiGraphics, mouseX, mouseY); } @Override - protected void renderLabels(PoseStack pPoseStack, int pMouseX, int pMouseY) { + protected void renderLabels(GuiGraphics guiGraphics, int pMouseX, int pMouseY) { //prevent default labels being rendered } @Override - protected void renderBg(PoseStack stack, float partialTicks, int mouseX, int mouseY) { - RenderSystem.setShader(GameRenderer::getPositionTexShader); + protected void renderBg(GuiGraphics guiGraphics, float partialTicks, int mouseX, int mouseY) { RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - RenderSystem.setShaderTexture(0, TEXTURE); + guiGraphics.blit(TEXTURE, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight); - this.blit(stack, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight); int miningTime = this.otherworldMiner.miningTime; int progress = (int) (18 * (1.0F - (float) miningTime / this.otherworldMiner.maxMiningTime)); if (progress > 0 && miningTime > 0) { - this.blit(stack, this.leftPos + 61, this.topPos + 41, 176, 0, progress + 1, 4); + guiGraphics.blit(TEXTURE, this.leftPos + 61, this.topPos + 41, 176, 0, progress + 1, 4); } } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/GuiHelper.java b/src/main/java/com/klikli_dev/occultism/client/gui/GuiHelper.java similarity index 84% rename from src/main/java/com/github/klikli_dev/occultism/client/gui/GuiHelper.java rename to src/main/java/com/klikli_dev/occultism/client/gui/GuiHelper.java index 2278adfdc..7e65e9dca 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/gui/GuiHelper.java +++ b/src/main/java/com/klikli_dev/occultism/client/gui/GuiHelper.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.gui; +package com.klikli_dev.occultism.client.gui; -import com.github.klikli_dev.occultism.api.common.data.WorkAreaSize; -import com.github.klikli_dev.occultism.client.gui.spirit.BookOfCallingGui; -import com.github.klikli_dev.occultism.client.gui.spirit.BookOfCallingManagedMachineGui; -import com.github.klikli_dev.occultism.common.item.spirit.BookOfCallingItem; +import com.klikli_dev.occultism.api.common.data.WorkAreaSize; +import com.klikli_dev.occultism.client.gui.spirit.BookOfCallingGui; +import com.klikli_dev.occultism.client.gui.spirit.BookOfCallingManagedMachineGui; +import com.klikli_dev.occultism.common.item.spirit.BookOfCallingItem; import net.minecraft.client.Minecraft; import net.minecraft.core.Direction; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/controls/ItemSlotWidget.java b/src/main/java/com/klikli_dev/occultism/client/gui/controls/ItemSlotWidget.java similarity index 75% rename from src/main/java/com/github/klikli_dev/occultism/client/gui/controls/ItemSlotWidget.java rename to src/main/java/com/klikli_dev/occultism/client/gui/controls/ItemSlotWidget.java index 9e9bf277e..485e08139 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/gui/controls/ItemSlotWidget.java +++ b/src/main/java/com/klikli_dev/occultism/client/gui/controls/ItemSlotWidget.java @@ -21,14 +21,14 @@ */ -package com.github.klikli_dev.occultism.client.gui.controls; +package com.klikli_dev.occultism.client.gui.controls; -import com.github.klikli_dev.occultism.api.client.gui.IStorageControllerGuiContainer; -import com.github.klikli_dev.occultism.util.TextUtil; +import com.klikli_dev.occultism.api.client.gui.IStorageControllerGuiContainer; +import com.klikli_dev.occultism.util.TextUtil; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; import net.minecraft.world.item.ItemStack; @@ -36,7 +36,7 @@ import java.awt.*; public class ItemSlotWidget { - //region Fields + protected int x; protected int y; protected int stackSize; @@ -48,9 +48,7 @@ public class ItemSlotWidget { protected ItemStack stack; protected Font fontRenderer; protected int slotHighlightColor; - //endregion Fields - //region Initialization public ItemSlotWidget(IStorageControllerGuiContainer parent, @Nonnull ItemStack stack, int x, int y, int stackSize, int guiLeft, int guiTop, boolean showStackSize) { this.x = x; @@ -65,7 +63,6 @@ public ItemSlotWidget(IStorageControllerGuiContainer parent, @Nonnull ItemStack this.fontRenderer = this.parent.getFontRenderer(); this.slotHighlightColor = new Color(255, 255, 255, 128).getRGB(); } - //endregion Initialization //region Getter / Setter public ItemStack getStack() { @@ -85,13 +82,12 @@ public void setShowStackSize(boolean showStackSize) { } //endregion Getter / Setter - //region Methods public boolean isMouseOverSlot(int mouseX, int mouseY) { return this.parent.isPointInRegionController(this.x - this.guiLeft, this.y - this.guiTop, 16, 16, mouseX, mouseY); } - public void drawSlot(PoseStack poseStack, int mx, int my) { - poseStack.pushPose(); + public void drawSlot(GuiGraphics guiGraphics, int mx, int my) { + guiGraphics.pose().pushPose(); if (!this.getStack().isEmpty()) { //RenderHelper.enableGUIStandardItemLighting(); @@ -102,39 +98,39 @@ public void drawSlot(PoseStack poseStack, int mx, int my) { this.stackSize); //render item overlay - poseStack.pushPose(); + guiGraphics.pose().pushPose(); // this.minecraft.getItemRenderer() // .blitOffset = 0.1f; //we ended up not using any translate and it was fine - poseStack.scale(.5f, .5f, .5f); + guiGraphics.pose().scale(.5f, .5f, .5f); - this.minecraft.getItemRenderer().renderGuiItemDecorations(poseStack, this.fontRenderer, this.stack, this.x * 2 + 16, this.y * 2 + 16, amount); - poseStack.popPose(); + guiGraphics.renderItemDecorations(this.fontRenderer, this.stack, this.x * 2 + 16, this.y * 2 + 16, amount); + guiGraphics.pose().popPose(); } //this.minecraft.getItemRenderer().blitOffset = -100F; - poseStack.pushPose(); - poseStack.translate(0, 0, -100); - this.minecraft.getItemRenderer().renderAndDecorateItem(poseStack, this.getStack(), this.x, this.y); - poseStack.popPose(); + guiGraphics.pose().pushPose(); + guiGraphics.pose().translate(0, 0, -100); + guiGraphics.renderItem(this.getStack(), this.x, this.y); + guiGraphics.pose().popPose(); if (this.isMouseOverSlot(mx, my)) { RenderSystem.colorMask(true, true, true, false); - this.parent.drawGradientRect(poseStack, this.x, this.y, this.x + 16, this.y + 16, this.slotHighlightColor, + this.parent.drawGradientRect(guiGraphics, this.x, this.y, this.x + 16, this.y + 16, this.slotHighlightColor, this.slotHighlightColor); RenderSystem.colorMask(true, true, true, true); } } - poseStack.popPose(); + guiGraphics.pose().popPose(); } - public void drawTooltip(PoseStack poseStack, int mx, int my) { + public void drawTooltip(GuiGraphics guiGraphics, int mx, int my) { if (this.isMouseOverSlot(mx, my) && !this.getStack().isEmpty()) { - this.parent.renderToolTip(poseStack, this.getStack(), mx, my); + this.parent.renderToolTip(guiGraphics, this.getStack(), mx, my); } } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/controls/LabelWidget.java b/src/main/java/com/klikli_dev/occultism/client/gui/controls/LabelWidget.java similarity index 74% rename from src/main/java/com/github/klikli_dev/occultism/client/gui/controls/LabelWidget.java rename to src/main/java/com/klikli_dev/occultism/client/gui/controls/LabelWidget.java index a337feeaf..4d1e121d3 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/gui/controls/LabelWidget.java +++ b/src/main/java/com/klikli_dev/occultism/client/gui/controls/LabelWidget.java @@ -20,12 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.gui.controls; +package com.klikli_dev.occultism.client.gui.controls; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.resources.language.I18n; @@ -35,16 +36,14 @@ import java.util.List; public class LabelWidget extends AbstractWidget { - //region Fields + public List lines = new ArrayList<>(); public boolean centered = false; public boolean rightAligned = false; public int width = 0; public int margin = 2; public boolean shadow = false; - //endregion Fields - //region Initialization public LabelWidget(int xIn, int yIn) { this(xIn, yIn, false); } @@ -70,12 +69,9 @@ public LabelWidget(int xIn, int yIn, boolean centered, int width, int height, in //active false prevents click intercepts and other unwanted interactions this.active = false; } - //endregion Initialization - - //region Overrides @Override - public void renderWidget(PoseStack stack, int p_268034_, int p_268009_, float p_268085_) { + public void renderWidget(GuiGraphics guiGraphics, int p_268034_, int p_268009_, float p_268085_) { if (this.visible) { Minecraft minecraft = Minecraft.getInstance(); Font fontrenderer = minecraft.font; @@ -90,46 +86,43 @@ public void renderWidget(PoseStack stack, int p_268034_, int p_268009_, float p_ for (int i = 0; i < this.lines.size(); i++) { int top = this.getY() + i * (fontrenderer.lineHeight + this.margin); if (this.centered) { - this.drawCenteredLabelString(stack, fontrenderer, this.lines.get(i), this.getX(), top, color); + this.drawCenteredLabelString(guiGraphics, fontrenderer, this.lines.get(i), this.getX(), top, color); } else if (this.rightAligned) { - this.drawRightAlignedLabelString(stack, fontrenderer, this.lines.get(i), this.getX(), top, color); + this.drawRightAlignedLabelString(guiGraphics, fontrenderer, this.lines.get(i), this.getX(), top, color); } else { - this.drawLabelString(stack, fontrenderer, this.lines.get(i), this.getX(), top, color); + this.drawLabelString(guiGraphics, fontrenderer, this.lines.get(i), this.getX(), top, color); } } } } - public void drawCenteredLabelString(PoseStack stack, Font fontRenderer, String text, int x, int y, int color) { + public void drawCenteredLabelString(GuiGraphics guiGraphics, Font font, String text, int x, int y, int color) { if (this.shadow) { - fontRenderer - .drawShadow(stack, text, (float) (x - fontRenderer.width(text) / 2), (float) y, color); + guiGraphics.drawString(font, text, (float) (x - font.width(text) / 2), (float) y, color, true); } else { - fontRenderer.draw(stack, text, (float) (x - fontRenderer.width(text) / 2), (float) y, color); + guiGraphics.drawString(font, text, (float) (x - font.width(text) / 2), (float) y, color, false); } } - public void drawRightAlignedLabelString(PoseStack stack, Font fontRenderer, String text, + public void drawRightAlignedLabelString(GuiGraphics guiGraphics, Font font, String text, int x, int y, int color) { if (this.shadow) { - fontRenderer.drawShadow(stack, text, (float) (x - fontRenderer.width(text)), (float) y, color); + guiGraphics.drawString(font, text, (float) (x - font.width(text)), (float) y, color, true); } else { - fontRenderer.draw(stack, text, (float) (x - fontRenderer.width(text)), (float) y, color); + guiGraphics.drawString(font, text, (float) (x - font.width(text)), (float) y, color, false); } } - public void drawLabelString(PoseStack stack, Font fontRenderer, String text, int x, int y, int color) { + public void drawLabelString(GuiGraphics guiGraphics, Font font, String text, int x, int y, int color) { if (this.shadow) { - fontRenderer.drawShadow(stack, text, x, y, color); + guiGraphics.drawString(font, text, x, y, color, true); } else { - fontRenderer.draw(stack, text, x, y, color); + guiGraphics.drawString(font, text, x, y, color, false); } } - //endregion Overrides - //region Methods public LabelWidget alignRight(boolean align) { this.rightAligned = align; if (this.rightAligned) @@ -156,5 +149,5 @@ public void addLine(Component component) { protected void updateWidgetNarration(NarrationElementOutput pNarrationElementOutput) { } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/controls/MachineSlotWidget.java b/src/main/java/com/klikli_dev/occultism/client/gui/controls/MachineSlotWidget.java similarity index 74% rename from src/main/java/com/github/klikli_dev/occultism/client/gui/controls/MachineSlotWidget.java rename to src/main/java/com/klikli_dev/occultism/client/gui/controls/MachineSlotWidget.java index 51098ad3c..3dcc27c19 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/gui/controls/MachineSlotWidget.java +++ b/src/main/java/com/klikli_dev/occultism/client/gui/controls/MachineSlotWidget.java @@ -21,20 +21,20 @@ */ -package com.github.klikli_dev.occultism.client.gui.controls; +package com.klikli_dev.occultism.client.gui.controls; -import com.github.klikli_dev.occultism.api.client.gui.IStorageControllerGuiContainer; -import com.github.klikli_dev.occultism.api.common.data.MachineReference; +import com.klikli_dev.occultism.api.client.gui.IStorageControllerGuiContainer; +import com.klikli_dev.occultism.api.common.data.MachineReference; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import javax.annotation.Nonnull; import java.awt.*; public class MachineSlotWidget { - //region Fields + protected int x; protected int y; protected int guiLeft; @@ -44,9 +44,7 @@ public class MachineSlotWidget { protected MachineReference machine; protected Font fontRenderer; protected int slotHighlightColor; - //endregion Fields - //region Initialization public MachineSlotWidget(IStorageControllerGuiContainer parent, @Nonnull MachineReference machine, int x, int y, int guiLeft, int guiTop) { this.x = x; @@ -59,7 +57,6 @@ public MachineSlotWidget(IStorageControllerGuiContainer parent, @Nonnull Machine this.fontRenderer = this.parent.getFontRenderer(); this.slotHighlightColor = new Color(255, 255, 255, 128).getRGB(); } - //endregion Initialization //region Getter / Setter public MachineReference getMachine() { @@ -72,36 +69,35 @@ public void setMachine(MachineReference machine) { //endregion Getter / Setter - //region Methods public boolean isMouseOverSlot(double mouseX, double mouseY) { return this.parent.isPointInRegionController(this.x - this.guiLeft, this.y - this.guiTop, 16, 16, mouseX, mouseY); } - public void drawSlot(PoseStack poseStack, int mx, int my) { - poseStack.pushPose(); + public void drawSlot(GuiGraphics guiGraphics, int mx, int my) { + guiGraphics.pose().pushPose(); //render item //RenderHelper.setupGuiFlatDiffuseLighting(); var isMouseOverSlot = this.isMouseOverSlot(mx, my); if (isMouseOverSlot) - this.minecraft.getItemRenderer().renderAndDecorateItem(poseStack, this.machine.getExtractItemStack(), this.x, this.y); + guiGraphics.renderItem(this.machine.getExtractItemStack(), this.x, this.y); else - this.minecraft.getItemRenderer().renderAndDecorateItem(poseStack, this.machine.getInsertItemStack(), this.x, this.y); + guiGraphics.renderItem(this.machine.getInsertItemStack(), this.x, this.y); if (isMouseOverSlot) { RenderSystem.colorMask(true, true, true, false); - this.parent.drawGradientRect(poseStack, this.x, this.y, this.x + 16, this.y + 16, this.slotHighlightColor, + this.parent.drawGradientRect(guiGraphics, this.x, this.y, this.x + 16, this.y + 16, this.slotHighlightColor, this.slotHighlightColor); RenderSystem.colorMask(true, true, true, true); } - poseStack.popPose(); + guiGraphics.pose().popPose(); } - public void drawTooltip(PoseStack poseStack, int mx, int my) { + public void drawTooltip(GuiGraphics guiGraphics, int mx, int my) { if (this.isMouseOverSlot(mx, my)) { - this.parent.renderToolTip(poseStack, this.machine, mx, my); + this.parent.renderToolTip(guiGraphics, this.machine, mx, my); } } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/controls/SizedImageButton.java b/src/main/java/com/klikli_dev/occultism/client/gui/controls/SizedImageButton.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/client/gui/controls/SizedImageButton.java rename to src/main/java/com/klikli_dev/occultism/client/gui/controls/SizedImageButton.java index 82d1a4817..183bb2ecb 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/gui/controls/SizedImageButton.java +++ b/src/main/java/com/klikli_dev/occultism/client/gui/controls/SizedImageButton.java @@ -20,10 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.gui.controls; +package com.klikli_dev.occultism.client.gui.controls; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.renderer.GameRenderer; @@ -77,17 +78,15 @@ public void setPosition(int x, int y) { } @Override - public void renderWidget(PoseStack stack, int mouseX, int mouseY, float partialTicks) { + public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { if (this.visible) { - RenderSystem.setShader(GameRenderer::getPositionTexShader); - RenderSystem.setShaderTexture(0, this.resourceLocation); int i = this.xTexStart; int j = this.yTexStart; if (this.isHoveredOrFocused()) { i += this.xDiffOffset; } RenderSystem.enableDepthTest(); - blit(stack, this.getX(), this.getY(), this.width, this.height, i, j, this.textureWidth, this.textureHeight, this.textureMapWidth, this.textureMapHeight); + guiGraphics.blit(this.resourceLocation, this.getX(), this.getY(), this.width, this.height, i, j, this.textureWidth, this.textureHeight, this.textureMapWidth, this.textureMapHeight); } } } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/spirit/BookOfCallingGui.java b/src/main/java/com/klikli_dev/occultism/client/gui/spirit/BookOfCallingGui.java similarity index 81% rename from src/main/java/com/github/klikli_dev/occultism/client/gui/spirit/BookOfCallingGui.java rename to src/main/java/com/klikli_dev/occultism/client/gui/spirit/BookOfCallingGui.java index 1f310600b..6bcaf6f99 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/gui/spirit/BookOfCallingGui.java +++ b/src/main/java/com/klikli_dev/occultism/client/gui/spirit/BookOfCallingGui.java @@ -20,29 +20,27 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.gui.spirit; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.OccultismConstants; -import com.github.klikli_dev.occultism.api.common.data.WorkAreaSize; -import com.github.klikli_dev.occultism.client.gui.controls.LabelWidget; -import com.github.klikli_dev.occultism.common.item.spirit.BookOfCallingItem; -import com.github.klikli_dev.occultism.network.MessageSetItemMode; -import com.github.klikli_dev.occultism.network.MessageSetWorkAreaSize; -import com.github.klikli_dev.occultism.network.OccultismPackets; +package com.klikli_dev.occultism.client.gui.spirit; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.OccultismConstants; +import com.klikli_dev.occultism.api.common.data.WorkAreaSize; +import com.klikli_dev.occultism.client.gui.controls.LabelWidget; +import com.klikli_dev.occultism.common.item.spirit.BookOfCallingItem; +import com.klikli_dev.occultism.network.MessageSetItemMode; +import com.klikli_dev.occultism.network.MessageSetWorkAreaSize; +import com.klikli_dev.occultism.network.OccultismPackets; import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.minecraftforge.client.gui.widget.ExtendedButton; public class BookOfCallingGui extends Screen { - //region Fields public BookOfCallingItem.IItemModeSubset mode; public WorkAreaSize workAreaSize; - //endregion Fields - //region Initialization public BookOfCallingGui(BookOfCallingItem.IItemModeSubset mode, WorkAreaSize workAreaSize) { super(Component.literal("")); @@ -50,13 +48,11 @@ public BookOfCallingGui(BookOfCallingItem.IItemModeSubset mode, WorkAreaSize this.workAreaSize = workAreaSize; this.init(); } - //endregion Initialization - //region Overrides @Override - public void render(PoseStack stack, int mouseX, int mouseY, float partialTicks) { - this.renderBackground(stack); - super.render(stack, mouseX, mouseY, partialTicks); + public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { + this.renderBackground(guiGraphics); + super.render(guiGraphics, mouseX, mouseY, partialTicks); } @Override @@ -117,5 +113,5 @@ protected void init() { public boolean isPauseScreen() { return false; } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/spirit/BookOfCallingManagedMachineGui.java b/src/main/java/com/klikli_dev/occultism/client/gui/spirit/BookOfCallingManagedMachineGui.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/client/gui/spirit/BookOfCallingManagedMachineGui.java rename to src/main/java/com/klikli_dev/occultism/client/gui/spirit/BookOfCallingManagedMachineGui.java index a22c61b2d..3e6d49969 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/gui/spirit/BookOfCallingManagedMachineGui.java +++ b/src/main/java/com/klikli_dev/occultism/client/gui/spirit/BookOfCallingManagedMachineGui.java @@ -20,16 +20,17 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.gui.spirit; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.OccultismConstants; -import com.github.klikli_dev.occultism.api.common.data.MachineReference; -import com.github.klikli_dev.occultism.client.gui.controls.LabelWidget; -import com.github.klikli_dev.occultism.network.MessageSetManagedMachine; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.util.EnumUtil; +package com.klikli_dev.occultism.client.gui.spirit; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.OccultismConstants; +import com.klikli_dev.occultism.api.common.data.MachineReference; +import com.klikli_dev.occultism.client.gui.controls.LabelWidget; +import com.klikli_dev.occultism.network.MessageSetManagedMachine; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.util.EnumUtil; import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.screens.Screen; import net.minecraft.core.Direction; @@ -39,16 +40,13 @@ public class BookOfCallingManagedMachineGui extends Screen { - //region Fields protected final String originalCustomName; protected String customName; protected Direction insertFacing = Direction.UP; protected Direction extractFacing = Direction.DOWN; protected EditBox text; - //endregion Fields - //region Initialization public BookOfCallingManagedMachineGui(Direction insertFacing, Direction extractFacing, String customName) { super(Component.literal("")); @@ -59,14 +57,11 @@ public BookOfCallingManagedMachineGui(Direction insertFacing, Direction extractF this.init(); } - //endregion Initialization - - //region Overrides @Override - public void render(PoseStack stack, int mouseX, int mouseY, float partialTicks) { - this.renderBackground(stack); - this.text.render(stack, mouseX, mouseY, partialTicks); - super.render(stack, mouseX, mouseY, partialTicks); + public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { + this.renderBackground(guiGraphics); + this.text.render(guiGraphics, mouseX, mouseY, partialTicks); + super.render(guiGraphics, mouseX, mouseY, partialTicks); } @Override @@ -182,9 +177,7 @@ public boolean charTyped(char typedChar, int keyCode) { return super.charTyped(typedChar, keyCode); } } - //endregion Overrides - //region Methods public MachineReference makeMachineReference() { MachineReference reference = new MachineReference(null, null, false, null, null, false); reference.insertFacing = this.insertFacing; @@ -192,5 +185,5 @@ public MachineReference makeMachineReference() { reference.customName = this.customName; return reference; } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/spirit/SpiritGui.java b/src/main/java/com/klikli_dev/occultism/client/gui/spirit/SpiritGui.java similarity index 82% rename from src/main/java/com/github/klikli_dev/occultism/client/gui/spirit/SpiritGui.java rename to src/main/java/com/klikli_dev/occultism/client/gui/spirit/SpiritGui.java index 8b9de0a26..a8667c615 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/gui/spirit/SpiritGui.java +++ b/src/main/java/com/klikli_dev/occultism/client/gui/spirit/SpiritGui.java @@ -20,18 +20,19 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.gui.spirit; +package com.klikli_dev.occultism.client.gui.spirit; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.gui.controls.LabelWidget; -import com.github.klikli_dev.occultism.common.container.spirit.SpiritContainer; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.util.TextUtil; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.gui.controls.LabelWidget; +import com.klikli_dev.occultism.common.container.spirit.SpiritContainer; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.util.TextUtil; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.MultiBufferSource; @@ -45,15 +46,13 @@ import org.apache.commons.lang3.text.WordUtils; public class SpiritGui extends AbstractContainerScreen { - //region Fields + protected static final ResourceLocation TEXTURE = new ResourceLocation(Occultism.MODID, "textures/gui/inventory_spirit.png"); protected static final String TRANSLATION_KEY_BASE = "gui." + Occultism.MODID + ".spirit"; protected SpiritEntity spirit; protected T container; -//endregion Fields - //region Initialization public SpiritGui(T container, Inventory playerInventory, Component titleIn) { super(container, playerInventory, titleIn); this.container = container; @@ -61,10 +60,9 @@ public SpiritGui(T container, Inventory playerInventory, Component titleIn) { this.imageWidth = 175; this.imageHeight = 165; } - //endregion Initialization - //region Static Methods - public static void drawEntityToGui(PoseStack poseStack, int posX, int posY, int scale, float mouseX, float mouseY, LivingEntity entity) { + public static void drawEntityToGui(GuiGraphics guiGraphics, int posX, int posY, int scale, float mouseX, float mouseY, LivingEntity entity) { + var poseStack = guiGraphics.pose(); //From inventory screen float f = (float) Math.atan(mouseX / 40.0F); float f1 = (float) Math.atan(mouseY / 40.0F); @@ -103,7 +101,6 @@ public static void drawEntityToGui(PoseStack poseStack, int posX, int posY, int poseStack.popPose(); } - //region Overrides @Override @SuppressWarnings("deprecation") public void init() { @@ -138,27 +135,21 @@ public void init() { } @Override - protected void renderLabels(PoseStack pPoseStack, int pMouseX, int pMouseY) { + protected void renderLabels(GuiGraphics guiGraphics, int pMouseX, int pMouseY) { //prevent default labels being rendered } - //endregion Overrides - @Override - protected void renderBg(PoseStack poseStack, float partialTicks, int x, int y) { - this.renderBackground(poseStack); + protected void renderBg(GuiGraphics guiGraphics, float partialTicks, int x, int y) { + this.renderBackground(guiGraphics); - RenderSystem.setShader(GameRenderer::getPositionTexShader); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - RenderSystem.setShaderTexture(0, TEXTURE); - - this.blit(poseStack, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight); + guiGraphics.blit(TEXTURE, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight); - poseStack.pushPose(); + guiGraphics.pose().pushPose(); int scale = 30; - drawEntityToGui(poseStack, this.leftPos + 35, this.topPos + 65, scale, this.leftPos + 51 - x, + drawEntityToGui(guiGraphics, this.leftPos + 35, this.topPos + 65, scale, this.leftPos + 51 - x, this.topPos + 75 - 50 - y, this.spirit); - poseStack.popPose(); + guiGraphics.pose().popPose(); } -//endregion Static Methods } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/spirit/SpiritTransporterGui.java b/src/main/java/com/klikli_dev/occultism/client/gui/spirit/SpiritTransporterGui.java similarity index 81% rename from src/main/java/com/github/klikli_dev/occultism/client/gui/spirit/SpiritTransporterGui.java rename to src/main/java/com/klikli_dev/occultism/client/gui/spirit/SpiritTransporterGui.java index 3866768ed..8370a5848 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/gui/spirit/SpiritTransporterGui.java +++ b/src/main/java/com/klikli_dev/occultism/client/gui/spirit/SpiritTransporterGui.java @@ -20,20 +20,21 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.gui.spirit; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.OccultismConstants; -import com.github.klikli_dev.occultism.client.gui.controls.SizedImageButton; -import com.github.klikli_dev.occultism.common.container.spirit.SpiritTransporterContainer; -import com.github.klikli_dev.occultism.network.MessageSetFilterMode; -import com.github.klikli_dev.occultism.network.MessageSetTagFilterText; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.util.InputUtil; +package com.klikli_dev.occultism.client.gui.spirit; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.OccultismConstants; +import com.klikli_dev.occultism.client.gui.controls.SizedImageButton; +import com.klikli_dev.occultism.common.container.spirit.SpiritTransporterContainer; +import com.klikli_dev.occultism.network.MessageSetFilterMode; +import com.klikli_dev.occultism.network.MessageSetTagFilterText; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.util.InputUtil; import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; @@ -46,7 +47,7 @@ import java.util.Optional; public class SpiritTransporterGui extends SpiritGui { - //region Fields + protected static final ResourceLocation TEXTURE = new ResourceLocation(Occultism.MODID, "textures/gui/inventory_spirit_transporter_tagfilter.png"); protected static final String TRANSLATION_KEY_BASE = "gui." + Occultism.MODID + ".spirit.transporter"; @@ -57,9 +58,7 @@ public class SpiritTransporterGui extends SpiritGui protected EditBox tagFilterTextField; protected String tagFilter; - //endregion Fields - //region Initialization public SpiritTransporterGui(SpiritTransporterContainer container, Inventory playerInventory, Component titleIn) { @@ -70,7 +69,6 @@ public SpiritTransporterGui(SpiritTransporterContainer container, this.imageWidth = 176; this.imageHeight = 220; } - //endregion Initialization //region Getter / Setter public boolean isBlacklist() { @@ -91,7 +89,6 @@ public void setIsBlacklist(boolean isBlacklist) { } //endregion Getter / Setter - //region Overrides @Override public void init() { super.init(); @@ -131,21 +128,18 @@ public void init() { } @Override - protected void renderBg(PoseStack poseStack, float partialTicks, int x, int y) { - RenderSystem.setShader(GameRenderer::getPositionTexShader); + protected void renderBg(GuiGraphics guiGraphics, float partialTicks, int x, int y) { RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - RenderSystem.setShaderTexture(0, TEXTURE); - - this.blit(poseStack, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight); + guiGraphics.blit(TEXTURE, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight); - poseStack.pushPose(); + guiGraphics.pose().pushPose(); int scale = 30; - drawEntityToGui(poseStack, this.leftPos + 35, this.topPos + 65, scale, this.leftPos + 51 - x, + drawEntityToGui(guiGraphics, this.leftPos + 35, this.topPos + 65, scale, this.leftPos + 51 - x, this.topPos + 75 - 50 - y, this.spirit); - poseStack.popPose(); + guiGraphics.pose().popPose(); } - protected void renderFg(PoseStack poseStack, int mouseX, int mouseY) { + protected void renderFg(GuiGraphics guiGraphics, int mouseX, int mouseY) { this.tooltip.clear(); if (this.filterModeButton.isHoveredOrFocused()) { @@ -160,17 +154,15 @@ protected void renderFg(PoseStack poseStack, int mouseX, int mouseY) { this.tooltip.add(Component.translatable(TRANSLATION_KEY_BASE + ".tag_filter")); } - if (!this.tooltip.isEmpty()) { - this.renderTooltip(poseStack, this.tooltip, Optional.empty(), mouseX - this.leftPos, - mouseY - this.topPos); - } + if (!this.tooltip.isEmpty()) + guiGraphics.renderTooltip(this.font, this.tooltip, Optional.empty(), mouseX - this.leftPos, mouseY - this.topPos); } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { - super.render(poseStack, mouseX, mouseY, partialTicks); - this.tagFilterTextField.render(poseStack, mouseX, mouseY, partialTicks); - this.renderFg(poseStack, mouseX, mouseY); + public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { + super.render(guiGraphics, mouseX, mouseY, partialTicks); + this.tagFilterTextField.render(guiGraphics, mouseX, mouseY, partialTicks); + this.renderFg(guiGraphics, mouseX, mouseY); } @Override @@ -237,12 +229,10 @@ public boolean charTyped(char codePoint, int modifiers) { return false; } - //endregion Overrides - //region Methods protected boolean isPointInSearchbar(double mouseX, double mouseY) { return this.isHovering(this.tagFilterTextField.getX() - this.leftPos, this.tagFilterTextField.getY() - this.topPos, this.tagFilterTextField.getWidth() - 5, this.font.lineHeight + 6, mouseX, mouseY); } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/storage/SatchelScreen.java b/src/main/java/com/klikli_dev/occultism/client/gui/storage/SatchelScreen.java similarity index 71% rename from src/main/java/com/github/klikli_dev/occultism/client/gui/storage/SatchelScreen.java rename to src/main/java/com/klikli_dev/occultism/client/gui/storage/SatchelScreen.java index 037208823..0a5cb24a1 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/gui/storage/SatchelScreen.java +++ b/src/main/java/com/klikli_dev/occultism/client/gui/storage/SatchelScreen.java @@ -20,14 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.gui.storage; +package com.klikli_dev.occultism.client.gui.storage; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.container.storage.SatchelContainer; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.container.storage.SatchelContainer; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; -import net.minecraft.client.renderer.GameRenderer; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; @@ -52,23 +51,22 @@ protected void init() { } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { - this.renderBackground(poseStack); - super.render(poseStack, mouseX, mouseY, partialTicks); - this.renderTooltip(poseStack, mouseX, mouseY); + public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { + this.renderBackground(guiGraphics); + super.render(guiGraphics, mouseX, mouseY, partialTicks); + this.renderTooltip(guiGraphics, mouseX, mouseY); } @Override - protected void renderLabels(PoseStack pPoseStack, int pMouseX, int pMouseY) { + protected void renderLabels(GuiGraphics guiGraphics, int pMouseX, int pMouseY) { //prevent default labels being rendered } @Override - protected void renderBg(PoseStack poseStack, float partialTicks, int mouseX, + protected void renderBg(GuiGraphics guiGraphics, float partialTicks, int mouseX, int mouseY) { - RenderSystem.setShader(GameRenderer::getPositionTexShader); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - RenderSystem.setShaderTexture(0, BACKGROUND); - this.blit(poseStack, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight); + guiGraphics.blit(BACKGROUND, this.leftPos, this.topPos, 0, 0, this.imageWidth, + this.imageHeight); } } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/storage/StableWormholeGui.java b/src/main/java/com/klikli_dev/occultism/client/gui/storage/StableWormholeGui.java similarity index 80% rename from src/main/java/com/github/klikli_dev/occultism/client/gui/storage/StableWormholeGui.java rename to src/main/java/com/klikli_dev/occultism/client/gui/storage/StableWormholeGui.java index 27c57c9dc..b4eb7fc28 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/gui/storage/StableWormholeGui.java +++ b/src/main/java/com/klikli_dev/occultism/client/gui/storage/StableWormholeGui.java @@ -20,35 +20,30 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.gui.storage; +package com.klikli_dev.occultism.client.gui.storage; -import com.github.klikli_dev.occultism.api.common.data.SortDirection; -import com.github.klikli_dev.occultism.api.common.data.SortType; -import com.github.klikli_dev.occultism.common.blockentity.StorageControllerBlockEntity; -import com.github.klikli_dev.occultism.common.container.storage.StableWormholeContainer; -import com.github.klikli_dev.occultism.network.MessageUpdateStorageSettings; -import com.github.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.api.common.data.SortDirection; +import com.klikli_dev.occultism.api.common.data.SortType; +import com.klikli_dev.occultism.common.blockentity.StorageControllerBlockEntity; +import com.klikli_dev.occultism.common.container.storage.StableWormholeContainer; +import com.klikli_dev.occultism.network.MessageUpdateStorageSettings; +import com.klikli_dev.occultism.network.OccultismPackets; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; public class StableWormholeGui extends StorageControllerGuiBase { - //region Fields protected StorageControllerBlockEntity storageController; protected StableWormholeContainer container; - //endregion Fields - //region Initialization public StableWormholeGui(StableWormholeContainer container, Inventory playerInventory, Component name) { super(container, playerInventory, name); this.container = container; this.storageController = container.getStorageController(); } - //endregion Initialization - //region Overrides @Override protected boolean isGuiValid() { return true; @@ -80,5 +75,5 @@ public void setSortType(SortType sortType) { this.container.getStableWormhole().setSortType(sortType); OccultismPackets.sendToServer(new MessageUpdateStorageSettings(this.getSortDirection(), sortType)); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/storage/StorageControllerGui.java b/src/main/java/com/klikli_dev/occultism/client/gui/storage/StorageControllerGui.java similarity index 79% rename from src/main/java/com/github/klikli_dev/occultism/client/gui/storage/StorageControllerGui.java rename to src/main/java/com/klikli_dev/occultism/client/gui/storage/StorageControllerGui.java index 9a7c52a63..06fb58c64 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/gui/storage/StorageControllerGui.java +++ b/src/main/java/com/klikli_dev/occultism/client/gui/storage/StorageControllerGui.java @@ -20,33 +20,28 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.gui.storage; +package com.klikli_dev.occultism.client.gui.storage; -import com.github.klikli_dev.occultism.api.common.data.SortDirection; -import com.github.klikli_dev.occultism.api.common.data.SortType; -import com.github.klikli_dev.occultism.common.blockentity.StorageControllerBlockEntity; -import com.github.klikli_dev.occultism.common.container.storage.StorageControllerContainer; -import com.github.klikli_dev.occultism.network.MessageUpdateStorageSettings; -import com.github.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.api.common.data.SortDirection; +import com.klikli_dev.occultism.api.common.data.SortType; +import com.klikli_dev.occultism.common.blockentity.StorageControllerBlockEntity; +import com.klikli_dev.occultism.common.container.storage.StorageControllerContainer; +import com.klikli_dev.occultism.network.MessageUpdateStorageSettings; +import com.klikli_dev.occultism.network.OccultismPackets; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; public class StorageControllerGui extends StorageControllerGuiBase { - //region Fields protected StorageControllerBlockEntity storageController; - //endregion Fields - //region Initialization public StorageControllerGui(StorageControllerContainer container, Inventory playerInventory, Component name) { super(container, playerInventory, name); this.storageController = container.getStorageController(); } - //endregion Initialization - //region Overrides @Override protected boolean isGuiValid() { return true; @@ -78,5 +73,5 @@ public void setSortType(SortType sortType) { this.storageController.setSortType(sortType); OccultismPackets.sendToServer(new MessageUpdateStorageSettings(this.getSortDirection(), sortType)); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/storage/StorageControllerGuiBase.java b/src/main/java/com/klikli_dev/occultism/client/gui/storage/StorageControllerGuiBase.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/client/gui/storage/StorageControllerGuiBase.java rename to src/main/java/com/klikli_dev/occultism/client/gui/storage/StorageControllerGuiBase.java index ffc33a49e..9c18f9b11 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/gui/storage/StorageControllerGuiBase.java +++ b/src/main/java/com/klikli_dev/occultism/client/gui/storage/StorageControllerGuiBase.java @@ -20,31 +20,31 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.gui.storage; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.OccultismConstants; -import com.github.klikli_dev.occultism.api.client.gui.IStorageControllerGui; -import com.github.klikli_dev.occultism.api.client.gui.IStorageControllerGuiContainer; -import com.github.klikli_dev.occultism.api.common.container.IStorageControllerContainer; -import com.github.klikli_dev.occultism.api.common.data.*; -import com.github.klikli_dev.occultism.client.gui.controls.ItemSlotWidget; -import com.github.klikli_dev.occultism.client.gui.controls.LabelWidget; -import com.github.klikli_dev.occultism.client.gui.controls.MachineSlotWidget; -import com.github.klikli_dev.occultism.client.gui.controls.SizedImageButton; -import com.github.klikli_dev.occultism.common.container.storage.StorageControllerContainerBase; -import com.github.klikli_dev.occultism.integration.jei.JeiAccess; -import com.github.klikli_dev.occultism.integration.jei.JeiSettings; -import com.github.klikli_dev.occultism.network.*; -import com.github.klikli_dev.occultism.util.InputUtil; -import com.github.klikli_dev.occultism.util.TextUtil; +package com.klikli_dev.occultism.client.gui.storage; + import com.google.common.base.Joiner; import com.google.common.collect.Lists; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.OccultismConstants; +import com.klikli_dev.occultism.api.client.gui.IStorageControllerGui; +import com.klikli_dev.occultism.api.client.gui.IStorageControllerGuiContainer; +import com.klikli_dev.occultism.api.common.container.IStorageControllerContainer; +import com.klikli_dev.occultism.api.common.data.*; +import com.klikli_dev.occultism.client.gui.controls.ItemSlotWidget; +import com.klikli_dev.occultism.client.gui.controls.LabelWidget; +import com.klikli_dev.occultism.client.gui.controls.MachineSlotWidget; +import com.klikli_dev.occultism.client.gui.controls.SizedImageButton; +import com.klikli_dev.occultism.common.container.storage.StorageControllerContainerBase; +import com.klikli_dev.occultism.integration.jei.JeiAccess; +import com.klikli_dev.occultism.integration.jei.JeiSettings; +import com.klikli_dev.occultism.network.*; +import com.klikli_dev.occultism.util.InputUtil; +import com.klikli_dev.occultism.util.TextUtil; import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.screens.Screen; @@ -69,7 +69,7 @@ import java.util.stream.Collectors; public abstract class StorageControllerGuiBase extends AbstractContainerScreen implements IStorageControllerGui, IStorageControllerGuiContainer, ContainerListener { - //region Fields + public static final int ORDER_AREA_OFFSET = 48; protected static final ResourceLocation BACKGROUND = new ResourceLocation(Occultism.MODID, "textures/gui/storage_controller_droparea.png"); @@ -101,9 +101,7 @@ public abstract class StorageControllerGuiBase tooltip = new ArrayList<>(); tooltip.add(machine.getInsertItemStack().getDisplayName()); if (machine.customName != null) { @@ -176,11 +172,12 @@ public void renderToolTip(PoseStack poseStack, MachineReference machine, int x, ChatFormatting.RESET)); } - if (this.minecraft.player.level.dimension() != machine.insertGlobalPos.getDimensionKey()) + if (this.minecraft.player.level().dimension() != machine.insertGlobalPos.getDimensionKey()) tooltip.add(Component.translatable(ChatFormatting.GRAY.toString() + ChatFormatting.ITALIC + machine.insertGlobalPos.getDimensionKey().location() + ChatFormatting.RESET)); - this.renderComponentTooltip(poseStack, tooltip, x, y); + + guiGraphics.renderComponentTooltip(this.font, tooltip, x, y); } @Override @@ -255,17 +252,17 @@ public void init() { } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) { - this.renderBackground(poseStack); - super.render(poseStack, mouseX, mouseY, partialTicks); + public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { + this.renderBackground(guiGraphics); + super.render(guiGraphics, mouseX, mouseY, partialTicks); - this.renderTooltip(poseStack, mouseX, mouseY); + this.renderTooltip(guiGraphics, mouseX, mouseY); if (!this.isGuiValid()) { this.minecraft.player.closeContainer(); return; } try { - this.drawTooltips(poseStack, mouseX, mouseY); + this.drawTooltips(guiGraphics, mouseX, mouseY); } catch (Throwable e) { Occultism.LOGGER.error("Error drawing tooltip.", e); } @@ -283,28 +280,28 @@ public void render(PoseStack poseStack, int mouseX, int mouseY, float partialTic } @Override - protected void renderLabels(PoseStack pPoseStack, int pMouseX, int pMouseY) { + protected void renderLabels(GuiGraphics guiGraphics, int pMouseX, int pMouseY) { //prevent default labels being rendered } @Override - protected void renderBg(PoseStack poseStack, float partialTicks, int mouseX, + protected void renderBg(GuiGraphics guiGraphics, float partialTicks, int mouseX, int mouseY) { if (!this.isGuiValid()) { return; } - this.drawBackgroundTexture(poseStack); + this.drawBackgroundTexture(guiGraphics); switch (this.guiMode) { case INVENTORY: - this.drawItems(poseStack, partialTicks, mouseX, mouseY); + this.drawItems(guiGraphics, partialTicks, mouseX, mouseY); break; case AUTOCRAFTING: - this.drawMachines(poseStack, partialTicks, mouseX, mouseY); + this.drawMachines(guiGraphics, partialTicks, mouseX, mouseY); break; } - this.searchBar.render(poseStack, mouseX, mouseY, partialTicks); + this.searchBar.render(guiGraphics, mouseX, mouseY, partialTicks); } @Override @@ -425,9 +422,7 @@ public boolean charTyped(char typedChar, int keyCode) { return false; } - //endregion Overrides - //region Methods public void initButtons() { int controlButtonSize = 12; @@ -536,20 +531,20 @@ public void initButtons() { this.addRenderableWidget(this.autocraftingModeButton); } - protected void drawItems(PoseStack poseStack, float partialTicks, int mouseX, int mouseY) { + protected void drawItems(GuiGraphics guiGraphics, float partialTicks, int mouseX, int mouseY) { List stacksToDisplay = this.applySearchToItems(); this.sortItemStacks(stacksToDisplay); this.buildPage(stacksToDisplay); this.buildItemSlots(stacksToDisplay); - this.drawItemSlots(poseStack, mouseX, mouseY); + this.drawItemSlots(guiGraphics, mouseX, mouseY); } - protected void drawMachines(PoseStack poseStack, float partialTicks, int mouseX, int mouseY) { + protected void drawMachines(GuiGraphics guiGraphics, float partialTicks, int mouseX, int mouseY) { List machinesToDisplay = this.applySearchToMachines(); this.sortMachines(machinesToDisplay); this.buildPage(machinesToDisplay); this.buildMachineSlots(machinesToDisplay); - this.drawMachineSlots(poseStack, mouseX, mouseY); + this.drawMachineSlots(guiGraphics, mouseX, mouseY); } protected boolean canClick() { @@ -570,19 +565,19 @@ protected boolean isPointInItemArea(double mouseX, double mouseY) { mouseY > (this.topPos + itemAreaTop) && mouseY < (this.topPos + itemAreaTop + itemAreaHeight); } - protected void drawTooltips(PoseStack poseStack, int mouseX, int mouseY) { + protected void drawTooltips(GuiGraphics guiGraphics, int mouseX, int mouseY) { switch (this.guiMode) { case INVENTORY: for (ItemSlotWidget s : this.itemSlots) { if (s != null && s.isMouseOverSlot(mouseX, mouseY)) { - s.drawTooltip(poseStack, mouseX, mouseY); + s.drawTooltip(guiGraphics, mouseX, mouseY); } } break; case AUTOCRAFTING: for (MachineSlotWidget s : this.machineSlots) { if (s != null && s.isMouseOverSlot(mouseX, mouseY)) { - s.drawTooltip(poseStack, mouseX, mouseY); + s.drawTooltip(guiGraphics, mouseX, mouseY); } } break; @@ -605,11 +600,10 @@ protected void drawTooltips(PoseStack poseStack, int mouseX, int mouseY) { } tooltip.add(Component.translatable(TRANSLATION_KEY_BASE + ".search.tooltip_rightclick")); } - this.renderComponentTooltip(poseStack, tooltip, mouseX, mouseY); + guiGraphics.renderComponentTooltip(this.font, tooltip, mouseX, mouseY); } if (this.clearTextButton != null && this.clearTextButton.isMouseOver(mouseX, mouseY)) { - this.renderComponentTooltip(poseStack, - Lists.newArrayList(Component.translatable(TRANSLATION_KEY_BASE + ".search.tooltip_clear")), + guiGraphics.renderComponentTooltip(this.font, Lists.newArrayList(Component.translatable(TRANSLATION_KEY_BASE + ".search.tooltip_clear")), mouseX, mouseY); } if (this.sortTypeButton != null && this.sortTypeButton.isMouseOver(mouseX, mouseY)) { @@ -625,35 +619,34 @@ protected void drawTooltips(PoseStack poseStack, int mouseX, int mouseY) { this.getSortType().getSerializedName(); break; } - this.renderTooltip(poseStack, Component.translatable(translationKey), mouseX, mouseY); + guiGraphics.renderTooltip(this.font, Component.translatable(translationKey), mouseX, mouseY); } if (this.sortDirectionButton != null && this.sortDirectionButton.isMouseOver(mouseX, mouseY)) { - this.renderTooltip(poseStack, Component.translatable( + guiGraphics.renderTooltip(this.font, Component.translatable( TRANSLATION_KEY_BASE + ".search.tooltip_sort_direction_" + this.getSortDirection().getSerializedName()), mouseX, mouseY); } if (this.jeiSyncButton != null && this.jeiSyncButton.isMouseOver(mouseX, mouseY)) { - this.renderTooltip(poseStack, Component.translatable( + guiGraphics.renderTooltip(this.font, Component.translatable( TRANSLATION_KEY_BASE + ".search.tooltip_jei_" + (JeiSettings.isJeiSearchSynced() ? "on" : "off")), mouseX, mouseY); } } - protected void drawBackgroundTexture(PoseStack poseStack) { - RenderSystem.setShader(GameRenderer::getPositionTexShader); - RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); - RenderSystem.setShaderTexture(0, BACKGROUND); + protected void drawBackgroundTexture(GuiGraphics guiGraphics) { int i = (this.width - this.imageWidth) / 2; int j = (this.height - this.imageHeight) / 2; - this.blit(poseStack, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight); + + RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + guiGraphics.blit(BACKGROUND, this.leftPos, this.topPos, 0, 0, this.imageWidth, this.imageHeight); } - protected void drawItemSlots(PoseStack poseStack, int mouseX, int mouseY) { + protected void drawItemSlots(GuiGraphics guiGraphics, int mouseX, int mouseY) { this.stackUnderMouse = ItemStack.EMPTY; for (ItemSlotWidget slot : this.itemSlots) { RenderSystem.setShader(GameRenderer::getPositionTexShader); - slot.drawSlot(poseStack, mouseX, mouseY); + slot.drawSlot(guiGraphics, mouseX, mouseY); if (slot.isMouseOverSlot(mouseX, mouseY)) { this.stackUnderMouse = slot.getStack(); // break; @@ -706,11 +699,8 @@ protected void buildPage(List objectsToDisplay) { protected void sortItemStacks(List stacksToDisplay) { stacksToDisplay.sort(new Comparator() { - //region Fields final int direction = StorageControllerGuiBase.this.getSortDirection().isDown() ? -1 : 1; - //endregion Fields - //region Overrides @Override public int compare(ItemStack a, ItemStack b) { switch (StorageControllerGuiBase.this.getSortType()) { @@ -727,7 +717,7 @@ public int compare(ItemStack a, ItemStack b) { } return 0; } - //endregion Overrides + }); } @@ -799,14 +789,11 @@ protected boolean machineMatchesSearch(MachineReference machine) { protected void sortMachines(List machinesToDisplay) { BlockPos entityPosition = this.getEntityPosition(); - ResourceKey dimensionKey = this.minecraft.player.level.dimension(); + ResourceKey dimensionKey = this.minecraft.player.level().dimension(); machinesToDisplay.sort(new Comparator() { - //region Fields final int direction = StorageControllerGuiBase.this.getSortDirection().isDown() ? -1 : 1; - //endregion Fields - //region Overrides @Override public int compare(MachineReference a, MachineReference b) { switch (StorageControllerGuiBase.this.getSortType()) { @@ -830,7 +817,7 @@ public int compare(MachineReference a, MachineReference b) { } return 0; } - //endregion Overrides + }); } @@ -854,9 +841,9 @@ protected void buildMachineSlots(List machinesToDisplay) { } } - protected void drawMachineSlots(PoseStack poseStack, int mouseX, int mouseY) { + protected void drawMachineSlots(GuiGraphics guiGraphics, int mouseX, int mouseY) { for (MachineSlotWidget slot : this.machineSlots) { - slot.drawSlot(poseStack, mouseX, mouseY); + slot.drawSlot(guiGraphics, mouseX, mouseY); } } @@ -867,5 +854,4 @@ protected void clearSearch() { } } - //endregion Methods } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/gui/storage/StorageRemoteGui.java b/src/main/java/com/klikli_dev/occultism/client/gui/storage/StorageRemoteGui.java similarity index 82% rename from src/main/java/com/github/klikli_dev/occultism/client/gui/storage/StorageRemoteGui.java rename to src/main/java/com/klikli_dev/occultism/client/gui/storage/StorageRemoteGui.java index 2913b5f67..345be0619 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/gui/storage/StorageRemoteGui.java +++ b/src/main/java/com/klikli_dev/occultism/client/gui/storage/StorageRemoteGui.java @@ -20,32 +20,27 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.gui.storage; +package com.klikli_dev.occultism.client.gui.storage; -import com.github.klikli_dev.occultism.api.common.data.SortDirection; -import com.github.klikli_dev.occultism.api.common.data.SortType; -import com.github.klikli_dev.occultism.common.container.storage.StorageRemoteContainer; -import com.github.klikli_dev.occultism.network.MessageUpdateStorageSettings; -import com.github.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.api.common.data.SortDirection; +import com.klikli_dev.occultism.api.common.data.SortType; +import com.klikli_dev.occultism.common.container.storage.StorageRemoteContainer; +import com.klikli_dev.occultism.network.MessageUpdateStorageSettings; +import com.klikli_dev.occultism.network.OccultismPackets; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; public class StorageRemoteGui extends StorageControllerGuiBase { - //region Fields protected StorageRemoteContainer container; - //endregion Fields - //region Initialization public StorageRemoteGui(StorageRemoteContainer container, Inventory playerInventory, Component name) { super(container, playerInventory, name); this.container = container; } - //endregion Initialization - //region Overrides @Override protected boolean isGuiValid() { return !this.container.getStorageRemote().isEmpty(); @@ -77,5 +72,5 @@ public void setSortType(SortType sortType) { this.container.getStorageRemote().getOrCreateTag().putInt("sortType", sortType.getValue()); OccultismPackets.sendToServer(new MessageUpdateStorageSettings(this.getSortDirection(), sortType)); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/itemproperties/DivinationRodItemPropertyGetter.java b/src/main/java/com/klikli_dev/occultism/client/itemproperties/DivinationRodItemPropertyGetter.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/client/itemproperties/DivinationRodItemPropertyGetter.java rename to src/main/java/com/klikli_dev/occultism/client/itemproperties/DivinationRodItemPropertyGetter.java index 844969051..f1ebae18f 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/itemproperties/DivinationRodItemPropertyGetter.java +++ b/src/main/java/com/klikli_dev/occultism/client/itemproperties/DivinationRodItemPropertyGetter.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.itemproperties; +package com.klikli_dev.occultism.client.itemproperties; -import com.github.klikli_dev.occultism.OccultismConstants; -import com.github.klikli_dev.occultism.common.item.tool.DivinationRodItem; +import com.klikli_dev.occultism.OccultismConstants; +import com.klikli_dev.occultism.common.item.tool.DivinationRodItem; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.item.ItemPropertyFunction; import net.minecraft.world.entity.LivingEntity; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/itemproperties/OtherworldBlockItemPropertyGetter.java b/src/main/java/com/klikli_dev/occultism/client/itemproperties/OtherworldBlockItemPropertyGetter.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/client/itemproperties/OtherworldBlockItemPropertyGetter.java rename to src/main/java/com/klikli_dev/occultism/client/itemproperties/OtherworldBlockItemPropertyGetter.java index 667dfb8b8..79920f73a 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/itemproperties/OtherworldBlockItemPropertyGetter.java +++ b/src/main/java/com/klikli_dev/occultism/client/itemproperties/OtherworldBlockItemPropertyGetter.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.itemproperties; +package com.klikli_dev.occultism.client.itemproperties; -import com.github.klikli_dev.occultism.registry.OccultismEffects; +import com.klikli_dev.occultism.registry.OccultismEffects; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.item.ItemPropertyFunction; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/itemproperties/SoulGemItemPropertyGetter.java b/src/main/java/com/klikli_dev/occultism/client/itemproperties/SoulGemItemPropertyGetter.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/client/itemproperties/SoulGemItemPropertyGetter.java rename to src/main/java/com/klikli_dev/occultism/client/itemproperties/SoulGemItemPropertyGetter.java index 2afb00c1b..c2fccbb04 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/itemproperties/SoulGemItemPropertyGetter.java +++ b/src/main/java/com/klikli_dev/occultism/client/itemproperties/SoulGemItemPropertyGetter.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.itemproperties; +package com.klikli_dev.occultism.client.itemproperties; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.item.ItemPropertyFunction; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/itemproperties/StableWormholeBlockItemPropertyGetter.java b/src/main/java/com/klikli_dev/occultism/client/itemproperties/StableWormholeBlockItemPropertyGetter.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/client/itemproperties/StableWormholeBlockItemPropertyGetter.java rename to src/main/java/com/klikli_dev/occultism/client/itemproperties/StableWormholeBlockItemPropertyGetter.java index d39a11d75..9e370a3c0 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/itemproperties/StableWormholeBlockItemPropertyGetter.java +++ b/src/main/java/com/klikli_dev/occultism/client/itemproperties/StableWormholeBlockItemPropertyGetter.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.itemproperties; +package com.klikli_dev.occultism.client.itemproperties; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.item.ItemPropertyFunction; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/itemproperties/StorageRemoteItemPropertyGetter.java b/src/main/java/com/klikli_dev/occultism/client/itemproperties/StorageRemoteItemPropertyGetter.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/client/itemproperties/StorageRemoteItemPropertyGetter.java rename to src/main/java/com/klikli_dev/occultism/client/itemproperties/StorageRemoteItemPropertyGetter.java index 7b3caab38..1baaae95c 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/itemproperties/StorageRemoteItemPropertyGetter.java +++ b/src/main/java/com/klikli_dev/occultism/client/itemproperties/StorageRemoteItemPropertyGetter.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.itemproperties; +package com.klikli_dev.occultism.client.itemproperties; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.item.ItemPropertyFunction; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/keybindings/BackpackKeyConflictContext.java b/src/main/java/com/klikli_dev/occultism/client/keybindings/BackpackKeyConflictContext.java similarity index 73% rename from src/main/java/com/github/klikli_dev/occultism/client/keybindings/BackpackKeyConflictContext.java rename to src/main/java/com/klikli_dev/occultism/client/keybindings/BackpackKeyConflictContext.java index c6ebf51de..707d14584 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/keybindings/BackpackKeyConflictContext.java +++ b/src/main/java/com/klikli_dev/occultism/client/keybindings/BackpackKeyConflictContext.java @@ -1,17 +1,14 @@ -package com.github.klikli_dev.occultism.client.keybindings; +package com.klikli_dev.occultism.client.keybindings; -import com.github.klikli_dev.occultism.client.gui.storage.SatchelScreen; +import com.klikli_dev.occultism.client.gui.storage.SatchelScreen; import net.minecraft.client.Minecraft; import net.minecraftforge.client.settings.IKeyConflictContext; import net.minecraftforge.client.settings.KeyConflictContext; public class BackpackKeyConflictContext implements IKeyConflictContext { - //region Fields public static final BackpackKeyConflictContext INSTANCE = new BackpackKeyConflictContext(); - //endregion Fields - //region Overrides @Override public boolean isActive() { return !KeyConflictContext.GUI.isActive() || Minecraft.getInstance().screen instanceof SatchelScreen; @@ -21,6 +18,5 @@ public boolean isActive() { public boolean conflicts(IKeyConflictContext other) { return this == other; } - //endregion Overrides } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/keybindings/StorageRemoteKeyConflictContext.java b/src/main/java/com/klikli_dev/occultism/client/keybindings/StorageRemoteKeyConflictContext.java similarity index 72% rename from src/main/java/com/github/klikli_dev/occultism/client/keybindings/StorageRemoteKeyConflictContext.java rename to src/main/java/com/klikli_dev/occultism/client/keybindings/StorageRemoteKeyConflictContext.java index 534afaa76..a5421461c 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/keybindings/StorageRemoteKeyConflictContext.java +++ b/src/main/java/com/klikli_dev/occultism/client/keybindings/StorageRemoteKeyConflictContext.java @@ -1,17 +1,14 @@ -package com.github.klikli_dev.occultism.client.keybindings; +package com.klikli_dev.occultism.client.keybindings; -import com.github.klikli_dev.occultism.client.gui.storage.StorageControllerGuiBase; +import com.klikli_dev.occultism.client.gui.storage.StorageControllerGuiBase; import net.minecraft.client.Minecraft; import net.minecraftforge.client.settings.IKeyConflictContext; import net.minecraftforge.client.settings.KeyConflictContext; public class StorageRemoteKeyConflictContext implements IKeyConflictContext { - //region Fields public static final StorageRemoteKeyConflictContext INSTANCE = new StorageRemoteKeyConflictContext(); - //endregion Fields - //region Overrides @Override public boolean isActive() { return !KeyConflictContext.GUI.isActive() || Minecraft.getInstance().screen instanceof StorageControllerGuiBase; @@ -21,6 +18,5 @@ public boolean isActive() { public boolean conflicts(IKeyConflictContext other) { return this == other; } - //endregion Overrides } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/AfritModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/AfritModel.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/AfritModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/AfritModel.java index 8de5e71b0..29c09ecc1 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/AfritModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/AfritModel.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.spirit.AfritEntity; +import com.klikli_dev.occultism.common.entity.spirit.AfritEntity; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -38,7 +38,6 @@ public class AfritModel extends HumanoidModel { public static final String WINGED_WINGS_LEFT = "wingedWingsLeft"; public static final String WINGED_WINGS_RIGHT = "wingedWingsRight"; - //region Fields public ModelPart nose; public ModelPart earLeft; public ModelPart earRight; @@ -46,9 +45,6 @@ public class AfritModel extends HumanoidModel { public ModelPart wingedWingsLeft; public ModelPart wingedWingsRight; - //endregion Fields - - //region Initialization public AfritModel(ModelPart modelPart) { super(modelPart); //modelsize 1.0 was used here this.leftArmPose = ArmPose.EMPTY; @@ -61,9 +57,6 @@ public AfritModel(ModelPart modelPart) { this.wingedWingsLeft = this.wingedWings.getChild(WINGED_WINGS_LEFT); this.wingedWingsRight = this.wingedWings.getChild(WINGED_WINGS_RIGHT); } - //endregion Initialization - - //region Methods public static LayerDefinition createBodyLayer() { MeshDefinition meshdefinition = HumanoidModel.createMesh(CubeDeformation.NONE, 0); @@ -134,5 +127,5 @@ public static LayerDefinition createBodyLayer() { return LayerDefinition.create(meshdefinition, 64, 64); } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/AfritWildModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/AfritWildModel.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/AfritWildModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/AfritWildModel.java index d895e231d..3244e0cef 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/AfritWildModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/AfritWildModel.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.spirit.AfritWildEntity; +import com.klikli_dev.occultism.common.entity.spirit.AfritWildEntity; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -38,7 +38,6 @@ public class AfritWildModel extends HumanoidModel { public static final String WINGED_WINGS_LEFT = "wingedWingsLeft"; public static final String WINGED_WINGS_RIGHT = "wingedWingsRight"; - //region Fields public ModelPart nose; public ModelPart earLeft; public ModelPart earRight; @@ -46,9 +45,6 @@ public class AfritWildModel extends HumanoidModel { public ModelPart wingedWingsLeft; public ModelPart wingedWingsRight; - //endregion Fields - - //region Initialization public AfritWildModel(ModelPart modelPart) { super(modelPart); //modelsize 1.0 was used here this.leftArmPose = ArmPose.EMPTY; @@ -61,9 +57,6 @@ public AfritWildModel(ModelPart modelPart) { this.wingedWingsLeft = this.wingedWings.getChild(WINGED_WINGS_LEFT); this.wingedWingsRight = this.wingedWings.getChild(WINGED_WINGS_RIGHT); } - //endregion Initialization - - //region Methods public static LayerDefinition createBodyLayer() { MeshDefinition meshdefinition = HumanoidModel.createMesh(CubeDeformation.NONE, 0); @@ -134,5 +127,5 @@ public static LayerDefinition createBodyLayer() { return LayerDefinition.create(meshdefinition, 64, 64); } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/BatFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/BatFamiliarModel.java similarity index 86% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/BatFamiliarModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/BatFamiliarModel.java index eb5e0e631..1fa7d5c75 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/BatFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/BatFamiliarModel.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.BatFamiliarEntity; +import com.klikli_dev.occultism.common.entity.familiar.BatFamiliarEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Minecraft; @@ -88,48 +88,48 @@ public class BatFamiliarModel extends EntityModel { public BatFamiliarModel(ModelPart part) { this.body1 = part.getChild("body1"); - this.head = body1.getChild("head"); - this.body2 = body1.getChild("body2"); - this.leftEye = head.getChild("leftEye"); - this.leftEar1 = head.getChild("leftEar1"); - this.mouth = head.getChild("mouth"); - this.hair = head.getChild("hair"); - this.ribbon = head.getChild("ribbon"); - this.rightEye = head.getChild("rightEye"); - this.rightEar1 = head.getChild("rightEar1"); - this.leftEar2 = leftEar1.getChild("leftEar2"); - this.leftEarBack1 = leftEar1.getChild("leftEarBack1"); - this.leftEarBack2 = leftEar2.getChild("leftEarBack2"); - this.nose = mouth.getChild("nose"); - this.tooth = mouth.getChild("tooth"); - this.rightEar2 = rightEar1.getChild("rightEar2"); - this.rightEarBack1 = rightEar1.getChild("rightEarBack1"); - this.rightEarBack2 = rightEar2.getChild("rightEarBack2"); - this.leftLeg = body2.getChild("leftLeg"); - this.leftWing1 = body2.getChild("leftWing1"); - this.rightLeg = body2.getChild("rightLeg"); - this.tail = body2.getChild("tail"); - this.rightWing1 = body2.getChild("rightWing1"); - this.stick = body2.getChild("stick"); - this.goblet1 = leftLeg.getChild("goblet1"); - this.goblet2 = goblet1.getChild("goblet2"); - this.goblet3 = goblet1.getChild("goblet3"); - this.goblet4 = goblet3.getChild("goblet4"); - this.goblet5 = goblet3.getChild("goblet5"); - this.goblet6 = goblet3.getChild("goblet6"); - this.goblet7 = goblet3.getChild("goblet7"); - this.leftWing2 = leftWing1.getChild("leftWing2"); - this.leftWingBack1 = leftWing1.getChild("leftWingBack1"); - this.leftWingBack2 = leftWing2.getChild("leftWingBack2"); - this.rightWing2 = rightWing1.getChild("rightWing2"); - this.rightWingBack1 = rightWing1.getChild("rightWingBack1"); - this.rightWingBack2 = rightWing2.getChild("rightWingBack2"); - this.leftChain1 = stick.getChild("leftChain1"); - this.rightChain1 = stick.getChild("rightChain1"); - this.leftChain2 = leftChain1.getChild("leftChain2"); - this.leftChain3 = leftChain2.getChild("leftChain3"); - this.rightChain2 = rightChain1.getChild("rightChain2"); - this.rightChain3 = rightChain2.getChild("rightChain3"); + this.head = this.body1.getChild("head"); + this.body2 = this.body1.getChild("body2"); + this.leftEye = this.head.getChild("leftEye"); + this.leftEar1 = this.head.getChild("leftEar1"); + this.mouth = this.head.getChild("mouth"); + this.hair = this.head.getChild("hair"); + this.ribbon = this.head.getChild("ribbon"); + this.rightEye = this.head.getChild("rightEye"); + this.rightEar1 = this.head.getChild("rightEar1"); + this.leftEar2 = this.leftEar1.getChild("leftEar2"); + this.leftEarBack1 = this.leftEar1.getChild("leftEarBack1"); + this.leftEarBack2 = this.leftEar2.getChild("leftEarBack2"); + this.nose = this.mouth.getChild("nose"); + this.tooth = this.mouth.getChild("tooth"); + this.rightEar2 = this.rightEar1.getChild("rightEar2"); + this.rightEarBack1 = this.rightEar1.getChild("rightEarBack1"); + this.rightEarBack2 = this.rightEar2.getChild("rightEarBack2"); + this.leftLeg = this.body2.getChild("leftLeg"); + this.leftWing1 = this.body2.getChild("leftWing1"); + this.rightLeg = this.body2.getChild("rightLeg"); + this.tail = this.body2.getChild("tail"); + this.rightWing1 = this.body2.getChild("rightWing1"); + this.stick = this.body2.getChild("stick"); + this.goblet1 = this.leftLeg.getChild("goblet1"); + this.goblet2 = this.goblet1.getChild("goblet2"); + this.goblet3 = this.goblet1.getChild("goblet3"); + this.goblet4 = this.goblet3.getChild("goblet4"); + this.goblet5 = this.goblet3.getChild("goblet5"); + this.goblet6 = this.goblet3.getChild("goblet6"); + this.goblet7 = this.goblet3.getChild("goblet7"); + this.leftWing2 = this.leftWing1.getChild("leftWing2"); + this.leftWingBack1 = this.leftWing1.getChild("leftWingBack1"); + this.leftWingBack2 = this.leftWing2.getChild("leftWingBack2"); + this.rightWing2 = this.rightWing1.getChild("rightWing2"); + this.rightWingBack1 = this.rightWing1.getChild("rightWingBack1"); + this.rightWingBack2 = this.rightWing2.getChild("rightWingBack2"); + this.leftChain1 = this.stick.getChild("leftChain1"); + this.rightChain1 = this.stick.getChild("rightChain1"); + this.leftChain2 = this.leftChain1.getChild("leftChain2"); + this.leftChain3 = this.leftChain2.getChild("leftChain3"); + this.rightChain2 = this.rightChain1.getChild("rightChain2"); + this.rightChain3 = this.rightChain2.getChild("rightChain3"); } public static LayerDefinition createBodyLayer() { @@ -189,7 +189,7 @@ public void renderToBuffer(PoseStack pPoseStack, VertexConsumer pBuffer, int pPa @Override public void setupAnim(BatFamiliarEntity pEntity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) { - showModels(pEntity); + this.showModels(pEntity); float partialTicks = Minecraft.getInstance().getFrameTime(); @@ -209,8 +209,8 @@ public void setupAnim(BatFamiliarEntity pEntity, float limbSwing, float limbSwin this.leftWing2.xRot = animationHeight * this.toRads(20) + this.toRads(15); this.rightWing2.xRot = animationHeight * this.toRads(20) + this.toRads(15); this.body1.xRot = this.toRads(20) + limbSwingAmount * this.toRads(30); - this.leftLeg.xRot = 0.24f + Mth.cos(ageInTicks * 0.1f) * toRads(20); - this.rightLeg.xRot = 0.24f + Mth.cos(ageInTicks * 0.1f) * toRads(20); + this.leftLeg.xRot = 0.24f + Mth.cos(ageInTicks * 0.1f) * this.toRads(20); + this.rightLeg.xRot = 0.24f + Mth.cos(ageInTicks * 0.1f) * this.toRads(20); if (pEntity.isPartying()) { float headRot = Mth.sin(ageInTicks / 3) * this.toRads(10); @@ -225,8 +225,8 @@ public void setupAnim(BatFamiliarEntity pEntity, float limbSwing, float limbSwin this.leftWing2.xRot = wingRot; this.rightWing2.xRot = wingRot; this.body1.xRot = this.toRads(20) + limbSwingAmount * this.toRads(70); - this.leftEar1.xRot = Mth.cos(ageInTicks / 3 + PI) * toRads(25); - this.rightEar1.xRot = Mth.cos(ageInTicks / 3) * toRads(25); + this.leftEar1.xRot = Mth.cos(ageInTicks / 3 + PI) * this.toRads(25); + this.rightEar1.xRot = Mth.cos(ageInTicks / 3) * this.toRads(25); } else if (pEntity.isSitting()) { this.leftWing1.xRot = this.toRads(0); this.rightWing1.xRot = this.toRads(0); diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/BeaverFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/BeaverFamiliarModel.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/BeaverFamiliarModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/BeaverFamiliarModel.java index 4e07570d0..d41e68785 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/BeaverFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/BeaverFamiliarModel.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.BeaverFamiliarEntity; +import com.klikli_dev.occultism.common.entity.familiar.BeaverFamiliarEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.model.EntityModel; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/BeholderFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/BeholderFamiliarModel.java similarity index 99% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/BeholderFamiliarModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/BeholderFamiliarModel.java index b1e064e5f..7e5293410 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/BeholderFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/BeholderFamiliarModel.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.BeholderFamiliarEntity; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.entity.familiar.BeholderFamiliarEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/BlacksmithFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/BlacksmithFamiliarModel.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/BlacksmithFamiliarModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/BlacksmithFamiliarModel.java index 2f31ab297..3f797b717 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/BlacksmithFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/BlacksmithFamiliarModel.java @@ -19,11 +19,11 @@ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.BlacksmithFamiliarEntity; -import com.github.klikli_dev.occultism.util.FamiliarUtil; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.entity.familiar.BlacksmithFamiliarEntity; +import com.klikli_dev.occultism.util.FamiliarUtil; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.model.EntityModel; @@ -221,7 +221,7 @@ private void showModels(BlacksmithFamiliarEntity entityIn) { this.mouth2.visible = hasMarioMoustache && !isChristmas; this.hair1.visible = hasSquarehair; this.hair2.visible = !hasSquarehair; - + this.christmasBeard.visible = isChristmas; } } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/ChimeraFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/ChimeraFamiliarModel.java similarity index 99% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/ChimeraFamiliarModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/ChimeraFamiliarModel.java index 3a3f426fb..61d14ad3a 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/ChimeraFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/ChimeraFamiliarModel.java @@ -19,9 +19,9 @@ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.ChimeraFamiliarEntity; +import com.klikli_dev.occultism.common.entity.familiar.ChimeraFamiliarEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.model.EntityModel; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/CthulhuFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/CthulhuFamiliarModel.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/CthulhuFamiliarModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/CthulhuFamiliarModel.java index bd026f9c3..d3326f9d6 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/CthulhuFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/CthulhuFamiliarModel.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.CthulhuFamiliarEntity; +import com.klikli_dev.occultism.common.entity.familiar.CthulhuFamiliarEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Minecraft; @@ -218,7 +218,7 @@ public void setupAnim(CthulhuFamiliarEntity entityIn, float limbSwing, float lim if (entityIn.isVehicle()) { float animHeight = entityIn.getAnimationHeight(partialTicks); - this.rightArm.xRot = toRads(40 - animHeight * 15); + this.rightArm.xRot = this.toRads(40 - animHeight * 15); } } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/DeerFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/DeerFamiliarModel.java similarity index 99% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/DeerFamiliarModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/DeerFamiliarModel.java index d68d26f4b..ab181afc6 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/DeerFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/DeerFamiliarModel.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.DeerFamiliarEntity; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.entity.familiar.DeerFamiliarEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.model.EntityModel; @@ -146,6 +146,10 @@ public static LayerDefinition createBodyLayer() { return LayerDefinition.create(mesh, 64, 16); } + private static float toRad(float deg) { + return (float) Math.toRadians(deg); + } + @Override public void renderToBuffer(PoseStack pPoseStack, VertexConsumer pBuffer, int pPackedLight, int pPackedOverlay, float red, float green, float blue, float alpha) { ImmutableList.of(this.body).forEach((ModelPart) -> { @@ -153,10 +157,6 @@ public void renderToBuffer(PoseStack pPoseStack, VertexConsumer pBuffer, int pPa }); } - private static float toRad(float deg) { - return (float) Math.toRadians(deg); - } - @Override public void prepareMobModel(DeerFamiliarEntity entityIn, float limbSwing, float limbSwingAmount, float partialTick) { diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/DevilFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/DevilFamiliarModel.java similarity index 99% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/DevilFamiliarModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/DevilFamiliarModel.java index fa98daaf1..fdb25d955 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/DevilFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/DevilFamiliarModel.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.DevilFamiliarEntity; +import com.klikli_dev.occultism.common.entity.familiar.DevilFamiliarEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.model.EntityModel; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/DjinniModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/DjinniModel.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/DjinniModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/DjinniModel.java index 1e16bb643..dfc2d0e47 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/DjinniModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/DjinniModel.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.spirit.DjinniEntity; +import com.klikli_dev.occultism.common.entity.spirit.DjinniEntity; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/DragonFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/DragonFamiliarModel.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/DragonFamiliarModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/DragonFamiliarModel.java index a0486cf7d..89fb54e1b 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/DragonFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/DragonFamiliarModel.java @@ -1,9 +1,10 @@ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.DragonFamiliarEntity; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.entity.familiar.DragonFamiliarEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -322,12 +323,12 @@ public void setColor(float r, float g, float b, float a) { } @Override - public void render(PoseStack pPoseStack, VertexConsumer pVertexConsumer, int pPackedLight, int pPackedOverlay, float pRed, float pGreen, float pBlue, float pAlpha) { + public void render(PoseStack poseStack, VertexConsumer pVertexConsumer, int pPackedLight, int pPackedOverlay, float pRed, float pGreen, float pBlue, float pAlpha) { //prevent actual render } - public void proxyRender(PoseStack pPoseStack, VertexConsumer pVertexConsumer, int pPackedLight, int pPackedOverlay, float pRed, float pGreen, float pBlue, float pAlpha) { - this.proxied.render(pPoseStack, pVertexConsumer, pPackedLight, pPackedOverlay, this.r, this.g, this.b, this.a); + public void proxyRender(PoseStack poseStack, VertexConsumer pVertexConsumer, int pPackedLight, int pPackedOverlay, float pRed, float pGreen, float pBlue, float pAlpha) { + this.proxied.render(poseStack, pVertexConsumer, pPackedLight, pPackedOverlay, this.r, this.g, this.b, this.a); } } } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/FairyFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/FairyFamiliarModel.java similarity index 99% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/FairyFamiliarModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/FairyFamiliarModel.java index 07a94dc83..162a995df 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/FairyFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/FairyFamiliarModel.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.FairyFamiliarEntity; +import com.klikli_dev.occultism.common.entity.familiar.FairyFamiliarEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/FoliotModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/FoliotModel.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/FoliotModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/FoliotModel.java index 67ba1731e..e098baf18 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/FoliotModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/FoliotModel.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.spirit.FoliotEntity; +import com.klikli_dev.occultism.common.entity.spirit.FoliotEntity; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/GoatFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/GoatFamiliarModel.java similarity index 99% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/GoatFamiliarModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/GoatFamiliarModel.java index bd837fea5..8385485a3 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/GoatFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/GoatFamiliarModel.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.GoatFamiliarEntity; +import com.klikli_dev.occultism.common.entity.familiar.GoatFamiliarEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.model.EntityModel; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/GreedyFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/GreedyFamiliarModel.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/GreedyFamiliarModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/GreedyFamiliarModel.java index 5495c05ca..87129d8c9 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/GreedyFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/GreedyFamiliarModel.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.GreedyFamiliarEntity; +import com.klikli_dev.occultism.common.entity.familiar.GreedyFamiliarEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.model.EntityModel; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/GuardianFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/GuardianFamiliarModel.java similarity index 99% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/GuardianFamiliarModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/GuardianFamiliarModel.java index 3fa7b8ea1..fb8eb0d52 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/GuardianFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/GuardianFamiliarModel.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.GuardianFamiliarEntity; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.entity.familiar.GuardianFamiliarEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.model.EntityModel; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/HeadlessFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/HeadlessFamiliarModel.java similarity index 99% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/HeadlessFamiliarModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/HeadlessFamiliarModel.java index 7329f6b6f..8e0578209 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/HeadlessFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/HeadlessFamiliarModel.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.HeadlessFamiliarEntity; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.entity.familiar.HeadlessFamiliarEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.model.EntityModel; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/MaridModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/MaridModel.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/MaridModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/MaridModel.java index eca5d988c..57bd0b8de 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/MaridModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/MaridModel.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.spirit.MaridEntity; +import com.klikli_dev.occultism.common.entity.spirit.MaridEntity; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.model.geom.ModelPart; import net.minecraft.client.model.geom.PartPose; @@ -33,14 +33,11 @@ public class MaridModel extends HumanoidModel { - //region Fields + public ModelPart nose; public ModelPart earLeft; public ModelPart earRight; - //endregion Fields - - //region Initialization public MaridModel(ModelPart part) { super(part); @@ -48,8 +45,6 @@ public MaridModel(ModelPart part) { this.earLeft = this.head.getChild("left_ear"); this.earRight = this.head.getChild("right_ear"); } - //endregion Initialization - public static LayerDefinition createBodyLayer() { MeshDefinition mesh = new MeshDefinition(); diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/MummyFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/MummyFamiliarModel.java similarity index 63% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/MummyFamiliarModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/MummyFamiliarModel.java index dbaefa34d..b11bed3bd 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/MummyFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/MummyFamiliarModel.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.MummyFamiliarEntity; +import com.klikli_dev.occultism.common.entity.familiar.MummyFamiliarEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.model.EntityModel; @@ -69,30 +69,30 @@ public class MummyFamiliarModel extends EntityModel { public MummyFamiliarModel(ModelPart part) { this.body = part.getChild("body"); - this.head = body.getChild("head"); - this.leftArm1 = body.getChild("leftArm1"); - this.leftLeg1 = body.getChild("leftLeg1"); - this.skeleton = body.getChild("skeleton"); - this.spine = body.getChild("spine"); - this.rightArm1 = body.getChild("rightArm1"); - this.rightLeg1 = body.getChild("rightLeg1"); - this.nose = head.getChild("nose"); - this.eyeSockets = head.getChild("eyeSockets"); - this.leftEye = head.getChild("leftEye"); - this.rightEye = head.getChild("rightEye"); - this.crown = head.getChild("crown"); - this.tooth = nose.getChild("tooth"); - this.leftArm2 = leftArm1.getChild("leftArm2"); - this.leftArmBandage = leftArm1.getChild("leftArmBandage"); - this.heka = leftArm2.getChild("heka"); - this.leftGlove = leftArm2.getChild("leftGlove"); - this.leftLeg2 = leftLeg1.getChild("leftLeg2"); - this.leftLegBandage = leftLeg1.getChild("leftLegBandage"); - this.rightArm2 = rightArm1.getChild("rightArm2"); - this.rightGlove = rightArm2.getChild("rightGlove"); - this.rightArmBandage = rightArm2.getChild("rightArmBandage"); - this.rightLeg2 = rightLeg1.getChild("rightLeg2"); - this.leftLegBandage_1 = rightLeg2.getChild("leftLegBandage_1"); + this.head = this.body.getChild("head"); + this.leftArm1 = this.body.getChild("leftArm1"); + this.leftLeg1 = this.body.getChild("leftLeg1"); + this.skeleton = this.body.getChild("skeleton"); + this.spine = this.body.getChild("spine"); + this.rightArm1 = this.body.getChild("rightArm1"); + this.rightLeg1 = this.body.getChild("rightLeg1"); + this.nose = this.head.getChild("nose"); + this.eyeSockets = this.head.getChild("eyeSockets"); + this.leftEye = this.head.getChild("leftEye"); + this.rightEye = this.head.getChild("rightEye"); + this.crown = this.head.getChild("crown"); + this.tooth = this.nose.getChild("tooth"); + this.leftArm2 = this.leftArm1.getChild("leftArm2"); + this.leftArmBandage = this.leftArm1.getChild("leftArmBandage"); + this.heka = this.leftArm2.getChild("heka"); + this.leftGlove = this.leftArm2.getChild("leftGlove"); + this.leftLeg2 = this.leftLeg1.getChild("leftLeg2"); + this.leftLegBandage = this.leftLeg1.getChild("leftLegBandage"); + this.rightArm2 = this.rightArm1.getChild("rightArm2"); + this.rightGlove = this.rightArm2.getChild("rightGlove"); + this.rightArmBandage = this.rightArm2.getChild("rightArmBandage"); + this.rightLeg2 = this.rightLeg1.getChild("rightLeg2"); + this.leftLegBandage_1 = this.rightLeg2.getChild("leftLegBandage_1"); } @@ -135,105 +135,105 @@ public void renderToBuffer(PoseStack pPoseStack, VertexConsumer pBuffer, int pPa @Override public void setupAnim(MummyFamiliarEntity pEntity, float pLimbSwing, float pLimbSwingAmount, float pAgeInTicks, float pNetHeadYaw, float pHeadPitch) { - showModels(pEntity); + this.showModels(pEntity); - setRotateAngle(body, 0, 0, 0); - setRotateAngle(head, 0, 0, 0); - setRotateAngle(rightArm1, -0.274f, 0, 0); - setRotateAngle(rightArm2, -0.43f, 0, 0); - setRotateAngle(leftArm1, -0.274f, 0, 0); - setRotateAngle(leftArm2, -0.43f, 0, 0); - setRotateAngle(rightLeg1, 0, 0, 0); - setRotateAngle(rightLeg2, 0, 0, 0); - setRotateAngle(leftLeg1, 0, 0, 0); - setRotateAngle(leftLeg2, 0, 0, 0); + this.setRotateAngle(this.body, 0, 0, 0); + this.setRotateAngle(this.head, 0, 0, 0); + this.setRotateAngle(this.rightArm1, -0.274f, 0, 0); + this.setRotateAngle(this.rightArm2, -0.43f, 0, 0); + this.setRotateAngle(this.leftArm1, -0.274f, 0, 0); + this.setRotateAngle(this.leftArm2, -0.43f, 0, 0); + this.setRotateAngle(this.rightLeg1, 0, 0, 0); + this.setRotateAngle(this.rightLeg2, 0, 0, 0); + this.setRotateAngle(this.leftLeg1, 0, 0, 0); + this.setRotateAngle(this.leftLeg2, 0, 0, 0); this.body.z = 0; - this.head.xRot = toRads(pHeadPitch); - this.head.yRot = toRads(pNetHeadYaw); - this.rightLeg1.xRot = Mth.cos(pLimbSwing * 0.5f + PI) * toRads(40) * pLimbSwingAmount; - this.leftLeg1.xRot = Mth.cos(pLimbSwing * 0.5f) * toRads(40) * pLimbSwingAmount; - this.rightLeg2.xRot = Math.abs(Mth.cos(pLimbSwing * 0.5f + PI)) * toRads(40) * pLimbSwingAmount; - this.leftLeg2.xRot = Math.abs(Mth.cos(pLimbSwing * 0.5f) * toRads(40)) * pLimbSwingAmount; - this.rightArm1.xRot = Mth.cos(pLimbSwing * 0.5f) * toRads(40) * pLimbSwingAmount; - this.leftArm1.xRot = Mth.cos(pLimbSwing * 0.5f + PI) * toRads(40) * pLimbSwingAmount; - this.rightArm2.xRot = toRads(-30) + Mth.cos(pLimbSwing * 0.5f) * toRads(20) * pLimbSwingAmount; - this.leftArm2.xRot = toRads(-30) + Mth.cos(pLimbSwing * 0.5f + PI) * toRads(20) * pLimbSwingAmount; + this.head.xRot = this.toRads(pHeadPitch); + this.head.yRot = this.toRads(pNetHeadYaw); + this.rightLeg1.xRot = Mth.cos(pLimbSwing * 0.5f + PI) * this.toRads(40) * pLimbSwingAmount; + this.leftLeg1.xRot = Mth.cos(pLimbSwing * 0.5f) * this.toRads(40) * pLimbSwingAmount; + this.rightLeg2.xRot = Math.abs(Mth.cos(pLimbSwing * 0.5f + PI)) * this.toRads(40) * pLimbSwingAmount; + this.leftLeg2.xRot = Math.abs(Mth.cos(pLimbSwing * 0.5f) * this.toRads(40)) * pLimbSwingAmount; + this.rightArm1.xRot = Mth.cos(pLimbSwing * 0.5f) * this.toRads(40) * pLimbSwingAmount; + this.leftArm1.xRot = Mth.cos(pLimbSwing * 0.5f + PI) * this.toRads(40) * pLimbSwingAmount; + this.rightArm2.xRot = this.toRads(-30) + Mth.cos(pLimbSwing * 0.5f) * this.toRads(20) * pLimbSwingAmount; + this.leftArm2.xRot = this.toRads(-30) + Mth.cos(pLimbSwing * 0.5f + PI) * this.toRads(20) * pLimbSwingAmount; int fightPose = pEntity.getFightPose(); if (fightPose == 0) { - this.body.yRot = toRads(-60); - this.body.xRot = toRads(-40); - this.body.zRot = toRads(40); - this.head.yRot = toRads(60); - this.head.xRot = toRads(20); - this.rightArm1.xRot = toRads(20); - this.rightArm1.zRot = toRads(60); - this.rightArm2.xRot = toRads(-20); - this.leftArm1.xRot = toRads(-30); - this.leftArm1.yRot = toRads(40); - this.leftArm1.zRot = toRads(-40); - this.leftArm2.xRot = toRads(-70); - this.rightLeg1.zRot = toRads(70); - this.leftLeg1.xRot = toRads(-20); - this.leftLeg1.zRot = toRads(-60); - this.leftLeg2.zRot = toRads(110); + this.body.yRot = this.toRads(-60); + this.body.xRot = this.toRads(-40); + this.body.zRot = this.toRads(40); + this.head.yRot = this.toRads(60); + this.head.xRot = this.toRads(20); + this.rightArm1.xRot = this.toRads(20); + this.rightArm1.zRot = this.toRads(60); + this.rightArm2.xRot = this.toRads(-20); + this.leftArm1.xRot = this.toRads(-30); + this.leftArm1.yRot = this.toRads(40); + this.leftArm1.zRot = this.toRads(-40); + this.leftArm2.xRot = this.toRads(-70); + this.rightLeg1.zRot = this.toRads(70); + this.leftLeg1.xRot = this.toRads(-20); + this.leftLeg1.zRot = this.toRads(-60); + this.leftLeg2.zRot = this.toRads(110); } else if (fightPose == 1) { - this.body.yRot = toRads(40); - this.head.yRot = toRads(-25); - this.leftArm1.xRot = toRads(-60); - this.leftArm1.zRot = toRads(-70); - this.leftArm2.xRot = toRads(-10); - this.rightArm1.yRot = toRads(-20); - this.rightArm1.xRot = toRads(30); - this.rightArm2.xRot = toRads(-90); - this.leftLeg1.yRot = toRads(-40); - this.leftLeg1.xRot = toRads(-50); - this.leftLeg2.xRot = toRads(50); - this.rightLeg1.yRot = toRads(60); - this.rightLeg1.xRot = toRads(-40); - this.rightLeg2.xRot = toRads(25); + this.body.yRot = this.toRads(40); + this.head.yRot = this.toRads(-25); + this.leftArm1.xRot = this.toRads(-60); + this.leftArm1.zRot = this.toRads(-70); + this.leftArm2.xRot = this.toRads(-10); + this.rightArm1.yRot = this.toRads(-20); + this.rightArm1.xRot = this.toRads(30); + this.rightArm2.xRot = this.toRads(-90); + this.leftLeg1.yRot = this.toRads(-40); + this.leftLeg1.xRot = this.toRads(-50); + this.leftLeg2.xRot = this.toRads(50); + this.rightLeg1.yRot = this.toRads(60); + this.rightLeg1.xRot = this.toRads(-40); + this.rightLeg2.xRot = this.toRads(25); } else if (fightPose == 2) { - this.body.yRot = toRads(-60); - this.head.yRot = toRads(60); - this.head.xRot = toRads(-15); - this.rightArm1.yRot = toRads(60); - this.rightArm1.xRot = toRads(-140); - this.rightArm2.xRot = toRads(-35); - this.leftArm1.yRot = toRads(40); - this.leftArm1.xRot = toRads(40); - this.leftArm2.xRot = toRads(-70); - this.rightLeg1.yRot = toRads(60); - this.rightLeg1.xRot = toRads(-40); - this.rightLeg2.xRot = toRads(55); - this.leftLeg1.yRot = toRads(60); - this.leftLeg1.xRot = toRads(30); + this.body.yRot = this.toRads(-60); + this.head.yRot = this.toRads(60); + this.head.xRot = this.toRads(-15); + this.rightArm1.yRot = this.toRads(60); + this.rightArm1.xRot = this.toRads(-140); + this.rightArm2.xRot = this.toRads(-35); + this.leftArm1.yRot = this.toRads(40); + this.leftArm1.xRot = this.toRads(40); + this.leftArm2.xRot = this.toRads(-70); + this.rightLeg1.yRot = this.toRads(60); + this.rightLeg1.xRot = this.toRads(-40); + this.rightLeg2.xRot = this.toRads(55); + this.leftLeg1.yRot = this.toRads(60); + this.leftLeg1.xRot = this.toRads(30); } if (pEntity.isPartying()) { - setRotateAngle(head, 0, 0, 0); + this.setRotateAngle(this.head, 0, 0, 0); float bodyRot = pAgeInTicks * 10f % 360; - this.body.z = Mth.sin(toRads(bodyRot)) * 5; + this.body.z = Mth.sin(this.toRads(bodyRot)) * 5; this.body.yRot = bodyRot > 90 && bodyRot < 270 ? 0 : PI; - this.leftArm1.xRot = toRads(90); - this.leftArm2.xRot = toRads(-90) + Mth.cos(pAgeInTicks * 0.5f) * toRads(20); - this.rightArm1.xRot = toRads(-90); - this.rightArm2.xRot = toRads(-90) + Mth.cos(pAgeInTicks * 0.5f) * toRads(20); - this.leftLeg1.xRot = toRads(-20) + Mth.cos(pAgeInTicks * 0.5f) * toRads(20); - this.leftLeg2.xRot = toRads(20) + Mth.cos(pAgeInTicks * 0.5f) * toRads(-10); - this.rightLeg1.xRot = toRads(-20) - Mth.cos(pAgeInTicks * 0.5f) * toRads(20); - this.rightLeg2.xRot = toRads(20) - Mth.cos(pAgeInTicks * 0.5f) * toRads(-10); + this.leftArm1.xRot = this.toRads(90); + this.leftArm2.xRot = this.toRads(-90) + Mth.cos(pAgeInTicks * 0.5f) * this.toRads(20); + this.rightArm1.xRot = this.toRads(-90); + this.rightArm2.xRot = this.toRads(-90) + Mth.cos(pAgeInTicks * 0.5f) * this.toRads(20); + this.leftLeg1.xRot = this.toRads(-20) + Mth.cos(pAgeInTicks * 0.5f) * this.toRads(20); + this.leftLeg2.xRot = this.toRads(20) + Mth.cos(pAgeInTicks * 0.5f) * this.toRads(-10); + this.rightLeg1.xRot = this.toRads(-20) - Mth.cos(pAgeInTicks * 0.5f) * this.toRads(20); + this.rightLeg2.xRot = this.toRads(20) - Mth.cos(pAgeInTicks * 0.5f) * this.toRads(-10); } else if (pEntity.isSitting()) { - this.head.xRot = toRads(40); - this.head.yRot = toRads(-20); - this.body.xRot = toRads(35); - this.leftArm1.xRot = toRads(-50); - this.leftArm2.xRot = toRads(10); - this.rightArm1.xRot = toRads(-50); - this.rightArm2.xRot = toRads(10); - this.leftLeg1.xRot = toRads(-35); - this.rightLeg1.xRot = toRads(-35); + this.head.xRot = this.toRads(40); + this.head.yRot = this.toRads(-20); + this.body.xRot = this.toRads(35); + this.leftArm1.xRot = this.toRads(-50); + this.leftArm2.xRot = this.toRads(10); + this.rightArm1.xRot = this.toRads(-50); + this.rightArm2.xRot = this.toRads(10); + this.leftLeg1.xRot = this.toRads(-35); + this.rightLeg1.xRot = this.toRads(-35); } } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/ShubNiggurathFamiliarModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/ShubNiggurathFamiliarModel.java similarity index 99% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/ShubNiggurathFamiliarModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/ShubNiggurathFamiliarModel.java index 5170ed44e..e108a5e97 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/ShubNiggurathFamiliarModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/ShubNiggurathFamiliarModel.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.CthulhuFamiliarEntity; -import com.github.klikli_dev.occultism.common.entity.familiar.ShubNiggurathFamiliarEntity; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.entity.familiar.CthulhuFamiliarEntity; +import com.klikli_dev.occultism.common.entity.familiar.ShubNiggurathFamiliarEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/ShubNiggurathSpawnModel.java b/src/main/java/com/klikli_dev/occultism/client/model/entity/ShubNiggurathSpawnModel.java similarity index 86% rename from src/main/java/com/github/klikli_dev/occultism/client/model/entity/ShubNiggurathSpawnModel.java rename to src/main/java/com/klikli_dev/occultism/client/model/entity/ShubNiggurathSpawnModel.java index fe55c178c..c3962ff7a 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/model/entity/ShubNiggurathSpawnModel.java +++ b/src/main/java/com/klikli_dev/occultism/client/model/entity/ShubNiggurathSpawnModel.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.model.entity; +package com.klikli_dev.occultism.client.model.entity; -import com.github.klikli_dev.occultism.common.entity.familiar.ShubNiggurathSpawnEntity; -import com.github.klikli_dev.occultism.util.FamiliarUtil; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.entity.familiar.ShubNiggurathSpawnEntity; +import com.klikli_dev.occultism.util.FamiliarUtil; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.model.EntityModel; @@ -71,30 +71,30 @@ public class ShubNiggurathSpawnModel extends EntityModel selectedBlocks = new HashSet<>(); - //endregion Fields - - //region Methods /** * Highlights the given block position until the given system time (not game time) @@ -130,24 +126,19 @@ protected void renderSelectedBlocks(RenderLevelStageEvent event) { } } } - //endregion Methods public class SelectionInfo { - //region Fields + public BlockPos selectedBlock; public long selectionExpireTime; public Color color; - //endregion Fields - //region Initialization public SelectionInfo(BlockPos selectedBlock, long selectionExpireTime, Color color) { this.selectedBlock = selectedBlock; this.selectionExpireTime = selectionExpireTime; this.color = color; } - //endregion Initialization - //region Overrides @Override public int hashCode() { return this.selectedBlock.hashCode(); @@ -164,6 +155,6 @@ public boolean equals(Object obj) { return other.selectedBlock.equals(this.selectedBlock); } - //endregion Overrides + } } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/ThirdEyeEffectRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/ThirdEyeEffectRenderer.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/client/render/ThirdEyeEffectRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/ThirdEyeEffectRenderer.java index a101e9c27..d78bc96e6 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/ThirdEyeEffectRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/ThirdEyeEffectRenderer.java @@ -20,13 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render; +package com.klikli_dev.occultism.client.render; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.api.common.data.OtherworldBlockTier; -import com.github.klikli_dev.occultism.common.block.otherworld.IOtherworldBlock; -import com.github.klikli_dev.occultism.registry.OccultismEffects; -import com.github.klikli_dev.occultism.util.CuriosUtil; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.api.common.data.OtherworldBlockTier; +import com.klikli_dev.occultism.common.block.otherworld.IOtherworldBlock; +import com.klikli_dev.occultism.registry.OccultismEffects; +import com.klikli_dev.occultism.util.CuriosUtil; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.systems.RenderSystem; @@ -38,6 +38,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.client.event.ScreenEvent; import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -58,7 +59,7 @@ public class ThirdEyeEffectRenderer { @SubscribeEvent public void onPlayerTick(TickEvent.PlayerTickEvent event) { - if (event.player.level.isClientSide && event.player == Minecraft.getInstance().player) { + if (event.player.level().isClientSide && event.player == Minecraft.getInstance().player) { this.onThirdEyeTick(event); this.onGogglesTick(event); } @@ -66,6 +67,7 @@ public void onPlayerTick(TickEvent.PlayerTickEvent event) { public void renderOverlay(PoseStack pose) { + RenderSystem.setShaderTexture(0, ThirdEyeEffectRenderer.THIRD_EYE_TEXTURE); RenderSystem.enableBlend(); RenderSystem.blendFuncSeparate( GlStateManager.SourceFactor.SRC_ALPHA, @@ -128,8 +130,7 @@ public void uncoverBlocks(Player player, Level level, OtherworldBlockTier tier) BlockPos.betweenClosed(origin.offset(-MAX_THIRD_EYE_DISTANCE, -MAX_THIRD_EYE_DISTANCE, -MAX_THIRD_EYE_DISTANCE), origin.offset(MAX_THIRD_EYE_DISTANCE, MAX_THIRD_EYE_DISTANCE, MAX_THIRD_EYE_DISTANCE)).forEach(pos -> { BlockState state = level.getBlockState(pos); - if (state.getBlock() instanceof IOtherworldBlock) { - IOtherworldBlock block = (IOtherworldBlock) state.getBlock(); + if (state.getBlock() instanceof IOtherworldBlock block) { if (block.getTier().getLevel() <= tier.getLevel()) { if (!state.getValue(IOtherworldBlock.UNCOVERED)) { level.setBlock(pos, state.setValue(IOtherworldBlock.UNCOVERED, true), 1); @@ -157,11 +158,11 @@ public void onThirdEyeTick(TickEvent.PlayerTickEvent event) { } } //also handle goggles in one if we have them - this.uncoverBlocks(event.player, event.player.level, OtherworldBlockTier.ONE); + this.uncoverBlocks(event.player, event.player.level(), OtherworldBlockTier.ONE); } else { //if we don't have goggles, cover blocks //Try twice, but on the last effect tick, clear the list. - this.resetUncoveredBlocks(event.player.level, duration == 0); + this.resetUncoveredBlocks(event.player.level(), duration == 0); if (this.thirdEyeActiveLastTick) { this.thirdEyeActiveLastTick = false; @@ -180,16 +181,16 @@ public void onGogglesTick(TickEvent.PlayerTickEvent event) { if (!this.gogglesActiveLastTick) { this.gogglesActiveLastTick = true; } - this.uncoverBlocks(event.player, event.player.level, OtherworldBlockTier.TWO); + this.uncoverBlocks(event.player, event.player.level(), OtherworldBlockTier.TWO); } else { if (this.gogglesActiveLastTick) { this.gogglesActiveLastTick = false; //only cover blocks if third eye is not active and still needs them visible. - this.resetUncoveredBlocks(event.player.level, true); + this.resetUncoveredBlocks(event.player.level(), true); if (this.thirdEyeActiveLastTick) { //this uncovers tier 1 blocks that we still can see under normal third eye - this.uncoverBlocks(event.player, event.player.level, OtherworldBlockTier.ONE); + this.uncoverBlocks(event.player, event.player.level(), OtherworldBlockTier.ONE); } } } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/blockentity/SacrificialBowlRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/blockentity/SacrificialBowlRenderer.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/client/render/blockentity/SacrificialBowlRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/blockentity/SacrificialBowlRenderer.java index 64d927443..77b140053 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/blockentity/SacrificialBowlRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/blockentity/SacrificialBowlRenderer.java @@ -20,15 +20,14 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.blockentity; +package com.klikli_dev.occultism.client.render.blockentity; -import com.github.klikli_dev.occultism.common.block.SpiritAttunedCrystalBlock; -import com.github.klikli_dev.occultism.common.blockentity.SacrificialBowlBlockEntity; +import com.klikli_dev.occultism.common.block.SpiritAttunedCrystalBlock; +import com.klikli_dev.occultism.common.blockentity.SacrificialBowlBlockEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.client.renderer.entity.ItemRenderer; @@ -39,13 +38,9 @@ public class SacrificialBowlRenderer implements BlockEntityRenderer { - //region Initialization public SacrificialBowlRenderer(BlockEntityRendererProvider.Context context) { } - //endregion Initialization - - //region Overrides //region Static Methods public static float getScale(ItemStack stack) { @@ -55,7 +50,6 @@ public static float getScale(ItemStack stack) { } return 1.0f; } - //endregion Overrides @Override public void render(SacrificialBowlBlockEntity blockEntity, float partialTicks, PoseStack poseStack, diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/blockentity/StorageControllerGeoRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/blockentity/StorageControllerGeoRenderer.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/client/render/blockentity/StorageControllerGeoRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/blockentity/StorageControllerGeoRenderer.java index 6b926b863..7ad7aaebd 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/blockentity/StorageControllerGeoRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/blockentity/StorageControllerGeoRenderer.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.blockentity; +package com.klikli_dev.occultism.client.render.blockentity; -import com.github.klikli_dev.occultism.client.model.tile.DimensionalMatrixModel; -import com.github.klikli_dev.occultism.common.blockentity.StorageControllerBlockEntity; +import com.klikli_dev.occultism.client.model.tile.DimensionalMatrixModel; +import com.klikli_dev.occultism.common.blockentity.StorageControllerBlockEntity; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; @@ -74,7 +74,7 @@ public void actuallyRender(PoseStack poseStack, StorageControllerBlockEntity ani if (!isReRender) { var animationState = new AnimationState<>(animatable, 0, 0, partialTicks, false); - long instanceId = getInstanceId(animatable); + long instanceId = this.getInstanceId(animatable); animationState.setData(DataTickets.TICK, animatable.getTick(animatable)); animationState.setData(DataTickets.BLOCK_ENTITY, animatable); diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/blockentity/StorageControllerRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/blockentity/StorageControllerRenderer.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/client/render/blockentity/StorageControllerRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/blockentity/StorageControllerRenderer.java index 045d81c54..deee72be5 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/blockentity/StorageControllerRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/blockentity/StorageControllerRenderer.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.blockentity; +package com.klikli_dev.occultism.client.render.blockentity; -import com.github.klikli_dev.occultism.common.blockentity.StorageControllerBlockEntity; -import com.github.klikli_dev.occultism.registry.OccultismItems; +import com.klikli_dev.occultism.common.blockentity.StorageControllerBlockEntity; +import com.klikli_dev.occultism.registry.OccultismItems; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Axis; @@ -49,18 +49,13 @@ @Deprecated public class StorageControllerRenderer implements BlockEntityRenderer { - //region Fields protected Minecraft minecraft; protected ItemStack stack; - //endregion Fields - //region Initialization public StorageControllerRenderer(BlockEntityRendererProvider.Context context) { this.minecraft = Minecraft.getInstance(); } - //endregion Initialization - //region Overrides @Override public void render(StorageControllerBlockEntity blockEntity, float partialTicks, PoseStack poseStack, MultiBufferSource buffer, int combinedLight, int combinedOverlay) { @@ -116,9 +111,7 @@ public void render(StorageControllerBlockEntity blockEntity, float partialTicks, poseStack.popPose(); } - //endregion Overrides - //region Methods public void renderQuads(PoseStack matrixStackIn, VertexConsumer bufferIn, List quadsIn, int colorIn, int combinedLightIn, int combinedOverlayIn) { //from ItemRenderer#renderQuadList @@ -135,5 +128,4 @@ public void renderQuads(PoseStack matrixStackIn, VertexConsumer bufferIn, List { - //region Fields + private static final ResourceLocation[] TEXTURES = {new ResourceLocation(Occultism.MODID, "textures/entity/afrit.png")}; - //endregion Fields - - //region Initialization public AfritRenderer(EntityRendererProvider.Context context) { super(context, new AfritModel(context.bakeLayer(OccultismModelLayers.AFRIT)), 0.5f); } - //endregion Initialization - - //region Overrides @Override public ResourceLocation getTextureLocation(AfritEntity entity) { @@ -55,5 +49,5 @@ protected void scale(AfritEntity entity, PoseStack matrixStackIn, float partialT super.scale(entity, matrixStackIn, partialTickTime); matrixStackIn.scale(1.2f, 1.2f, 1.2f); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/AfritWildRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/AfritWildRenderer.java similarity index 86% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/AfritWildRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/AfritWildRenderer.java index 6a69c9c5d..576ae0004 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/AfritWildRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/AfritWildRenderer.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.AfritWildModel; -import com.github.klikli_dev.occultism.common.entity.spirit.AfritWildEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.AfritWildModel; +import com.klikli_dev.occultism.common.entity.spirit.AfritWildEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.HumanoidMobRenderer; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/BatFamiliarRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/BatFamiliarRenderer.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/BatFamiliarRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/BatFamiliarRenderer.java index c8d63744b..d70ea23b6 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/BatFamiliarRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/BatFamiliarRenderer.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.BatFamiliarModel; -import com.github.klikli_dev.occultism.common.entity.familiar.BatFamiliarEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.BatFamiliarModel; +import com.klikli_dev.occultism.common.entity.familiar.BatFamiliarEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.EntityRendererProvider; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/BeaverFamiliarRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/BeaverFamiliarRenderer.java similarity index 84% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/BeaverFamiliarRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/BeaverFamiliarRenderer.java index 3d961b1de..ee1a18498 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/BeaverFamiliarRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/BeaverFamiliarRenderer.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.BeaverFamiliarModel; -import com.github.klikli_dev.occultism.common.entity.familiar.BeaverFamiliarEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.BeaverFamiliarModel; +import com.klikli_dev.occultism.common.entity.familiar.BeaverFamiliarEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.MobRenderer; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/BeholderFamiliarRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/BeholderFamiliarRenderer.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/BeholderFamiliarRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/BeholderFamiliarRenderer.java index f0cfd0464..e1e3ecdd2 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/BeholderFamiliarRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/BeholderFamiliarRenderer.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.BeholderFamiliarModel; -import com.github.klikli_dev.occultism.common.entity.familiar.BeholderFamiliarEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.BeholderFamiliarModel; +import com.klikli_dev.occultism.common.entity.familiar.BeholderFamiliarEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/BipedSpiritRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/BipedSpiritRenderer.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/BipedSpiritRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/BipedSpiritRenderer.java index c205acd71..7a0790d7b 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/BipedSpiritRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/BipedSpiritRenderer.java @@ -20,18 +20,17 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.HumanoidMobRenderer; public abstract class BipedSpiritRenderer> extends HumanoidMobRenderer { - //region Initialization public BipedSpiritRenderer(EntityRendererProvider.Context context, M modelBiped, float shadowsizein) { super(context, modelBiped, shadowsizein); } - //endregion Initialization + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/BlacksmithFamiliarRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/BlacksmithFamiliarRenderer.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/BlacksmithFamiliarRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/BlacksmithFamiliarRenderer.java index 406eec050..4e2dab1ff 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/BlacksmithFamiliarRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/BlacksmithFamiliarRenderer.java @@ -20,16 +20,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.BlacksmithFamiliarModel; -import com.github.klikli_dev.occultism.common.entity.familiar.BlacksmithFamiliarEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.BlacksmithFamiliarModel; +import com.klikli_dev.occultism.common.entity.familiar.BlacksmithFamiliarEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.MobRenderer; import net.minecraft.client.renderer.entity.RenderLayerParent; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/ChimeraFamiliarRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/ChimeraFamiliarRenderer.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/ChimeraFamiliarRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/ChimeraFamiliarRenderer.java index 48f416642..137db7ebd 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/ChimeraFamiliarRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/ChimeraFamiliarRenderer.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.ChimeraFamiliarModel; -import com.github.klikli_dev.occultism.common.entity.familiar.ChimeraFamiliarEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.ChimeraFamiliarModel; +import com.klikli_dev.occultism.common.entity.familiar.ChimeraFamiliarEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.EntityRendererProvider; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/CthulhuFamiliarRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/CthulhuFamiliarRenderer.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/CthulhuFamiliarRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/CthulhuFamiliarRenderer.java index a6368406f..40f6e6c5f 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/CthulhuFamiliarRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/CthulhuFamiliarRenderer.java @@ -20,16 +20,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.CthulhuFamiliarModel; -import com.github.klikli_dev.occultism.common.entity.familiar.CthulhuFamiliarEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.CthulhuFamiliarModel; +import com.klikli_dev.occultism.common.entity.familiar.CthulhuFamiliarEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.MobRenderer; import net.minecraft.client.renderer.entity.RenderLayerParent; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/DeerFamiliarRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/DeerFamiliarRenderer.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/DeerFamiliarRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/DeerFamiliarRenderer.java index b58ea4537..f1390a2b4 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/DeerFamiliarRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/DeerFamiliarRenderer.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.DeerFamiliarModel; -import com.github.klikli_dev.occultism.common.entity.familiar.DeerFamiliarEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.DeerFamiliarModel; +import com.klikli_dev.occultism.common.entity.familiar.DeerFamiliarEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/DevilFamiliarRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/DevilFamiliarRenderer.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/DevilFamiliarRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/DevilFamiliarRenderer.java index 047e736a0..9cbfe4641 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/DevilFamiliarRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/DevilFamiliarRenderer.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.DevilFamiliarModel; -import com.github.klikli_dev.occultism.common.entity.familiar.DevilFamiliarEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.DevilFamiliarModel; +import com.klikli_dev.occultism.common.entity.familiar.DevilFamiliarEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.EntityRendererProvider; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/DjinniRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/DjinniRenderer.java similarity index 81% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/DjinniRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/DjinniRenderer.java index 5aefc2838..5939043ee 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/DjinniRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/DjinniRenderer.java @@ -20,30 +20,24 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.DjinniModel; -import com.github.klikli_dev.occultism.common.entity.spirit.DjinniEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.DjinniModel; +import com.klikli_dev.occultism.common.entity.spirit.DjinniEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.resources.ResourceLocation; public class DjinniRenderer extends BipedSpiritRenderer { - //region Fields + private static final ResourceLocation[] TEXTURES = {new ResourceLocation(Occultism.MODID, "textures/entity/djinni.png")}; - //endregion Fields - - //region Initialization public DjinniRenderer(EntityRendererProvider.Context context) { super(context, new DjinniModel(context.bakeLayer(OccultismModelLayers.DJINNI)), 0.25f); } - //endregion Initialization - - //region Overrides @Override public ResourceLocation getTextureLocation(DjinniEntity entity) { @@ -55,5 +49,5 @@ protected void scale(DjinniEntity entity, PoseStack matrixStackIn, float partial super.scale(entity, matrixStackIn, partialTickTime); matrixStackIn.scale(0.6f, 0.6f, 0.6f); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/DragonFamiliarRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/DragonFamiliarRenderer.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/DragonFamiliarRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/DragonFamiliarRenderer.java index c70118b74..25e07d4e3 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/DragonFamiliarRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/DragonFamiliarRenderer.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.DragonFamiliarModel; -import com.github.klikli_dev.occultism.common.entity.familiar.DragonFamiliarEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.DragonFamiliarModel; +import com.klikli_dev.occultism.common.entity.familiar.DragonFamiliarEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; @@ -84,7 +84,7 @@ public static void renderText(RenderLivingEvent { - //region Fields + private static final ResourceLocation[] TEXTURES = {new ResourceLocation(Occultism.MODID, "textures/entity/foliot.png")}; - //endregion Fields - - //region Initialization public FoliotRenderer(EntityRendererProvider.Context context) { super(context, new FoliotModel(context.bakeLayer(OccultismModelLayers.FOLIOT)), 0.25f); } - //endregion Initialization - - //region Overrides @Override public ResourceLocation getTextureLocation(FoliotEntity entity) { @@ -55,5 +49,5 @@ protected void scale(FoliotEntity entity, PoseStack matrixStackIn, float partial super.scale(entity, matrixStackIn, partialTickTime); matrixStackIn.scale(0.6f, 0.6f, 0.6f); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/GoatFamiliarRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/GoatFamiliarRenderer.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/GoatFamiliarRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/GoatFamiliarRenderer.java index 18b09221e..fd1313c27 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/GoatFamiliarRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/GoatFamiliarRenderer.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.GoatFamiliarModel; -import com.github.klikli_dev.occultism.common.entity.familiar.GoatFamiliarEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.GoatFamiliarModel; +import com.klikli_dev.occultism.common.entity.familiar.GoatFamiliarEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/GreedyFamiliarRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/GreedyFamiliarRenderer.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/GreedyFamiliarRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/GreedyFamiliarRenderer.java index 2d9f32c38..3dd2450e4 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/GreedyFamiliarRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/GreedyFamiliarRenderer.java @@ -20,20 +20,19 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.GreedyFamiliarModel; -import com.github.klikli_dev.occultism.common.entity.familiar.GreedyFamiliarEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; -import com.github.klikli_dev.occultism.util.FamiliarUtil; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.GreedyFamiliarModel; +import com.klikli_dev.occultism.common.entity.familiar.GreedyFamiliarEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.util.FamiliarUtil; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemInHandRenderer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.LivingEntityRenderer; import net.minecraft.client.renderer.entity.MobRenderer; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/GuardianFamiliarRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/GuardianFamiliarRenderer.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/GuardianFamiliarRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/GuardianFamiliarRenderer.java index 3ccc6a3c5..d8d185b9c 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/GuardianFamiliarRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/GuardianFamiliarRenderer.java @@ -20,20 +20,19 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.GuardianFamiliarModel; -import com.github.klikli_dev.occultism.common.entity.familiar.GuardianFamiliarEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; -import com.github.klikli_dev.occultism.util.FamiliarUtil; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.GuardianFamiliarModel; +import com.klikli_dev.occultism.common.entity.familiar.GuardianFamiliarEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.util.FamiliarUtil; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemInHandRenderer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.LivingEntityRenderer; import net.minecraft.client.renderer.entity.MobRenderer; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/HeadlessFamiliarRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/HeadlessFamiliarRenderer.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/HeadlessFamiliarRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/HeadlessFamiliarRenderer.java index 6412da3ba..71580baa0 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/HeadlessFamiliarRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/HeadlessFamiliarRenderer.java @@ -20,16 +20,16 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.CthulhuFamiliarModel; -import com.github.klikli_dev.occultism.client.model.entity.HeadlessFamiliarModel; -import com.github.klikli_dev.occultism.common.entity.familiar.HeadlessFamiliarEntity; -import com.github.klikli_dev.occultism.registry.OccultismEntities; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; -import com.github.klikli_dev.occultism.util.FamiliarUtil; +package com.klikli_dev.occultism.client.render.entity; + import com.google.common.collect.ImmutableMap; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.CthulhuFamiliarModel; +import com.klikli_dev.occultism.client.model.entity.HeadlessFamiliarModel; +import com.klikli_dev.occultism.common.entity.familiar.HeadlessFamiliarEntity; +import com.klikli_dev.occultism.registry.OccultismEntities; +import com.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.util.FamiliarUtil; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Minecraft; @@ -41,7 +41,6 @@ import net.minecraft.client.renderer.ItemInHandRenderer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.block.model.ItemTransforms; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.LivingEntityRenderer; import net.minecraft.client.renderer.entity.MobRenderer; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/MaridRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/MaridRenderer.java similarity index 81% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/MaridRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/MaridRenderer.java index f51f3bf8e..995c07d0c 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/MaridRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/MaridRenderer.java @@ -20,30 +20,24 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.MaridModel; -import com.github.klikli_dev.occultism.common.entity.spirit.MaridEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.MaridModel; +import com.klikli_dev.occultism.common.entity.spirit.MaridEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.resources.ResourceLocation; public class MaridRenderer extends BipedSpiritRenderer { - //region Fields + private static final ResourceLocation[] TEXTURES = {new ResourceLocation(Occultism.MODID, "textures/entity/marid.png")}; - //endregion Fields - - //region Initialization public MaridRenderer(EntityRendererProvider.Context context) { super(context, new MaridModel(context.bakeLayer(OccultismModelLayers.MARID)), 0.5f); } - //endregion Initialization - - //region Overrides @Override public ResourceLocation getTextureLocation(MaridEntity entity) { @@ -55,5 +49,5 @@ protected void scale(MaridEntity entity, PoseStack matrixStackIn, float partialT super.scale(entity, matrixStackIn, partialTickTime); matrixStackIn.scale(1.2f, 1.2f, 1.2f); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/MummyFamiliarRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/MummyFamiliarRenderer.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/MummyFamiliarRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/MummyFamiliarRenderer.java index 98647f04d..b69591d23 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/MummyFamiliarRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/MummyFamiliarRenderer.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.MummyFamiliarModel; -import com.github.klikli_dev.occultism.common.entity.familiar.MummyFamiliarEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.MummyFamiliarModel; +import com.klikli_dev.occultism.common.entity.familiar.MummyFamiliarEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.gui.Font; @@ -49,7 +49,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.phys.Vec3; import org.joml.Quaternionf; -import oshi.hardware.Display; public class MummyFamiliarRenderer extends MobRenderer { diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/OtherworldBirdRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/OtherworldBirdRenderer.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/OtherworldBirdRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/OtherworldBirdRenderer.java index b41eef4dd..5c4b2922d 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/OtherworldBirdRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/OtherworldBirdRenderer.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; import net.minecraft.client.model.ParrotModel; import net.minecraft.client.model.geom.ModelLayers; @@ -30,7 +30,7 @@ import net.minecraft.util.Mth; import net.minecraft.world.entity.animal.Parrot; -import static com.github.klikli_dev.occultism.util.StaticUtil.modLoc; +import static com.klikli_dev.occultism.util.StaticUtil.modLoc; public class OtherworldBirdRenderer extends MobRenderer { public static final ResourceLocation TEXTURE = modLoc("textures/entity/otherworld_bird.png"); diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/ShubNiggurathFamiliarRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/ShubNiggurathFamiliarRenderer.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/ShubNiggurathFamiliarRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/ShubNiggurathFamiliarRenderer.java index 1e96aa716..38092a0b9 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/ShubNiggurathFamiliarRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/ShubNiggurathFamiliarRenderer.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.ShubNiggurathFamiliarModel; -import com.github.klikli_dev.occultism.common.entity.familiar.ShubNiggurathFamiliarEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.ShubNiggurathFamiliarModel; +import com.klikli_dev.occultism.common.entity.familiar.ShubNiggurathFamiliarEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.entity.EntityRendererProvider; diff --git a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/ShubNiggurathSpawnRenderer.java b/src/main/java/com/klikli_dev/occultism/client/render/entity/ShubNiggurathSpawnRenderer.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/client/render/entity/ShubNiggurathSpawnRenderer.java rename to src/main/java/com/klikli_dev/occultism/client/render/entity/ShubNiggurathSpawnRenderer.java index 668d3e746..1621e560f 100644 --- a/src/main/java/com/github/klikli_dev/occultism/client/render/entity/ShubNiggurathSpawnRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/client/render/entity/ShubNiggurathSpawnRenderer.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.client.render.entity; +package com.klikli_dev.occultism.client.render.entity; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.model.entity.ShubNiggurathSpawnModel; -import com.github.klikli_dev.occultism.common.entity.familiar.ShubNiggurathSpawnEntity; -import com.github.klikli_dev.occultism.registry.OccultismModelLayers; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.model.entity.ShubNiggurathSpawnModel; +import com.klikli_dev.occultism.common.entity.familiar.ShubNiggurathSpawnEntity; +import com.klikli_dev.occultism.registry.OccultismModelLayers; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.model.geom.ModelPart; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/DebugHelper.java b/src/main/java/com/klikli_dev/occultism/common/DebugHelper.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/common/DebugHelper.java rename to src/main/java/com/klikli_dev/occultism/common/DebugHelper.java index 55527daf4..c34b82654 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/DebugHelper.java +++ b/src/main/java/com/klikli_dev/occultism/common/DebugHelper.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common; +package com.klikli_dev.occultism.common; public class DebugHelper { public boolean debugAI; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/advancement/FamiliarTrigger.java b/src/main/java/com/klikli_dev/occultism/common/advancement/FamiliarTrigger.java similarity index 77% rename from src/main/java/com/github/klikli_dev/occultism/common/advancement/FamiliarTrigger.java rename to src/main/java/com/klikli_dev/occultism/common/advancement/FamiliarTrigger.java index b9453af25..7397a58a2 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/advancement/FamiliarTrigger.java +++ b/src/main/java/com/klikli_dev/occultism/common/advancement/FamiliarTrigger.java @@ -1,7 +1,7 @@ -package com.github.klikli_dev.occultism.common.advancement; +package com.klikli_dev.occultism.common.advancement; -import com.github.klikli_dev.occultism.Occultism; import com.google.gson.JsonObject; +import com.klikli_dev.occultism.Occultism; import net.minecraft.advancements.critereon.*; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; @@ -13,7 +13,7 @@ public class FamiliarTrigger extends SimpleCriterionTrigger { return Shapes.join(v1, v2, BooleanOp.OR); }).get(); - //endregion Fields - //region Initialization public CandleBlock(Properties properties) { super(properties); } - //endregion Initialization - - //region Overrides @Override @SuppressWarnings("deprecation") @@ -107,5 +102,5 @@ public boolean canSurvive(BlockState state, LevelReader worldIn, BlockPos pos) { BlockState downState = worldIn.getBlockState(down); return downState.isFaceSturdy(worldIn, down, Direction.UP); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/block/ChalkGlyphBlock.java b/src/main/java/com/klikli_dev/occultism/common/block/ChalkGlyphBlock.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/common/block/ChalkGlyphBlock.java rename to src/main/java/com/klikli_dev/occultism/common/block/ChalkGlyphBlock.java index d841050ea..19f682bd4 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/block/ChalkGlyphBlock.java +++ b/src/main/java/com/klikli_dev/occultism/common/block/ChalkGlyphBlock.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.block; +package com.klikli_dev.occultism.common.block; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -104,7 +104,7 @@ public boolean canBeReplaced(BlockState state, Fluid fluid) { public boolean canSurvive(BlockState state, LevelReader worldIn, BlockPos pos) { BlockPos down = pos.below(); BlockState downState = worldIn.getBlockState(down); - return downState.isFaceSturdy(worldIn, down, Direction.UP) && state.getMaterial().isReplaceable(); + return downState.isFaceSturdy(worldIn, down, Direction.UP) && state.canBeReplaced(); } @Override @@ -150,5 +150,5 @@ public ItemStack getCloneItemStack(BlockState state, HitResult target, BlockGett public @Nullable BlockPathTypes getBlockPathType(BlockState state, BlockGetter level, BlockPos pos, @org.jetbrains.annotations.Nullable Mob mob) { return BlockPathTypes.OPEN; } - + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/block/DimensionalMineshaftBlock.java b/src/main/java/com/klikli_dev/occultism/common/block/DimensionalMineshaftBlock.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/common/block/DimensionalMineshaftBlock.java rename to src/main/java/com/klikli_dev/occultism/common/block/DimensionalMineshaftBlock.java index aae2dadbc..5efb3d15b 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/block/DimensionalMineshaftBlock.java +++ b/src/main/java/com/klikli_dev/occultism/common/block/DimensionalMineshaftBlock.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.block; +package com.klikli_dev.occultism.common.block; -import com.github.klikli_dev.occultism.common.blockentity.DimensionalMineshaftBlockEntity; -import com.github.klikli_dev.occultism.registry.OccultismTiles; -import com.github.klikli_dev.occultism.util.StorageUtil; +import com.klikli_dev.occultism.common.blockentity.DimensionalMineshaftBlockEntity; +import com.klikli_dev.occultism.registry.OccultismTiles; +import com.klikli_dev.occultism.util.StorageUtil; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/block/GoldenSacrificialBowlBlock.java b/src/main/java/com/klikli_dev/occultism/common/block/GoldenSacrificialBowlBlock.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/common/block/GoldenSacrificialBowlBlock.java rename to src/main/java/com/klikli_dev/occultism/common/block/GoldenSacrificialBowlBlock.java index 04b0d6d7b..01307e4e6 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/block/GoldenSacrificialBowlBlock.java +++ b/src/main/java/com/klikli_dev/occultism/common/block/GoldenSacrificialBowlBlock.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.block; +package com.klikli_dev.occultism.common.block; -import com.github.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; -import com.github.klikli_dev.occultism.registry.OccultismTiles; -import com.github.klikli_dev.occultism.util.StorageUtil; +import com.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; +import com.klikli_dev.occultism.registry.OccultismTiles; +import com.klikli_dev.occultism.util.StorageUtil; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/block/NonPathfindableBlock.java b/src/main/java/com/klikli_dev/occultism/common/block/NonPathfindableBlock.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/common/block/NonPathfindableBlock.java rename to src/main/java/com/klikli_dev/occultism/common/block/NonPathfindableBlock.java index 1b292efbe..f6c5455d1 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/block/NonPathfindableBlock.java +++ b/src/main/java/com/klikli_dev/occultism/common/block/NonPathfindableBlock.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.block; +package com.klikli_dev.occultism.common.block; import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockGetter; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/block/SacrificialBowlBlock.java b/src/main/java/com/klikli_dev/occultism/common/block/SacrificialBowlBlock.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/common/block/SacrificialBowlBlock.java rename to src/main/java/com/klikli_dev/occultism/common/block/SacrificialBowlBlock.java index 5f830fbe9..c68e5a31d 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/block/SacrificialBowlBlock.java +++ b/src/main/java/com/klikli_dev/occultism/common/block/SacrificialBowlBlock.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.block; +package com.klikli_dev.occultism.common.block; -import com.github.klikli_dev.occultism.common.blockentity.SacrificialBowlBlockEntity; -import com.github.klikli_dev.occultism.registry.OccultismTiles; -import com.github.klikli_dev.occultism.util.StorageUtil; +import com.klikli_dev.occultism.common.blockentity.SacrificialBowlBlockEntity; +import com.klikli_dev.occultism.registry.OccultismTiles; +import com.klikli_dev.occultism.util.StorageUtil; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/block/SpiritAttunedCrystalBlock.java b/src/main/java/com/klikli_dev/occultism/common/block/SpiritAttunedCrystalBlock.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/common/block/SpiritAttunedCrystalBlock.java rename to src/main/java/com/klikli_dev/occultism/common/block/SpiritAttunedCrystalBlock.java index 1d2f73ed9..0efc07955 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/block/SpiritAttunedCrystalBlock.java +++ b/src/main/java/com/klikli_dev/occultism/common/block/SpiritAttunedCrystalBlock.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.block; +package com.klikli_dev.occultism.common.block; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -37,7 +37,7 @@ import java.util.stream.Stream; public class SpiritAttunedCrystalBlock extends Block { - //region Fields + private static final VoxelShape SHAPE = Stream.of( Block.box(5, 0, 9, 8, 4, 12), Block.box(9, 0, 8, 12, 8, 11), @@ -47,15 +47,10 @@ public class SpiritAttunedCrystalBlock extends Block { ).reduce((v1, v2) -> { return Shapes.join(v1, v2, BooleanOp.OR); }).get(); - //endregion Fields - //region Initialization public SpiritAttunedCrystalBlock(Properties properties) { super(properties); } - //endregion Initialization - - //region Overrides @Override @SuppressWarnings("deprecation") @@ -80,5 +75,5 @@ public boolean canSurvive(BlockState state, LevelReader worldIn, BlockPos pos) { BlockState downState = worldIn.getBlockState(down); return downState.isFaceSturdy(worldIn, down, Direction.UP); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/block/SpiritFireBlock.java b/src/main/java/com/klikli_dev/occultism/common/block/SpiritFireBlock.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/common/block/SpiritFireBlock.java rename to src/main/java/com/klikli_dev/occultism/common/block/SpiritFireBlock.java index 0b8cc88f6..c071f7fdf 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/block/SpiritFireBlock.java +++ b/src/main/java/com/klikli_dev/occultism/common/block/SpiritFireBlock.java @@ -20,13 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.block; +package com.klikli_dev.occultism.common.block; -import com.github.klikli_dev.occultism.crafting.recipe.ItemStackFakeInventory; -import com.github.klikli_dev.occultism.crafting.recipe.SpiritFireRecipe; -import com.github.klikli_dev.occultism.registry.OccultismRecipes; -import com.github.klikli_dev.occultism.registry.OccultismSounds; -import com.github.klikli_dev.occultism.util.Math3DUtil; +import com.klikli_dev.occultism.crafting.recipe.ItemStackFakeInventory; +import com.klikli_dev.occultism.crafting.recipe.SpiritFireRecipe; +import com.klikli_dev.occultism.registry.OccultismRecipes; +import com.klikli_dev.occultism.registry.OccultismSounds; +import com.klikli_dev.occultism.util.Math3DUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundSource; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/block/SpiritTorchBlock.java b/src/main/java/com/klikli_dev/occultism/common/block/SpiritTorchBlock.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/common/block/SpiritTorchBlock.java rename to src/main/java/com/klikli_dev/occultism/common/block/SpiritTorchBlock.java index d215e1e51..9e780d0ab 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/block/SpiritTorchBlock.java +++ b/src/main/java/com/klikli_dev/occultism/common/block/SpiritTorchBlock.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.block; +package com.klikli_dev.occultism.common.block; -import com.github.klikli_dev.occultism.registry.OccultismParticles; +import com.klikli_dev.occultism.registry.OccultismParticles; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.util.RandomSource; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/block/SpiritWallTorchBlock.java b/src/main/java/com/klikli_dev/occultism/common/block/SpiritWallTorchBlock.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/common/block/SpiritWallTorchBlock.java rename to src/main/java/com/klikli_dev/occultism/common/block/SpiritWallTorchBlock.java index 6885ed8e5..dced51460 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/block/SpiritWallTorchBlock.java +++ b/src/main/java/com/klikli_dev/occultism/common/block/SpiritWallTorchBlock.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.block; +package com.klikli_dev.occultism.common.block; -import com.github.klikli_dev.occultism.registry.OccultismParticles; +import com.klikli_dev.occultism.registry.OccultismParticles; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.ParticleTypes; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/block/crops/IReplantableCrops.java b/src/main/java/com/klikli_dev/occultism/common/block/crops/IReplantableCrops.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/common/block/crops/IReplantableCrops.java rename to src/main/java/com/klikli_dev/occultism/common/block/crops/IReplantableCrops.java index 4840d34b6..7918e47e9 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/block/crops/IReplantableCrops.java +++ b/src/main/java/com/klikli_dev/occultism/common/block/crops/IReplantableCrops.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.block.crops; +package com.klikli_dev.occultism.common.block.crops; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; @@ -38,9 +38,8 @@ import java.util.List; public interface IReplantableCrops { - //region Fields + float EXHAUSTION_PER_HARVEST = 0.005f; - //endregion Fields //region Getter / Setter ItemLike getCropsItem(); @@ -48,10 +47,8 @@ public interface IReplantableCrops { ItemLike getSeedsItem(); //endregion Getter / Setter - //region Overrides - //endregion Getter / Setter - //region Methods + default InteractionResult onHarvest(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand) { if (!level.isClientSide) { if (state.getValue(CropBlock.AGE) >= 7) { @@ -77,5 +74,5 @@ default InteractionResult onHarvest(BlockState state, Level level, BlockPos pos, } return InteractionResult.PASS; } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/block/crops/ReplantableCropsBlock.java b/src/main/java/com/klikli_dev/occultism/common/block/crops/ReplantableCropsBlock.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/common/block/crops/ReplantableCropsBlock.java rename to src/main/java/com/klikli_dev/occultism/common/block/crops/ReplantableCropsBlock.java index 2c1bed56b..0cbb32231 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/block/crops/ReplantableCropsBlock.java +++ b/src/main/java/com/klikli_dev/occultism/common/block/crops/ReplantableCropsBlock.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.block.crops; +package com.klikli_dev.occultism.common.block.crops; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/block/otherworld/IOtherworldBlock.java b/src/main/java/com/klikli_dev/occultism/common/block/otherworld/IOtherworldBlock.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/common/block/otherworld/IOtherworldBlock.java rename to src/main/java/com/klikli_dev/occultism/common/block/otherworld/IOtherworldBlock.java index 134d3edac..f0484c3bb 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/block/otherworld/IOtherworldBlock.java +++ b/src/main/java/com/klikli_dev/occultism/common/block/otherworld/IOtherworldBlock.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.block.otherworld; +package com.klikli_dev.occultism.common.block.otherworld; -import com.github.klikli_dev.occultism.api.common.data.OtherworldBlockTier; -import com.github.klikli_dev.occultism.api.common.item.IOtherworldTool; -import com.github.klikli_dev.occultism.registry.OccultismEffects; +import com.klikli_dev.occultism.api.common.data.OtherworldBlockTier; +import com.klikli_dev.occultism.api.common.item.IOtherworldTool; +import com.klikli_dev.occultism.registry.OccultismEffects; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -35,9 +35,8 @@ import net.minecraft.world.level.block.state.properties.Property; public interface IOtherworldBlock { - //region Fields + Property UNCOVERED = BooleanProperty.create("uncovered"); - //endregion Fields //region Getter / Setter Block getUncoveredBlock(); @@ -47,8 +46,6 @@ public interface IOtherworldBlock { OtherworldBlockTier getTier(); //endregion Getter / Setter - //region Methods - default OtherworldBlockTier getPlayerHarvestTier(Player player, ItemStack tool) { OtherworldBlockTier toolTier = OtherworldBlockTier.NONE; OtherworldBlockTier effectTier = player.hasEffect(OccultismEffects.THIRD_EYE.get()) ? @@ -71,5 +68,4 @@ default ItemStack getItem(BlockGetter worldIn, BlockPos pos, BlockState state) { return new ItemStack(state.getValue(UNCOVERED) ? this.getUncoveredBlock() : this.getCoveredBlock(), 1); } - //endregion Methods } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/block/otherworld/IesniumOreNaturalBlock.java b/src/main/java/com/klikli_dev/occultism/common/block/otherworld/IesniumOreNaturalBlock.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/common/block/otherworld/IesniumOreNaturalBlock.java rename to src/main/java/com/klikli_dev/occultism/common/block/otherworld/IesniumOreNaturalBlock.java index 47676146f..2feb30a9e 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/block/otherworld/IesniumOreNaturalBlock.java +++ b/src/main/java/com/klikli_dev/occultism/common/block/otherworld/IesniumOreNaturalBlock.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.block.otherworld; +package com.klikli_dev.occultism.common.block.otherworld; -import com.github.klikli_dev.occultism.api.common.data.OtherworldBlockTier; -import com.github.klikli_dev.occultism.registry.OccultismBlocks; +import com.klikli_dev.occultism.api.common.data.OtherworldBlockTier; +import com.klikli_dev.occultism.registry.OccultismBlocks; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -39,14 +39,12 @@ import javax.annotation.Nullable; public class IesniumOreNaturalBlock extends Block implements IOtherworldBlock { - //region Initialization + public IesniumOreNaturalBlock(Properties properties) { super(properties); this.registerDefaultState(this.getStateDefinition().any().setValue(UNCOVERED, false)); } - //endregion Initialization - //region Overrides @Override public Block getUncoveredBlock() { return OccultismBlocks.IESNIUM_ORE.get(); @@ -85,5 +83,5 @@ protected void createBlockStateDefinition(StateDefinition.Builder inputHandler = LazyOptional.of(() -> new ItemStackHandler(1) { - //region Overrides + @Override protected void onContentsChanged(int slot) { DimensionalMineshaftBlockEntity.this.setChanged(); } - //endregion Overrides + }); public LazyOptional outputHandler = LazyOptional.of(() -> new ItemStackHandler(9) { - //region Overrides + @Override protected void onContentsChanged(int slot) { DimensionalMineshaftBlockEntity.this.setChanged(); } - //endregion Overrides + }); public LazyOptional combinedHandler = LazyOptional @@ -96,12 +94,9 @@ protected void onContentsChanged(int slot) { protected Item currentInputType; protected List possibleResults; - //endregion Fields - //region Initialization public DimensionalMineshaftBlockEntity(BlockPos worldPos, BlockState state) { super(OccultismTiles.DIMENSIONAL_MINESHAFT.get(), worldPos, state); } - //endregion Initialization //region Static Methods public static void forceInitStackNBT(ItemStack stack, ServerLevel level) { @@ -124,7 +119,6 @@ public static int getRollsPerOperation(ItemStack stack) { return rolls <= 0 ? DEFAULT_ROLLS_PER_OPERATION : rolls; } - //region Overrides @Override public Component getDisplayName() { return Component.literal(ForgeRegistries.BLOCK_ENTITY_TYPES.getKey(this.getType()).getPath()); @@ -173,7 +167,6 @@ public CompoundTag saveNetwork(CompoundTag compound) { compound.putInt("maxMiningTime", this.maxMiningTime); return super.saveNetwork(compound); } - //endregion Overrides @Override public void setRemoved() { @@ -188,12 +181,12 @@ public void tick() { ItemStack input = inputHandler.getStackInSlot(0); //handle unusing enchantment from evilcraft, see https://github.com/klikli-dev/occultism/issues/909 - if(input.getMaxDamage() - input.getDamageValue() < 6 && + if (input.getMaxDamage() - input.getDamageValue() < 6 && input.isEnchanted() && ForgeRegistries.ENCHANTMENTS.containsKey(EVILCRAFT_UNUSING_ENCHANTEMENT) && - input.getEnchantmentLevel(ForgeRegistries.ENCHANTMENTS.getValue(EVILCRAFT_UNUSING_ENCHANTEMENT)) > 0){ - this.miningTime = 0; - return; + input.getEnchantmentLevel(ForgeRegistries.ENCHANTMENTS.getValue(EVILCRAFT_UNUSING_ENCHANTEMENT)) > 0) { + this.miningTime = 0; + return; } boolean dirty = false; @@ -243,7 +236,6 @@ public AbstractContainerMenu createMenu(int id, Inventory playerInventory, Playe } //endregion Static Methods - //region Methods public void mine() { ItemStackHandler inputHandler = this.inputHandler.orElseThrow(ItemHandlerMissingException::new); ItemStackHandler outputHandler = this.outputHandler.orElseThrow(ItemHandlerMissingException::new); @@ -288,5 +280,4 @@ public void invalidateCaps() { this.combinedHandler.invalidate(); } - //endregion Methods } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/blockentity/GoldenSacrificialBowlBlockEntity.java b/src/main/java/com/klikli_dev/occultism/common/blockentity/GoldenSacrificialBowlBlockEntity.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/common/blockentity/GoldenSacrificialBowlBlockEntity.java rename to src/main/java/com/klikli_dev/occultism/common/blockentity/GoldenSacrificialBowlBlockEntity.java index cd53e1547..b278721c0 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/blockentity/GoldenSacrificialBowlBlockEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/blockentity/GoldenSacrificialBowlBlockEntity.java @@ -20,21 +20,21 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.blockentity; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.item.DummyTooltipItem; -import com.github.klikli_dev.occultism.common.item.spirit.BookOfBindingItem; -import com.github.klikli_dev.occultism.common.ritual.Ritual; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; -import com.github.klikli_dev.occultism.exceptions.ItemHandlerMissingException; -import com.github.klikli_dev.occultism.registry.OccultismParticles; -import com.github.klikli_dev.occultism.registry.OccultismRecipes; -import com.github.klikli_dev.occultism.registry.OccultismTiles; -import com.github.klikli_dev.occultism.util.EntityUtil; +package com.klikli_dev.occultism.common.blockentity; + import com.klikli_dev.modonomicon.api.ModonomiconAPI; import com.klikli_dev.modonomicon.api.multiblock.Multiblock; import com.klikli_dev.modonomicon.api.multiblock.Multiblock.SimulateResult; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.item.DummyTooltipItem; +import com.klikli_dev.occultism.common.item.spirit.BookOfBindingItem; +import com.klikli_dev.occultism.common.ritual.Ritual; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.exceptions.ItemHandlerMissingException; +import com.klikli_dev.occultism.registry.OccultismParticles; +import com.klikli_dev.occultism.registry.OccultismRecipes; +import com.klikli_dev.occultism.registry.OccultismTiles; +import com.klikli_dev.occultism.util.EntityUtil; import com.mojang.datafixers.util.Pair; import net.minecraft.Util; import net.minecraft.core.BlockPos; @@ -115,7 +115,7 @@ private static boolean helpWithPentacle(Level level, BlockPos pos, Player player Component.translatable(Util.makeDescriptionId("multiblock", bestMatch.getId())), pentacleDiffToComponent(bestPentacleDiff)), false); return true; - } else if(bestPentacleDiff != null && !bestPentacleDiff.isEmpty()) { + } else if (bestPentacleDiff != null && !bestPentacleDiff.isEmpty()) { //player probably doesn't have a pentacle at all player.displayClientMessage( Component.translatable("ritual." + Occultism.MODID + ".pentacle_help.no_pentacle"), false); @@ -235,8 +235,8 @@ public RitualRecipe getCurrentRitualRecipe() { Optional> recipe = this.level.getRecipeManager().byKey(this.currentRitualRecipeId); recipe.map(r -> (RitualRecipe) r).ifPresent(r -> this.currentRitualRecipe = r); - MinecraftForge.EVENT_BUS.addListener(rightClickItemListener); - MinecraftForge.EVENT_BUS.addListener(livingDeathEventListener); + MinecraftForge.EVENT_BUS.addListener(this.rightClickItemListener); + MinecraftForge.EVENT_BUS.addListener(this.livingDeathEventListener); this.currentRitualRecipeId = null; } @@ -320,9 +320,6 @@ public void tick() { } } - //endregion Overrides - - //region Methods public void restoreCastingPlayer() { //every 30 seconds try to restore the casting player if (this.castingPlayer == null && this.castingPlayerId != null && @@ -401,8 +398,8 @@ public void startRitual(Player player, ItemStack activationItem, RitualRecipe ri this.currentRitualRecipe.getRitual().start(this.level, this.getBlockPos(), this, player, handler.getStackInSlot(0)); - MinecraftForge.EVENT_BUS.addListener(rightClickItemListener); - MinecraftForge.EVENT_BUS.addListener(livingDeathEventListener); + MinecraftForge.EVENT_BUS.addListener(this.rightClickItemListener); + MinecraftForge.EVENT_BUS.addListener(this.livingDeathEventListener); this.setChanged(); this.markNetworkDirty(); @@ -437,8 +434,8 @@ public void stopRitual(boolean finished) { this.remainingAdditionalIngredients.clear(); this.consumedIngredients.clear(); - MinecraftForge.EVENT_BUS.unregister(rightClickItemListener); - MinecraftForge.EVENT_BUS.unregister(livingDeathEventListener); + MinecraftForge.EVENT_BUS.unregister(this.rightClickItemListener); + MinecraftForge.EVENT_BUS.unregister(this.livingDeathEventListener); this.setChanged(); this.markNetworkDirty(); @@ -463,7 +460,7 @@ public void notifyItemUse(PlayerInteractEvent.RightClickItem event) { public void onPlayerRightClickItem(PlayerInteractEvent.RightClickItem event) { Player player = event.getEntity(); - if (!player.level.isClientSide && this.getCurrentRitualRecipe() != null) { + if (!player.level().isClientSide && this.getCurrentRitualRecipe() != null) { if (this.getBlockPos().distSqr(event.getPos()) <= Ritual.ITEM_USE_DETECTION_RANGE_SQUARE) { if (this.getCurrentRitualRecipe().getRitual().isValidItemUse(event)) { @@ -475,7 +472,7 @@ public void onPlayerRightClickItem(PlayerInteractEvent.RightClickItem event) { public void onLivingDeath(LivingDeathEvent event) { LivingEntity entityLivingBase = event.getEntity(); - if (!entityLivingBase.level.isClientSide && this.getCurrentRitualRecipe() != null) { + if (!entityLivingBase.level().isClientSide && this.getCurrentRitualRecipe() != null) { //Limit to player kills if (event.getSource().getEntity() instanceof Player) { if (this.getBlockPos().distSqr(entityLivingBase.blockPosition()) <= Ritual.SACRIFICE_DETECTION_RANGE_SQUARE) { diff --git a/src/main/java/com/github/klikli_dev/occultism/common/blockentity/NetworkedBlockEntity.java b/src/main/java/com/klikli_dev/occultism/common/blockentity/NetworkedBlockEntity.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/common/blockentity/NetworkedBlockEntity.java rename to src/main/java/com/klikli_dev/occultism/common/blockentity/NetworkedBlockEntity.java index d17abd50e..9379bbc45 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/blockentity/NetworkedBlockEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/blockentity/NetworkedBlockEntity.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.blockentity; +package com.klikli_dev.occultism.common.blockentity; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; @@ -36,7 +36,6 @@ public NetworkedBlockEntity(BlockEntityType BlockEntityTypeIn, BlockPos world super(BlockEntityTypeIn, worldPos, state); } - //region Overrides @Override public void load(CompoundTag compound) { this.loadNetwork(compound); @@ -70,10 +69,6 @@ public void handleUpdateTag(CompoundTag tag) { this.loadNetwork(tag); } - //endregion Overrides - - //region Methods - /** * Reads networked nbt, this is a subset of the entire nbt that is synchronized over network. * diff --git a/src/main/java/com/github/klikli_dev/occultism/common/blockentity/SacrificialBowlBlockEntity.java b/src/main/java/com/klikli_dev/occultism/common/blockentity/SacrificialBowlBlockEntity.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/common/blockentity/SacrificialBowlBlockEntity.java rename to src/main/java/com/klikli_dev/occultism/common/blockentity/SacrificialBowlBlockEntity.java index ef1556552..5e2e13c78 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/blockentity/SacrificialBowlBlockEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/blockentity/SacrificialBowlBlockEntity.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.blockentity; +package com.klikli_dev.occultism.common.blockentity; -import com.github.klikli_dev.occultism.registry.OccultismTiles; +import com.klikli_dev.occultism.registry.OccultismTiles; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -38,11 +38,10 @@ public class SacrificialBowlBlockEntity extends NetworkedBlockEntity { - //region Fields public long lastChangeTime; public LazyOptional itemStackHandler = LazyOptional.of( () -> new ItemStackHandler(1) { - //region Overrides + @Override public int getSlotLimit(int slot) { return 1; @@ -57,12 +56,10 @@ protected void onContentsChanged( SacrificialBowlBlockEntity.this.markNetworkDirty(); } } - //endregion Overrides + }); protected boolean initialized = false; - //endregion Fields - //region Initialization public SacrificialBowlBlockEntity(BlockPos worldPos, BlockState state) { super(OccultismTiles.SACRIFICIAL_BOWL.get(), worldPos, state); } @@ -70,9 +67,7 @@ public SacrificialBowlBlockEntity(BlockPos worldPos, BlockState state) { public SacrificialBowlBlockEntity(BlockEntityType BlockEntityTypeIn, BlockPos worldPos, BlockState state) { super(BlockEntityTypeIn, worldPos, state); } - //endregion Initialization - //region Overrides @Nonnull @Override public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction direction) { @@ -101,5 +96,4 @@ public void invalidateCaps() { this.itemStackHandler.invalidate(); } - //endregion Overrides } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/blockentity/StableWormholeBlockEntity.java b/src/main/java/com/klikli_dev/occultism/common/blockentity/StableWormholeBlockEntity.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/common/blockentity/StableWormholeBlockEntity.java rename to src/main/java/com/klikli_dev/occultism/common/blockentity/StableWormholeBlockEntity.java index 340ce7c24..8c3d79adb 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/blockentity/StableWormholeBlockEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/blockentity/StableWormholeBlockEntity.java @@ -20,18 +20,18 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.blockentity; - -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageAccessor; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageControllerProxy; -import com.github.klikli_dev.occultism.api.common.data.GlobalBlockPos; -import com.github.klikli_dev.occultism.api.common.data.SortDirection; -import com.github.klikli_dev.occultism.api.common.data.SortType; -import com.github.klikli_dev.occultism.common.block.storage.StableWormholeBlock; -import com.github.klikli_dev.occultism.common.container.storage.StableWormholeContainer; -import com.github.klikli_dev.occultism.registry.OccultismTiles; -import com.github.klikli_dev.occultism.util.BlockEntityUtil; +package com.klikli_dev.occultism.common.blockentity; + +import com.klikli_dev.occultism.api.common.blockentity.IStorageAccessor; +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.blockentity.IStorageControllerProxy; +import com.klikli_dev.occultism.api.common.data.GlobalBlockPos; +import com.klikli_dev.occultism.api.common.data.SortDirection; +import com.klikli_dev.occultism.api.common.data.SortType; +import com.klikli_dev.occultism.common.block.storage.StableWormholeBlock; +import com.klikli_dev.occultism.common.container.storage.StableWormholeContainer; +import com.klikli_dev.occultism.registry.OccultismTiles; +import com.klikli_dev.occultism.util.BlockEntityUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -57,19 +57,15 @@ public class StableWormholeBlockEntity extends NetworkedBlockEntity implements IStorageControllerProxy, MenuProvider, IStorageAccessor { - //region Fields protected GlobalBlockPos linkedStorageControllerPosition; protected Map matrix = new HashMap<>(); protected ItemStack orderStack = ItemStack.EMPTY; protected SortDirection sortDirection = SortDirection.DOWN; protected SortType sortType = SortType.AMOUNT; - //endregion Fields - //region Initialization public StableWormholeBlockEntity(BlockPos worldPos, BlockState state) { super(OccultismTiles.STABLE_WORMHOLE.get(), worldPos, state); } - //endregion Initialization //region Getter / Setter @Override @@ -108,7 +104,6 @@ public void setOrderStack(@Nonnull ItemStack orderStack) { } //endregion Getter / Setter - //region Overrides @Override public Component getDisplayName() { return Component.literal(ForgeRegistries.BLOCK_ENTITY_TYPES.getKey(this.getType()).getPath()); @@ -117,11 +112,12 @@ public Component getDisplayName() { @Override public IStorageController getLinkedStorageController() { if (this.linkedStorageControllerPosition != null) { - if(!BlockEntityUtil.isLoaded(this.level, this.linkedStorageControllerPosition)) { + if (!BlockEntityUtil.isLoaded(this.level, this.linkedStorageControllerPosition)) { //if the target pos is not loaded we exit early to prevent accidentally clearing the linked storage controller position return null; } + BlockEntity blockEntity = BlockEntityUtil.get(this.level, this.linkedStorageControllerPosition); if (blockEntity instanceof IStorageController controller) @@ -215,8 +211,5 @@ public CompoundTag saveNetwork(CompoundTag compound) { public AbstractContainerMenu createMenu(int id, Inventory playerInventory, Player player) { return new StableWormholeContainer(id, playerInventory, this); } - //endregion Overrides - //region Methods - //endregion Methods } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/blockentity/StorageControllerBlockEntity.java b/src/main/java/com/klikli_dev/occultism/common/blockentity/StorageControllerBlockEntity.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/common/blockentity/StorageControllerBlockEntity.java rename to src/main/java/com/klikli_dev/occultism/common/blockentity/StorageControllerBlockEntity.java index 8b8fea832..cb45dd8e2 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/blockentity/StorageControllerBlockEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/blockentity/StorageControllerBlockEntity.java @@ -20,31 +20,31 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.blockentity; - - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageAccessor; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageControllerProxy; -import com.github.klikli_dev.occultism.api.common.container.IItemStackComparator; -import com.github.klikli_dev.occultism.api.common.data.GlobalBlockPos; -import com.github.klikli_dev.occultism.api.common.data.MachineReference; -import com.github.klikli_dev.occultism.api.common.data.SortDirection; -import com.github.klikli_dev.occultism.api.common.data.SortType; -import com.github.klikli_dev.occultism.common.block.storage.StorageStabilizerBlock; -import com.github.klikli_dev.occultism.common.container.storage.StorageControllerContainer; -import com.github.klikli_dev.occultism.common.entity.job.ManageMachineJob; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.common.misc.DepositOrder; -import com.github.klikli_dev.occultism.common.misc.ItemStackComparator; -import com.github.klikli_dev.occultism.common.misc.StorageControllerItemStackHandler; -import com.github.klikli_dev.occultism.network.MessageUpdateStacks; -import com.github.klikli_dev.occultism.registry.OccultismBlocks; -import com.github.klikli_dev.occultism.registry.OccultismItems; -import com.github.klikli_dev.occultism.registry.OccultismTiles; -import com.github.klikli_dev.occultism.util.EntityUtil; -import com.github.klikli_dev.occultism.util.Math3DUtil; +package com.klikli_dev.occultism.common.blockentity; + + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.api.common.blockentity.IStorageAccessor; +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.blockentity.IStorageControllerProxy; +import com.klikli_dev.occultism.api.common.container.IItemStackComparator; +import com.klikli_dev.occultism.api.common.data.GlobalBlockPos; +import com.klikli_dev.occultism.api.common.data.MachineReference; +import com.klikli_dev.occultism.api.common.data.SortDirection; +import com.klikli_dev.occultism.api.common.data.SortType; +import com.klikli_dev.occultism.common.block.storage.StorageStabilizerBlock; +import com.klikli_dev.occultism.common.container.storage.StorageControllerContainer; +import com.klikli_dev.occultism.common.entity.job.ManageMachineJob; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.common.misc.DepositOrder; +import com.klikli_dev.occultism.common.misc.ItemStackComparator; +import com.klikli_dev.occultism.common.misc.StorageControllerItemStackHandler; +import com.klikli_dev.occultism.network.MessageUpdateStacks; +import com.klikli_dev.occultism.registry.OccultismBlocks; +import com.klikli_dev.occultism.registry.OccultismItems; +import com.klikli_dev.occultism.registry.OccultismTiles; +import com.klikli_dev.occultism.util.EntityUtil; +import com.klikli_dev.occultism.util.Math3DUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/capability/DoubleJumpCapability.java b/src/main/java/com/klikli_dev/occultism/common/capability/DoubleJumpCapability.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/common/capability/DoubleJumpCapability.java rename to src/main/java/com/klikli_dev/occultism/common/capability/DoubleJumpCapability.java index 382e71dd2..7f64c2996 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/capability/DoubleJumpCapability.java +++ b/src/main/java/com/klikli_dev/occultism/common/capability/DoubleJumpCapability.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.capability; +package com.klikli_dev.occultism.common.capability; -import com.github.klikli_dev.occultism.registry.OccultismCapabilities; +import com.klikli_dev.occultism.registry.OccultismCapabilities; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraftforge.common.capabilities.Capability; @@ -35,14 +35,10 @@ public class DoubleJumpCapability implements INBTSerializable { - //region Fields private int jumps = 0; - //endregion Fields - //region Initialization public DoubleJumpCapability() { } - //endregion Initialization //region Getter / Setter public int getJumps() { @@ -54,7 +50,6 @@ public void setJumps(int i) { } //endregion Getter / Setter - //region Methods public void addJump() { this.jumps++; } @@ -70,16 +65,12 @@ public CompoundTag serializeNBT() { public void deserializeNBT(CompoundTag nbt) { this.jumps = nbt.getInt("jumps"); } - //endregion Methods public static class Dispatcher implements ICapabilitySerializable { - //region Fields private final LazyOptional doubleJumpCapability = LazyOptional.of( DoubleJumpCapability::new); - //endregion Fields - //region Overrides @Nonnull @Override public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { @@ -99,7 +90,5 @@ public void deserializeNBT(CompoundTag nbt) { this.doubleJumpCapability.ifPresent(capability -> capability.deserializeNBT(nbt)); } - //endregion Overrides - } } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/capability/FamiliarSettingsCapability.java b/src/main/java/com/klikli_dev/occultism/common/capability/FamiliarSettingsCapability.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/common/capability/FamiliarSettingsCapability.java rename to src/main/java/com/klikli_dev/occultism/common/capability/FamiliarSettingsCapability.java index 9fca8c3c3..f25a18644 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/capability/FamiliarSettingsCapability.java +++ b/src/main/java/com/klikli_dev/occultism/common/capability/FamiliarSettingsCapability.java @@ -20,14 +20,14 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.capability; +package com.klikli_dev.occultism.common.capability; -import com.github.klikli_dev.occultism.common.entity.familiar.IFamiliar; -import com.github.klikli_dev.occultism.network.MessageSyncFamiliarSettings; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.registry.OccultismCapabilities; -import com.github.klikli_dev.occultism.registry.OccultismEntities; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.entity.familiar.IFamiliar; +import com.klikli_dev.occultism.network.MessageSyncFamiliarSettings; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.registry.OccultismCapabilities; +import com.klikli_dev.occultism.registry.OccultismEntities; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/command/DebugAICommand.java b/src/main/java/com/klikli_dev/occultism/common/command/DebugAICommand.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/common/command/DebugAICommand.java rename to src/main/java/com/klikli_dev/occultism/common/command/DebugAICommand.java index 65cb0dc1e..086768400 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/command/DebugAICommand.java +++ b/src/main/java/com/klikli_dev/occultism/common/command/DebugAICommand.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.command; +package com.klikli_dev.occultism.common.command; -import com.github.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.Occultism; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.builder.ArgumentBuilder; @@ -35,24 +35,19 @@ public class DebugAICommand implements Command { - //region Fields private static final DebugAICommand CMD = new DebugAICommand(); - //endregion Fields - //region Static Methods public static ArgumentBuilder register(CommandDispatcher dispatcher) { return Commands.literal("ai") .requires(cs -> cs.hasPermission(1)) .executes(CMD); } - //endregion Overrides - //region Overrides @Override public int run(CommandContext context) throws CommandSyntaxException { Occultism.DEBUG.debugAI = !Occultism.DEBUG.debugAI; - context.getSource().sendSuccess(Component.literal("AI Debugging enabled: " + Occultism.DEBUG.debugAI), false); + context.getSource().sendSuccess(() -> Component.literal("AI Debugging enabled: " + Occultism.DEBUG.debugAI), false); return 0; } //endregion Static Methods diff --git a/src/main/java/com/github/klikli_dev/occultism/common/command/NbtCommand.java b/src/main/java/com/klikli_dev/occultism/common/command/NbtCommand.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/common/command/NbtCommand.java rename to src/main/java/com/klikli_dev/occultism/common/command/NbtCommand.java index 33f93ceaa..4f21df9f4 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/command/NbtCommand.java +++ b/src/main/java/com/klikli_dev/occultism/common/command/NbtCommand.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.command; +package com.klikli_dev.occultism.common.command; import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; @@ -51,7 +51,7 @@ public int run(CommandContext context) throws CommandSyntaxE ItemStack heldItem = player.getItemInHand(InteractionHand.MAIN_HAND); Component nbtText = heldItem.isEmpty() || !heldItem.hasTag() ? Component.literal("{}") : NbtUtils.toPrettyComponent(heldItem.getTag()); - context.getSource().sendSuccess(nbtText, false); + context.getSource().sendSuccess(() -> nbtText, false); return 0; } } \ No newline at end of file diff --git a/src/main/java/com/github/klikli_dev/occultism/common/container/DimensionalMineshaftContainer.java b/src/main/java/com/klikli_dev/occultism/common/container/DimensionalMineshaftContainer.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/common/container/DimensionalMineshaftContainer.java rename to src/main/java/com/klikli_dev/occultism/common/container/DimensionalMineshaftContainer.java index d7aa1dff9..4b6d90d6e 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/container/DimensionalMineshaftContainer.java +++ b/src/main/java/com/klikli_dev/occultism/common/container/DimensionalMineshaftContainer.java @@ -20,13 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.container; +package com.klikli_dev.occultism.common.container; -import com.github.klikli_dev.occultism.common.blockentity.DimensionalMineshaftBlockEntity; -import com.github.klikli_dev.occultism.exceptions.ItemHandlerMissingException; -import com.github.klikli_dev.occultism.registry.OccultismContainers; -import com.github.klikli_dev.occultism.registry.OccultismRecipes; -import com.github.klikli_dev.occultism.util.RecipeUtil; +import com.klikli_dev.occultism.common.blockentity.DimensionalMineshaftBlockEntity; +import com.klikli_dev.occultism.exceptions.ItemHandlerMissingException; +import com.klikli_dev.occultism.registry.OccultismContainers; +import com.klikli_dev.occultism.registry.OccultismRecipes; +import com.klikli_dev.occultism.util.RecipeUtil; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -39,14 +39,11 @@ public class DimensionalMineshaftContainer extends AbstractContainerMenu { - //region Fields public ItemStackHandler inputHandler; public ItemStackHandler outputHandler; public DimensionalMineshaftBlockEntity otherworldMiner; public Inventory playerInventory; - //endregion Fields - //region Initialization public DimensionalMineshaftContainer(int id, Inventory playerInventory, DimensionalMineshaftBlockEntity otherworldMiner) { super(OccultismContainers.OTHERWORLD_MINER.get(), id); @@ -59,9 +56,7 @@ public DimensionalMineshaftContainer(int id, Inventory playerInventory, this.setupPlayerInventorySlots(playerInventory.player); this.setupPlayerHotbar(playerInventory.player); } - //endregion Initialization - //region Overrides @Override public boolean stillValid(Player player) { return player.distanceToSqr(this.otherworldMiner.getBlockPos().getX() + 0.5D, @@ -103,9 +98,6 @@ else if (!this.moveItemStackTo(itemstack1, 0, this.outputHandler.getSlots() + 1, return itemstack; } - //endregion Overrides - - //region Methods protected void setupPlayerInventorySlots(Player player) { int playerInventoryTop = 84; int playerInventoryLeft = 8; @@ -140,35 +132,29 @@ protected void setupMinerInventory() { this.addSlot(new InputSlot(inputHandler, 0, 26, 35)); } - //endregion Methods public class InputSlot extends SlotItemHandler { - //region Initialization public InputSlot(IItemHandler itemHandler, int index, int xPosition, int yPosition) { super(itemHandler, index, xPosition, yPosition); } - //endregion Initialization - //region Overrides public boolean mayPlace(ItemStack stack) { RecipeManager recipeManager = DimensionalMineshaftContainer.this.otherworldMiner.getLevel().getRecipeManager(); return RecipeUtil.isValidIngredient(recipeManager, OccultismRecipes.MINER_TYPE.get(), stack); } - //endregion Overrides + } public class OutputSlot extends SlotItemHandler { - //region Initialization + public OutputSlot(IItemHandler itemHandler, int index, int xPosition, int yPosition) { super(itemHandler, index, xPosition, yPosition); } - //endregion Initialization - //region Overrides public boolean mayPlace(ItemStack stack) { return false; } - //endregion Overrides + } } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/container/spirit/SpiritContainer.java b/src/main/java/com/klikli_dev/occultism/common/container/spirit/SpiritContainer.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/common/container/spirit/SpiritContainer.java rename to src/main/java/com/klikli_dev/occultism/common/container/spirit/SpiritContainer.java index e9898068d..1e6956fbd 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/container/spirit/SpiritContainer.java +++ b/src/main/java/com/klikli_dev/occultism/common/container/spirit/SpiritContainer.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.container.spirit; +package com.klikli_dev.occultism.common.container.spirit; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.exceptions.ItemHandlerMissingException; -import com.github.klikli_dev.occultism.registry.OccultismContainers; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.exceptions.ItemHandlerMissingException; +import com.klikli_dev.occultism.registry.OccultismContainers; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -38,12 +38,9 @@ public class SpiritContainer extends AbstractContainerMenu { - //region Fields public ItemStackHandler inventory; public SpiritEntity spirit; - //endregion Fields - //region Initialization public SpiritContainer(int id, Inventory playerInventory, SpiritEntity spirit) { this(OccultismContainers.SPIRIT.get(), id, playerInventory, spirit); } @@ -55,9 +52,7 @@ public SpiritContainer(@Nullable MenuType type, int id, Inventory playerInven this.setupSlots(playerInventory); } - //endregion Initialization - //region Overrides @Override public ItemStack quickMoveStack(Player playerIn, int index) { ItemStack itemstack = ItemStack.EMPTY; @@ -92,9 +87,7 @@ public void removed(Player playerIn) { public boolean stillValid(Player entityPlayer) { return this.spirit.isAlive() && this.spirit.distanceTo(entityPlayer) < 8.0F; } - //endregion Overrides - //region Methods public void setupSlots(Inventory playerInventory) { this.setupPlayerInventorySlots(playerInventory.player); this.setupPlayerHotbar(playerInventory.player); @@ -120,7 +113,7 @@ protected void setupPlayerHotbar(Player player) { protected void setupEntityInventory() { this.addSlot(new SlotItemHandler(this.inventory, 0, 152, 54) { - //region Overrides + @Override public boolean mayPlace(ItemStack stack) { return super.mayPlace(stack); @@ -129,8 +122,8 @@ public boolean mayPlace(ItemStack stack) { public void setChanged() { this.container.setChanged(); } - //endregion Overrides + }); } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/container/spirit/SpiritTransporterContainer.java b/src/main/java/com/klikli_dev/occultism/common/container/spirit/SpiritTransporterContainer.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/common/container/spirit/SpiritTransporterContainer.java rename to src/main/java/com/klikli_dev/occultism/common/container/spirit/SpiritTransporterContainer.java index 7c4de0c4a..529e8123b 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/container/spirit/SpiritTransporterContainer.java +++ b/src/main/java/com/klikli_dev/occultism/common/container/spirit/SpiritTransporterContainer.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.container.spirit; +package com.klikli_dev.occultism.common.container.spirit; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.exceptions.ItemHandlerMissingException; -import com.github.klikli_dev.occultism.registry.OccultismContainers; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.exceptions.ItemHandlerMissingException; +import com.klikli_dev.occultism.registry.OccultismContainers; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ClickType; @@ -37,11 +37,9 @@ import javax.annotation.Nonnull; public class SpiritTransporterContainer extends SpiritContainer { - //region Fields + protected final Player player; - //endregion Fields - //region Initialization public SpiritTransporterContainer(int id, Inventory playerInventory, SpiritEntity spirit) { @@ -51,9 +49,6 @@ public SpiritTransporterContainer(int id, Inventory playerInventory, //needs to be called after transport item jobs has been set, so its not in setupSlots() this.setupFilterSlots(); } - //endregion Initialization - - //region Overrides @Override protected void setupPlayerInventorySlots(Player player) { @@ -102,9 +97,7 @@ public boolean canTakeItemForPickAll(ItemStack stack, Slot slot) { return super.canTakeItemForPickAll(stack, slot); } - //endregion Overrides - //region Methods protected void setupFilterSlots() { int x = 8; int y = 84; @@ -117,16 +110,13 @@ protected void setupFilterSlots() { } } } - //endregion Methods public class FilterSlot extends SlotItemHandler { - //region Initialization + public FilterSlot(IItemHandler handler, int inventoryIndex, int x, int y) { super(handler, inventoryIndex, x, y); } - //endregion Initialization - //region Overrides @Override public void set(@Nonnull ItemStack stack) { if (!stack.isEmpty()) { @@ -135,7 +125,7 @@ public void set(@Nonnull ItemStack stack) { super.set(stack); } - //endregion Overrides + } } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/container/storage/SatchelContainer.java b/src/main/java/com/klikli_dev/occultism/common/container/storage/SatchelContainer.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/common/container/storage/SatchelContainer.java rename to src/main/java/com/klikli_dev/occultism/common/container/storage/SatchelContainer.java index 83711ba94..e7fafe4b1 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/container/storage/SatchelContainer.java +++ b/src/main/java/com/klikli_dev/occultism/common/container/storage/SatchelContainer.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.container.storage; +package com.klikli_dev.occultism.common.container.storage; -import com.github.klikli_dev.occultism.registry.OccultismContainers; -import com.github.klikli_dev.occultism.registry.OccultismItems; -import com.github.klikli_dev.occultism.util.CuriosUtil; +import com.klikli_dev.occultism.registry.OccultismContainers; +import com.klikli_dev.occultism.registry.OccultismItems; +import com.klikli_dev.occultism.util.CuriosUtil; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.Container; import net.minecraft.world.SimpleContainer; @@ -35,14 +35,12 @@ import net.minecraft.world.item.ItemStack; public class SatchelContainer extends AbstractContainerMenu { - //region Fields + public static final int SATCHEL_SIZE = 13 * 9; protected Container satchelInventory; protected Inventory playerInventory; protected int selectedSlot; - //endregion Fields - //region Initialization public SatchelContainer(int id, Inventory playerInventory, Container satchelInventory, int selectedSlot) { super(OccultismContainers.SATCHEL.get(), id); this.satchelInventory = satchelInventory; @@ -53,7 +51,6 @@ public SatchelContainer(int id, Inventory playerInventory, Container satchelInve this.setupPlayerInventorySlots(); this.setupPlayerHotbar(); } - //endregion Initialization //region Static Methods public static SatchelContainer createClientContainer(int id, Inventory playerInventory, FriendlyByteBuf buffer) { @@ -61,7 +58,6 @@ public static SatchelContainer createClientContainer(int id, Inventory playerInv return new SatchelContainer(id, playerInventory, new SimpleContainer(SATCHEL_SIZE), selectedSlot); } - //region Overrides @Override public void broadcastChanges() { if (this.satchelInventory instanceof SatchelInventory) { @@ -105,7 +101,6 @@ else if (!this.moveItemStackTo(itemstack1, 0, this.satchelInventory.getContainer return itemstack; } - //endregion Overrides @Override public boolean stillValid(Player player) { @@ -118,7 +113,6 @@ public boolean stillValid(Player player) { } //endregion Static Methods - //region Methods protected void setupPlayerInventorySlots() { int playerInventoryTop = 174; int playerInventoryLeft = 44; @@ -151,5 +145,5 @@ protected void setupSatchelSlots() { } } } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/container/storage/SatchelInventory.java b/src/main/java/com/klikli_dev/occultism/common/container/storage/SatchelInventory.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/common/container/storage/SatchelInventory.java rename to src/main/java/com/klikli_dev/occultism/common/container/storage/SatchelInventory.java index 86c2e80f4..e64626458 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/container/storage/SatchelInventory.java +++ b/src/main/java/com/klikli_dev/occultism/common/container/storage/SatchelInventory.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.container.storage; +package com.klikli_dev.occultism.common.container.storage; import net.minecraft.core.NonNullList; import net.minecraft.nbt.CompoundTag; @@ -30,17 +30,13 @@ public class SatchelInventory extends SimpleContainer { - //region Fields private final ItemStack itemStack; - //endregion Fields - //region Initialization public SatchelInventory(ItemStack itemStack, int count) { super(count); this.itemStack = itemStack; this.readItemStack(); } - //endregion Initialization //region Getter / Setter public ItemStack getItemStack() { @@ -48,7 +44,6 @@ public ItemStack getItemStack() { } //endregion Getter / Setter - //region Methods public void readItemStack() { this.readNBT(this.itemStack.getOrCreateTag()); } @@ -78,5 +73,5 @@ private void writeNBT(CompoundTag compound) { } ContainerHelper.saveAllItems(compound, list, false); } - //endregion Methods + } \ No newline at end of file diff --git a/src/main/java/com/github/klikli_dev/occultism/common/container/storage/SatchelSlot.java b/src/main/java/com/klikli_dev/occultism/common/container/storage/SatchelSlot.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/common/container/storage/SatchelSlot.java rename to src/main/java/com/klikli_dev/occultism/common/container/storage/SatchelSlot.java index 548d293c6..e9b2b81bf 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/container/storage/SatchelSlot.java +++ b/src/main/java/com/klikli_dev/occultism/common/container/storage/SatchelSlot.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.container.storage; +package com.klikli_dev.occultism.common.container.storage; -import com.github.klikli_dev.occultism.registry.OccultismItems; +import com.klikli_dev.occultism.registry.OccultismItems; import net.minecraft.world.Container; import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/container/storage/StableWormholeContainer.java b/src/main/java/com/klikli_dev/occultism/common/container/storage/StableWormholeContainer.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/common/container/storage/StableWormholeContainer.java rename to src/main/java/com/klikli_dev/occultism/common/container/storage/StableWormholeContainer.java index 542034f8e..76f998e82 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/container/storage/StableWormholeContainer.java +++ b/src/main/java/com/klikli_dev/occultism/common/container/storage/StableWormholeContainer.java @@ -20,17 +20,17 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.container.storage; - -import com.github.klikli_dev.occultism.api.common.data.GlobalBlockPos; -import com.github.klikli_dev.occultism.client.gui.storage.StorageControllerGuiBase; -import com.github.klikli_dev.occultism.common.blockentity.StableWormholeBlockEntity; -import com.github.klikli_dev.occultism.common.blockentity.StorageControllerBlockEntity; -import com.github.klikli_dev.occultism.common.misc.StorageControllerCraftingInventory; -import com.github.klikli_dev.occultism.network.MessageUpdateLinkedMachines; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.registry.OccultismContainers; -import com.github.klikli_dev.occultism.util.BlockEntityUtil; +package com.klikli_dev.occultism.common.container.storage; + +import com.klikli_dev.occultism.api.common.data.GlobalBlockPos; +import com.klikli_dev.occultism.client.gui.storage.StorageControllerGuiBase; +import com.klikli_dev.occultism.common.blockentity.StableWormholeBlockEntity; +import com.klikli_dev.occultism.common.blockentity.StorageControllerBlockEntity; +import com.klikli_dev.occultism.common.misc.StorageControllerCraftingInventory; +import com.klikli_dev.occultism.network.MessageUpdateLinkedMachines; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.registry.OccultismContainers; +import com.klikli_dev.occultism.util.BlockEntityUtil; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; @@ -41,12 +41,10 @@ public class StableWormholeContainer extends StorageControllerContainerBase { - //region Fields + protected StorageControllerBlockEntity storageController; protected StableWormholeBlockEntity stableWormhole; - //endregion Fields - //region Initialization public StableWormholeContainer(int id, Inventory playerInventory, StableWormholeBlockEntity stableWormhole) { super(OccultismContainers.STABLE_WORMHOLE.get(), id, playerInventory); @@ -64,7 +62,6 @@ public StableWormholeContainer(int id, Inventory playerInventory, this.slotsChanged(this.matrix); } - //endregion Initialization //region Getter / Setter public StableWormholeBlockEntity getStableWormhole() { @@ -72,7 +69,6 @@ public StableWormholeBlockEntity getStableWormhole() { } //endregion Getter / Setter - //region Overrides @Override protected void setupPlayerHotbar() { int hotbarTop = 232; @@ -145,5 +141,5 @@ public boolean stillValid(Player player) { return player.distanceToSqr(wormholePosition.getX() + 0.5D, wormholePosition.getY() + 0.5D, wormholePosition.getZ() + 0.5D) <= 64.0D; } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/container/storage/StorageControllerContainer.java b/src/main/java/com/klikli_dev/occultism/common/container/storage/StorageControllerContainer.java similarity index 86% rename from src/main/java/com/github/klikli_dev/occultism/common/container/storage/StorageControllerContainer.java rename to src/main/java/com/klikli_dev/occultism/common/container/storage/StorageControllerContainer.java index f2a6ae794..628a09ee8 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/container/storage/StorageControllerContainer.java +++ b/src/main/java/com/klikli_dev/occultism/common/container/storage/StorageControllerContainer.java @@ -20,14 +20,14 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.container.storage; - -import com.github.klikli_dev.occultism.client.gui.storage.StorageControllerGuiBase; -import com.github.klikli_dev.occultism.common.blockentity.StorageControllerBlockEntity; -import com.github.klikli_dev.occultism.common.misc.StorageControllerCraftingInventory; -import com.github.klikli_dev.occultism.network.MessageUpdateLinkedMachines; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.registry.OccultismContainers; +package com.klikli_dev.occultism.common.container.storage; + +import com.klikli_dev.occultism.client.gui.storage.StorageControllerGuiBase; +import com.klikli_dev.occultism.common.blockentity.StorageControllerBlockEntity; +import com.klikli_dev.occultism.common.misc.StorageControllerCraftingInventory; +import com.klikli_dev.occultism.network.MessageUpdateLinkedMachines; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.registry.OccultismContainers; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Inventory; @@ -38,11 +38,9 @@ public class StorageControllerContainer extends StorageControllerContainerBase { - //region Fields + protected StorageControllerBlockEntity storageController; - //endregion Fields - //region Initialization public StorageControllerContainer(int id, Inventory playerInventory, StorageControllerBlockEntity storageController) { super(OccultismContainers.STORAGE_CONTROLLER.get(), id, playerInventory); @@ -60,9 +58,7 @@ public StorageControllerContainer(int id, Inventory playerInventory, this.slotsChanged(this.matrix); } - //endregion Initialization - //region Overrides @Override protected void setupPlayerHotbar() { int hotbarTop = 232; @@ -125,5 +121,5 @@ public boolean stillValid(Player player) { return player.distanceToSqr(controllerPosition.getX() + 0.5D, controllerPosition.getY() + 0.5D, controllerPosition.getZ() + 0.5D) <= 64.0D; } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/container/storage/StorageControllerContainerBase.java b/src/main/java/com/klikli_dev/occultism/common/container/storage/StorageControllerContainerBase.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/common/container/storage/StorageControllerContainerBase.java rename to src/main/java/com/klikli_dev/occultism/common/container/storage/StorageControllerContainerBase.java index a8ddc69f4..d356b99eb 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/container/storage/StorageControllerContainerBase.java +++ b/src/main/java/com/klikli_dev/occultism/common/container/storage/StorageControllerContainerBase.java @@ -20,16 +20,16 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.container.storage; - -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.container.IStorageControllerContainer; -import com.github.klikli_dev.occultism.api.common.data.GlobalBlockPos; -import com.github.klikli_dev.occultism.client.gui.storage.StorageControllerGuiBase; -import com.github.klikli_dev.occultism.common.misc.ItemStackComparator; -import com.github.klikli_dev.occultism.common.misc.StorageControllerCraftingInventory; -import com.github.klikli_dev.occultism.common.misc.StorageControllerSlot; -import com.github.klikli_dev.occultism.network.OccultismPackets; +package com.klikli_dev.occultism.common.container.storage; + +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.container.IStorageControllerContainer; +import com.klikli_dev.occultism.api.common.data.GlobalBlockPos; +import com.klikli_dev.occultism.client.gui.storage.StorageControllerGuiBase; +import com.klikli_dev.occultism.common.misc.ItemStackComparator; +import com.klikli_dev.occultism.common.misc.StorageControllerCraftingInventory; +import com.klikli_dev.occultism.common.misc.StorageControllerSlot; +import com.klikli_dev.occultism.network.OccultismPackets; import net.minecraft.core.NonNullList; import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; import net.minecraft.server.level.ServerPlayer; @@ -44,7 +44,6 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.wrapper.PlayerMainInvWrapper; -import net.minecraftforge.registries.ForgeRegistries; import javax.annotation.Nullable; import java.util.ArrayList; @@ -53,7 +52,6 @@ public abstract class StorageControllerContainerBase extends AbstractContainerMenu implements IStorageControllerContainer { - //region Fields public Inventory playerInventory; public Player player; protected ResultContainer result; @@ -65,9 +63,6 @@ public abstract class StorageControllerContainerBase extends AbstractContainerMe * used to lock recipe while crafting */ protected boolean recipeLocked = false; - //endregion Fields - - //region Initialization protected StorageControllerContainerBase(@Nullable MenuType type, int id, Inventory playerInventory) { super(type, id); @@ -78,10 +73,6 @@ protected StorageControllerContainerBase(@Nullable MenuType type, int id, Inv this.orderInventory = new SimpleContainer(1); } - //endregion Initialization - - //region Overrides - @Override public GlobalBlockPos getStorageControllerGlobalBlockPos() { return GlobalBlockPos.from( @@ -109,7 +100,7 @@ public SimpleContainer getOrderSlot() { @Override public ItemStack quickMoveStack(Player player, int index) { - if (player.level.isClientSide) + if (player.level().isClientSide) return ItemStack.EMPTY; ItemStack result = ItemStack.EMPTY; @@ -157,9 +148,6 @@ public void removed(Player playerIn) { super.removed(playerIn); } - //endregion Overrides - - //region Methods protected void setupPlayerInventorySlots() { int playerInventoryTop = 174; int playerInventoryLeft = 8 + StorageControllerGuiBase.ORDER_AREA_OFFSET; @@ -202,24 +190,24 @@ protected void setupOrderInventorySlot() { protected void findRecipeForMatrixClient() { Optional optional = - this.player.level.getRecipeManager().getRecipeFor(RecipeType.CRAFTING, this.matrix, this.player.level); + this.player.level().getRecipeManager().getRecipeFor(RecipeType.CRAFTING, this.matrix, this.player.level()); optional.ifPresent(iCraftingRecipe -> this.currentRecipe = iCraftingRecipe); } protected void findRecipeForMatrix() { //NOTE: if there are issues, set up a copy of this based on WorkBenchContainer func_217066_a / updateCraftingResult // and call it onCraftingMatrixChanged(). Send slot packet! - if (!this.player.level.isClientSide) { + if (!this.player.level().isClientSide) { this.currentRecipe = null; ServerPlayer serverplayerentity = (ServerPlayer) this.player; ItemStack itemstack = ItemStack.EMPTY; - Optional optional = this.player.level.getServer().getRecipeManager() + Optional optional = this.player.level().getServer().getRecipeManager() .getRecipeFor(RecipeType.CRAFTING, this.matrix, - this.player.level); + this.player.level()); if (optional.isPresent()) { CraftingRecipe icraftingrecipe = optional.get(); - if (this.result.setRecipeUsed(this.player.level, serverplayerentity, icraftingrecipe)) { - itemstack = icraftingrecipe.assemble(this.matrix, serverplayerentity.level.registryAccess()); + if (this.result.setRecipeUsed(this.player.level(), serverplayerentity, icraftingrecipe)) { + itemstack = icraftingrecipe.assemble(this.matrix, serverplayerentity.level().registryAccess()); this.currentRecipe = icraftingrecipe; } } @@ -249,7 +237,7 @@ protected void craftShift(Player player, IStorageController storageController) { } //Get the crafting result and abort if none - ItemStack result = this.currentRecipe.assemble(this.matrix, player.level.registryAccess()); + ItemStack result = this.currentRecipe.assemble(this.matrix, player.level().registryAccess()); if (result.isEmpty()) { return; } @@ -265,7 +253,7 @@ protected void craftShift(Player player, IStorageController storageController) { if (this.currentRecipe == null) break; - ItemStack newResult = this.currentRecipe.assemble(this.matrix, player.level.registryAccess()).copy(); + ItemStack newResult = this.currentRecipe.assemble(this.matrix, player.level().registryAccess()).copy(); if (newResult.getItem() != result.getItem()) break; @@ -277,7 +265,7 @@ protected void craftShift(Player player, IStorageController storageController) { } //if recipe is no longer fulfilled, stop - if (!this.currentRecipe.matches(this.matrix, player.level)) { + if (!this.currentRecipe.matches(this.matrix, player.level())) { break; } @@ -303,7 +291,7 @@ protected void craftShift(Player player, IStorageController storageController) { //handle container item refunding if (!stackInSlot.getItem().getCraftingRemainingItem(stackInSlot).isEmpty()) { - ItemStack container = stackInSlot.getItem().getCraftingRemainingItem (stackInSlot); + ItemStack container = stackInSlot.getItem().getCraftingRemainingItem(stackInSlot); if (!stackInSlot.isStackable()) { stackInSlot = container; this.matrix.setItem(i, stackInSlot); @@ -318,20 +306,20 @@ protected void craftShift(Player player, IStorageController storageController) { this.matrix.setItem(i, currentCraftingItem); } //handle "normal items" ie non-damagable - else if (!stackInSlot.isDamageableItem() && ItemStack.tagMatches(stackInSlot, currentCraftingItem)) { + else if (!stackInSlot.isDamageableItem() && ItemStack.isSameItemSameTags(stackInSlot, currentCraftingItem)) { //Used to call grow here, but that causes dupes of unbreakable items //removing it seems not to cause any harm? // currentCraftingItem.grow(stackInSlot.getCount()); this.matrix.setItem(i, currentCraftingItem); } //handle items that consume durability on craft - else if (ItemStack.isSame(stackInSlot, currentCraftingItem)) { + else if (ItemStack.isSameItem(stackInSlot, currentCraftingItem)) { this.matrix.setItem(i, currentCraftingItem); } else { //last resort, try to place in player inventory or if that fails, drop. ItemHandlerHelper.giveItemToPlayer(player, newResult); } - + } else if (!stackInSlot.isEmpty()) { //decrease the stack size in the matrix this.matrix.removeItem(i, 1); @@ -376,5 +364,5 @@ else if (ItemStack.isSame(stackInSlot, currentCraftingItem)) { OccultismPackets.sendTo((ServerPlayer) player, this.getStorageController().getMessageUpdateStacks()); } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/container/storage/StorageRemoteContainer.java b/src/main/java/com/klikli_dev/occultism/common/container/storage/StorageRemoteContainer.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/common/container/storage/StorageRemoteContainer.java rename to src/main/java/com/klikli_dev/occultism/common/container/storage/StorageRemoteContainer.java index 10e8714d5..2014e90b3 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/container/storage/StorageRemoteContainer.java +++ b/src/main/java/com/klikli_dev/occultism/common/container/storage/StorageRemoteContainer.java @@ -20,17 +20,17 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.container.storage; - -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.data.GlobalBlockPos; -import com.github.klikli_dev.occultism.client.gui.storage.StorageControllerGuiBase; -import com.github.klikli_dev.occultism.common.item.storage.StorageRemoteItem; -import com.github.klikli_dev.occultism.common.misc.StorageControllerCraftingInventory; -import com.github.klikli_dev.occultism.network.MessageUpdateLinkedMachines; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.registry.OccultismContainers; -import com.github.klikli_dev.occultism.util.CuriosUtil; +package com.klikli_dev.occultism.common.container.storage; + +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.data.GlobalBlockPos; +import com.klikli_dev.occultism.client.gui.storage.StorageControllerGuiBase; +import com.klikli_dev.occultism.common.item.storage.StorageRemoteItem; +import com.klikli_dev.occultism.common.misc.StorageControllerCraftingInventory; +import com.klikli_dev.occultism.network.MessageUpdateLinkedMachines; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.registry.OccultismContainers; +import com.klikli_dev.occultism.util.CuriosUtil; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; import net.minecraft.server.level.ServerPlayer; @@ -44,11 +44,9 @@ import java.util.List; public class StorageRemoteContainer extends StorageControllerContainerBase { - //region Fields + protected int selectedSlot; - //endregion Fields - //region Initialization public StorageRemoteContainer(int id, Inventory playerInventory, int selectedSlot) { super(OccultismContainers.STORAGE_REMOTE.get(), id, playerInventory); @@ -67,7 +65,6 @@ public StorageRemoteContainer(int id, Inventory playerInventory, int selectedSlo this.slotsChanged(this.matrix); } - //endregion Initialization //region Getter / Setter public ItemStack getStorageRemote() { @@ -81,9 +78,6 @@ public ItemStack getStorageRemote() { } //endregion Getter / Setter - - //region Overrides - @Override public GlobalBlockPos getStorageControllerGlobalBlockPos() { ItemStack storageRemote = this.getStorageRemote(); @@ -97,7 +91,7 @@ protected void setupPlayerHotbar() { for (int i = 0; i < 9; i++) { if (i == this.selectedSlot) { this.addSlot(new Slot(this.playerInventory, i, hotbarLeft + i * 18, hotbarTop) { - //region Overrides + @Override public boolean mayPlace(ItemStack stack) { return false; @@ -112,7 +106,6 @@ public boolean hasItem() { public boolean mayPickup(Player playerIn) { return false; } - //endregion Overrides }); } else { @@ -126,12 +119,12 @@ protected void setupPlayerInventorySlots() { int playerInventoryTop = 174; int playerInventoryLeft = 8 + StorageControllerGuiBase.ORDER_AREA_OFFSET; - for (int i = 0; i < 3; i++){ - for (int j = 0; j < 9; j++){ + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 9; j++) { if (j + i * 9 + 9 == this.selectedSlot) { this.addSlot(new Slot(this.playerInventory, j + i * 9 + 9, playerInventoryLeft + j * 18, playerInventoryTop + i * 18) { - //region Overrides + @Override public boolean mayPlace(ItemStack stack) { return false; @@ -146,7 +139,6 @@ public boolean hasItem() { public boolean mayPickup(Player playerIn) { return false; } - //endregion Overrides }); } else { @@ -157,8 +149,6 @@ public boolean mayPickup(Player playerIn) { } - - } @Override @@ -167,8 +157,8 @@ public boolean stillValid(Player entityPlayer) { //stillValid is constantly called, so we use it to send //stack updates every 40 ticks. - if (storageController != null && !entityPlayer.level.isClientSide && - entityPlayer.level.getGameTime() % 40 == 0) { + if (storageController != null && !entityPlayer.level().isClientSide && + entityPlayer.level().getGameTime() % 40 == 0) { OccultismPackets.sendTo((ServerPlayer) this.player, this.getStorageController().getMessageUpdateStacks()); OccultismPackets.sendTo((ServerPlayer) this.player, new MessageUpdateLinkedMachines(this.getStorageController().getLinkedMachines())); @@ -180,7 +170,7 @@ public boolean stillValid(Player entityPlayer) { @Override public IStorageController getStorageController() { - return StorageRemoteItem.getStorageController(this.getStorageRemote(), this.playerInventory.player.level); + return StorageRemoteItem.getStorageController(this.getStorageRemote(), this.playerInventory.player.level()); } @Override @@ -205,9 +195,7 @@ public void updateOrderSlot(boolean force) { if (storageRemote != ItemStack.EMPTY) storageRemote.getOrCreateTag().put("orderStack", this.orderInventory.getItem(0).serializeNBT()); } - //endregion Overrides - //region Methods protected List getCraftingMatrixFromItemStack(ItemStack stack) { List craftingMatrix = new ArrayList<>(Collections.nCopies(9, ItemStack.EMPTY)); if (!stack.getOrCreateTag().contains("craftingMatrix")) @@ -228,5 +216,5 @@ protected ItemStack getOrderStackFromItemStack(ItemStack stack) { return ItemStack.of(stack.getTag().getCompound("orderStack")); } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/data/ChalkGlyphType.java b/src/main/java/com/klikli_dev/occultism/common/data/ChalkGlyphType.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/common/data/ChalkGlyphType.java rename to src/main/java/com/klikli_dev/occultism/common/data/ChalkGlyphType.java index d4547cf1f..dfc536c60 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/data/ChalkGlyphType.java +++ b/src/main/java/com/klikli_dev/occultism/common/data/ChalkGlyphType.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.data; +package com.klikli_dev.occultism.common.data; import net.minecraft.util.StringRepresentable; @@ -46,7 +46,6 @@ public enum ChalkGlyphType implements StringRepresentable { */ PURPLE(3); - //region Fields private static final Map lookup = new HashMap(); static { @@ -56,13 +55,10 @@ public enum ChalkGlyphType implements StringRepresentable { } private final int value; - //endregion Fields - //region Initialization ChalkGlyphType(int value) { this.value = value; } - //endregion Initialization //region Static Methods public static ChalkGlyphType get(int value) { diff --git a/src/main/java/com/github/klikli_dev/occultism/common/data/NonNullArrayList.java b/src/main/java/com/klikli_dev/occultism/common/data/NonNullArrayList.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/common/data/NonNullArrayList.java rename to src/main/java/com/klikli_dev/occultism/common/data/NonNullArrayList.java index ae0a5c763..70ef7db61 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/data/NonNullArrayList.java +++ b/src/main/java/com/klikli_dev/occultism/common/data/NonNullArrayList.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.data; +package com.klikli_dev.occultism.common.data; import net.minecraft.core.NonNullList; @@ -34,11 +34,8 @@ public class NonNullArrayList extends NonNullList { - //region Fields protected final ArrayList delegate; - //endregion Fields - //region Initialization protected NonNullArrayList() { this(new ArrayList<>(), null); } @@ -47,9 +44,6 @@ protected NonNullArrayList(ArrayList delegateIn, @Nullable E listType) { super(delegateIn, listType); this.delegate = delegateIn; } - //endregion Initialization - - //region Overrides //region Static Methods public static NonNullArrayList create() { @@ -59,7 +53,6 @@ public static NonNullArrayList create() { public static NonNullArrayList withSize(int size, E fill) { return new NonNullArrayList<>(new ArrayList<>(Collections.nCopies(size, fill)), fill); } - //endregion Overrides @SafeVarargs public static NonNullList from(E defaultElementIn, E... elements) { diff --git a/src/main/java/com/github/klikli_dev/occultism/common/effect/DoubleJumpEffect.java b/src/main/java/com/klikli_dev/occultism/common/effect/DoubleJumpEffect.java similarity index 80% rename from src/main/java/com/github/klikli_dev/occultism/common/effect/DoubleJumpEffect.java rename to src/main/java/com/klikli_dev/occultism/common/effect/DoubleJumpEffect.java index 573b10b6b..8c6c80359 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/effect/DoubleJumpEffect.java +++ b/src/main/java/com/klikli_dev/occultism/common/effect/DoubleJumpEffect.java @@ -20,14 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.effect; +package com.klikli_dev.occultism.common.effect; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.registry.OccultismEffects; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.Minecraft; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.registry.OccultismEffects; import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.GuiComponent; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.EffectRenderingInventoryScreen; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.effect.MobEffect; @@ -47,17 +45,15 @@ public class DoubleJumpEffect extends MobEffect { public static final IClientMobEffectExtensions EFFECT_RENDERER = new IClientMobEffectExtensions() { @Override - public boolean renderInventoryIcon(MobEffectInstance instance, EffectRenderingInventoryScreen screen, PoseStack poseStack, int x, int y, int blitOffset) { - screen.getMinecraft().getTextureManager().bindForSetup(ICON); - GuiComponent.blit(poseStack, x + 6, y + 7, 18, 18, 0, 0, 255, 255, 256, 256); + public boolean renderInventoryIcon(MobEffectInstance instance, EffectRenderingInventoryScreen screen, GuiGraphics guiGraphics, int x, int y, int blitOffset) { + guiGraphics.blit(ICON, x + 6, y + 7, 18, 18, 0, 0, 255, 255, 256, 256); return false; } @Override - public boolean renderGuiIcon(MobEffectInstance instance, Gui gui, PoseStack poseStack, int x, int y, float z, float alpha) { - Minecraft.getInstance().getTextureManager().bindForSetup(ICON); - GuiComponent.blit(poseStack, x + 3, y + 3, 18, 18, 0, 0, 255, 255, 256, 256); + public boolean renderGuiIcon(MobEffectInstance instance, Gui gui, GuiGraphics guiGraphics, int x, int y, float z, float alpha) { + guiGraphics.blit(ICON, x + 3, y + 3, 18, 18, 0, 0, 255, 255, 256, 256); return false; } }; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/effect/ThirdEyeEffect.java b/src/main/java/com/klikli_dev/occultism/common/effect/ThirdEyeEffect.java similarity index 84% rename from src/main/java/com/github/klikli_dev/occultism/common/effect/ThirdEyeEffect.java rename to src/main/java/com/klikli_dev/occultism/common/effect/ThirdEyeEffect.java index 31144e142..983b52e59 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/effect/ThirdEyeEffect.java +++ b/src/main/java/com/klikli_dev/occultism/common/effect/ThirdEyeEffect.java @@ -20,13 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.effect; +package com.klikli_dev.occultism.common.effect; -import com.github.klikli_dev.occultism.Occultism; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; +import com.klikli_dev.occultism.Occultism; import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.GuiComponent; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; @@ -44,10 +42,8 @@ public class ThirdEyeEffect extends MobEffect { public static final IClientMobEffectExtensions EFFECT_RENDERER = new IClientMobEffectExtensions() { @Override - public boolean renderGuiIcon(MobEffectInstance instance, Gui gui, PoseStack poseStack, int x, int y, float z, float alpha) { - RenderSystem.setShaderTexture(0, ICON); - GuiComponent.blit(poseStack, x + 3, y + 3, 18, 18, 0, 0, 255, 255, 256, 256); - + public boolean renderGuiIcon(MobEffectInstance instance, Gui gui, GuiGraphics guiGraphics, int x, int y, float z, float alpha) { + guiGraphics.blit(ICON, x + 3, y + 3, 18, 18, 0, 0, 255, 255, 256, 256); return true; } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/BlockSorter.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/BlockSorter.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/BlockSorter.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/BlockSorter.java index 655feee3e..fc3992c0e 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/BlockSorter.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/BlockSorter.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.ai; +package com.klikli_dev.occultism.common.entity.ai; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; @@ -28,26 +28,19 @@ import java.util.Comparator; public class BlockSorter implements Comparator { - //region Fields + private final Entity entity; - //endregion Fields - //region Initialization public BlockSorter(Entity entity) { this.entity = entity; } - //endregion Initialization - //region Overrides @Override public int compare(BlockPos a, BlockPos b) { double distanceA = this.getDistance(a); double distanceB = this.getDistance(b); return Double.compare(distanceA, distanceB); } - //endregion Overrides - - //region Methods /** * Gets the distance of the entity to the given position at eye level. @@ -61,6 +54,5 @@ private double getDistance(BlockPos pos) { double deltaZ = this.entity.getZ() - (pos.getZ() + 0.5); return deltaX * deltaX + deltaY * deltaY + deltaZ * deltaZ; } - //endregion Methods + } -//endregion Subtypes \ No newline at end of file diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/EntitySorter.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/EntitySorter.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/EntitySorter.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/EntitySorter.java index 32b46df44..7b9a7e174 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/EntitySorter.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/EntitySorter.java @@ -20,29 +20,24 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.ai; +package com.klikli_dev.occultism.common.entity.ai; import net.minecraft.world.entity.Entity; import java.util.Comparator; public class EntitySorter implements Comparator { - //region Fields + private final Entity entity; - //endregion Fields - //region Initialization public EntitySorter(Entity entity) { this.entity = entity; } - //endregion Initialization - //region Overrides public int compare(Entity a, Entity b) { double distanceA = this.entity.distanceToSqr(a); double distanceB = this.entity.distanceToSqr(b); return Double.compare(distanceA, distanceB); } - //endregion Overrides + } -//endregion Subtypes \ No newline at end of file diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/DepositItemsBehaviour.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/DepositItemsBehaviour.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/DepositItemsBehaviour.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/DepositItemsBehaviour.java index ecab5f041..ec3589167 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/DepositItemsBehaviour.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/DepositItemsBehaviour.java @@ -1,9 +1,9 @@ -package com.github.klikli_dev.occultism.common.entity.ai.behaviour; +package com.klikli_dev.occultism.common.entity.ai.behaviour; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.exceptions.ItemHandlerMissingException; -import com.github.klikli_dev.occultism.registry.OccultismMemoryTypes; -import com.github.klikli_dev.occultism.util.StorageUtil; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.exceptions.ItemHandlerMissingException; +import com.klikli_dev.occultism.registry.OccultismMemoryTypes; +import com.klikli_dev.occultism.util.StorageUtil; import com.mojang.datafixers.util.Pair; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.minecraft.server.level.ServerLevel; @@ -52,7 +52,7 @@ protected void start(E entity) { var depositPos = BrainUtils.getMemory(entity, OccultismMemoryTypes.DEPOSIT_POSITION.get()); var depositFacing = BrainUtils.getMemory(entity, OccultismMemoryTypes.DEPOSIT_FACING.get()); - var blockEntity = entity.level.getBlockEntity(depositPos); + var blockEntity = entity.level().getBlockEntity(depositPos); if (blockEntity != null) { BrainUtils.setMemory(entity, MemoryModuleType.LOOK_TARGET, new BlockPosTracker(depositPos)); @@ -89,7 +89,7 @@ protected void stop(E entity) { //we use stop with a runtimeprovider to create the delay. var depositPos = BrainUtils.getMemory(entity, OccultismMemoryTypes.DEPOSIT_POSITION.get()); - var blockEntity = entity.level.getBlockEntity(depositPos); + var blockEntity = entity.level().getBlockEntity(depositPos); if (blockEntity != null) { this.toggleContainer(blockEntity, false); } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/FellTreeBehaviour.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/FellTreeBehaviour.java similarity index 86% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/FellTreeBehaviour.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/FellTreeBehaviour.java index 1c0b6b9d5..e005541f8 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/FellTreeBehaviour.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/FellTreeBehaviour.java @@ -1,8 +1,8 @@ -package com.github.klikli_dev.occultism.common.entity.ai.behaviour; +package com.klikli_dev.occultism.common.entity.ai.behaviour; -import com.github.klikli_dev.occultism.common.entity.ai.sensor.NearestTreeSensor; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.registry.OccultismMemoryTypes; +import com.klikli_dev.occultism.common.entity.ai.sensor.NearestTreeSensor; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.registry.OccultismMemoryTypes; import com.mojang.datafixers.util.Pair; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.minecraft.core.BlockPos; @@ -57,7 +57,7 @@ protected boolean shouldKeepRunning(E entity) { @Override protected void tick(E entity) { var treePos = BrainUtils.getMemory(entity, OccultismMemoryTypes.NEAREST_TREE.get()); - if (NearestTreeSensor.isLog(entity.level, treePos)) { + if (NearestTreeSensor.isLog(entity.level(), treePos)) { BrainUtils.setMemory(entity, MemoryModuleType.LOOK_TARGET, new BlockPosTracker(treePos)); this.breakingTime++; entity.swing(InteractionHand.MAIN_HAND); @@ -67,20 +67,20 @@ protected void tick(E entity) { entity.playSound(SoundEvents.PLAYER_ATTACK_SWEEP, 1, 0.5F); } if (i != this.previousBreakProgress) { - entity.level.destroyBlockProgress(entity.getId(), treePos, i); + entity.level().destroyBlockProgress(entity.getId(), treePos, i); this.previousBreakProgress = i; } if (this.breakingTime == 160) { entity.playSound(SoundEvents.WOOD_BREAK, 1, 1); this.fellTree(entity, treePos); BrainUtils.setMemory(entity, OccultismMemoryTypes.LAST_FELLED_TREE.get(), treePos); - this.stop((ServerLevel) entity.getLevel(), entity, entity.getLevel().getGameTime()); + this.stop((ServerLevel) entity.level(), entity, entity.level().getGameTime()); //we stop here (even though the above condition would save us) because sensor might reset last felled tree meanwhile } } else { //if the tree is gone, just stop and reset. - this.stop((ServerLevel) entity.getLevel(), entity, entity.getLevel().getGameTime()); + this.stop((ServerLevel) entity.level(), entity, entity.level().getGameTime()); } } @@ -94,7 +94,7 @@ protected void stop(E entity) { } private void fellTree(E entity, BlockPos treePos) { - Level level = entity.level; + Level level = entity.level(); BlockPos base = treePos; Queue blocks = new ArrayDeque<>(); Set visited = new HashSet<>(); diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/HandleUnreachableTreeBehaviour.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/HandleUnreachableTreeBehaviour.java similarity index 83% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/HandleUnreachableTreeBehaviour.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/HandleUnreachableTreeBehaviour.java index f97b61a86..c7fee9433 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/HandleUnreachableTreeBehaviour.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/HandleUnreachableTreeBehaviour.java @@ -1,11 +1,11 @@ -package com.github.klikli_dev.occultism.common.entity.ai.behaviour; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.OccultismConstants; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.network.MessageSelectBlock; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.registry.OccultismMemoryTypes; +package com.klikli_dev.occultism.common.entity.ai.behaviour; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.OccultismConstants; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.network.MessageSelectBlock; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.registry.OccultismMemoryTypes; import com.mojang.datafixers.util.Pair; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.minecraft.world.entity.ai.behavior.BlockPosTracker; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/PickupItemBehaviour.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/PickupItemBehaviour.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/PickupItemBehaviour.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/PickupItemBehaviour.java index 60149437d..3d5482f74 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/PickupItemBehaviour.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/PickupItemBehaviour.java @@ -1,9 +1,9 @@ -package com.github.klikli_dev.occultism.common.entity.ai.behaviour; +package com.klikli_dev.occultism.common.entity.ai.behaviour; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.exceptions.ItemHandlerMissingException; -import com.github.klikli_dev.occultism.registry.OccultismMemoryTypes; -import com.github.klikli_dev.occultism.util.Math3DUtil; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.exceptions.ItemHandlerMissingException; +import com.klikli_dev.occultism.registry.OccultismMemoryTypes; +import com.klikli_dev.occultism.util.Math3DUtil; import com.mojang.datafixers.util.Pair; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/ReplantSaplingBehaviour.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/ReplantSaplingBehaviour.java similarity index 81% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/ReplantSaplingBehaviour.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/ReplantSaplingBehaviour.java index 7a6600b21..4acc6ec77 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/ReplantSaplingBehaviour.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/ReplantSaplingBehaviour.java @@ -1,9 +1,9 @@ -package com.github.klikli_dev.occultism.common.entity.ai.behaviour; +package com.klikli_dev.occultism.common.entity.ai.behaviour; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.exceptions.ItemHandlerMissingException; -import com.github.klikli_dev.occultism.registry.OccultismMemoryTypes; -import com.github.klikli_dev.occultism.util.StorageUtil; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.exceptions.ItemHandlerMissingException; +import com.klikli_dev.occultism.registry.OccultismMemoryTypes; +import com.klikli_dev.occultism.util.StorageUtil; import com.mojang.datafixers.util.Pair; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.minecraft.server.level.ServerLevel; @@ -37,13 +37,13 @@ protected boolean checkExtraStartConditions(ServerLevel level, E entity) { protected void start(E entity) { var lastFelledTree = BrainUtils.getMemory(entity, OccultismMemoryTypes.LAST_FELLED_TREE.get()); - if (entity.level.isEmptyBlock(lastFelledTree)) { + if (entity.level().isEmptyBlock(lastFelledTree)) { BrainUtils.setMemory(entity, MemoryModuleType.LOOK_TARGET, new BlockPosTracker(lastFelledTree)); var handler = entity.itemStackHandler.orElseThrow(ItemHandlerMissingException::new); ItemStack sapling = handler.getStackInSlot(StorageUtil.getFirstMatchingSlot(handler, ItemTags.SAPLINGS)); if (sapling.getItem() instanceof BlockItem saplingBlockItem) { - entity.level.setBlockAndUpdate(lastFelledTree, saplingBlockItem.getBlock().defaultBlockState()); + entity.level().setBlockAndUpdate(lastFelledTree, saplingBlockItem.getBlock().defaultBlockState()); sapling.shrink(1); } } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToDepositBehaviour.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToDepositBehaviour.java similarity index 81% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToDepositBehaviour.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToDepositBehaviour.java index 55ce2d953..0379e82cc 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToDepositBehaviour.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToDepositBehaviour.java @@ -1,13 +1,13 @@ -package com.github.klikli_dev.occultism.common.entity.ai.behaviour; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.OccultismConstants; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.exceptions.ItemHandlerMissingException; -import com.github.klikli_dev.occultism.network.MessageSelectBlock; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.registry.OccultismMemoryTypes; -import com.github.klikli_dev.occultism.util.StorageUtil; +package com.klikli_dev.occultism.common.entity.ai.behaviour; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.OccultismConstants; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.exceptions.ItemHandlerMissingException; +import com.klikli_dev.occultism.network.MessageSelectBlock; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.registry.OccultismMemoryTypes; +import com.klikli_dev.occultism.util.StorageUtil; import com.mojang.datafixers.util.Pair; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.minecraft.core.BlockPos; @@ -54,7 +54,7 @@ protected void start(E entity) { for (Direction facing : Direction.Plane.HORIZONTAL) { var pos = depositPos.relative(facing); - if (entity.getLevel().isEmptyBlock(pos) && !unreachableWalkTargets.contains(pos)) { + if (entity.level().isEmptyBlock(pos) && !unreachableWalkTargets.contains(pos)) { walkPos = pos; break; } @@ -66,7 +66,7 @@ protected void start(E entity) { if (Occultism.DEBUG.debugAI) { - OccultismPackets.sendToTracking(entity, new MessageSelectBlock(depositPos, 5000, OccultismConstants.Color.MAGENTA)); + OccultismPackets.sendToTracking(entity, new MessageSelectBlock(depositPos, 5000, OccultismConstants.Color.MAGENTA)); OccultismPackets.sendToTracking(entity, new MessageSelectBlock(walkPos, 5000, OccultismConstants.Color.GREEN)); } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToItemBehaviour.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToItemBehaviour.java similarity index 83% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToItemBehaviour.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToItemBehaviour.java index e01d11e08..bf2b88f77 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToItemBehaviour.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToItemBehaviour.java @@ -1,12 +1,12 @@ -package com.github.klikli_dev.occultism.common.entity.ai.behaviour; +package com.klikli_dev.occultism.common.entity.ai.behaviour; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.OccultismConstants; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.network.MessageSelectBlock; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.registry.OccultismMemoryTypes; -import com.github.klikli_dev.occultism.util.Math3DUtil; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.OccultismConstants; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.network.MessageSelectBlock; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.registry.OccultismMemoryTypes; +import com.klikli_dev.occultism.util.Math3DUtil; import com.mojang.datafixers.util.Pair; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.minecraft.world.entity.ai.behavior.EntityTracker; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToReplantSaplingBehaviour.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToReplantSaplingBehaviour.java similarity index 79% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToReplantSaplingBehaviour.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToReplantSaplingBehaviour.java index f7b535b4a..63ef835a3 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToReplantSaplingBehaviour.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToReplantSaplingBehaviour.java @@ -1,13 +1,13 @@ -package com.github.klikli_dev.occultism.common.entity.ai.behaviour; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.OccultismConstants; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.exceptions.ItemHandlerMissingException; -import com.github.klikli_dev.occultism.network.MessageSelectBlock; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.registry.OccultismMemoryTypes; -import com.github.klikli_dev.occultism.util.StorageUtil; +package com.klikli_dev.occultism.common.entity.ai.behaviour; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.OccultismConstants; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.exceptions.ItemHandlerMissingException; +import com.klikli_dev.occultism.network.MessageSelectBlock; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.registry.OccultismMemoryTypes; +import com.klikli_dev.occultism.util.StorageUtil; import com.mojang.datafixers.util.Pair; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToTreeBehaviour.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToTreeBehaviour.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToTreeBehaviour.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToTreeBehaviour.java index a318ad355..b0ff03348 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToTreeBehaviour.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/behaviour/SetWalkTargetToTreeBehaviour.java @@ -1,11 +1,11 @@ -package com.github.klikli_dev.occultism.common.entity.ai.behaviour; +package com.klikli_dev.occultism.common.entity.ai.behaviour; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.OccultismConstants; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.network.MessageSelectBlock; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.registry.OccultismMemoryTypes; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.OccultismConstants; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.network.MessageSelectBlock; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.registry.OccultismMemoryTypes; import com.mojang.datafixers.util.Pair; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.minecraft.core.BlockPos; @@ -50,7 +50,7 @@ protected void start(E entity) { for (Direction facing : Direction.Plane.HORIZONTAL) { var pos = treePos.relative(facing); - if (entity.getLevel().isEmptyBlock(pos) && !unreachableWalkTargets.contains(pos)) { + if (entity.level().isEmptyBlock(pos) && !unreachableWalkTargets.contains(pos)) { walkPos = pos; break; } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/DepositItemsGoal.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/DepositItemsGoal.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/DepositItemsGoal.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/DepositItemsGoal.java index 0238c8df3..93bec3245 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/DepositItemsGoal.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/DepositItemsGoal.java @@ -20,15 +20,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.ai.goal; - -import com.github.klikli_dev.occultism.common.entity.ai.BlockSorter; -import com.github.klikli_dev.occultism.common.entity.ai.target.BlockPosMoveTarget; -import com.github.klikli_dev.occultism.common.entity.ai.target.EntityMoveTarget; -import com.github.klikli_dev.occultism.common.entity.ai.target.IMoveTarget; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.exceptions.ItemHandlerMissingException; -import com.github.klikli_dev.occultism.util.Math3DUtil; +package com.klikli_dev.occultism.common.entity.ai.goal; + +import com.klikli_dev.occultism.common.entity.ai.BlockSorter; +import com.klikli_dev.occultism.common.entity.ai.target.BlockPosMoveTarget; +import com.klikli_dev.occultism.common.entity.ai.target.EntityMoveTarget; +import com.klikli_dev.occultism.common.entity.ai.target.IMoveTarget; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.exceptions.ItemHandlerMissingException; +import com.klikli_dev.occultism.util.Math3DUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; @@ -47,19 +47,16 @@ import java.util.UUID; public class DepositItemsGoal extends PausableGoal { - //region Fields + protected final SpiritEntity entity; protected final BlockSorter targetSorter; protected IMoveTarget moveTarget = null; - //endregion Fields - //region Initialization public DepositItemsGoal(SpiritEntity entity) { this.entity = entity; this.targetSorter = new BlockSorter(entity); this.setFlags(EnumSet.of(Flag.TARGET)); } - //endregion Initialization //region Getter / Setter @@ -72,7 +69,6 @@ private BlockPos getMoveTarget() { } //endregion Getter / Setter - //region Overrides @Override public boolean canUse() { //do not use if there is a target to attack @@ -160,21 +156,19 @@ public void tick() { } } } - //endregion Overrides - //region Methods public boolean canSeeTarget() { // ClipContext context = new ClipContext(this.entity.position(), // Math3DUtil.center(this.moveTarget.getBlockPos()), ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, // this.entity); -// BlockHitResult result = this.entity.level.clip(context); +// BlockHitResult result = this.entity.level().clip(context); // // if (result.getType() != BlockHitResult.Type.MISS) { // BlockPos sidePos = result.getBlockPos(); // BlockPos pos = new BlockPos(result.getLocation()); -// return this.entity.level.isEmptyBlock(sidePos) || this.entity.level.isEmptyBlock(pos) || -// this.entity.level.getBlockEntity(pos) == this.entity.level.getBlockEntity(this.moveTarget.getBlockPos()); +// return this.entity.level().isEmptyBlock(sidePos) || this.entity.level().isEmptyBlock(pos) || +// this.entity.level().getBlockEntity(pos) == this.entity.level().getBlockEntity(this.moveTarget.getBlockPos()); // } return true; @@ -188,12 +182,12 @@ public boolean canSeeTarget() { */ public void toggleChest(IMoveTarget target, boolean open) { if (target instanceof BlockPosMoveTarget) { - BlockEntity blockEntity = this.entity.level.getBlockEntity(target.getBlockPos()); + BlockEntity blockEntity = this.entity.level().getBlockEntity(target.getBlockPos()); if (blockEntity instanceof ChestBlockEntity chest) { if (open) { - this.entity.level.blockEvent(this.moveTarget.getBlockPos(), chest.getBlockState().getBlock(), 1, 1); + this.entity.level().blockEvent(this.moveTarget.getBlockPos(), chest.getBlockState().getBlock(), 1, 1); } else { - this.entity.level.blockEvent(this.moveTarget.getBlockPos(), chest.getBlockState().getBlock(), 1, 0); + this.entity.level().blockEvent(this.moveTarget.getBlockPos(), chest.getBlockState().getBlock(), 1, 0); } } } @@ -203,7 +197,7 @@ private void resetTarget() { //check a target block Optional targetPos = this.entity.getDepositPosition(); targetPos.ifPresent((pos) -> { - this.moveTarget = new BlockPosMoveTarget(this.entity.level, pos); + this.moveTarget = new BlockPosMoveTarget(this.entity.level(), pos); if (!this.moveTarget.getCapability(ForgeCapabilities.ITEM_HANDLER, this.entity.getDepositFacing()) .isPresent()) { //the deposit block is not valid for depositing, so we disable this to allow exiting this task. @@ -213,7 +207,7 @@ private void resetTarget() { //also check a target entity -> its mutually exclusive with block, ensured by spirit entity Optional targetUUID = this.entity.getDepositEntityUUID(); targetUUID.ifPresent((uuid) -> { - Entity targetEntity = ((ServerLevel) this.entity.level).getEntity(uuid); + Entity targetEntity = ((ServerLevel) this.entity.level()).getEntity(uuid); if (targetEntity != null) { this.moveTarget = new EntityMoveTarget(targetEntity); } else { @@ -221,5 +215,5 @@ private void resetTarget() { } }); } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/ExtractItemsGoal.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/ExtractItemsGoal.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/ExtractItemsGoal.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/ExtractItemsGoal.java index 1953679e5..a14d5ec01 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/ExtractItemsGoal.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/ExtractItemsGoal.java @@ -20,13 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.ai.goal; +package com.klikli_dev.occultism.common.entity.ai.goal; -import com.github.klikli_dev.occultism.common.entity.ai.BlockSorter; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.exceptions.ItemHandlerMissingException; -import com.github.klikli_dev.occultism.util.Math3DUtil; -import com.github.klikli_dev.occultism.util.StorageUtil; +import com.klikli_dev.occultism.common.entity.ai.BlockSorter; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.exceptions.ItemHandlerMissingException; +import com.klikli_dev.occultism.util.Math3DUtil; +import com.klikli_dev.occultism.util.StorageUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.Container; @@ -45,19 +45,16 @@ import java.util.Optional; public class ExtractItemsGoal extends PausableGoal { - //region Fields + protected final SpiritEntity entity; protected final BlockSorter targetSorter; protected BlockPos targetBlock = null; - //endregion Fields - //region Initialization public ExtractItemsGoal(SpiritEntity entity) { this.entity = entity; this.targetSorter = new BlockSorter(entity); this.setFlags(EnumSet.of(Flag.TARGET)); } - //endregion Initialization //region Getter / Setter @@ -70,7 +67,6 @@ private BlockPos getMoveTarget() { } //endregion Getter / Setter - //region Overrides @Override public boolean canUse() { //do not use if there is a target to attack @@ -99,8 +95,8 @@ public void stop() { @Override public void tick() { if (this.targetBlock != null) { - if (this.entity.level.getBlockEntity(this.targetBlock) != null) { - BlockEntity blockEntity = this.entity.level.getBlockEntity(this.targetBlock); + if (this.entity.level().getBlockEntity(this.targetBlock) != null) { + BlockEntity blockEntity = this.entity.level().getBlockEntity(this.targetBlock); float accessDistance = 1.86f; @@ -162,21 +158,19 @@ public void tick() { } } } - //endregion Overrides - //region Methods public boolean canSeeTarget() { ClipContext context = new ClipContext(this.entity.position(), Math3DUtil.center(this.targetBlock), ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this.entity); - BlockHitResult result = this.entity.level.clip(context); + BlockHitResult result = this.entity.level().clip(context); if (result.getType() != BlockHitResult.Type.MISS) { BlockPos sidePos = result.getBlockPos(); BlockPos pos = BlockPos.containing(result.getLocation()); - return this.entity.level.isEmptyBlock(sidePos) || this.entity.level.isEmptyBlock(pos) || - this.entity.level.getBlockEntity(pos) == this.entity.level.getBlockEntity(this.targetBlock); + return this.entity.level().isEmptyBlock(sidePos) || this.entity.level().isEmptyBlock(pos) || + this.entity.level().getBlockEntity(pos) == this.entity.level().getBlockEntity(this.targetBlock); } return true; @@ -191,9 +185,9 @@ public boolean canSeeTarget() { public void toggleChest(Container blockEntity, boolean open) { if (blockEntity instanceof ChestBlockEntity chest) { if (open) { - this.entity.level.blockEvent(this.targetBlock, chest.getBlockState().getBlock(), 1, 1); + this.entity.level().blockEvent(this.targetBlock, chest.getBlockState().getBlock(), 1, 1); } else { - this.entity.level.blockEvent(this.targetBlock, chest.getBlockState().getBlock(), 1, 0); + this.entity.level().blockEvent(this.targetBlock, chest.getBlockState().getBlock(), 1, 0); } } } @@ -202,7 +196,7 @@ private void resetTarget() { Optional targetPos = this.entity.getExtractPosition(); targetPos.ifPresent((pos) -> { this.targetBlock = pos; - BlockEntity blockEntity = this.entity.level.getBlockEntity(this.targetBlock); + BlockEntity blockEntity = this.entity.level().getBlockEntity(this.targetBlock); if (blockEntity == null || !blockEntity.getCapability(ForgeCapabilities.ITEM_HANDLER, this.entity.getExtractFacing()) .isPresent()) { @@ -211,5 +205,5 @@ private void resetTarget() { } }); } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/FallbackDepositToControllerGoal.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/FallbackDepositToControllerGoal.java similarity index 86% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/FallbackDepositToControllerGoal.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/FallbackDepositToControllerGoal.java index 3fc8c21d8..a600b6a18 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/FallbackDepositToControllerGoal.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/FallbackDepositToControllerGoal.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.ai.goal; +package com.klikli_dev.occultism.common.entity.ai.goal; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageControllerProxy; -import com.github.klikli_dev.occultism.common.entity.ai.BlockSorter; -import com.github.klikli_dev.occultism.common.entity.job.ManageMachineJob; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.api.common.blockentity.IStorageControllerProxy; +import com.klikli_dev.occultism.common.entity.ai.BlockSorter; +import com.klikli_dev.occultism.common.entity.job.ManageMachineJob; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; @@ -41,24 +41,19 @@ * If there is a handheld item and no deposit location, it will try to deposit in a storage controller. */ public class FallbackDepositToControllerGoal extends PausableGoal { - //region Fields + protected final SpiritEntity entity; protected final BlockSorter targetSorter; protected ManageMachineJob job; protected int retries = 0; - //endregion Fields - //region Initialization public FallbackDepositToControllerGoal(SpiritEntity entity, ManageMachineJob job) { this.entity = entity; this.job = job; this.targetSorter = new BlockSorter(entity); this.setFlags(EnumSet.of(Flag.MOVE)); } - //endregion Initialization - - //region Overrides @Override public boolean canUse() { //do not use if there is a target to attack @@ -95,15 +90,12 @@ public void tick() { } } - //endregion Overrides - - //region Methods protected BlockEntity findClosestStorageProxy() { - Level level = this.entity.level; + Level level = this.entity.level(); List allBlocks = new ArrayList<>(); - if(this.job.getManagedMachine() == null || this.job.getManagedMachine().insertGlobalPos == null) + if (this.job.getManagedMachine() == null || this.job.getManagedMachine().insertGlobalPos == null) return null; BlockPos machinePosition = this.job.getManagedMachine().insertGlobalPos.getPos(); @@ -132,5 +124,4 @@ protected BlockEntity findClosestStorageProxy() { return null; } - //endregion Methods } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/ManageMachineGoal.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/ManageMachineGoal.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/ManageMachineGoal.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/ManageMachineGoal.java index 4aaac7f4f..3c0ae711e 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/ManageMachineGoal.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/ManageMachineGoal.java @@ -20,17 +20,17 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.ai.goal; - -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageControllerProxy; -import com.github.klikli_dev.occultism.api.common.data.MachineReference; -import com.github.klikli_dev.occultism.common.entity.ai.BlockSorter; -import com.github.klikli_dev.occultism.common.entity.job.ManageMachineJob; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.common.misc.DepositOrder; -import com.github.klikli_dev.occultism.exceptions.ItemHandlerMissingException; -import com.github.klikli_dev.occultism.util.Math3DUtil; +package com.klikli_dev.occultism.common.entity.ai.goal; + +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.blockentity.IStorageControllerProxy; +import com.klikli_dev.occultism.api.common.data.MachineReference; +import com.klikli_dev.occultism.common.entity.ai.BlockSorter; +import com.klikli_dev.occultism.common.entity.job.ManageMachineJob; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.common.misc.DepositOrder; +import com.klikli_dev.occultism.exceptions.ItemHandlerMissingException; +import com.klikli_dev.occultism.util.Math3DUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; @@ -106,9 +106,9 @@ public void tick() { //Insert Result into Storage Controller: DepositItemsGoal if (this.targetBlock != null) { - if (this.entity.level.getBlockEntity(this.targetBlock) != null && this.job.getStorageController() != null) { + if (this.entity.level().getBlockEntity(this.targetBlock) != null && this.job.getStorageController() != null) { - BlockEntity blockEntity = this.entity.level.getBlockEntity(this.targetBlock); + BlockEntity blockEntity = this.entity.level().getBlockEntity(this.targetBlock); //when approaching a chest, open it visually double distance = this.entity.position().distanceTo(Math3DUtil.center(this.targetBlock)); @@ -200,17 +200,17 @@ public void tick() { } public boolean canSeeTarget() { - BlockState targetBlockState = this.entity.level.getBlockState(this.targetBlock); + BlockState targetBlockState = this.entity.level().getBlockState(this.targetBlock); ClipContext context = new ClipContext(this.entity.getEyePosition(0), Math3DUtil.center(this.targetBlock), ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, this.entity); - BlockHitResult rayTrace = this.entity.level.clip(context); + BlockHitResult rayTrace = this.entity.level().clip(context); if (rayTrace.getType() != BlockHitResult.Type.MISS) { BlockPos sidePos = rayTrace.getBlockPos(); BlockPos pos = BlockPos.containing(rayTrace.getLocation()); - return this.entity.level.isEmptyBlock(sidePos) || this.entity.level.isEmptyBlock(pos) || - this.entity.level.getBlockEntity(pos) == this.entity.level.getBlockEntity(this.targetBlock); + return this.entity.level().isEmptyBlock(sidePos) || this.entity.level().isEmptyBlock(pos) || + this.entity.level().getBlockEntity(pos) == this.entity.level().getBlockEntity(this.targetBlock); } return true; @@ -220,7 +220,7 @@ protected BlockEntity findClosestStorageProxy() { if (this.cachedStorageAccessor != null && this.cachedStorageAccessorOrder == this.job.getCurrentDepositOrder()) return this.cachedStorageAccessor; - Level level = this.entity.level; + Level level = this.entity.level(); List allBlocks = new ArrayList<>(); BlockPos machinePosition = this.job.getManagedMachine().insertGlobalPos.getPos(); diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/PausableGoal.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/PausableGoal.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/PausableGoal.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/PausableGoal.java index 39c985769..220ba55d9 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/PausableGoal.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/PausableGoal.java @@ -20,16 +20,14 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.ai.goal; +package com.klikli_dev.occultism.common.entity.ai.goal; import net.minecraft.world.entity.ai.goal.Goal; public abstract class PausableGoal extends Goal { - //region Fields protected long lastPaused; protected long pauseDuration; - //endregion Fields //region Getter / Setter public boolean isPaused() { @@ -39,7 +37,6 @@ public boolean isPaused() { } //endregion Getter / Setter - //region Overrides @Override public boolean canUse() { return !this.isPaused(); @@ -49,9 +46,7 @@ public boolean canUse() { public boolean canContinueToUse() { return super.canContinueToUse() && !this.isPaused(); } - //endregion Overrides - //region Methods public void pause(long i) { this.pauseDuration = i; this.lastPaused = System.currentTimeMillis(); @@ -60,5 +55,5 @@ public void pause(long i) { public void unpause() { this.pauseDuration = 0; } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/PickupItemsGoal.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/PickupItemsGoal.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/PickupItemsGoal.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/PickupItemsGoal.java index bf729ecc2..4777201b3 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/PickupItemsGoal.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/PickupItemsGoal.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.ai.goal; +package com.klikli_dev.occultism.common.entity.ai.goal; -import com.github.klikli_dev.occultism.common.entity.ai.EntitySorter; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.exceptions.ItemHandlerMissingException; import com.google.common.base.Predicate; +import com.klikli_dev.occultism.common.entity.ai.EntitySorter; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.exceptions.ItemHandlerMissingException; import net.minecraft.world.entity.ai.goal.target.TargetGoal; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.ItemStack; @@ -39,17 +39,12 @@ public class PickupItemsGoal extends TargetGoal { - //region Fields - protected final SpiritEntity entity; protected final Predicate targetItemSelector; protected final EntitySorter entitySorter; protected ItemEntity targetItem; protected int executionChance; protected float pickupRange; - //endregion Fields - - //region Initialization public PickupItemsGoal(SpiritEntity entity) { this(entity, 2f, 10); @@ -62,7 +57,7 @@ public PickupItemsGoal(SpiritEntity entity, float pickupRange, int executionChan this.pickupRange = pickupRange; this.executionChance = executionChance; this.targetItemSelector = new Predicate() { - //region Overrides + @Override public boolean apply(@Nullable ItemEntity item) { ItemStack stack = item.getItem(); @@ -70,19 +65,17 @@ public boolean apply(@Nullable ItemEntity item) { entity.itemStackHandler.orElseThrow(ItemHandlerMissingException::new), stack, true).getCount() < stack.getCount(); } - //endregion Overrides + }; this.entitySorter = new EntitySorter(entity); this.setFlags(EnumSet.of(Flag.MOVE)); } - //endregion Initialization - //region Overrides @Override public boolean canUse() { //fire on a slow tick based on chance - long worldTime = this.mob.level.getGameTime() % 10; + long worldTime = this.mob.level().getGameTime() % 10; if (this.entity.getNoActionTime() >= 100 && worldTime != 0) { return false; } @@ -95,7 +88,7 @@ public boolean canUse() { AABB targetBox = new AABB(-workAreaSize, -workAreaSize / 2.0, -workAreaSize, workAreaSize, workAreaSize / 2.0, workAreaSize).move(this.entity.getWorkAreaCenter()); - List list = this.mob.level + List list = this.mob.level() .getEntitiesOfClass(ItemEntity.class, targetBox, this.targetItemSelector); if (list.isEmpty()) { return false; @@ -138,6 +131,5 @@ public void start() { this.mob.getNavigation().moveTo(this.mob.getNavigation().createPath(this.targetItem, 0), 1.0f); super.start(); } - //endregion Overrides } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/ReplantSaplingGoal.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/ReplantSaplingGoal.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/ReplantSaplingGoal.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/ReplantSaplingGoal.java index 339028832..85cda4a0d 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/ReplantSaplingGoal.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/ReplantSaplingGoal.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.ai.goal; +package com.klikli_dev.occultism.common.entity.ai.goal; -import com.github.klikli_dev.occultism.common.entity.ai.BlockSorter; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.util.Math3DUtil; +import com.klikli_dev.occultism.common.entity.ai.BlockSorter; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.util.Math3DUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.tags.ItemTags; @@ -89,10 +89,10 @@ public void tick() { // this.entity.getJob().map(j -> (LumberjackJob) j).map(LumberjackJob::getLastFelledTree).ifPresent(lastFelledTree -> { // -// if (this.entity.level.isEmptyBlock(lastFelledTree)) { +// if (this.entity.level().isEmptyBlock(lastFelledTree)) { // ItemStack sapling = this.entity.getItemInHand(InteractionHand.MAIN_HAND); // if (sapling.getItem() instanceof BlockItem saplingBlockItem) { -// this.entity.level.setBlockAndUpdate(lastFelledTree, saplingBlockItem.getBlock().defaultBlockState()); +// this.entity.level().setBlockAndUpdate(lastFelledTree, saplingBlockItem.getBlock().defaultBlockState()); // sapling.shrink(1); // } // } @@ -111,14 +111,11 @@ public void tick() { this.resetTarget(); //if there is no tile entity, recheck } } - //endregion Overrides - - //region Methods private void resetTarget() { this.moveTarget = null; // this.entity.getJob().map(j -> (LumberjackJob) j).map(LumberjackJob::getLastFelledTree) // .ifPresent(t -> this.moveTarget = t); } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/ReturnToWorkAreaGoal.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/ReturnToWorkAreaGoal.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/ReturnToWorkAreaGoal.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/ReturnToWorkAreaGoal.java index 265199c01..59c9c9401 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/goal/ReturnToWorkAreaGoal.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/goal/ReturnToWorkAreaGoal.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.ai.goal; +package com.klikli_dev.occultism.common.entity.ai.goal; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; import net.minecraft.world.entity.ai.goal.Goal; import net.minecraft.world.phys.Vec3; @@ -30,13 +30,8 @@ public class ReturnToWorkAreaGoal extends Goal { - //region Fields - protected final SpiritEntity entity; protected int executionChance; - //endregion Fields - - //region Initialization public ReturnToWorkAreaGoal(SpiritEntity entity) { this(entity, 10); @@ -47,14 +42,12 @@ public ReturnToWorkAreaGoal(SpiritEntity entity, int executionChance) { this.executionChance = executionChance; this.setFlags(EnumSet.of(Flag.TARGET)); } - //endregion Initialization - //region Overrides @Override public boolean canUse() { //fire on a slow tick based on chance - long worldTime = this.entity.level.getGameTime() % 10; + long worldTime = this.entity.level().getGameTime() % 10; if (this.entity.getNoActionTime() >= 100 && worldTime != 0) { return false; } @@ -93,6 +86,5 @@ public void start() { this.entity.getWorkAreaPosition().orElse(this.entity.blockPosition()), 0), 1.0f); super.start(); } - //endregion Overrides } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/sensor/NearestJobItemSensor.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/sensor/NearestJobItemSensor.java similarity index 86% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/sensor/NearestJobItemSensor.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/sensor/NearestJobItemSensor.java index 505e93cb6..9a0e91b4b 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/sensor/NearestJobItemSensor.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/sensor/NearestJobItemSensor.java @@ -1,12 +1,12 @@ -package com.github.klikli_dev.occultism.common.entity.ai.sensor; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.OccultismConstants; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.network.MessageSelectBlock; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.registry.OccultismMemoryTypes; -import com.github.klikli_dev.occultism.registry.OccultismSensors; +package com.klikli_dev.occultism.common.entity.ai.sensor; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.OccultismConstants; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.network.MessageSelectBlock; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.registry.OccultismMemoryTypes; +import com.klikli_dev.occultism.registry.OccultismSensors; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.ai.memory.MemoryModuleType; @@ -21,7 +21,7 @@ import java.util.List; public class NearestJobItemSensor extends PredicateSensor { - public static final int DEFAULT_SCAN_RATE_TICKS = 20 * 1; + public static final int DEFAULT_SCAN_RATE_TICKS = 20; private static final List> MEMORIES = ObjectArrayList.of(MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM); public NearestJobItemSensor() { @@ -43,7 +43,7 @@ public SensorType> type() { protected void doTick(ServerLevel level, E entity) { //exit if we already have a desired item, to avoid switching back and forth if we lose LoS during movement - if (BrainUtils.hasMemory(entity, MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM)){ + if (BrainUtils.hasMemory(entity, MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM)) { var nearestEntity = BrainUtils.getMemory(entity, MemoryModuleType.NEAREST_VISIBLE_WANTED_ITEM); if (Occultism.DEBUG.debugAI) { OccultismPackets.sendToTracking(entity, new MessageSelectBlock(nearestEntity.blockPosition(), 5000, OccultismConstants.Color.GREEN)); @@ -69,7 +69,7 @@ protected void doTick(ServerLevel level, E entity) { var aabb = new AABB(workAreaCenter.offset(-workAreaSize / 2, -workAreaSize / 2, -workAreaSize / 2), workAreaCenter.offset(workAreaSize / 2, workAreaSize / 2, workAreaSize / 2)); - ItemEntity nearestEntity = EntityRetrievalUtil.getNearestEntity(level, + ItemEntity nearestEntity = EntityRetrievalUtil.getNearestEntity(level, aabb, entity.position(), (obj) -> { if (obj instanceof ItemEntity item) { return this.predicate().test(item, entity); diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/sensor/NearestTreeSensor.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/sensor/NearestTreeSensor.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/sensor/NearestTreeSensor.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/sensor/NearestTreeSensor.java index fcb16950f..55f3adf73 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/sensor/NearestTreeSensor.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/sensor/NearestTreeSensor.java @@ -1,14 +1,14 @@ -package com.github.klikli_dev.occultism.common.entity.ai.sensor; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.OccultismConstants; -import com.github.klikli_dev.occultism.common.entity.ai.BlockSorter; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.network.MessageSelectBlock; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.registry.OccultismMemoryTypes; -import com.github.klikli_dev.occultism.registry.OccultismSensors; -import com.github.klikli_dev.occultism.registry.OccultismTags; +package com.klikli_dev.occultism.common.entity.ai.sensor; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.OccultismConstants; +import com.klikli_dev.occultism.common.entity.ai.BlockSorter; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.network.MessageSelectBlock; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.registry.OccultismMemoryTypes; +import com.klikli_dev.occultism.registry.OccultismSensors; +import com.klikli_dev.occultism.registry.OccultismTags; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/sensor/UnreachableTreeWalkTargetSensor.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/sensor/UnreachableTreeWalkTargetSensor.java similarity index 86% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/sensor/UnreachableTreeWalkTargetSensor.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/sensor/UnreachableTreeWalkTargetSensor.java index c8912dd9b..21d6ecdf9 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/sensor/UnreachableTreeWalkTargetSensor.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/sensor/UnreachableTreeWalkTargetSensor.java @@ -1,11 +1,11 @@ -package com.github.klikli_dev.occultism.common.entity.ai.sensor; +package com.klikli_dev.occultism.common.entity.ai.sensor; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.OccultismConstants; -import com.github.klikli_dev.occultism.network.MessageSelectBlock; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.registry.OccultismMemoryTypes; -import com.github.klikli_dev.occultism.registry.OccultismSensors; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.OccultismConstants; +import com.klikli_dev.occultism.network.MessageSelectBlock; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.registry.OccultismMemoryTypes; +import com.klikli_dev.occultism.registry.OccultismSensors; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.LivingEntity; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/target/BlockPosMoveTarget.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/target/BlockPosMoveTarget.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/target/BlockPosMoveTarget.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/target/BlockPosMoveTarget.java index 7bde8b3cd..57a7444ca 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/target/BlockPosMoveTarget.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/target/BlockPosMoveTarget.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.ai.target; +package com.klikli_dev.occultism.common.entity.ai.target; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/target/EntityMoveTarget.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/target/EntityMoveTarget.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/target/EntityMoveTarget.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/target/EntityMoveTarget.java index 09c9a30e7..059bbe9b6 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/target/EntityMoveTarget.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/target/EntityMoveTarget.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.ai.target; +package com.klikli_dev.occultism.common.entity.ai.target; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/target/IMoveTarget.java b/src/main/java/com/klikli_dev/occultism/common/entity/ai/target/IMoveTarget.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/ai/target/IMoveTarget.java rename to src/main/java/com/klikli_dev/occultism/common/entity/ai/target/IMoveTarget.java index 4d6832777..4948dd2ed 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/ai/target/IMoveTarget.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/ai/target/IMoveTarget.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.ai.target; +package com.klikli_dev.occultism.common.entity.ai.target; import net.minecraft.core.BlockPos; import net.minecraftforge.common.capabilities.ICapabilityProvider; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/BatFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/BatFamiliarEntity.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/BatFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/BatFamiliarEntity.java index fbd59f02e..1b86368fd 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/BatFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/BatFamiliarEntity.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; -import com.github.klikli_dev.occultism.registry.OccultismEffects; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.registry.OccultismAdvancements; +import com.klikli_dev.occultism.registry.OccultismEffects; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; @@ -92,7 +92,7 @@ protected PathNavigation createNavigation(Level level) { @Override public boolean isStableDestination(BlockPos pos) { BlockState state = this.level.getBlockState(pos); - return state.isAir() || !state.getMaterial().blocksMotion(); + return state.isAir() || !state.blocksMotion(); } }; return navigation; @@ -134,7 +134,7 @@ public float getAnimationHeight(float partialTicks) { @Override public boolean isFlying() { - return !this.onGround; + return !this.onGround(); } public Iterable getFamiliarEffects() { @@ -199,7 +199,7 @@ public void start() { private Bat nearbyBat() { Bat nearby = null; - List bats = this.bat.level.getEntitiesOfClass(Bat.class, this.bat.getBoundingBox().inflate(2)); + List bats = this.bat.level().getEntitiesOfClass(Bat.class, this.bat.getBoundingBox().inflate(2)); if (!bats.isEmpty()) nearby = bats.get(0); return nearby; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/BeaverFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/BeaverFamiliarEntity.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/BeaverFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/BeaverFamiliarEntity.java index 713548fc0..783c94c3e 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/BeaverFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/BeaverFamiliarEntity.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; -import com.github.klikli_dev.occultism.registry.OccultismEffects; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.registry.OccultismAdvancements; +import com.klikli_dev.occultism.registry.OccultismEffects; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.tags.BlockTags; @@ -71,7 +71,7 @@ public static AttributeSupplier.Builder createAttributes() { @Override public void updateSwimming() { - if (!this.level.isClientSide) { + if (!this.level().isClientSide) { if (this.isInWater()) { this.navigation = this.waterNavigator; this.setSwimming(true); @@ -159,7 +159,7 @@ private ChopTreeGoal(BeaverFamiliarEntity beaver) { @Override public boolean canUse() { return !this.beaver.isSitting() && this.beaver.isEffectEnabled(this.beaver.getFamiliarOwner()) && this.beaver.treeTarget != null - && this.beaver.level.getBlockState(this.beaver.treeTarget).is(BlockTags.LOGS); + && this.beaver.level().getBlockState(this.beaver.treeTarget).is(BlockTags.LOGS); } @Override @@ -190,7 +190,7 @@ public void tick() { harvesting.add(pos); for (BlockPos p : BlockPos.withinManhattan(pos, 1, 1, 1)) { - if (!harvesting.contains(p) && this.beaver.level.getBlockState(p).is(BlockTags.LOGS)) { + if (!harvesting.contains(p) && this.beaver.level().getBlockState(p).is(BlockTags.LOGS)) { positions.add(p.immutable()); harvesting.add(pos); } @@ -204,7 +204,7 @@ public void tick() { } for (BlockPos p : harvesting) - this.beaver.level.destroyBlock(p, true); + this.beaver.level().destroyBlock(p, true); this.beaver.treeTarget = null; OccultismAdvancements.FAMILIAR.trigger(this.beaver.getFamiliarOwner(), FamiliarTrigger.Type.BEAVER_WOODCHOP); } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/BeholderFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/BeholderFamiliarEntity.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/BeholderFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/BeholderFamiliarEntity.java index affa7aa57..df55b0f2e 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/BeholderFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/BeholderFamiliarEntity.java @@ -20,14 +20,14 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.network.MessageBeholderAttack; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; -import com.github.klikli_dev.occultism.util.FamiliarUtil; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.network.MessageBeholderAttack; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.registry.OccultismAdvancements; +import com.klikli_dev.occultism.util.FamiliarUtil; import net.minecraft.core.particles.DustParticleOptions; import net.minecraft.nbt.CompoundTag; import net.minecraft.sounds.SoundEvents; @@ -52,6 +52,7 @@ import javax.annotation.Nullable; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public class BeholderFamiliarEntity extends ColoredFamiliarEntity { @@ -106,7 +107,7 @@ protected void registerGoals() { public void tick() { super.tick(); - if (this.level.isClientSide) { + if (this.level().isClientSide) { for (Eye eye : this.eyes) eye.tick(); @@ -126,13 +127,13 @@ public void tick() { if (this.eatTimer < 50) { if (this.eatTimer % 5 == 0) - this.level.playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEvents.GENERIC_EAT, + this.level().playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEvents.GENERIC_EAT, SoundSource.HOSTILE, this.getSoundVolume(), this.getVoicePitch(), false); this.mouthRot = Mth.sin(this.tickCount) * FamiliarUtil.toRads(50) + FamiliarUtil.toRads(20); } if (this.eatTimer == 51) - this.level.playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEvents.GENERIC_EXPLODE, + this.level().playLocalSound(this.getX(), this.getY(), this.getZ(), SoundEvents.GENERIC_EXPLODE, SoundSource.HOSTILE, this.getSoundVolume(), 0.2f, false); } this.actualMouthRot = Mth.lerp(0.2f, this.actualMouthRot, this.mouthRot); @@ -171,7 +172,7 @@ private void tickGlow(LivingEntity owner) { if (!this.isEffectEnabled(owner)) return; - List nearby = owner.level.getEntitiesOfClass(LivingEntity.class, + List nearby = owner.level().getEntitiesOfClass(LivingEntity.class, owner.getBoundingBox().inflate(10), e -> !(e instanceof Player) && e != owner && e != this && !e.hasEffect(MobEffects.GLOWING)); if (nearby.isEmpty()) @@ -243,8 +244,7 @@ public void swing(InteractionHand pHand) { // Client method public void shootRay(List targetIds) { List eyeList = new ArrayList<>(); - for (Eye e : this.eyes) - eyeList.add(e); + Collections.addAll(eyeList, this.eyes); for (int id : targetIds) { if (eyeList.isEmpty()) @@ -311,7 +311,7 @@ protected void attack() { OccultismAdvancements.FAMILIAR.trigger(owner, FamiliarTrigger.Type.BEHOLDER_RAY); for (int id : this.targetIds) { - Entity e = this.entity.level.getEntity(id); + Entity e = this.entity.level().getEntity(id); float damage = 6; if (this.entity.hasEffect(MobEffects.DAMAGE_BOOST)) damage *= this.entity.getEffect(MobEffects.DAMAGE_BOOST).getAmplifier() + 2; @@ -342,7 +342,7 @@ public boolean canUse() { @Override public void start() { this.cooldown = MAX_COOLDOWN; - List foods = this.entity.level.getEntitiesOfClass(ShubNiggurathSpawnEntity.class, + List foods = this.entity.level().getEntitiesOfClass(ShubNiggurathSpawnEntity.class, this.entity.getBoundingBox().inflate(3), Entity::isAlive); LivingEntity owner = this.entity.getFamiliarOwner(); @@ -365,9 +365,9 @@ public void stop() { } private class Eye { + private final Vec3 pos; private Vec3 lookPos0; private Vec3 lookPos; - private final Vec3 pos; private EyeTarget eyeTarget; private int shotTimer; @@ -392,7 +392,7 @@ private void init() { } private void selectEyeTarget() { - List entities = BeholderFamiliarEntity.this.level.getEntitiesOfClass(LivingEntity.class, BeholderFamiliarEntity.this.getBoundingBox().inflate(7), + List entities = BeholderFamiliarEntity.this.level().getEntitiesOfClass(LivingEntity.class, BeholderFamiliarEntity.this.getBoundingBox().inflate(7), e -> e != BeholderFamiliarEntity.this); if (entities.isEmpty()) { this.eyeTarget = new PositionEyeTarget(Vec3.ZERO.add(5, 0, 0).yRot(BeholderFamiliarEntity.this.getRandom().nextFloat() * 360) @@ -453,7 +453,7 @@ private void shoot() { AABB endBox = new AABB(end, end).inflate(0.25); for (int i = 0; i < 150; i++) { Vec3 particlePos = start.add(direction.scale(i * 0.1)); - BeholderFamiliarEntity.this.level.addParticle(new DustParticleOptions(new Vector3f(BeholderFamiliarEntity.this.getRed(), BeholderFamiliarEntity.this.getBlue(), BeholderFamiliarEntity.this.getGreen()), 1), particlePos.x, + BeholderFamiliarEntity.this.level().addParticle(new DustParticleOptions(new Vector3f(BeholderFamiliarEntity.this.getRed(), BeholderFamiliarEntity.this.getBlue(), BeholderFamiliarEntity.this.getGreen()), 1), particlePos.x, particlePos.y, particlePos.z, 0, 0, 0); if (endBox.intersects(new AABB(particlePos, particlePos).inflate(0.25))) break; @@ -473,7 +473,7 @@ private EntityEyeTarget(int entityId) { @Override protected Vec3 getEyeTarget() { - Entity e = BeholderFamiliarEntity.this.level.getEntity(this.entityId); + Entity e = BeholderFamiliarEntity.this.level().getEntity(this.entityId); return e == null ? null : e.getEyePosition(0); } } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/BlacksmithFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/BlacksmithFamiliarEntity.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/BlacksmithFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/BlacksmithFamiliarEntity.java index b1437c5c4..94f669a97 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/BlacksmithFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/BlacksmithFamiliarEntity.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.registry.OccultismAdvancements; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; @@ -51,20 +51,18 @@ public class BlacksmithFamiliarEntity extends FamiliarEntity { private static final ConfigValue UPGRADE_COST = Occultism.SERVER_CONFIG.spiritJobs.blacksmithFamiliarUpgradeCost; - - private static int getMaxIron() { - return UPGRADE_COST.get() * 10; - } - private static final EntityDataAccessor BARS = SynchedEntityData.defineId(BlacksmithFamiliarEntity.class, EntityDataSerializers.BYTE); - private int ironCount; public BlacksmithFamiliarEntity(EntityType type, Level level) { super(type, level); } + private static int getMaxIron() { + return UPGRADE_COST.get() * 10; + } + @Nullable @Override public SpawnGroupData finalizeSpawn(ServerLevelAccessor pLevel, DifficultyInstance pDifficulty, MobSpawnType pReason, @Nullable SpawnGroupData pSpawnData, @Nullable CompoundTag pDataTag) { @@ -91,11 +89,11 @@ protected InteractionResult mobInteract(Player playerIn, InteractionHand hand) { Item item = stack.getItem(); if (playerIn == this.getFamiliarOwner() && this.ironCount < getMaxIron() && (stack.is(Tags.Items.INGOTS_IRON) || stack.is(Tags.Items.STORAGE_BLOCKS_IRON))) { - if (!this.level.isClientSide) { + if (!this.level().isClientSide) { stack.shrink(1); this.changeIronCount(stack.is(Tags.Items.INGOTS_IRON) ? 1 : 9); } - return InteractionResult.sidedSuccess(!this.level.isClientSide); + return InteractionResult.sidedSuccess(!this.level().isClientSide); } return super.mobInteract(playerIn, hand); } @@ -234,7 +232,7 @@ public void tick() { } private IFamiliar findTarget() { - for (LivingEntity e : this.blacksmith.level.getEntitiesOfClass(LivingEntity.class, + for (LivingEntity e : this.blacksmith.level().getEntitiesOfClass(LivingEntity.class, this.blacksmith.getBoundingBox().inflate(4), this::familiarPred)) { return (IFamiliar) e; } @@ -242,9 +240,8 @@ private IFamiliar findTarget() { } private boolean familiarPred(Entity e) { - if (!(e instanceof IFamiliar)) + if (!(e instanceof IFamiliar familiar)) return false; - IFamiliar familiar = (IFamiliar) e; LivingEntity owner = familiar.getFamiliarOwner(); return familiar.canBlacksmithUpgrade() && owner != null && owner == this.blacksmith.getFamiliarOwner(); } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ChimeraFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/ChimeraFamiliarEntity.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ChimeraFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/ChimeraFamiliarEntity.java index 0fe5579d6..5351a98ce 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ChimeraFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/ChimeraFamiliarEntity.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.registry.OccultismAdvancements; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; @@ -35,7 +35,6 @@ import net.minecraft.world.DifficultyInstance; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; -import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.*; @@ -86,7 +85,7 @@ public ChimeraFamiliarEntity(EntityType type, L } public static AttributeSupplier.Builder createAttributes() { - return FamiliarEntity.createMobAttributes().add(Attributes.ATTACK_DAMAGE, 4).add(Attributes.MOVEMENT_SPEED, 0.25).add(Attributes.MAX_HEALTH, 20); + return createMobAttributes().add(Attributes.ATTACK_DAMAGE, 4).add(Attributes.MOVEMENT_SPEED, 0.25).add(Attributes.MAX_HEALTH, 20); } private boolean isRiderJumping(Player rider) { @@ -107,7 +106,7 @@ protected void registerGoals() { @Override public void tick() { super.tick(); - if (!this.level.isClientSide && this.getRandom().nextDouble() < SHRINK_CHANCE) + if (!this.level().isClientSide && this.getRandom().nextDouble() < SHRINK_CHANCE) this.setSize((byte) (this.getSize() - 1)); if (this.jumpTimer > 0) @@ -117,7 +116,7 @@ public void tick() { if (this.attackTimer == 0) this.setAttacker(NO_ATTACKER); - if (this.level.isClientSide) { + if (this.level().isClientSide) { this.goatNoseTimer++; if (this.attackTimer > 0 && this.getAttacker() == LION_ATTACKER) { @@ -126,7 +125,7 @@ public void tick() { Vec3 pos = this.position().add(direction.x + (this.getRandom().nextFloat() - 0.5f) * 0.7, 1 + (this.getRandom().nextFloat() - 0.5f) * 0.7, direction.z + (this.getRandom().nextFloat() - 0.5f) * 0.7); - this.level.addParticle(ParticleTypes.FLAME, pos.x, pos.y, pos.z, direction.x * 0.1, 0, + this.level().addParticle(ParticleTypes.FLAME, pos.x, pos.y, pos.z, direction.x * 0.1, 0, direction.z * 0.1); } } @@ -284,29 +283,29 @@ protected InteractionResult mobInteract(Player playerIn, InteractionHand hand) { ItemStack stack = playerIn.getItemInHand(hand); FoodProperties food = stack.getItem().getFoodProperties(); if (this.hasGoat() && stack.getItem() == Items.GOLDEN_APPLE && playerIn == this.getFamiliarOwner()) { - if (!this.level.isClientSide) { + if (!this.level().isClientSide) { stack.shrink(1); this.setGoat(false); - GoatFamiliarEntity goat = new GoatFamiliarEntity(this.level, this.hasRing(), this.hasBeard(), + GoatFamiliarEntity goat = new GoatFamiliarEntity(this.level(), this.hasRing(), this.hasBeard(), this.getSize(), this.getFamiliarOwner()); goat.setPos(this.getX(), this.getY(), this.getZ()); - this.level.addFreshEntity(goat); + this.level().addFreshEntity(goat); OccultismAdvancements.FAMILIAR.trigger(playerIn, FamiliarTrigger.Type.GOAT_DETACH); } - return InteractionResult.sidedSuccess(this.level.isClientSide); + return InteractionResult.sidedSuccess(this.level().isClientSide); } if (this.getSize() < MAX_SIZE && food != null && food.isMeat()) { stack.shrink(1); this.setSize((byte) (this.getSize() + food.getNutrition())); this.heal(4); - return InteractionResult.sidedSuccess(this.level.isClientSide); + return InteractionResult.sidedSuccess(this.level().isClientSide); } else if (!this.isSitting() && !this.isVehicle() && !playerIn.isSecondaryUseActive() && this.getFamiliarOwner() == playerIn && this.getSize() > RIDING_SIZE) { - if (!this.level.isClientSide) { + if (!this.level().isClientSide) { playerIn.startRiding(this); OccultismAdvancements.FAMILIAR.trigger(playerIn, FamiliarTrigger.Type.CHIMERA_RIDE); } - return InteractionResult.sidedSuccess(this.level.isClientSide); + return InteractionResult.sidedSuccess(this.level().isClientSide); } return super.mobInteract(playerIn, hand); @@ -324,9 +323,8 @@ public boolean boost() { return false; } - @Override - protected void tickRidden(LivingEntity rider, Vec3 travelVec) { + protected void tickRidden(Player rider, Vec3 travelVec) { super.tickRidden(rider, travelVec); this.setRot(rider.getYRot(), rider.getXRot() * 0.5F); this.yRotO = this.yBodyRot = this.yHeadRot = this.getYRot(); @@ -334,12 +332,12 @@ protected void tickRidden(LivingEntity rider, Vec3 travelVec) { } @Override - protected Vec3 getRiddenInput(LivingEntity rider, Vec3 travelVec) { - if (this.isVehicle() && rider instanceof Player player) { - float forward = player.zza; - float strafe = player.xxa * 0.5f; + protected Vec3 getRiddenInput(Player rider, Vec3 travelVec) { + if (this.isVehicle()) { + float forward = rider.zza; + float strafe = rider.xxa * 0.5f; - if (this.isRiderJumping(player) && this.onGround && this.jumpTimer <= 0) { + if (this.isRiderJumping(rider) && this.onGround() && this.jumpTimer <= 0) { this.jumpTimer = JUMP_COOLDOWN; Vec3 forwardDirection = Vec3.directionFromRotation(0, this.yRotO).scale(0.7); this.setDeltaMovement(this.getDeltaMovement().add(forwardDirection.x, 0, forwardDirection.z)); @@ -356,7 +354,7 @@ protected Vec3 getRiddenInput(LivingEntity rider, Vec3 travelVec) { } @Override - protected float getRiddenSpeed(LivingEntity rider) { + protected float getRiddenSpeed(Player rider) { return (float) this.getAttributeValue(Attributes.MOVEMENT_SPEED) * 0.8f; } @@ -388,7 +386,7 @@ public double getPassengersRidingOffset() { @Nullable public LivingEntity getControllingPassenger() { - if(this.getFirstPassenger() instanceof LivingEntity livingEntity) + if (this.getFirstPassenger() instanceof LivingEntity livingEntity) return livingEntity; return null; } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ColoredFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/ColoredFamiliarEntity.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ColoredFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/ColoredFamiliarEntity.java index f50b353c1..fe3a2919d 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ColoredFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/ColoredFamiliarEntity.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/CthulhuFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/CthulhuFamiliarEntity.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/CthulhuFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/CthulhuFamiliarEntity.java index f371f0d7e..05141a382 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/CthulhuFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/CthulhuFamiliarEntity.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; -import com.github.klikli_dev.occultism.registry.OccultismBlocks; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.registry.OccultismAdvancements; +import com.klikli_dev.occultism.registry.OccultismBlocks; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; @@ -76,7 +76,7 @@ public CthulhuFamiliarEntity(EntityType type, L } public static AttributeSupplier.Builder createAttributes() { - return FamiliarEntity.createMobAttributes().add(ForgeMod.SWIM_SPEED.get(), 1f); + return createMobAttributes().add(ForgeMod.SWIM_SPEED.get(), 1f); } @Override @@ -109,7 +109,7 @@ public void tick() { this.riderRot0 = this.riderRot; this.riderRot = Mth.approachDegrees(this.riderRot, this.yRotO, 10); - if (!this.level.isClientSide) { + if (!this.level().isClientSide) { this.lightTimer--; if (this.lightTimer < 0) { this.lightTimer = 10; @@ -161,14 +161,14 @@ private void updateLight() { this.lightPos0 = this.lightPos; this.lightPos = this.blockPosition(); } - if (this.level.isEmptyBlock(this.lightPos) && this.isAlive() && this.hasBlacksmithUpgrade()) - this.level.setBlockAndUpdate(this.lightPos, OccultismBlocks.LIGHTED_AIR.get().defaultBlockState()); + if (this.level().isEmptyBlock(this.lightPos) && this.isAlive() && this.hasBlacksmithUpgrade()) + this.level().setBlockAndUpdate(this.lightPos, OccultismBlocks.LIGHTED_AIR.get().defaultBlockState()); } private void removeLight(BlockPos pos) { - if (!this.level.isClientSide && pos != null - && this.level.getBlockState(pos).getBlock() == OccultismBlocks.LIGHTED_AIR.get()) - this.level.setBlockAndUpdate(pos, Blocks.AIR.defaultBlockState()); + if (!this.level().isClientSide && pos != null + && this.level().getBlockState(pos).getBlock() == OccultismBlocks.LIGHTED_AIR.get()) + this.level().setBlockAndUpdate(pos, Blocks.AIR.defaultBlockState()); } @Override @@ -186,7 +186,7 @@ protected void playStepSound(BlockPos pPos, BlockState pBlock) { @Override public void updateSwimming() { - if (!this.level.isClientSide) { + if (!this.level().isClientSide) { if (this.isInWater()) { this.navigation = this.waterNavigator; this.setSwimming(true); @@ -198,13 +198,14 @@ public void updateSwimming() { } @Override - public void positionRider(Entity pPassenger) { + protected void positionRider(Entity pPassenger, Entity.MoveFunction pCallback) { if (this.hasPassenger(pPassenger)) { Vec3 direction = this.riderLocation(); - pPassenger.setPos(direction.x, direction.y, direction.z); + pCallback.accept(pPassenger, direction.x, direction.y, direction.z); } } + @Override public Vec3 getDismountLocationForPassenger(LivingEntity pLivingEntity) { return this.riderLocation(); @@ -362,7 +363,7 @@ public FollowOwnerWaterGoal(FamiliarEntity entity, double speed, float minDist, @Override protected boolean shouldTeleport(LivingEntity owner) { - return !this.entity.level.isWaterAt(owner.blockPosition()) && this.entity.isInWater(); + return !this.entity.level().isWaterAt(owner.blockPosition()) && this.entity.isInWater(); } } @@ -394,7 +395,7 @@ public boolean canContinueToUse() { @Override public void tick() { if (this.cthulhu.distanceToSqr(this.devil) < 2) { - ((ServerLevel) this.cthulhu.level).sendParticles(ParticleTypes.HEART, this.devil.getBlockX(), this.devil.getBlockY() + 1, + ((ServerLevel) this.cthulhu.level()).sendParticles(ParticleTypes.HEART, this.devil.getBlockX(), this.devil.getBlockY() + 1, this.devil.getBlockZ(), 1, 0, 0, 0, 1); this.devil = null; } @@ -413,7 +414,7 @@ public void resetTask() { } private DevilFamiliarEntity findDevil() { - List devils = this.cthulhu.level.getEntitiesOfClass(DevilFamiliarEntity.class, + List devils = this.cthulhu.level().getEntitiesOfClass(DevilFamiliarEntity.class, this.cthulhu.getBoundingBox().inflate(4)); return devils.isEmpty() ? null : devils.get(0); } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/DeerFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/DeerFamiliarEntity.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/DeerFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/DeerFamiliarEntity.java index 53f01a04a..08bb13e92 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/DeerFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/DeerFamiliarEntity.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; -import com.github.klikli_dev.occultism.registry.OccultismItems; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.registry.OccultismAdvancements; +import com.klikli_dev.occultism.registry.OccultismItems; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.Mth; @@ -83,10 +83,10 @@ public void setFamiliarOwner(LivingEntity owner) { @Override public void tick() { super.tick(); - if (!this.level.isClientSide && !this.hasGlowingTag() && this.hasRedNose()) + if (!this.level().isClientSide && !this.hasGlowingTag() && this.hasRedNose()) this.setGlowingTag(true); - if (this.level.isClientSide) { + if (this.level().isClientSide) { this.eatTimer--; this.oNeckRotTimer = this.neckRotTimer; if (this.isEating()) @@ -95,7 +95,7 @@ public void tick() { this.neckRotTimer = Math.max(this.neckRotTimer - 1, 0); } - if (!this.level.isClientSide) { + if (!this.level().isClientSide) { Entity owner = this.getFamiliarOwner(); if (owner != null && this.distanceToSqr(owner) > 50) { if (this.getAttribute(Attributes.MOVEMENT_SPEED).getModifier(SPEED_UUID) == null) diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/DevilFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/DevilFamiliarEntity.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/DevilFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/DevilFamiliarEntity.java index 7d1a3ebca..e51fa4bea 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/DevilFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/DevilFamiliarEntity.java @@ -20,19 +20,18 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; -import com.github.klikli_dev.occultism.util.FamiliarUtil; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.registry.OccultismAdvancements; +import com.klikli_dev.occultism.util.FamiliarUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; import net.minecraft.world.DifficultyInstance; import net.minecraft.world.InteractionHand; -import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.*; @@ -97,12 +96,12 @@ public void setFamiliarOwner(LivingEntity owner) { @Override public void aiStep() { super.aiStep(); - if (this.level.isClientSide && this.swinging) { + if (this.level().isClientSide && this.swinging) { Vec3 direction = Vec3.directionFromRotation(this.getRotationVector()).scale(0.6); for (int i = 0; i < 5; i++) { Vec3 pos = this.position().add(direction.x + (this.getRandom().nextFloat() - 0.5f) * 0.7, 1.5 + (this.getRandom().nextFloat() - 0.5f) * 0.7, direction.z + (this.getRandom().nextFloat() - 0.5f) * 0.7); - this.level.addParticle(ParticleTypes.FLAME, pos.x, pos.y, pos.z, direction.x * 0.25, 0, direction.z * 0.25); + this.level().addParticle(ParticleTypes.FLAME, pos.x, pos.y, pos.z, direction.x * 0.25, 0, direction.z * 0.25); } } } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/DragonFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/DragonFamiliarEntity.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/DragonFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/DragonFamiliarEntity.java index 29b7da09d..5a02fcf77 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/DragonFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/DragonFamiliarEntity.java @@ -20,13 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; -import com.github.klikli_dev.occultism.registry.OccultismEffects; -import com.github.klikli_dev.occultism.registry.OccultismEntities; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.registry.OccultismAdvancements; +import com.klikli_dev.occultism.registry.OccultismEffects; +import com.klikli_dev.occultism.registry.OccultismEntities; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.Mth; @@ -149,7 +149,7 @@ public void tick() { if (this.greedyTimer > 0) this.greedyTimer--; - if (!this.isOnGround()) { + if (!this.onGround()) { Vec3 motion = this.getDeltaMovement(); if (motion.y < 0) { motion = motion.multiply(1, 0.5, 1); @@ -160,7 +160,7 @@ public void tick() { if (!this.isEffectiveAi()) { this.flyingTimer0 = this.flyingTimer; this.wingspan0 = this.wingspan; - if (this.isOnGround()) { + if (this.onGround()) { this.wingspan -= 5; if (this.wingspan < 0) this.wingspan = 0; @@ -197,7 +197,7 @@ protected InteractionResult mobInteract(Player playerIn, InteractionHand hand) { if (this.isEffectiveAi()) stack.shrink(1); else - this.level.addParticle(ParticleTypes.HEART, this.getX(), this.getY() + 1, this.getZ(), 0, 0, + this.level().addParticle(ParticleTypes.HEART, this.getX(), this.getY() + 1, this.getZ(), 0, 0, 0); return InteractionResult.sidedSuccess(!this.isEffectiveAi()); } else if (stack.isEmpty() && playerIn.isShiftKeyDown()) { @@ -299,7 +299,7 @@ protected void attack(List enemies) { Entity enemy = enemies.get(this.entity.getRandom().nextInt(enemies.size())); ThrownSwordEntity sword = new ThrownSwordEntity(OccultismEntities.THROWN_SWORD_TYPE.get(), - this.entity.level); + this.entity.level()); sword.setOwner(this.entity.getFamiliarOwner()); double x = this.entity.getX(); double y = this.entity.getEyeY(); @@ -309,7 +309,7 @@ protected void attack(List enemies) { double zDir = enemy.getZ() - z; sword.setPos(x, y, z); sword.shoot(xDir, yDir, zDir, 0.5f, 3f); - this.entity.level.addFreshEntity(sword); + this.entity.level().addFreshEntity(sword); } } @@ -363,7 +363,7 @@ public void tick() { } private ItemEntity findStick() { - List sticks = this.dragon.level.getEntitiesOfClass(ItemEntity.class, + List sticks = this.dragon.level().getEntitiesOfClass(ItemEntity.class, this.dragon.getBoundingBox().inflate(8), e -> e.getItem().getItem() == Items.STICK && e.isAlive()); return sticks.isEmpty() ? null : sticks.get(0); } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/FairyFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/FairyFamiliarEntity.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/FairyFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/FairyFamiliarEntity.java index 6473e5a98..ed2004f25 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/FairyFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/FairyFamiliarEntity.java @@ -20,14 +20,14 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; - -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.network.MessageFairySupport; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; -import com.github.klikli_dev.occultism.registry.OccultismParticles; -import com.github.klikli_dev.occultism.util.FamiliarUtil; +package com.klikli_dev.occultism.common.entity.familiar; + +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.network.MessageFairySupport; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.registry.OccultismAdvancements; +import com.klikli_dev.occultism.registry.OccultismParticles; +import com.klikli_dev.occultism.util.FamiliarUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.DustParticleOptions; import net.minecraft.core.particles.ParticleOptions; @@ -154,10 +154,10 @@ public void tick() { this.partyParticle(); - if (!this.level.isClientSide && this.getTarget() == null) + if (!this.level().isClientSide && this.getTarget() == null) this.setMagicTarget(null); - if (this.level.isClientSide && this.hasMagicTarget()) { + if (this.level().isClientSide && this.hasMagicTarget()) { this.yBodyRot = 0; this.yBodyRotO = 0; @@ -217,11 +217,11 @@ private ParticleOptions createParticle() { private void magicParticle() { Vec3 pos = this.getMagicPosition(1); - this.level.addParticle(this.createParticle(), pos.x, pos.y + 1, pos.z, 0, 0, 0); + this.level().addParticle(this.createParticle(), pos.x, pos.y + 1, pos.z, 0, 0, 0); } private void partyParticle() { - if (!this.level.isClientSide || !this.isPartying() || this.tickCount % 2 != 0) + if (!this.level().isClientSide || !this.isPartying() || this.tickCount % 2 != 0) return; Vec3 right = Vec3.directionFromRotation(0, this.yBodyRot).yRot(FamiliarUtil.toRads(-90)); @@ -230,7 +230,7 @@ private void partyParticle() { Vec3 pos = this.position().add(right.scale(0.2 * (this.isLeftHanded() ? -1 : 1))) .add(0, 0.7 + this.getAnimationHeight(0), 0).add(armVector); - this.level.addParticle(this.createParticle(), pos.x, pos.y, pos.z, 0, 0, 0); + this.level().addParticle(this.createParticle(), pos.x, pos.y, pos.z, 0, 0, 0); } public Vec2 getMagicRadiusAngle(float partialTicks) { @@ -285,7 +285,7 @@ public Entity getMagicTarget() { int id = this.entityData.get(MAGIC_TARGET); if (id < 0) return null; - return this.level.getEntity(id); + return this.level().getEntity(id); } private void setMagicTarget(Entity entity) { @@ -302,7 +302,7 @@ public boolean saveFamiliar(IFamiliar familiar) { return false; this.saveCooldown = 20 * 20; - if (!familiar.getFamiliarEntity().level.isClientSide) + if (!familiar.getFamiliarEntity().level().isClientSide) OccultismPackets.sendToTracking(this, new MessageFairySupport(this.getId(), familiar.getFamiliarEntity().getId())); return true; @@ -350,7 +350,7 @@ public void startSupportAnimation() { @Override public boolean isFlying() { - return !this.onGround; + return !this.onGround(); } private static class SupportGoal extends Goal { @@ -384,7 +384,7 @@ public void tick() { if (owner == null) return; - List familiars = this.fairy.level.getEntitiesOfClass(Mob.class, + List familiars = this.fairy.level().getEntitiesOfClass(Mob.class, this.fairy.getBoundingBox().inflate(10), e -> e != this.fairy && e instanceof IFamiliar && ((IFamiliar) e).getFamiliarOwner() == owner); @@ -454,13 +454,13 @@ protected void checkAndPerformAttack(LivingEntity pEnemy, double pDistToEnemySqr if (owner != null) { pEnemy.hurt(this.fairy.damageSources().mobAttack(owner), 1); pEnemy.addEffect(new MobEffectInstance(MobEffects.MOVEMENT_SLOWDOWN, 40, 1)); - List allies = this.fairy.level.getEntitiesOfClass(LivingEntity.class, + List allies = this.fairy.level().getEntitiesOfClass(LivingEntity.class, this.fairy.getBoundingBox().inflate(7), e -> e != this.fairy && e instanceof IFamiliar && ((IFamiliar) e).getFamiliarOwner() == owner); allies.add(owner); for (LivingEntity ally : allies) { ally.heal(1); - ((ServerLevel) this.fairy.level).sendParticles(ParticleTypes.HEART, ally.getX(), + ((ServerLevel) this.fairy.level()).sendParticles(ParticleTypes.HEART, ally.getX(), ally.getY() + ally.getBbHeight(), ally.getZ(), 1, 0, 0, 0, 1); } } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/FamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/FamiliarEntity.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/FamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/FamiliarEntity.java index d9e080b71..159ba0df7 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/FamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/FamiliarEntity.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.registry.OccultismItems; +import com.klikli_dev.occultism.registry.OccultismItems; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; @@ -116,13 +116,13 @@ public void aiStep() { this.updateSwingTime(); if (this.jukeboxPos == null || !this.jukeboxPos.closerThan(this.blockPosition(), 3.5) - || !this.level.getBlockState(this.jukeboxPos).is(Blocks.JUKEBOX)) { + || !this.level().getBlockState(this.jukeboxPos).is(Blocks.JUKEBOX)) { this.partying = false; this.jukeboxPos = null; } LivingEntity owner; - if (!this.level.isClientSide && this.level.getGameTime() % 10 == 0 && (owner = this.getFamiliarOwner()) != null + if (!this.level().isClientSide && this.level().getGameTime() % 10 == 0 && (owner = this.getFamiliarOwner()) != null && this.distanceTo(owner) < MAX_BOOST_DISTANCE) for (MobEffectInstance effect : this.getFamiliarEffects()) owner.addEffect(effect); @@ -132,7 +132,7 @@ public void aiStep() { public LivingEntity getOwner() { UUID uuid = this.getOwnerId(); - return uuid == null ? null : this.level.getPlayerByUUID(uuid); + return uuid == null ? null : this.level().getPlayerByUUID(uuid); } @Override @@ -142,10 +142,10 @@ protected InteractionResult mobInteract(Player playerIn, InteractionHand hand) { return stack.interactLivingEntity(playerIn, this, hand); } else if (stack.getItem() == OccultismItems.DEBUG_WAND.get()) { this.setOwnerId(playerIn.getUUID()); - return InteractionResult.sidedSuccess(this.level.isClientSide); - } else if (stack.isEmpty() && !this.level.isClientSide && this.getFamiliarOwner() == playerIn) { + return InteractionResult.sidedSuccess(this.level().isClientSide); + } else if (stack.isEmpty() && !this.level().isClientSide && this.getFamiliarOwner() == playerIn) { this.setSitting(!this.isSitting()); - return InteractionResult.sidedSuccess(this.level.isClientSide); + return InteractionResult.sidedSuccess(this.level().isClientSide); } return InteractionResult.PASS; } @@ -285,9 +285,9 @@ private void tryTeleport() { } private boolean tryTeleport(BlockPos pos) { - boolean walkable = BlockPathTypes.WALKABLE == WalkNodeEvaluator.getBlockPathTypeStatic(this.entity.level, + boolean walkable = BlockPathTypes.WALKABLE == WalkNodeEvaluator.getBlockPathTypeStatic(this.entity.level(), pos.mutable()); - boolean noCollision = this.entity.level.noCollision(this.entity, + boolean noCollision = this.entity.level().noCollision(this.entity, this.entity.getBoundingBox().move(pos.subtract(this.entity.blockPosition()))); if (walkable && noCollision) { this.entity.moveTo(pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/GoatFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/GoatFamiliarEntity.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/GoatFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/GoatFamiliarEntity.java index ecf2213ad..a5fca1051 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/GoatFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/GoatFamiliarEntity.java @@ -20,13 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; -import com.github.klikli_dev.occultism.registry.OccultismEntities; -import com.github.klikli_dev.occultism.registry.OccultismTags; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.registry.OccultismAdvancements; +import com.klikli_dev.occultism.registry.OccultismEntities; +import com.klikli_dev.occultism.registry.OccultismTags; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.sounds.SoundEvents; @@ -66,7 +66,7 @@ public static void ringBell(FamiliarEntity entity) { entity.playSound(SoundEvents.BELL_BLOCK, 1, 1); - for (Mob e : entity.level.getEntitiesOfClass(Mob.class, entity.getBoundingBox().inflate(30), + for (Mob e : entity.level().getEntitiesOfClass(Mob.class, entity.getBoundingBox().inflate(30), e -> e.isAlive() && e.getClassification(false) == MobCategory.MONSTER)) e.setTarget(owner); } @@ -85,7 +85,7 @@ protected void registerGoals() { @Override public void tick() { super.tick(); - if (this.level.isClientSide) + if (this.level().isClientSide) this.shakeHeadTimer--; } @@ -175,10 +175,10 @@ else if (stack.getItem() == Items.FLINT) this.transform(); } - if (!this.level.isClientSide) //do this down here because shrink will erase item info and cause checks to fail + if (!this.level().isClientSide) //do this down here because shrink will erase item info and cause checks to fail stack.shrink(1); - return InteractionResult.sidedSuccess(this.level.isClientSide); + return InteractionResult.sidedSuccess(this.level().isClientSide); } else { this.shakeHeadTimer = 20; return InteractionResult.CONSUME; @@ -188,14 +188,14 @@ else if (stack.getItem() == Items.FLINT) } private void transform() { - if (this.level.isClientSide) { + if (this.level().isClientSide) { float scale = this.getScale(); for (int i = 0; i < 30; i++) - this.level.addParticle(ParticleTypes.SMOKE, this.getRandomX(scale), this.getRandomY() * scale, this.getRandomZ(scale), 0, 0, + this.level().addParticle(ParticleTypes.SMOKE, this.getRandomX(scale), this.getRandomY() * scale, this.getRandomZ(scale), 0, 0, 0); } else { - ShubNiggurathFamiliarEntity shubNiggurath = new ShubNiggurathFamiliarEntity(this.level, this); - this.level.addFreshEntity(shubNiggurath); + ShubNiggurathFamiliarEntity shubNiggurath = new ShubNiggurathFamiliarEntity(this.level(), this); + this.level().addFreshEntity(shubNiggurath); this.remove(RemovalReason.DISCARDED); } } @@ -211,7 +211,7 @@ boolean shouldTransform() { @SuppressWarnings("deprecation") private boolean isInTransformationBiome(Entity entity) { - return this.level.getBiome(entity.blockPosition()).is(OccultismTags.ALLOWS_SHUB_NIGGURRATH_TRANSFORMATION); + return this.level().getBiome(entity.blockPosition()).is(OccultismTags.ALLOWS_SHUB_NIGGURRATH_TRANSFORMATION); } public float getNeckYRot(float pPartialTick) { diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/GreedyFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/GreedyFamiliarEntity.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/GreedyFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/GreedyFamiliarEntity.java index 95883179e..9b1ce7178 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/GreedyFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/GreedyFamiliarEntity.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; -import com.github.klikli_dev.occultism.registry.OccultismEntities; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.registry.OccultismAdvancements; +import com.klikli_dev.occultism.registry.OccultismEntities; import net.minecraft.core.BlockPos; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; @@ -106,7 +106,7 @@ public void curioTick(LivingEntity wearer) { return; if (this.isEffectEnabled(wearer)) - for (ItemEntity e : wearer.level.getEntitiesOfClass(ItemEntity.class, wearer.getBoundingBox().inflate(5), Entity::isAlive)) { + for (ItemEntity e : wearer.level().getEntitiesOfClass(ItemEntity.class, wearer.getBoundingBox().inflate(5), Entity::isAlive)) { ItemStack stack = e.getItem(); boolean isStackDemagnetized = stack.hasTag() && stack.getTag().getBoolean("PreventRemoteMovement"); @@ -125,7 +125,7 @@ public void tick() { // Ears point to target block pos this.earRotX0 = this.earRotX; this.earRotZ0 = this.earRotZ; - if (this.level.isClientSide) { + if (this.level().isClientSide) { Optional targetBlock = this.getTargetBlock(); if (targetBlock.isPresent()) { Vec3 p = Vec3.atCenterOf(targetBlock.get()); @@ -199,11 +199,11 @@ protected InteractionResult mobInteract(Player playerIn, InteractionHand hand) { if (this.hasBlacksmithUpgrade() && !this.getOffhandItem().isEmpty()) { ItemHandlerHelper.giveItemToPlayer(playerIn, this.getOffhandItem()); this.setItemInHand(InteractionHand.OFF_HAND, ItemStack.EMPTY); - return InteractionResult.sidedSuccess(this.level.isClientSide); + return InteractionResult.sidedSuccess(this.level().isClientSide); } else if (this.hasBlacksmithUpgrade() && stack.getItem() instanceof BlockItem) { this.setItemInHand(InteractionHand.OFF_HAND, new ItemStack(stack.getItem())); stack.shrink(1); - return InteractionResult.sidedSuccess(this.level.isClientSide); + return InteractionResult.sidedSuccess(this.level().isClientSide); } return super.mobInteract(playerIn, hand); @@ -248,13 +248,12 @@ public void tick() { private ItemEntity getNearbyItem() { LivingEntity owner = this.entity.getFamiliarOwner(); - if (!(owner instanceof Player)) + if (!(owner instanceof Player player)) return null; - Player player = (Player) owner; IItemHandler inv = new PlayerMainInvWrapper(player.getInventory()); - for (ItemEntity item : this.entity.level.getEntitiesOfClass(ItemEntity.class, + for (ItemEntity item : this.entity.level().getEntitiesOfClass(ItemEntity.class, this.entity.getBoundingBox().inflate(RANGE), e -> e.isAlive())) { ItemStack stack = item.getItem(); @@ -284,7 +283,7 @@ public RideFamiliarGoal(FamiliarEntity rider, EntityType type) { @Override public boolean canUse() { - if (this.rider.getVehicle() != null && this.rider.getVehicle().getType() == type) + if (this.rider.getVehicle() != null && this.rider.getVehicle().getType() == this.type) return true; FamiliarEntity mount = this.findMount(); @@ -298,7 +297,7 @@ public boolean canUse() { @Override public boolean canContinueToUse() { - return (this.rider.getVehicle() != null && this.rider.getVehicle().getType() == type) + return (this.rider.getVehicle() != null && this.rider.getVehicle().getType() == this.type) || (this.rider.isPathFinding() && this.mount != null); } @@ -314,7 +313,7 @@ public void tick() { this.rider.startRiding(this.mount); this.mount.getNavigation().stop(); - if (this.rider.getType() == OccultismEntities.SHUB_NIGGURATH_FAMILIAR.get() && type == OccultismEntities.CTHULHU_FAMILIAR.get()) + if (this.rider.getType() == OccultismEntities.SHUB_NIGGURATH_FAMILIAR.get() && this.type == OccultismEntities.CTHULHU_FAMILIAR.get()) OccultismAdvancements.FAMILIAR.trigger(this.rider.getFamiliarOwner(), FamiliarTrigger.Type.SHUB_CTHULHU_FRIENDS); } } @@ -324,7 +323,7 @@ private FamiliarEntity findMount() { if (owner == null) return null; - List mounts = this.rider.level.getEntities(type, this.rider.getBoundingBox().inflate(5), + List mounts = this.rider.level().getEntities(this.type, this.rider.getBoundingBox().inflate(5), e -> e.getFamiliarOwner() == owner && !e.isVehicle() && !e.isSitting()); if (mounts.isEmpty()) return null; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/GuardianFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/GuardianFamiliarEntity.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/GuardianFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/GuardianFamiliarEntity.java index dd804b263..744d13f24 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/GuardianFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/GuardianFamiliarEntity.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.registry.OccultismAdvancements; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.BlockParticleOption; import net.minecraft.core.particles.ParticleTypes; @@ -53,14 +53,13 @@ public class GuardianFamiliarEntity extends ColoredFamiliarEntity { - private static final byte MAX_LIVES = 5; - public static final byte UNDAMAGED = MAX_LIVES; public static final byte ONE_ARMED = 4; public static final byte ONE_LEGGED = 3; public static final byte FLOATING = 2; public static final byte DEATHS_DOOR = 1; public static final byte DEAD = 0; - + private static final byte MAX_LIVES = 5; + public static final byte UNDAMAGED = MAX_LIVES; private static final EntityDataAccessor LIVES = SynchedEntityData.defineId(GuardianFamiliarEntity.class, EntityDataSerializers.BYTE); @@ -143,7 +142,7 @@ public boolean sacrifice() { public void tick() { super.tick(); - if (this.getLives() <= 0 && !this.level.isClientSide) + if (this.getLives() <= 0 && !this.level().isClientSide) this.kill(); if (this.lives0 != -1 && this.lives0 > this.getLives()) { @@ -153,10 +152,10 @@ public void tick() { this.lives0 = this.getLives(); - if (this.level.isClientSide) { + if (this.level().isClientSide) { if (this.particleTimer-- > 0) { for (int i = 0; i < 20; i++) { - this.level.addParticle(new BlockParticleOption(ParticleTypes.BLOCK, Blocks.STONE.defaultBlockState()) + this.level().addParticle(new BlockParticleOption(ParticleTypes.BLOCK, Blocks.STONE.defaultBlockState()) .setPos(this.blockPosition()), this.getRandomX(0.5), this.getRandomY(), this.getRandomZ(0.5), 0, 0, 0); } } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/HeadlessFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/HeadlessFamiliarEntity.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/HeadlessFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/HeadlessFamiliarEntity.java index fb7952050..b3c34ffdc 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/HeadlessFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/HeadlessFamiliarEntity.java @@ -20,15 +20,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.network.MessageHeadlessDie; -import com.github.klikli_dev.occultism.network.OccultismPackets; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; -import com.github.klikli_dev.occultism.registry.OccultismEntities; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.network.MessageHeadlessDie; +import com.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.registry.OccultismAdvancements; +import com.klikli_dev.occultism.registry.OccultismEntities; import net.minecraft.core.particles.DustParticleOptions; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; @@ -118,14 +118,14 @@ public boolean canUse() { public void tick() { super.tick(); - if (!this.level.isClientSide) { + if (!this.level().isClientSide) { if (this.headTimer-- == 0) this.setHead(NO_HEAD); if (this.hasBlacksmithUpgrade() && !this.isHeadlessDead() && this.tickCount % 10 == 0 && this.getHeadType() != null) - for (LivingEntity e : this.level.getEntities(this.getHeadType(), this.getBoundingBox().inflate(5), + for (LivingEntity e : this.level().getEntities(this.getHeadType(), this.getBoundingBox().inflate(5), e -> e != this.getFamiliarOwner())) e.addEffect(new MobEffectInstance(MobEffects.WEAKNESS, 20 * 3)); } else { @@ -133,15 +133,15 @@ public void tick() { Vec3 forward = Vec3.directionFromRotation(0, this.getYRot()); Vec3 pos = this.position().add(forward.reverse().scale(0.15)).add(this.randPos(0.08), this.randPos(0.08), this.randPos(0.08)); - this.level.addParticle(ParticleTypes.SOUL_FIRE_FLAME, pos.x, pos.y + 1.1, pos.z, 0, 0, 0); + this.level().addParticle(ParticleTypes.SOUL_FIRE_FLAME, pos.x, pos.y + 1.1, pos.z, 0, 0, 0); } if (this.headlessDieTimer == 1) - this.level.addParticle(ParticleTypes.SOUL, this.getX(), this.getY() + 1, this.getZ(), 0, 0, 0); + this.level().addParticle(ParticleTypes.SOUL, this.getX(), this.getY() + 1, this.getZ(), 0, 0, 0); if (this.headlessDieTimer-- > 7) for (int i = 0; i < 2; i++) { - this.level.addParticle(new DustParticleOptions(new Vector3f(0.5f, 0, 0), 1), this.getX() + this.randPos(0.3), + this.level().addParticle(new DustParticleOptions(new Vector3f(0.5f, 0, 0), 1), this.getX() + this.randPos(0.3), this.getY() + 1 + this.randPos(0.3), this.getZ() + this.randPos(0.3), 0, 0, 0); } } @@ -205,7 +205,7 @@ protected InteractionResult mobInteract(Player playerIn, InteractionHand hand) { if (this.isFullyRebuilt()) OccultismAdvancements.FAMILIAR.trigger(playerIn, FamiliarTrigger.Type.HEADLESS_REBUILT); - return InteractionResult.sidedSuccess(!this.level.isClientSide); + return InteractionResult.sidedSuccess(!this.level().isClientSide); } } return super.mobInteract(playerIn, hand); diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/IFamiliar.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/IFamiliar.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/IFamiliar.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/IFamiliar.java index 858dd554d..dde9c3494 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/IFamiliar.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/IFamiliar.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.common.item.tool.FamiliarRingItem; -import com.github.klikli_dev.occultism.registry.OccultismCapabilities; +import com.klikli_dev.occultism.common.item.tool.FamiliarRingItem; +import com.klikli_dev.occultism.registry.OccultismCapabilities; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/MummyFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/MummyFamiliarEntity.java similarity index 83% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/MummyFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/MummyFamiliarEntity.java index ce928207e..ea6705915 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/MummyFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/MummyFamiliarEntity.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; -import com.github.klikli_dev.occultism.registry.OccultismEffects; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.registry.OccultismAdvancements; +import com.klikli_dev.occultism.registry.OccultismEffects; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.DifficultyInstance; import net.minecraft.world.InteractionHand; @@ -61,7 +61,7 @@ public class MummyFamiliarEntity extends FamiliarEntity { public MummyFamiliarEntity(EntityType type, Level level) { super(type, level); - capowPos = capowOffset = capowOffset0 = Vec3.ZERO; + this.capowPos = this.capowOffset = this.capowOffset0 = Vec3.ZERO; this.fightPose = -1; } @@ -86,17 +86,17 @@ protected void registerGoals() { public void tick() { super.tick(); - if (level.isClientSide && fightPose != -1) { - this.capowOffset0 = capowOffset; - if (fightTimer++ == MAX_FIGHT_TIMER) { - fightTimer = 0; - fightPose += 1; - if (fightPose == 3) - fightPose = -1; - capowPos = new Vec3(randNum(2), -random.nextDouble(), randNum(2)); + if (this.level().isClientSide && this.fightPose != -1) { + this.capowOffset0 = this.capowOffset; + if (this.fightTimer++ == MAX_FIGHT_TIMER) { + this.fightTimer = 0; + this.fightPose += 1; + if (this.fightPose == 3) + this.fightPose = -1; + this.capowPos = new Vec3(this.randNum(2), -this.random.nextDouble(), this.randNum(2)); } - capowOffset = new Vec3(randNum(0.1), randNum(0.1), randNum(0.1)); + this.capowOffset = new Vec3(this.randNum(0.1), this.randNum(0.1), this.randNum(0.1)); } } @@ -127,19 +127,19 @@ public boolean canBlacksmithUpgrade() { } private double randNum(double size) { - return (random.nextDouble() - 0.5) * size; + return (this.random.nextDouble() - 0.5) * size; } public float getCapowAlpha(float partialTicks) { - return (MAX_FIGHT_TIMER - fightTimer - partialTicks) / MAX_FIGHT_TIMER; + return (MAX_FIGHT_TIMER - this.fightTimer - partialTicks) / MAX_FIGHT_TIMER; } public Vec3 getCapowPosition(float partialTicks) { - return capowPos.add(capowOffset0.add(capowOffset0.subtract(capowOffset).scale(partialTicks))); + return this.capowPos.add(this.capowOffset0.add(this.capowOffset0.subtract(this.capowOffset).scale(partialTicks))); } public int getFightPose() { - return fightPose; + return this.fightPose; } @Override diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/OtherworldBirdEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/OtherworldBirdEntity.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/OtherworldBirdEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/OtherworldBirdEntity.java index 1fdb79749..3baafe6c7 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/OtherworldBirdEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/OtherworldBirdEntity.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.registry.OccultismEffects; -import com.github.klikli_dev.occultism.registry.OccultismItems; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.registry.OccultismEffects; +import com.klikli_dev.occultism.registry.OccultismItems; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.effect.MobEffectInstance; @@ -83,7 +83,7 @@ protected void registerGoals() { @Override public void aiStep() { // Every 10 ticks, attempt to refresh the owner buff - if (!this.level.isClientSide && this.level.getGameTime() % 10 == 0 && this.isTame()) { + if (!this.level().isClientSide && this.level().getGameTime() % 10 == 0 && this.isTame()) { LivingEntity owner = this.getOwner(); if (owner != null && this.distanceTo(owner) < MAX_BOOST_DISTANCE) { // close enough to boost diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ResizableFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/ResizableFamiliarEntity.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ResizableFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/ResizableFamiliarEntity.java index 769041df4..77bf36a4b 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ResizableFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/ResizableFamiliarEntity.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ShubNiggurathFamiliarEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/ShubNiggurathFamiliarEntity.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ShubNiggurathFamiliarEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/ShubNiggurathFamiliarEntity.java index b191a2458..5e0f18324 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ShubNiggurathFamiliarEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/ShubNiggurathFamiliarEntity.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.registry.OccultismEntities; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.registry.OccultismEntities; import net.minecraft.tags.DamageTypeTags; import net.minecraft.util.Mth; import net.minecraft.world.damagesource.DamageSource; @@ -74,7 +74,7 @@ protected void registerGoals() { @Override public void tick() { super.tick(); - if (!this.level.isClientSide) { + if (!this.level().isClientSide) { this.rotateTowardsFriend(); this.createSpawn(this, new Vector3d(this.getRandomX(2), this.getRandomY(), this.getRandomZ(2))); @@ -99,9 +99,9 @@ public CthulhuFamiliarEntity getCthulhuFriend() { private void createSpawn(LivingEntity creator, Vector3d pos) { if (this.spawnTimer-- < 0) { this.spawnTimer = MAX_SPAWN_TIMER; - ShubNiggurathSpawnEntity spawn = new ShubNiggurathSpawnEntity(creator.level, creator); + ShubNiggurathSpawnEntity spawn = new ShubNiggurathSpawnEntity(creator.level(), creator); spawn.setPos(pos.x, pos.y, pos.z); - creator.level.addFreshEntity(spawn); + creator.level().addFreshEntity(spawn); } } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ShubNiggurathSpawnEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/ShubNiggurathSpawnEntity.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ShubNiggurathSpawnEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/ShubNiggurathSpawnEntity.java index 49eff7584..5938f53d2 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ShubNiggurathSpawnEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/ShubNiggurathSpawnEntity.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; -import com.github.klikli_dev.occultism.registry.OccultismEntities; -import com.github.klikli_dev.occultism.util.FamiliarUtil; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.registry.OccultismAdvancements; +import com.klikli_dev.occultism.registry.OccultismEntities; +import com.klikli_dev.occultism.util.FamiliarUtil; import net.minecraft.core.particles.DustParticleOptions; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; @@ -77,7 +77,7 @@ protected void registerGoals() { public void tick() { super.tick(); - if (!this.level.isClientSide) { + if (!this.level().isClientSide) { if (this.lifeTicks-- < 0) this.explode(); @@ -132,7 +132,7 @@ private void explode() { private LivingEntity getCreator() { if (this.creatorId == null) return null; - Entity creator = ((ServerLevel) this.level).getEntity(this.creatorId); + Entity creator = ((ServerLevel) this.level()).getEntity(this.creatorId); if (!(creator instanceof LivingEntity)) return null; return (LivingEntity) creator; @@ -149,9 +149,9 @@ private LivingEntity getCreatorOwner() { public void die(DamageSource pCause) { super.die(pCause); - if (this.level.isClientSide) + if (this.level().isClientSide) for (int i = 0; i < 30; i++) - this.level.addParticle(new DustParticleOptions(new Vector3f(0.5f, 0, 0), 1), this.getRandomX(1), this.getRandomY(), + this.level().addParticle(new DustParticleOptions(new Vector3f(0.5f, 0, 0), 1), this.getRandomX(1), this.getRandomY(), this.getRandomZ(1), 0, 1, 0); } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ThrownSwordEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/ThrownSwordEntity.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ThrownSwordEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/familiar/ThrownSwordEntity.java index 320322e32..bbb1dc624 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/familiar/ThrownSwordEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/familiar/ThrownSwordEntity.java @@ -20,12 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.familiar; +package com.klikli_dev.occultism.common.entity.familiar; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; -import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.projectile.ThrowableItemProjectile; @@ -51,7 +50,7 @@ public void tick() { super.tick(); this.duration++; - if (!this.level.isClientSide && this.duration > MAX_DURATION) + if (!this.level().isClientSide && this.duration > MAX_DURATION) this.remove(RemovalReason.DISCARDED); } @@ -89,7 +88,7 @@ protected void onHitEntity(EntityHitResult pResult) { if (this.friendlyFire(target)) return; - if (!this.level.isClientSide) { + if (!this.level().isClientSide) { target.hurt(this.damageSources().thrown(this, this.getOwner()), 6); } } @@ -97,7 +96,7 @@ protected void onHitEntity(EntityHitResult pResult) { @Override @SuppressWarnings("unchecked") public Packet getAddEntityPacket() { - return (Packet) NetworkHooks.getEntitySpawningPacket(this); + return NetworkHooks.getEntitySpawningPacket(this); } private boolean friendlyFire(Entity target) { diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/ChangeTimeJob.java b/src/main/java/com/klikli_dev/occultism/common/entity/job/ChangeTimeJob.java similarity index 84% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/job/ChangeTimeJob.java rename to src/main/java/com/klikli_dev/occultism/common/entity/job/ChangeTimeJob.java index 4839e0ca4..1f1999a43 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/ChangeTimeJob.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/job/ChangeTimeJob.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.job; +package com.klikli_dev.occultism.common.entity.job; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -30,7 +30,6 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; -import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.level.storage.ServerLevelData; @@ -60,9 +59,9 @@ public void onInit() { public void cleanup() { //in this case called on spirit death for (int i = 0; i < 5; i++) { - ((ServerLevel) this.entity.level) - .sendParticles(ParticleTypes.PORTAL, this.entity.getX() + this.entity.level.getRandom().nextGaussian(), - this.entity.getY() + 0.5 + this.entity.level.getRandom().nextGaussian(), this.entity.getZ() + this.entity.level.getRandom().nextGaussian(), 5, + ((ServerLevel) this.entity.level()) + .sendParticles(ParticleTypes.PORTAL, this.entity.getX() + this.entity.level().getRandom().nextGaussian(), + this.entity.getY() + 0.5 + this.entity.level().getRandom().nextGaussian(), this.entity.getZ() + this.entity.level().getRandom().nextGaussian(), 5, 0.0, 0.0, 0.0, 0.0); } @@ -78,8 +77,8 @@ public void update() { this.entity.swing(InteractionHand.MAIN_HAND); } - if (this.entity.level.getGameTime() % 2 == 0) { - ((ServerLevel) this.entity.level) + if (this.entity.level().getGameTime() % 2 == 0) { + ((ServerLevel) this.entity.level()) .sendParticles(ParticleTypes.PORTAL, this.entity.getX(), this.entity.getY() + 0.5, this.entity.getZ(), 3, 0.5, 0.0, 0.0, @@ -111,7 +110,7 @@ public void readJobFromNBT(CompoundTag compound) { } public void updateTime() { - var level = (ServerLevelData) this.entity.level.getLevelData(); + var level = (ServerLevelData) this.entity.level().getLevelData(); var remainingTime = this.newTime - level.getDayTime(); var remainingTicks = Math.max(this.requiredChangeTicks - this.currentChangeTicks, 1); @@ -119,7 +118,7 @@ public void updateTime() { var interpolatedTime = level.getDayTime() + timeChange; - if(interpolatedTime >= this.newTime){ + if (interpolatedTime >= this.newTime) { interpolatedTime = this.newTime; } @@ -127,8 +126,8 @@ public void updateTime() { } public void finishChangeTime() { - this.entity.level.playSound(null, this.entity.blockPosition(), SoundEvents.BEACON_ACTIVATE, SoundSource.NEUTRAL, 1, 1); - this.entity.die(this.entity.damageSources().outOfWorld()); + this.entity.level().playSound(null, this.entity.blockPosition(), SoundEvents.BEACON_ACTIVATE, SoundSource.NEUTRAL, 1, 1); + this.entity.die(this.entity.damageSources().fellOutOfWorld()); this.entity.remove(Entity.RemovalReason.DISCARDED); } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/ChangeWeatherJob.java b/src/main/java/com/klikli_dev/occultism/common/entity/job/ChangeWeatherJob.java similarity index 83% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/job/ChangeWeatherJob.java rename to src/main/java/com/klikli_dev/occultism/common/entity/job/ChangeWeatherJob.java index e6753da9b..848b38824 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/ChangeWeatherJob.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/job/ChangeWeatherJob.java @@ -20,14 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.job; +package com.klikli_dev.occultism.common.entity.job; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; -import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LightningBolt; @@ -35,20 +34,13 @@ public abstract class ChangeWeatherJob extends SpiritJob { - //region Fields protected int currentChangeTicks; protected int requiredChangeTicks; - //endregion Fields - - //region Initialization public ChangeWeatherJob(SpiritEntity entity, int requiredChangeTicks) { super(entity); this.requiredChangeTicks = requiredChangeTicks; } - //endregion Initialization - - //region Overrides @Override public void onInit() { @@ -59,9 +51,9 @@ public void onInit() { public void cleanup() { //in this case called on spirit death for (int i = 0; i < 5; i++) { - ((ServerLevel) this.entity.level) - .sendParticles(ParticleTypes.LARGE_SMOKE, this.entity.getX() + this.entity.level.getRandom().nextGaussian(), - this.entity.getY() + 0.5 + this.entity.level.getRandom().nextGaussian(), this.entity.getZ() + this.entity.level.getRandom().nextGaussian(), 5, + ((ServerLevel) this.entity.level()) + .sendParticles(ParticleTypes.LARGE_SMOKE, this.entity.getX() + this.entity.level().getRandom().nextGaussian(), + this.entity.getY() + 0.5 + this.entity.level().getRandom().nextGaussian(), this.entity.getZ() + this.entity.level().getRandom().nextGaussian(), 5, 0.0, 0.0, 0.0, 0.0); } @@ -76,8 +68,8 @@ public void update() { if (!this.entity.swinging) { this.entity.swing(InteractionHand.MAIN_HAND); } - if (this.entity.level.getGameTime() % 2 == 0) { - ((ServerLevel) this.entity.level) + if (this.entity.level().getGameTime() % 2 == 0) { + ((ServerLevel) this.entity.level()) .sendParticles(ParticleTypes.SMOKE, this.entity.getX(), this.entity.getY() + 0.5, this.entity.getZ(), 3, 0.5, 0.0, 0.0, @@ -87,7 +79,7 @@ public void update() { if (this.currentChangeTicks == this.requiredChangeTicks) { this.changeWeather(); - LightningBolt lightningboltentity = EntityType.LIGHTNING_BOLT.create(this.entity.level); + LightningBolt lightningboltentity = EntityType.LIGHTNING_BOLT.create(this.entity.level()); lightningboltentity.moveTo(Vec3.atBottomCenterOf(this.entity.blockPosition())); lightningboltentity.setVisualOnly(true); @@ -110,9 +102,6 @@ public void readJobFromNBT(CompoundTag compound) { this.requiredChangeTicks = compound.getInt("requiredChangeTicks"); } - //endregion Overrides - - //region Methods public abstract void changeWeather(); - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/CleanerJob.java b/src/main/java/com/klikli_dev/occultism/common/entity/job/CleanerJob.java similarity index 81% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/job/CleanerJob.java rename to src/main/java/com/klikli_dev/occultism/common/entity/job/CleanerJob.java index 68831aa9c..759f2a74e 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/CleanerJob.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/job/CleanerJob.java @@ -20,15 +20,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.job; +package com.klikli_dev.occultism.common.entity.job; -import com.github.klikli_dev.occultism.common.container.spirit.SpiritTransporterContainer; -import com.github.klikli_dev.occultism.common.entity.ai.goal.DepositItemsGoal; -import com.github.klikli_dev.occultism.common.entity.ai.goal.PickupItemsGoal; -import com.github.klikli_dev.occultism.common.entity.ai.goal.ReturnToWorkAreaGoal; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.exceptions.ItemHandlerMissingException; -import com.github.klikli_dev.occultism.util.StorageUtil; +import com.klikli_dev.occultism.common.container.spirit.SpiritTransporterContainer; +import com.klikli_dev.occultism.common.entity.ai.goal.DepositItemsGoal; +import com.klikli_dev.occultism.common.entity.ai.goal.PickupItemsGoal; +import com.klikli_dev.occultism.common.entity.ai.goal.ReturnToWorkAreaGoal; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.exceptions.ItemHandlerMissingException; +import com.klikli_dev.occultism.util.StorageUtil; import net.minecraft.network.chat.Component; import net.minecraft.world.MenuProvider; import net.minecraft.world.entity.item.ItemEntity; @@ -41,20 +41,14 @@ public class CleanerJob extends SpiritJob implements MenuProvider { - //region Fields protected PickupItemsGoal pickupItemsGoal; protected ReturnToWorkAreaGoal returnToWorkAreaGoal; protected DepositItemsGoal depositItemsGoal; - //endregion Fields - - //region Initialization public CleanerJob(SpiritEntity entity) { super(entity); } - //endregion Initialization - //region Overrides @Override public Component getDisplayName() { return this.entity.getDisplayName(); @@ -90,5 +84,5 @@ public boolean canPickupItem(ItemEntity entity) { public AbstractContainerMenu createMenu(int id, Inventory playerInventory, Player player) { return new SpiritTransporterContainer(id, playerInventory, this.entity); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/ClearWeatherJob.java b/src/main/java/com/klikli_dev/occultism/common/entity/job/ClearWeatherJob.java similarity index 86% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/job/ClearWeatherJob.java rename to src/main/java/com/klikli_dev/occultism/common/entity/job/ClearWeatherJob.java index d3c97f659..cd5e6e050 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/ClearWeatherJob.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/job/ClearWeatherJob.java @@ -20,26 +20,23 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.job; +package com.klikli_dev.occultism.common.entity.job; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; import net.minecraft.network.chat.Component; import net.minecraft.world.level.storage.ServerLevelData; public class ClearWeatherJob extends ChangeWeatherJob { - //region Initialization public ClearWeatherJob(SpiritEntity entity, int ticksToClear) { super(entity, ticksToClear); } - //endregion Initialization - //region Overrides public void changeWeather() { if (Occultism.SERVER_CONFIG.rituals.enableClearWeatherRitual.get()) { //taken from weathercommand#clear - ServerLevelData level = (ServerLevelData) this.entity.level.getLevelData(); + ServerLevelData level = (ServerLevelData) this.entity.level().getLevelData(); level.setClearWeatherTime(6000); level.setRainTime(0); level.setThunderTime(0); @@ -49,5 +46,5 @@ public void changeWeather() { this.entity.getOwner().sendSystemMessage(Component.translatable("ritual.occultism.disabled")); } } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/CrusherJob.java b/src/main/java/com/klikli_dev/occultism/common/entity/job/CrusherJob.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/job/CrusherJob.java rename to src/main/java/com/klikli_dev/occultism/common/entity/job/CrusherJob.java index 52c698ebf..eb6d2547a 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/CrusherJob.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/job/CrusherJob.java @@ -20,15 +20,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.job; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.entity.ai.goal.PickupItemsGoal; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.crafting.recipe.CrushingRecipe; -import com.github.klikli_dev.occultism.crafting.recipe.TieredItemStackFakeInventory; -import com.github.klikli_dev.occultism.registry.OccultismRecipes; -import com.github.klikli_dev.occultism.registry.OccultismSounds; +package com.klikli_dev.occultism.common.entity.job; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.entity.ai.goal.PickupItemsGoal; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.crafting.recipe.CrushingRecipe; +import com.klikli_dev.occultism.crafting.recipe.TieredItemStackFakeInventory; +import com.klikli_dev.occultism.registry.OccultismRecipes; +import com.klikli_dev.occultism.registry.OccultismSounds; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; @@ -73,7 +73,7 @@ public CrusherJob(SpiritEntity entity, Supplier crushingTimeMultiplier, S @Override public void onInit() { this.entity.targetSelector.addGoal(1, this.pickupItemsGoal = new PickupItemsGoal(this.entity)); - this.itemsToPickUp = this.entity.level.getRecipeManager().getRecipes().stream() + this.itemsToPickUp = this.entity.level().getRecipeManager().getRecipes().stream() .filter( recipe -> recipe.getType() == OccultismRecipes.CRUSHING_TYPE.get() && ((CrushingRecipe) recipe).getMinTier() <= this.tier.get() @@ -92,13 +92,13 @@ public void update() { var fakeInventory = new TieredItemStackFakeInventory(handHeld, this.tier.get()); if (!this.currentRecipe.isPresent() && !handHeld.isEmpty()) { - this.currentRecipe = this.entity.level.getRecipeManager().getRecipeFor(OccultismRecipes.CRUSHING_TYPE.get(), - fakeInventory, this.entity.level); + this.currentRecipe = this.entity.level().getRecipeManager().getRecipeFor(OccultismRecipes.CRUSHING_TYPE.get(), + fakeInventory, this.entity.level()); this.crushingTimer = 0; if (this.currentRecipe.isPresent()) { //play crushing sound - this.entity.level + this.entity.level() .playSound(null, this.entity.blockPosition(), OccultismSounds.CRUNCHING.get(), SoundSource.NEUTRAL, 0.5f, 1 + 0.5f * this.entity.getRandom().nextFloat()); } else { @@ -111,7 +111,7 @@ public void update() { } } if (this.currentRecipe.isPresent()) { - if (handHeld.isEmpty() || !this.currentRecipe.get().matches(fakeInventory, this.entity.level)) { + if (handHeld.isEmpty() || !this.currentRecipe.get().matches(fakeInventory, this.entity.level())) { //Reset cached recipe if it no longer matches this.currentRecipe = Optional.empty(); } else { @@ -119,17 +119,17 @@ public void update() { this.crushingTimer++; //show particle effect while crushing - if (this.entity.level.getGameTime() % 10 == 0) { + if (this.entity.level().getGameTime() % 10 == 0) { Vec3 pos = this.entity.position(); - ((ServerLevel) this.entity.level) - .sendParticles(ParticleTypes.PORTAL, pos.x + this.entity.level.random.nextGaussian() / 3, - pos.y + 0.5, pos.z + this.entity.level.random.nextGaussian() / 3, 1, 0.0, 0.0, 0.0, + ((ServerLevel) this.entity.level()) + .sendParticles(ParticleTypes.PORTAL, pos.x + this.entity.level().random.nextGaussian() / 3, + pos.y + 0.5, pos.z + this.entity.level().random.nextGaussian() / 3, 1, 0.0, 0.0, 0.0, 0.0); } //every two seconds, play another crushing sound if (this.crushingTimer % 40 == 0) { - this.entity.level.playSound(null, this.entity.blockPosition(), OccultismSounds.CRUNCHING.get(), + this.entity.level().playSound(null, this.entity.blockPosition(), OccultismSounds.CRUNCHING.get(), SoundSource.NEUTRAL, 0.5f, 1 + 0.5f * this.entity.getRandom().nextFloat()); } @@ -137,7 +137,7 @@ public void update() { if (this.crushingTimer >= this.currentRecipe.get().getCrushingTime() * this.crushingTimeMultiplier.get()) { this.crushingTimer = 0; - ItemStack result = this.currentRecipe.get().assemble(fakeInventory, this.entity.level.registryAccess()); + ItemStack result = this.currentRecipe.get().assemble(fakeInventory, this.entity.level().registryAccess()); //make sure to ignore output multiplier on recipes that set that flag. //prevents e.g. 1x ingot -> 3x dust -> 3x ingot -> 9x dust ... float outputMultiplier = this.outputMultiplier.get(); diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/DayTimeJob.java b/src/main/java/com/klikli_dev/occultism/common/entity/job/DayTimeJob.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/job/DayTimeJob.java rename to src/main/java/com/klikli_dev/occultism/common/entity/job/DayTimeJob.java index 9839e3357..32a92c595 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/DayTimeJob.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/job/DayTimeJob.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.job; +package com.klikli_dev.occultism.common.entity.job; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; import net.minecraft.network.chat.Component; import net.minecraft.world.level.storage.ServerLevelData; @@ -40,7 +40,7 @@ public long getNewTime() { //nightfall is 13000, 37000, 61000, etc //midnight is 18000 - ServerLevelData level = (ServerLevelData) this.entity.level.getLevelData(); + ServerLevelData level = (ServerLevelData) this.entity.level().getLevelData(); //time of next dawn long newTime = ((level.getDayTime() + 24000) / 24000) * 24000; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/LumberjackJob.java b/src/main/java/com/klikli_dev/occultism/common/entity/job/LumberjackJob.java similarity index 86% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/job/LumberjackJob.java rename to src/main/java/com/klikli_dev/occultism/common/entity/job/LumberjackJob.java index 9421b40be..8e7502eb3 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/LumberjackJob.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/job/LumberjackJob.java @@ -20,19 +20,19 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.job; - -import com.github.klikli_dev.occultism.api.common.container.IItemStackComparator; -import com.github.klikli_dev.occultism.common.entity.ai.behaviour.*; -import com.github.klikli_dev.occultism.common.entity.ai.sensor.NearestJobItemSensor; -import com.github.klikli_dev.occultism.common.entity.ai.sensor.NearestTreeSensor; -import com.github.klikli_dev.occultism.common.entity.ai.sensor.UnreachableTreeWalkTargetSensor; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.common.misc.ItemStackComparator; -import com.github.klikli_dev.occultism.common.misc.ItemTagComparator; -import com.github.klikli_dev.occultism.registry.OccultismMemoryTypes; -import com.github.klikli_dev.occultism.registry.OccultismTags; +package com.klikli_dev.occultism.common.entity.job; + import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.api.common.container.IItemStackComparator; +import com.klikli_dev.occultism.common.entity.ai.behaviour.*; +import com.klikli_dev.occultism.common.entity.ai.sensor.NearestJobItemSensor; +import com.klikli_dev.occultism.common.entity.ai.sensor.NearestTreeSensor; +import com.klikli_dev.occultism.common.entity.ai.sensor.UnreachableTreeWalkTargetSensor; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.common.misc.ItemStackComparator; +import com.klikli_dev.occultism.common.misc.ItemTagComparator; +import com.klikli_dev.occultism.registry.OccultismMemoryTypes; +import com.klikli_dev.occultism.registry.OccultismTags; import net.minecraft.tags.ItemTags; import net.minecraft.world.entity.EntityDimensions; import net.minecraft.world.entity.Pose; @@ -110,7 +110,7 @@ public BrainActivityGroup getIdleTasks() { @Override - public void handleAdditionalBrainSetup(Brain brain) { + public void handleAdditionalBrainSetup(Brain brain) { } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/ManageMachineJob.java b/src/main/java/com/klikli_dev/occultism/common/entity/job/ManageMachineJob.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/job/ManageMachineJob.java rename to src/main/java/com/klikli_dev/occultism/common/entity/job/ManageMachineJob.java index 2f61ccdd5..38b043d63 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/ManageMachineJob.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/job/ManageMachineJob.java @@ -20,17 +20,17 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.job; - -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.data.GlobalBlockPos; -import com.github.klikli_dev.occultism.api.common.data.MachineReference; -import com.github.klikli_dev.occultism.common.entity.ai.goal.DepositItemsGoal; -import com.github.klikli_dev.occultism.common.entity.ai.goal.FallbackDepositToControllerGoal; -import com.github.klikli_dev.occultism.common.entity.ai.goal.ManageMachineGoal; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.common.misc.DepositOrder; -import com.github.klikli_dev.occultism.util.BlockEntityUtil; +package com.klikli_dev.occultism.common.entity.job; + +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.data.GlobalBlockPos; +import com.klikli_dev.occultism.api.common.data.MachineReference; +import com.klikli_dev.occultism.common.entity.ai.goal.DepositItemsGoal; +import com.klikli_dev.occultism.common.entity.ai.goal.FallbackDepositToControllerGoal; +import com.klikli_dev.occultism.common.entity.ai.goal.ManageMachineGoal; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.common.misc.DepositOrder; +import com.klikli_dev.occultism.util.BlockEntityUtil; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; @@ -42,7 +42,7 @@ import java.util.Queue; public class ManageMachineJob extends SpiritJob { - //region Fields + protected DepositItemsGoal depositItemsGoal; protected ManageMachineGoal manageMachineGoal; protected FallbackDepositToControllerGoal fallbackDepositToControllerGoal; @@ -55,12 +55,9 @@ public class ManageMachineJob extends SpiritJob { protected BlockEntity managedMachineBlockEntity; protected BlockEntity extractBlockEntity; - //endregion Fields - //region Initialization public ManageMachineJob(SpiritEntity entity) { super(entity); } - //endregion Initialization //region Getter / Setter public DepositOrder getCurrentDepositOrder() { @@ -105,7 +102,7 @@ public IStorageController getStorageController() { return null; if (this.storageController == null) { - this.storageController = (IStorageController) BlockEntityUtil.get(this.entity.level, + this.storageController = (IStorageController) BlockEntityUtil.get(this.entity.level(), this.storageControllerPosition); } @@ -119,7 +116,7 @@ public BlockEntity getManagedMachineBlockEntity() { return null; if (this.managedMachineBlockEntity == null) { - this.managedMachineBlockEntity = BlockEntityUtil.get(this.entity.level, this.managedMachine.insertGlobalPos); + this.managedMachineBlockEntity = BlockEntityUtil.get(this.entity.level(), this.managedMachine.insertGlobalPos); } @@ -131,7 +128,7 @@ public BlockEntity getExtractBlockEntity() { return null; if (this.extractBlockEntity == null) { - this.extractBlockEntity = BlockEntityUtil.get(this.entity.level, this.managedMachine.extractGlobalPos); + this.extractBlockEntity = BlockEntityUtil.get(this.entity.level(), this.managedMachine.extractGlobalPos); } @@ -139,7 +136,6 @@ public BlockEntity getExtractBlockEntity() { } //endregion Getter / Setter - //region Overrides @Override public void onInit() { this.entity.getNavigation().getNodeEvaluator().setCanPassDoors(true); @@ -220,7 +216,6 @@ public void readJobFromNBT(CompoundTag compound) { super.readJobFromNBT(compound); } - //region Methods public void addDepsitOrder(DepositOrder order) { this.depositOrderQueue.add(order); } @@ -236,7 +231,7 @@ protected void registerWithStorageController() { if (storageController != null && this.managedMachine != null) { storageController.addDepositOrderSpirit(this.managedMachine.insertGlobalPos, this.entity.getUUID()); storageController.linkMachine(this.managedMachine); - BlockEntityUtil.updateTile(this.entity.level, this.getStorageControllerPosition().getPos()); + BlockEntityUtil.updateTile(this.entity.level(), this.getStorageControllerPosition().getPos()); } } @@ -247,5 +242,5 @@ protected void unregisterFromStorageController() { storageController.removeDepositOrderSpirit(this.managedMachine.insertGlobalPos); } } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/NightTimeJob.java b/src/main/java/com/klikli_dev/occultism/common/entity/job/NightTimeJob.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/job/NightTimeJob.java rename to src/main/java/com/klikli_dev/occultism/common/entity/job/NightTimeJob.java index 7faca3fe2..15024e521 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/NightTimeJob.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/job/NightTimeJob.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.job; +package com.klikli_dev.occultism.common.entity.job; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; import net.minecraft.network.chat.Component; import net.minecraft.world.level.storage.ServerLevelData; @@ -40,7 +40,7 @@ public long getNewTime() { //nightfall is 13000, 37000, 61000, etc //midnight is 18000 - ServerLevelData level = (ServerLevelData) this.entity.level.getLevelData(); + ServerLevelData level = (ServerLevelData) this.entity.level().getLevelData(); //calculate the time of the next nightfall long newTime = ((level.getDayTime() + 11000) / 24000) * 24000 + 13000; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/RainWeatherJob.java b/src/main/java/com/klikli_dev/occultism/common/entity/job/RainWeatherJob.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/job/RainWeatherJob.java rename to src/main/java/com/klikli_dev/occultism/common/entity/job/RainWeatherJob.java index ab1d7c757..0b3c56308 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/RainWeatherJob.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/job/RainWeatherJob.java @@ -20,25 +20,22 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.job; +package com.klikli_dev.occultism.common.entity.job; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; import net.minecraft.network.chat.Component; import net.minecraft.world.level.storage.ServerLevelData; public class RainWeatherJob extends ChangeWeatherJob { - //region Initialization public RainWeatherJob(SpiritEntity entity, int ticksToClear) { super(entity, ticksToClear); } - //endregion Initialization - //region Overrides public void changeWeather() { if (Occultism.SERVER_CONFIG.rituals.enableRainWeatherRitual.get()) { - ServerLevelData level = (ServerLevelData) this.entity.level.getLevelData(); + ServerLevelData level = (ServerLevelData) this.entity.level().getLevelData(); level.setClearWeatherTime(0); level.setRainTime(6000); level.setThunderTime(6000); @@ -48,5 +45,5 @@ public void changeWeather() { this.entity.getOwner().sendSystemMessage(Component.translatable("ritual.occultism.disabled")); } } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/SpiritJob.java b/src/main/java/com/klikli_dev/occultism/common/entity/job/SpiritJob.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/job/SpiritJob.java rename to src/main/java/com/klikli_dev/occultism/common/entity/job/SpiritJob.java index 6cc581e59..c99d3517d 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/SpiritJob.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/job/SpiritJob.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.job; +package com.klikli_dev.occultism.common.entity.job; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.registry.OccultismMemoryTypes; -import com.github.klikli_dev.occultism.registry.OccultismSpiritJobs; import com.google.common.collect.ImmutableList; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.registry.OccultismMemoryTypes; +import com.klikli_dev.occultism.registry.OccultismSpiritJobs; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EntityDimensions; @@ -77,15 +77,16 @@ public void deserializeNBT(CompoundTag nbt) { /** * Sets up the job, e.g. AI Tasks */ - public final void init(){ + public final void init() { BrainUtils.setMemory(this.entity, OccultismMemoryTypes.WORK_AREA_CENTER.get(), this.entity.getWorkAreaCenter()); BrainUtils.setMemory(this.entity, OccultismMemoryTypes.WORK_AREA_SIZE.get(), this.entity.getWorkAreaSize().getValue()); - BrainUtils.setMemory(this.entity, OccultismMemoryTypes.DEPOSIT_POSITION.get(), this.entity.getDepositPosition().orElse(null)); + BrainUtils.setMemory(this.entity, OccultismMemoryTypes.DEPOSIT_POSITION.get(), this.entity.getDepositPosition().orElse(null)); BrainUtils.setMemory(this.entity, OccultismMemoryTypes.DEPOSIT_FACING.get(), this.entity.getDepositFacing()); this.onInit(); } protected abstract void onInit(); + public List> getSensors() { return ImmutableList.of(); } @@ -98,7 +99,7 @@ public BrainActivityGroup getIdleTasks() { return BrainActivityGroup.empty(); } - public void handleAdditionalBrainSetup(Brain brain) { + public void handleAdditionalBrainSetup(Brain brain) { } @@ -147,7 +148,7 @@ public EntityDimensions getDimensions(Pose pPose, EntityDimensions original) { return original; } - public void onChangeWorkArea(){ + public void onChangeWorkArea() { } } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/SpiritJobFactory.java b/src/main/java/com/klikli_dev/occultism/common/entity/job/SpiritJobFactory.java similarity index 82% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/job/SpiritJobFactory.java rename to src/main/java/com/klikli_dev/occultism/common/entity/job/SpiritJobFactory.java index 1a354483f..3ccedfbdc 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/SpiritJobFactory.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/job/SpiritJobFactory.java @@ -20,30 +20,25 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.job; +package com.klikli_dev.occultism.common.entity.job; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.registry.OccultismSpiritJobs; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.registry.OccultismSpiritJobs; import java.util.function.Function; public class SpiritJobFactory { - //region Fields Function constructor; - //endregion Fields - //region Initialization public SpiritJobFactory(Function constructor) { this.constructor = constructor; } - //endregion Initialization - //region Methods public SpiritJob create(SpiritEntity entity) { SpiritJob job = this.constructor.apply(entity); job.setFactoryId(OccultismSpiritJobs.REGISTRY.get().getKey(this)); return job; } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/ThunderWeatherJob.java b/src/main/java/com/klikli_dev/occultism/common/entity/job/ThunderWeatherJob.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/job/ThunderWeatherJob.java rename to src/main/java/com/klikli_dev/occultism/common/entity/job/ThunderWeatherJob.java index 2000a28a8..8f5f2aad3 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/ThunderWeatherJob.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/job/ThunderWeatherJob.java @@ -20,25 +20,22 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.job; +package com.klikli_dev.occultism.common.entity.job; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; import net.minecraft.network.chat.Component; import net.minecraft.world.level.storage.ServerLevelData; public class ThunderWeatherJob extends ChangeWeatherJob { - //region Initialization public ThunderWeatherJob(SpiritEntity entity, int ticksToClear) { super(entity, ticksToClear); } - //endregion Initialization - //region Overrides public void changeWeather() { if (Occultism.SERVER_CONFIG.rituals.enableThunderWeatherRitual.get()) { - ServerLevelData level = (ServerLevelData) this.entity.level.getLevelData(); + ServerLevelData level = (ServerLevelData) this.entity.level().getLevelData(); level.setClearWeatherTime(0); level.setRainTime(6000); level.setThunderTime(6000); @@ -48,5 +45,5 @@ public void changeWeather() { this.entity.getOwner().sendSystemMessage(Component.translatable("ritual.occultism.disabled")); } } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/TraderJob.java b/src/main/java/com/klikli_dev/occultism/common/entity/job/TraderJob.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/job/TraderJob.java rename to src/main/java/com/klikli_dev/occultism/common/entity/job/TraderJob.java index 5f6555973..004511ecd 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/TraderJob.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/job/TraderJob.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.job; +package com.klikli_dev.occultism.common.entity.job; -import com.github.klikli_dev.occultism.common.entity.ai.goal.PickupItemsGoal; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.crafting.recipe.SpiritTradeRecipe; +import com.klikli_dev.occultism.common.entity.ai.goal.PickupItemsGoal; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.crafting.recipe.SpiritTradeRecipe; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; @@ -41,7 +41,6 @@ public class TraderJob extends SpiritJob { - //region Fields /** * The current ticks in the conversion, will convert once it reaches timeToConvert */ @@ -52,15 +51,11 @@ public class TraderJob extends SpiritJob { protected SpiritTradeRecipe trade; protected int maxTradesPerRound = 4; - //endregion Fields - - //region Initialization public TraderJob(SpiritEntity entity, ResourceLocation recipeId) { super(entity); this.setTradeRecipeId(recipeId); } - //endregion Initialization //region Getter / Setter @@ -82,7 +77,7 @@ public void setTimeToConvert(int timeToConvert) { */ public void setTradeRecipeId(ResourceLocation recipeId) { this.trade = null; - Optional> recipe = this.entity.level.getRecipeManager().byKey(recipeId); + Optional> recipe = this.entity.level().getRecipeManager().byKey(recipeId); recipe.ifPresent(r -> { if (r instanceof SpiritTradeRecipe) this.trade = (SpiritTradeRecipe) r; @@ -99,7 +94,6 @@ public void setMaxTradesPerRound(int trades) { } //endregion Getter / Setter - //region Overrides @Override public void onInit() { this.entity.targetSelector.addGoal(1, this.pickupItemsGoal = new PickupItemsGoal(this.entity)); @@ -114,15 +108,15 @@ public void cleanup() { public void update() { ItemStack handHeld = this.entity.getItemInHand(InteractionHand.MAIN_HAND); if (this.trade != null && this.trade.isValid(handHeld)) { - if (this.entity.level.getGameTime() % 10 == 0) { + if (this.entity.level().getGameTime() % 10 == 0) { //show particle effect while converting Vec3 pos = this.entity.position(); - ((ServerLevel) this.entity.level) - .sendParticles(ParticleTypes.PORTAL, pos.x + this.entity.level.random.nextGaussian() / 3, - pos.y + 0.5, pos.z + this.entity.level.random.nextGaussian() / 3, 1, 0.0, 0.0, 0.0, + ((ServerLevel) this.entity.level()) + .sendParticles(ParticleTypes.PORTAL, pos.x + this.entity.level().random.nextGaussian() / 3, + pos.y + 0.5, pos.z + this.entity.level().random.nextGaussian() / 3, 1, 0.0, 0.0, 0.0, 0.0); } - if (this.entity.level.getGameTime() % 20 == 0) { + if (this.entity.level().getGameTime() % 20 == 0) { this.conversionTimer++; } if (this.conversionTimer >= this.getTimeToConvert()) { @@ -141,7 +135,7 @@ public void update() { this.entity.setItemInHand(InteractionHand.MAIN_HAND, input.get(0)); } - ItemStack converted = this.trade.getResultItem(this.entity.level.registryAccess()).copy(); + ItemStack converted = this.trade.getResultItem(this.entity.level().registryAccess()).copy(); converted.setCount(converted.getCount() * resultCount); if (resultCount > 0) { @@ -181,9 +175,6 @@ public boolean canPickupItem(ItemEntity entity) { ItemStack stack = entity.getItem(); return !stack.isEmpty() && this.trade.isValid(stack); } - //endregion Overrides - - //region Methods /** * Called when a conversion trade was successful. @@ -193,5 +184,5 @@ public boolean canPickupItem(ItemEntity entity) { public void onConvert(int count) { } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/TransportItemsJob.java b/src/main/java/com/klikli_dev/occultism/common/entity/job/TransportItemsJob.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/job/TransportItemsJob.java rename to src/main/java/com/klikli_dev/occultism/common/entity/job/TransportItemsJob.java index a3058fa9b..3b8cc106a 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/job/TransportItemsJob.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/job/TransportItemsJob.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.job; +package com.klikli_dev.occultism.common.entity.job; -import com.github.klikli_dev.occultism.common.container.spirit.SpiritTransporterContainer; -import com.github.klikli_dev.occultism.common.entity.ai.goal.DepositItemsGoal; -import com.github.klikli_dev.occultism.common.entity.ai.goal.ExtractItemsGoal; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.common.container.spirit.SpiritTransporterContainer; +import com.klikli_dev.occultism.common.entity.ai.goal.DepositItemsGoal; +import com.klikli_dev.occultism.common.entity.ai.goal.ExtractItemsGoal; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; import net.minecraft.network.chat.Component; import net.minecraft.world.MenuProvider; import net.minecraft.world.entity.ai.goal.OpenDoorGoal; @@ -37,22 +37,15 @@ import javax.annotation.Nullable; public class TransportItemsJob extends SpiritJob implements MenuProvider { - //region Fields protected DepositItemsGoal depositItemsGoal; protected ExtractItemsGoal extractItemsGoal; protected OpenDoorGoal openDoorGoal; - //endregion Fields - - //region Initialization - public TransportItemsJob(SpiritEntity entity) { super(entity); } - //endregion Initialization - //region Overrides @Override public Component getDisplayName() { return this.entity.getDisplayName(); @@ -81,5 +74,5 @@ public void cleanup() { public AbstractContainerMenu createMenu(int id, Inventory playerInventory, Player player) { return new SpiritTransporterContainer(id, playerInventory, this.entity); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/possessed/PossessedEndermanEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/possessed/PossessedEndermanEntity.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/possessed/PossessedEndermanEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/possessed/PossessedEndermanEntity.java index 3fbdf822c..98a9485f5 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/possessed/PossessedEndermanEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/possessed/PossessedEndermanEntity.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.possessed; +package com.klikli_dev.occultism.common.entity.possessed; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; @@ -28,20 +28,17 @@ import net.minecraft.world.level.Level; public class PossessedEndermanEntity extends EnderMan { - //region Initialization + public PossessedEndermanEntity(EntityType type, Level worldIn) { super(type, worldIn); } - //endregion Initialization //region Static Methods public static AttributeSupplier.Builder createAttributes() { return EnderMan.createAttributes(); } - //endregion Overrides - //region Overrides @Override protected boolean shouldDespawnInPeaceful() { return false; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/possessed/PossessedEndermiteEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/possessed/PossessedEndermiteEntity.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/possessed/PossessedEndermiteEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/possessed/PossessedEndermiteEntity.java index 7c63e44d6..eaf741cac 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/possessed/PossessedEndermiteEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/possessed/PossessedEndermiteEntity.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.possessed; +package com.klikli_dev.occultism.common.entity.possessed; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; @@ -28,20 +28,17 @@ import net.minecraft.world.level.Level; public class PossessedEndermiteEntity extends Endermite { - //region Initialization + public PossessedEndermiteEntity(EntityType type, Level worldIn) { super(type, worldIn); } - //endregion Initialization //region Static Methods public static AttributeSupplier.Builder createAttributes() { return Endermite.createAttributes(); } - //endregion Overrides - //region Overrides @Override protected boolean shouldDespawnInPeaceful() { return false; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/possessed/PossessedGhastEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/possessed/PossessedGhastEntity.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/possessed/PossessedGhastEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/possessed/PossessedGhastEntity.java index c241f78f4..62619f7ef 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/possessed/PossessedGhastEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/possessed/PossessedGhastEntity.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.possessed; +package com.klikli_dev.occultism.common.entity.possessed; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/possessed/PossessedSkeletonEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/possessed/PossessedSkeletonEntity.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/possessed/PossessedSkeletonEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/possessed/PossessedSkeletonEntity.java index 590ffb837..f294ec59c 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/possessed/PossessedSkeletonEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/possessed/PossessedSkeletonEntity.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.possessed; +package com.klikli_dev.occultism.common.entity.possessed; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; @@ -29,12 +29,11 @@ import net.minecraft.world.level.Level; public class PossessedSkeletonEntity extends Skeleton { - //region Initialization + public PossessedSkeletonEntity(EntityType type, Level worldIn) { super(type, worldIn); } - //endregion Initialization //region Static Methods public static AttributeSupplier.Builder createAttributes() { @@ -43,12 +42,10 @@ public static AttributeSupplier.Builder createAttributes() { .add(Attributes.MAX_HEALTH, 30.0); } - //region Overrides @Override protected boolean shouldDespawnInPeaceful() { return false; } - //endregion Overrides @Override protected boolean isSunBurnTick() { diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/AfritEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/AfritEntity.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/AfritEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/spirit/AfritEntity.java index 3f1586bd6..38e8ebe1b 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/AfritEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/AfritEntity.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.spirit; +package com.klikli_dev.occultism.common.entity.spirit; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/AfritWildEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/AfritWildEntity.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/AfritWildEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/spirit/AfritWildEntity.java index 87c0867ad..1ba6f7928 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/AfritWildEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/AfritWildEntity.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.spirit; +package com.klikli_dev.occultism.common.entity.spirit; -import com.github.klikli_dev.occultism.registry.OccultismTags; +import com.klikli_dev.occultism.registry.OccultismTags; import net.minecraft.nbt.CompoundTag; import net.minecraft.tags.DamageTypeTags; import net.minecraft.tags.TagKey; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/DjinniEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/DjinniEntity.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/DjinniEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/spirit/DjinniEntity.java index 7d96b8651..657e810f0 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/DjinniEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/DjinniEntity.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.spirit; +package com.klikli_dev.occultism.common.entity.spirit; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; @@ -29,13 +29,10 @@ public class DjinniEntity extends SpiritEntity { - //region Initialization public DjinniEntity(EntityType type, Level level) { super(type, level); } - //endregion Initialization - //region Static Methods public static AttributeSupplier.Builder createAttributes() { return SpiritEntity.createAttributes() diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/FoliotEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/FoliotEntity.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/FoliotEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/spirit/FoliotEntity.java index e66328bbb..8eb339403 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/FoliotEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/FoliotEntity.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.spirit; +package com.klikli_dev.occultism.common.entity.spirit; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; @@ -29,11 +29,9 @@ public class FoliotEntity extends SpiritEntity { - //region Initialization public FoliotEntity(EntityType type, Level level) { super(type, level); } - //endregion Initialization //region Static Methods public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/ISkinnedCreatureMixin.java b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/ISkinnedCreatureMixin.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/ISkinnedCreatureMixin.java rename to src/main/java/com/klikli_dev/occultism/common/entity/spirit/ISkinnedCreatureMixin.java index 81493a743..cf03ea2c5 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/ISkinnedCreatureMixin.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/ISkinnedCreatureMixin.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.spirit; +package com.klikli_dev.occultism.common.entity.spirit; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; @@ -53,7 +53,6 @@ default int getSkinTypes() { } //endregion Getter / Setter - //region Methods default void writeSkinToNBT(CompoundTag tag) { SynchedEntityData entityData = this.getEntity().getEntityData(); tag.putInt("skin", entityData.get(this.getDataParameterSkin())); @@ -78,5 +77,5 @@ default void selectRandomSkin() { default void registerSkinDataParameter() { this.getEntity().getEntityData().define(this.getDataParameterSkin(), 0); } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/MaridEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/MaridEntity.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/MaridEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/spirit/MaridEntity.java index b6afbaf4f..f8a3a45a5 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/MaridEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/MaridEntity.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.spirit; +package com.klikli_dev.occultism.common.entity.spirit; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.ai.attributes.AttributeSupplier; @@ -29,11 +29,9 @@ public class MaridEntity extends SpiritEntity { - //region Initialization public MaridEntity(EntityType type, Level level) { super(type, level); } - //endregion Initialization //region Static Methods public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/SpiritEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/SpiritEntity.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/SpiritEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/spirit/SpiritEntity.java index 192128ff3..ba322a773 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/SpiritEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/SpiritEntity.java @@ -20,17 +20,17 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.spirit; - -import com.github.klikli_dev.occultism.api.common.data.WorkAreaSize; -import com.github.klikli_dev.occultism.common.container.spirit.SpiritContainer; -import com.github.klikli_dev.occultism.common.entity.job.SpiritJob; -import com.github.klikli_dev.occultism.common.item.spirit.BookOfCallingItem; -import com.github.klikli_dev.occultism.exceptions.ItemHandlerMissingException; -import com.github.klikli_dev.occultism.registry.OccultismMemoryTypes; -import com.github.klikli_dev.occultism.registry.OccultismSounds; +package com.klikli_dev.occultism.common.entity.spirit; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.klikli_dev.occultism.api.common.data.WorkAreaSize; +import com.klikli_dev.occultism.common.container.spirit.SpiritContainer; +import com.klikli_dev.occultism.common.entity.job.SpiritJob; +import com.klikli_dev.occultism.common.item.spirit.BookOfCallingItem; +import com.klikli_dev.occultism.exceptions.ItemHandlerMissingException; +import com.klikli_dev.occultism.registry.OccultismMemoryTypes; +import com.klikli_dev.occultism.registry.OccultismSounds; import com.mojang.serialization.Dynamic; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -177,7 +177,7 @@ protected void customServerAiStep() { } @Override - public void handleAdditionalBrainSetup(SmartBrain brain) { + public void handleAdditionalBrainSetup(SmartBrain brain) { //we might want to init brain vars that come from spirit vars here, but as this happens before entity is in the world, we are missing fallback data such as entity position that some of our spirit vars (work area center) use this.job.ifPresent(job -> job.handleAdditionalBrainSetup(brain)); @@ -204,7 +204,7 @@ public void onSyncedDataUpdated(EntityDataAccessor key) { if (key == FILTER_ITEMS) { //restore filter item handler from data param on client - if (this.level.isClientSide) { + if (this.level().isClientSide) { this.filterItemStackHandler.ifPresent((handler) -> { CompoundTag compound = this.entityData.get(FILTER_ITEMS); if (!compound.isEmpty()) @@ -444,14 +444,14 @@ public AgeableMob getBreedOffspring(ServerLevel serverLevel, AgeableMob ageable) @Override public void aiStep() { - if (!this.level.isClientSide) { + if (!this.level().isClientSide) { if (!this.isInitialized) { this.isInitialized = true; this.init(); } //every 20 ticks = 1 second, age by 1 second - if (this.level.getGameTime() % 20 == 0 && !this.dead && this.canDieFromAge()) { + if (this.level().getGameTime() % 20 == 0 && !this.dead && this.canDieFromAge()) { this.setSpiritAge(this.getSpiritAge() + 1); if (this.getSpiritAge() > this.getSpiritMaxAge()) { this.die(this.damageSources().generic()); @@ -657,18 +657,18 @@ protected void dropEquipment() { @Override public void die(DamageSource cause) { - if (!this.level.isClientSide) { + if (!this.level().isClientSide) { if (this.isTame()) { - BookOfCallingItem.spiritDeathRegister.put(this.uuid, this.level.getGameTime()); + BookOfCallingItem.spiritDeathRegister.put(this.uuid, this.level().getGameTime()); } this.removeJob(); //Death sound and particle effects - ((ServerLevel) this.level) + ((ServerLevel) this.level()) .sendParticles(ParticleTypes.LARGE_SMOKE, this.getX(), this.getY() + 0.5, this.getZ(), 1, 0.0, 0.0, 0.0, 0.0); - this.level.playSound(null, this.blockPosition(), OccultismSounds.START_RITUAL.get(), SoundSource.NEUTRAL, 1, + this.level().playSound(null, this.blockPosition(), OccultismSounds.START_RITUAL.get(), SoundSource.NEUTRAL, 1, 1); } @@ -721,7 +721,7 @@ public boolean canPickupItem(ItemEntity entity) { } public void openScreen(Player playerEntity) { - if (!this.level.isClientSide) { + if (!this.level().isClientSide) { MenuProvider menuProvider = this; SpiritJob currentJob = this.job.orElse(null); diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/WildHuntSkeletonEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/WildHuntSkeletonEntity.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/WildHuntSkeletonEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/spirit/WildHuntSkeletonEntity.java index b4998cb30..e2c927203 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/WildHuntSkeletonEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/WildHuntSkeletonEntity.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.spirit; +package com.klikli_dev.occultism.common.entity.spirit; -import com.github.klikli_dev.occultism.registry.OccultismTags; +import com.klikli_dev.occultism.registry.OccultismTags; import net.minecraft.tags.TagKey; import net.minecraft.util.RandomSource; import net.minecraft.world.DifficultyInstance; @@ -40,7 +40,7 @@ import java.util.Optional; public class WildHuntSkeletonEntity extends Skeleton { - //region Fields + protected Optional master = Optional.empty(); public WildHuntSkeletonEntity(EntityType type, diff --git a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/WildHuntWitherSkeletonEntity.java b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/WildHuntWitherSkeletonEntity.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/WildHuntWitherSkeletonEntity.java rename to src/main/java/com/klikli_dev/occultism/common/entity/spirit/WildHuntWitherSkeletonEntity.java index a6a94cda5..56fa84d48 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/entity/spirit/WildHuntWitherSkeletonEntity.java +++ b/src/main/java/com/klikli_dev/occultism/common/entity/spirit/WildHuntWitherSkeletonEntity.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.entity.spirit; +package com.klikli_dev.occultism.common.entity.spirit; -import com.github.klikli_dev.occultism.registry.OccultismEntities; -import com.github.klikli_dev.occultism.registry.OccultismTags; -import com.github.klikli_dev.occultism.util.TextUtil; +import com.klikli_dev.occultism.registry.OccultismEntities; +import com.klikli_dev.occultism.registry.OccultismTags; +import com.klikli_dev.occultism.util.TextUtil; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.tags.TagKey; @@ -46,16 +46,13 @@ import java.util.List; public class WildHuntWitherSkeletonEntity extends WitherSkeleton { - //region Fields + List minions = new ArrayList<>(); - //endregion Fields - //region Initialization public WildHuntWitherSkeletonEntity(EntityType type, Level worldIn) { super(type, worldIn); } - //endregion Initialization //region Static Methods public static AttributeSupplier.Builder createAttributes() { @@ -64,14 +61,13 @@ public static AttributeSupplier.Builder createAttributes() { .add(Attributes.MAX_HEALTH, 60.0); } - //region Overrides @Override public SpawnGroupData finalizeSpawn(ServerLevelAccessor level, DifficultyInstance difficultyIn, MobSpawnType reason, @Nullable SpawnGroupData spawnDataIn, @Nullable CompoundTag dataTag) { int maxSkeletons = 3 + level.getRandom().nextInt(6); for (int i = 0; i < maxSkeletons; i++) { - WildHuntSkeletonEntity entity = OccultismEntities.WILD_HUNT_SKELETON.get().create(this.level); + WildHuntSkeletonEntity entity = OccultismEntities.WILD_HUNT_SKELETON.get().create(this.level()); ForgeEventFactory.onFinalizeSpawn(entity, level, difficultyIn, reason, spawnDataIn, dataTag); @@ -112,7 +108,6 @@ public boolean isInvulnerableTo(DamageSource source) { return super.isInvulnerableTo(source); } - //endregion Overrides @Override public boolean isInvulnerable() { @@ -120,9 +115,8 @@ public boolean isInvulnerable() { } //endregion Static Methods - //region Methods public void notifyMinionDeath(WildHuntSkeletonEntity minion) { this.minions.remove(minion); } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/DummyTooltipItem.java b/src/main/java/com/klikli_dev/occultism/common/item/DummyTooltipItem.java similarity index 86% rename from src/main/java/com/github/klikli_dev/occultism/common/item/DummyTooltipItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/DummyTooltipItem.java index d1f67d19a..4a7882d6f 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/DummyTooltipItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/DummyTooltipItem.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item; +package com.klikli_dev.occultism.common.item; -import com.github.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; -import com.github.klikli_dev.occultism.registry.OccultismRecipes; +import com.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.registry.OccultismRecipes; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; @@ -41,14 +41,10 @@ */ public class DummyTooltipItem extends Item { - //region Initialization - public DummyTooltipItem(Properties properties) { super(properties); } - //endregion Initialization - public void performRitual(Level level, BlockPos pos, GoldenSacrificialBowlBlockEntity blockEntity, Player player, ItemStack activationItem) { Optional ritualRecipe = level.getRecipeManager().getAllRecipesFor(OccultismRecipes.RITUAL_TYPE.get()) @@ -57,11 +53,10 @@ public void performRitual(Level level, BlockPos pos, GoldenSacrificialBowlBlockE ritualRecipe.ifPresent(r -> r.getRitual().finish(level, pos, blockEntity, player, activationItem)); } - //region Overrides @Override public void appendHoverText(ItemStack stack, Level worldIn, List tooltip, TooltipFlag flagIn) { super.appendHoverText(stack, worldIn, tooltip, flagIn); tooltip.add(Component.translatable(stack.getDescriptionId() + ".tooltip")); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/armor/OtherworldGogglesItem.java b/src/main/java/com/klikli_dev/occultism/common/item/armor/OtherworldGogglesItem.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/common/item/armor/OtherworldGogglesItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/armor/OtherworldGogglesItem.java index cd461fe92..130604314 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/armor/OtherworldGogglesItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/armor/OtherworldGogglesItem.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.armor; +package com.klikli_dev.occultism.common.item.armor; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.registry.OccultismTags; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.registry.OccultismTags; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.ArmorItem; @@ -44,6 +44,12 @@ public OtherworldGogglesItem(ArmorMaterial materialIn, super(materialIn, type, builder); } + public static boolean isGogglesItem(ItemStack stack) { + return stack.getItem() instanceof OtherworldGogglesItem || + stack.is(OccultismTags.OTHERWORLD_GOGGLES) || + (stack.hasTag() && stack.getTag().getBoolean(NBT_GOGGLES)); + } + @Override public boolean isValidRepairItem(ItemStack pToRepair, ItemStack pRepair) { return false; @@ -54,10 +60,4 @@ public boolean isValidRepairItem(ItemStack pToRepair, ItemStack pRepair) { public String getArmorTexture(ItemStack stack, Entity entity, EquipmentSlot slot, String type) { return TEXTURE; } - - public static boolean isGogglesItem(ItemStack stack) { - return stack.getItem() instanceof OtherworldGogglesItem || - stack.is(OccultismTags.OTHERWORLD_GOGGLES) || - (stack.hasTag() && stack.getTag().getBoolean(NBT_GOGGLES)); - } } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/debug/DebugWandItem.java b/src/main/java/com/klikli_dev/occultism/common/item/debug/DebugWandItem.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/common/item/debug/DebugWandItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/debug/DebugWandItem.java index 02ae9b431..a7e801e81 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/debug/DebugWandItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/debug/DebugWandItem.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.debug; +package com.klikli_dev.occultism.common.item.debug; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; @@ -34,13 +34,10 @@ public class DebugWandItem extends Item { - //region Initialization public DebugWandItem(Properties properties) { super(properties); } - //endregion Initialization - //region Overrides @Override public InteractionResult useOn(UseOnContext context) { @@ -88,5 +85,5 @@ public InteractionResult interactLivingEntity(ItemStack stack, Player player, Li return InteractionResult.SUCCESS; } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonDjinniManageMachineItem.java b/src/main/java/com/klikli_dev/occultism/common/item/debug/SummonDjinniManageMachineItem.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonDjinniManageMachineItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/debug/SummonDjinniManageMachineItem.java index 36d935641..45938e210 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonDjinniManageMachineItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/debug/SummonDjinniManageMachineItem.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.debug; +package com.klikli_dev.occultism.common.item.debug; -import com.github.klikli_dev.occultism.common.entity.job.SpiritJob; -import com.github.klikli_dev.occultism.common.entity.spirit.DjinniEntity; -import com.github.klikli_dev.occultism.registry.OccultismEntities; -import com.github.klikli_dev.occultism.registry.OccultismSpiritJobs; +import com.klikli_dev.occultism.common.entity.job.SpiritJob; +import com.klikli_dev.occultism.common.entity.spirit.DjinniEntity; +import com.klikli_dev.occultism.registry.OccultismEntities; +import com.klikli_dev.occultism.registry.OccultismSpiritJobs; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; @@ -38,20 +38,17 @@ public class SummonDjinniManageMachineItem extends Item { - //region Initialization public SummonDjinniManageMachineItem(Properties properties) { super(properties); } - //endregion Initialization - //region Overrides @Override public InteractionResult useOn(UseOnContext context) { if (!context.getLevel().isClientSide) { DjinniEntity spirit = OccultismEntities.DJINNI.get().create(context.getLevel()); - ForgeEventFactory.onFinalizeSpawn(spirit, (ServerLevel) context.getLevel(), context.getLevel().getCurrentDifficultyAt(context.getClickedPos()), MobSpawnType.SPAWN_EGG, null, null); + ForgeEventFactory.onFinalizeSpawn(spirit, (ServerLevel) context.getLevel(), context.getLevel().getCurrentDifficultyAt(context.getClickedPos()), MobSpawnType.SPAWN_EGG, null, null); spirit.tame(context.getPlayer()); spirit.setPos(context.getClickedPos().getX(), context.getClickedPos().getY() + 1.0f, context.getClickedPos().getZ()); @@ -71,5 +68,4 @@ public InteractionResult useOn(UseOnContext context) { return InteractionResult.SUCCESS; } - //endregion Overrides } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonDjinniTest.java b/src/main/java/com/klikli_dev/occultism/common/item/debug/SummonDjinniTest.java similarity index 84% rename from src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonDjinniTest.java rename to src/main/java/com/klikli_dev/occultism/common/item/debug/SummonDjinniTest.java index 646b79c84..9b7d73b54 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonDjinniTest.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/debug/SummonDjinniTest.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.debug; +package com.klikli_dev.occultism.common.item.debug; -import com.github.klikli_dev.occultism.common.entity.job.SpiritJob; -import com.github.klikli_dev.occultism.common.entity.spirit.DjinniEntity; -import com.github.klikli_dev.occultism.registry.OccultismEntities; -import com.github.klikli_dev.occultism.registry.OccultismSpiritJobs; +import com.klikli_dev.occultism.common.entity.job.SpiritJob; +import com.klikli_dev.occultism.common.entity.spirit.DjinniEntity; +import com.klikli_dev.occultism.registry.OccultismEntities; +import com.klikli_dev.occultism.registry.OccultismSpiritJobs; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; @@ -38,20 +38,17 @@ public class SummonDjinniTest extends Item { - //region Initialization public SummonDjinniTest(Properties properties) { super(properties); } - //endregion Initialization - //region Overrides @Override public InteractionResult useOn(UseOnContext context) { if (!context.getLevel().isClientSide) { DjinniEntity spirit = OccultismEntities.DJINNI.get().create(context.getLevel()); - ForgeEventFactory.onFinalizeSpawn(spirit, (ServerLevel) context.getLevel(), context.getLevel().getCurrentDifficultyAt(context.getClickedPos()), MobSpawnType.SPAWN_EGG, null, null); + ForgeEventFactory.onFinalizeSpawn(spirit, (ServerLevel) context.getLevel(), context.getLevel().getCurrentDifficultyAt(context.getClickedPos()), MobSpawnType.SPAWN_EGG, null, null); spirit.tame(context.getPlayer()); spirit.setPos(context.getClickedPos().getX(), context.getClickedPos().getY() + 1.0f, context.getClickedPos().getZ()); @@ -72,5 +69,4 @@ public InteractionResult useOn(UseOnContext context) { return InteractionResult.SUCCESS; } - //endregion Overrides } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonFoliotCleanerItem.java b/src/main/java/com/klikli_dev/occultism/common/item/debug/SummonFoliotCleanerItem.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonFoliotCleanerItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/debug/SummonFoliotCleanerItem.java index 30013140b..b1511327c 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonFoliotCleanerItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/debug/SummonFoliotCleanerItem.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.debug; +package com.klikli_dev.occultism.common.item.debug; -import com.github.klikli_dev.occultism.common.entity.job.SpiritJob; -import com.github.klikli_dev.occultism.common.entity.spirit.FoliotEntity; -import com.github.klikli_dev.occultism.registry.OccultismEntities; -import com.github.klikli_dev.occultism.registry.OccultismSpiritJobs; +import com.klikli_dev.occultism.common.entity.job.SpiritJob; +import com.klikli_dev.occultism.common.entity.spirit.FoliotEntity; +import com.klikli_dev.occultism.registry.OccultismEntities; +import com.klikli_dev.occultism.registry.OccultismSpiritJobs; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; @@ -38,19 +38,16 @@ public class SummonFoliotCleanerItem extends Item { - //region Initialization public SummonFoliotCleanerItem(Properties properties) { super(properties); } - //endregion Initialization - //region Overrides @Override public InteractionResult useOn(UseOnContext context) { if (!context.getLevel().isClientSide) { FoliotEntity spirit = OccultismEntities.FOLIOT.get().create(context.getLevel()); - ForgeEventFactory.onFinalizeSpawn(spirit, (ServerLevel) context.getLevel(), context.getLevel().getCurrentDifficultyAt(context.getClickedPos()), MobSpawnType.SPAWN_EGG, null, null); + ForgeEventFactory.onFinalizeSpawn(spirit, (ServerLevel) context.getLevel(), context.getLevel().getCurrentDifficultyAt(context.getClickedPos()), MobSpawnType.SPAWN_EGG, null, null); spirit.tame(context.getPlayer()); spirit.setPos(context.getClickedPos().getX(), context.getClickedPos().getY() + 1.0f, context.getClickedPos().getZ()); @@ -70,5 +67,4 @@ public InteractionResult useOn(UseOnContext context) { return InteractionResult.SUCCESS; } - //endregion Overrides } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonFoliotLumberjackItem.java b/src/main/java/com/klikli_dev/occultism/common/item/debug/SummonFoliotLumberjackItem.java similarity index 84% rename from src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonFoliotLumberjackItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/debug/SummonFoliotLumberjackItem.java index 1c2f68dc3..d0f7c5016 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonFoliotLumberjackItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/debug/SummonFoliotLumberjackItem.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.debug; +package com.klikli_dev.occultism.common.item.debug; -import com.github.klikli_dev.occultism.common.entity.job.SpiritJob; -import com.github.klikli_dev.occultism.common.entity.spirit.FoliotEntity; -import com.github.klikli_dev.occultism.registry.OccultismEntities; -import com.github.klikli_dev.occultism.registry.OccultismSpiritJobs; +import com.klikli_dev.occultism.common.entity.job.SpiritJob; +import com.klikli_dev.occultism.common.entity.spirit.FoliotEntity; +import com.klikli_dev.occultism.registry.OccultismEntities; +import com.klikli_dev.occultism.registry.OccultismSpiritJobs; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; @@ -38,19 +38,16 @@ public class SummonFoliotLumberjackItem extends Item { - //region Initialization public SummonFoliotLumberjackItem(Properties properties) { super(properties); } - //endregion Initialization - //region Overrides @Override public InteractionResult useOn(UseOnContext context) { if (!context.getLevel().isClientSide) { FoliotEntity spirit = OccultismEntities.FOLIOT.get().create(context.getLevel()); - ForgeEventFactory.onFinalizeSpawn(spirit, (ServerLevel) context.getLevel(), context.getLevel().getCurrentDifficultyAt(context.getClickedPos()), MobSpawnType.SPAWN_EGG, null, null); + ForgeEventFactory.onFinalizeSpawn(spirit, (ServerLevel) context.getLevel(), context.getLevel().getCurrentDifficultyAt(context.getClickedPos()), MobSpawnType.SPAWN_EGG, null, null); spirit.tame(context.getPlayer()); spirit.setPos(context.getClickedPos().getX(), context.getClickedPos().getY() + 1.0f, context.getClickedPos().getZ()); @@ -70,5 +67,4 @@ public InteractionResult useOn(UseOnContext context) { return InteractionResult.SUCCESS; } - //endregion Overrides } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonFoliotTraderItem.java b/src/main/java/com/klikli_dev/occultism/common/item/debug/SummonFoliotTraderItem.java similarity index 81% rename from src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonFoliotTraderItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/debug/SummonFoliotTraderItem.java index 22a2ca61f..9b52db062 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonFoliotTraderItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/debug/SummonFoliotTraderItem.java @@ -20,12 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.debug; +package com.klikli_dev.occultism.common.item.debug; -import com.github.klikli_dev.occultism.common.entity.job.TraderJob; -import com.github.klikli_dev.occultism.common.entity.spirit.FoliotEntity; -import com.github.klikli_dev.occultism.registry.OccultismEntities; -import com.github.klikli_dev.occultism.registry.OccultismSpiritJobs; +import com.klikli_dev.occultism.common.entity.job.TraderJob; +import com.klikli_dev.occultism.common.entity.spirit.FoliotEntity; +import com.klikli_dev.occultism.registry.OccultismEntities; +import com.klikli_dev.occultism.registry.OccultismSpiritJobs; +import com.klikli_dev.occultism.util.StaticUtil; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; @@ -36,23 +37,18 @@ import net.minecraft.world.item.context.UseOnContext; import net.minecraftforge.event.ForgeEventFactory; -import static com.github.klikli_dev.occultism.util.StaticUtil.modLoc; - public class SummonFoliotTraderItem extends Item { - //region Initialization public SummonFoliotTraderItem(Properties properties) { super(properties); } - //endregion Initialization - //region Overrides @Override public InteractionResult useOn(UseOnContext context) { if (!context.getLevel().isClientSide) { FoliotEntity spirit = OccultismEntities.FOLIOT.get().create(context.getLevel()); - ForgeEventFactory.onFinalizeSpawn(spirit, (ServerLevel) context.getLevel(), context.getLevel().getCurrentDifficultyAt(context.getClickedPos()), MobSpawnType.SPAWN_EGG, null, null); + ForgeEventFactory.onFinalizeSpawn(spirit, (ServerLevel) context.getLevel(), context.getLevel().getCurrentDifficultyAt(context.getClickedPos()), MobSpawnType.SPAWN_EGG, null, null); spirit.tame(context.getPlayer()); spirit.setPos(context.getClickedPos().getX(), context.getClickedPos().getY() + 1.0f, context.getClickedPos().getZ()); @@ -61,7 +57,7 @@ public InteractionResult useOn(UseOnContext context) { //set up the job TraderJob trader = (TraderJob) OccultismSpiritJobs.TRADE_OTHERSTONE_T1.get().create(spirit); trader.init(); - trader.setTradeRecipeId(modLoc("spirit_trade/test")); + trader.setTradeRecipeId(StaticUtil.modLoc("spirit_trade/test")); spirit.setJob(trader); //notify players nearby and spawn @@ -73,5 +69,4 @@ public InteractionResult useOn(UseOnContext context) { return InteractionResult.SUCCESS; } - //endregion Overrides } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonFoliotTransportItemsItem.java b/src/main/java/com/klikli_dev/occultism/common/item/debug/SummonFoliotTransportItemsItem.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonFoliotTransportItemsItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/debug/SummonFoliotTransportItemsItem.java index 7d2947286..d972d803d 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/debug/SummonFoliotTransportItemsItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/debug/SummonFoliotTransportItemsItem.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.debug; +package com.klikli_dev.occultism.common.item.debug; -import com.github.klikli_dev.occultism.common.entity.job.SpiritJob; -import com.github.klikli_dev.occultism.common.entity.spirit.FoliotEntity; -import com.github.klikli_dev.occultism.registry.OccultismEntities; -import com.github.klikli_dev.occultism.registry.OccultismSpiritJobs; +import com.klikli_dev.occultism.common.entity.job.SpiritJob; +import com.klikli_dev.occultism.common.entity.spirit.FoliotEntity; +import com.klikli_dev.occultism.registry.OccultismEntities; +import com.klikli_dev.occultism.registry.OccultismSpiritJobs; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; @@ -38,19 +38,16 @@ public class SummonFoliotTransportItemsItem extends Item { - //region Initialization public SummonFoliotTransportItemsItem(Properties properties) { super(properties); } - //endregion Initialization - //region Overrides @Override public InteractionResult useOn(UseOnContext context) { if (!context.getLevel().isClientSide) { FoliotEntity spirit = OccultismEntities.FOLIOT.get().create(context.getLevel()); - ForgeEventFactory.onFinalizeSpawn(spirit, (ServerLevel) context.getLevel(), context.getLevel().getCurrentDifficultyAt(context.getClickedPos()), MobSpawnType.SPAWN_EGG, null, null); + ForgeEventFactory.onFinalizeSpawn(spirit, (ServerLevel) context.getLevel(), context.getLevel().getCurrentDifficultyAt(context.getClickedPos()), MobSpawnType.SPAWN_EGG, null, null); spirit.tame(context.getPlayer()); spirit.setPos(context.getClickedPos().getX(), context.getClickedPos().getY() + 1.0f, context.getClickedPos().getZ()); @@ -70,5 +67,4 @@ public InteractionResult useOn(UseOnContext context) { return InteractionResult.SUCCESS; } - //endregion Overrides } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/otherworld/OtherworldBlockItem.java b/src/main/java/com/klikli_dev/occultism/common/item/otherworld/OtherworldBlockItem.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/common/item/otherworld/OtherworldBlockItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/otherworld/OtherworldBlockItem.java index 34b450ca3..c92931580 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/otherworld/OtherworldBlockItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/otherworld/OtherworldBlockItem.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.otherworld; +package com.klikli_dev.occultism.common.item.otherworld; -import com.github.klikli_dev.occultism.util.OtherworldUtil; +import com.klikli_dev.occultism.util.OtherworldUtil; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; @@ -33,13 +33,10 @@ * Allows to show different textures and translation keys for HWYLA and in the inventory */ public class OtherworldBlockItem extends BlockItem { - //region Initialization + public OtherworldBlockItem(Block blockIn, Properties builder) { super(blockIn, builder); } - //endregion Initialization - - //region Overrides /** * Make getDefaultTranslationKey public for use in OtherworldUtil @@ -59,5 +56,5 @@ public void inventoryTick(ItemStack stack, Level worldIn, Entity entityIn, int i super.inventoryTick(stack, worldIn, entityIn, itemSlot, isSelected); stack.getOrCreateTag().putBoolean("isInventoryItem", true); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfBindingBoundItem.java b/src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfBindingBoundItem.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfBindingBoundItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfBindingBoundItem.java index 9eeaad950..232b5462f 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfBindingBoundItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfBindingBoundItem.java @@ -20,17 +20,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.spirit; +package com.klikli_dev.occultism.common.item.spirit; -import com.github.klikli_dev.occultism.util.ItemNBTUtil; -import com.github.klikli_dev.occultism.util.TextUtil; +import com.klikli_dev.occultism.util.ItemNBTUtil; +import com.klikli_dev.occultism.util.TextUtil; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.level.Level; import javax.annotation.Nullable; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfBindingItem.java b/src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfBindingItem.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfBindingItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfBindingItem.java index 56de42ff8..e61aedd07 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfBindingItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfBindingItem.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.spirit; +package com.klikli_dev.occultism.common.item.spirit; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; @@ -33,13 +33,9 @@ public class BookOfBindingItem extends Item { - //region Initialization public BookOfBindingItem(Properties properties) { super(properties); } - //endregion Initialization - - //region Overrides @Override public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List tooltip, @@ -48,5 +44,4 @@ public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List spirit.getJob().orElse(null) instanceof CleanerJob); } - //endregion Initialization - //region Overrides @Override public IItemModeSubset getItemModeSubset(ItemStack stack) { ItemModeSubset subset = ItemModeSubset.get(ItemMode.get(this.getItemMode(stack))); return subset != null ? subset : ItemModeSubset.SET_BASE; } - //endregion Overrides public enum ItemModeSubset implements IItemModeSubset { SET_BASE(ItemMode.SET_BASE), SET_DEPOSIT(ItemMode.SET_DEPOSIT); - //region Fields private static final Map lookup = new HashMap<>(); static { @@ -57,25 +53,20 @@ public enum ItemModeSubset implements IItemModeSubset { } private final ItemMode itemMode; - //endregion Fields - //region Initialization ItemModeSubset(ItemMode itemMode) { this.itemMode = itemMode; } - //endregion Initialization //region Static Methods public static ItemModeSubset get(ItemMode value) { return lookup.get(value); } - //region Overrides @Override public ItemMode getItemMode() { return this.itemMode; } - //endregion Overrides @Override public ItemModeSubset next() { diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfCallingItem.java b/src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfCallingItem.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfCallingItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfCallingItem.java index 6c9e43dd8..5bf28f02a 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfCallingItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfCallingItem.java @@ -20,22 +20,22 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.spirit; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.TranslationKeys; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.data.GlobalBlockPos; -import com.github.klikli_dev.occultism.api.common.data.MachineReference; -import com.github.klikli_dev.occultism.api.common.data.WorkAreaSize; -import com.github.klikli_dev.occultism.api.common.item.IHandleItemMode; -import com.github.klikli_dev.occultism.client.gui.GuiHelper; -import com.github.klikli_dev.occultism.common.entity.job.ManageMachineJob; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.util.BlockEntityUtil; -import com.github.klikli_dev.occultism.util.EntityUtil; -import com.github.klikli_dev.occultism.util.ItemNBTUtil; -import com.github.klikli_dev.occultism.util.TextUtil; +package com.klikli_dev.occultism.common.item.spirit; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.TranslationKeys; +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.data.GlobalBlockPos; +import com.klikli_dev.occultism.api.common.data.MachineReference; +import com.klikli_dev.occultism.api.common.data.WorkAreaSize; +import com.klikli_dev.occultism.api.common.item.IHandleItemMode; +import com.klikli_dev.occultism.client.gui.GuiHelper; +import com.klikli_dev.occultism.common.entity.job.ManageMachineJob; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.util.BlockEntityUtil; +import com.klikli_dev.occultism.util.EntityUtil; +import com.klikli_dev.occultism.util.ItemNBTUtil; +import com.klikli_dev.occultism.util.TextUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -61,19 +61,15 @@ public class BookOfCallingItem extends Item implements IHandleItemMode { - //region Fields public static Map spiritDeathRegister = new HashMap<>(); public String translationKeyBase; public Predicate targetSpirit; - //endregion Fields - //region Initialization public BookOfCallingItem(Properties properties, String translationKeyBase, Predicate targetSpirit) { super(properties); this.translationKeyBase = translationKeyBase; this.targetSpirit = targetSpirit; } - //endregion Initialization //region Getter / Setter @@ -85,7 +81,6 @@ public String getTranslationKeyBase() { } //endregion Getter / Setter - //region Overrides @Override public int getItemMode(ItemStack stack) { @@ -168,7 +163,7 @@ public InteractionResult useOn(UseOnContext context) { @Override public InteractionResult interactLivingEntity(ItemStack stack, Player player, LivingEntity target, InteractionHand hand) { - if (target.level.isClientSide) + if (target.level().isClientSide) return InteractionResult.PASS; //Ignore anything that is not a spirit @@ -197,7 +192,7 @@ public InteractionResult interactLivingEntity(ItemStack stack, Player player, Li if (targetSpirit.getCapability(ForgeCapabilities.ITEM_HANDLER).isPresent()) { UUID boundSpiritId = ItemNBTUtil.getSpiritEntityUUID(stack); if (boundSpiritId != null) { - Optional boundSpirit = EntityUtil.getEntityByUuiDGlobal(target.level.getServer(), boundSpiritId) + Optional boundSpirit = EntityUtil.getEntityByUuiDGlobal(target.level().getServer(), boundSpiritId) .map(e -> (SpiritEntity) e); if (boundSpirit.isPresent()) { @@ -303,9 +298,7 @@ public boolean isFoil(ItemStack stack) { public Rarity getRarity(ItemStack stack) { return ItemNBTUtil.getSpiritEntityUUID(stack) != null ? Rarity.RARE : Rarity.COMMON; } - //endregion Overrides - //region Methods public IItemModeSubset getItemModeSubset(ItemStack stack) { return ItemMode.get(this.getItemMode(stack)); } @@ -595,8 +588,6 @@ public InteractionResult handleItemMode(Player player, Level world, BlockPos pos return InteractionResult.PASS; } - //endregion Methods - public enum ItemMode implements IItemModeSubset { SET_DEPOSIT(0, "set_deposit"), @@ -605,7 +596,6 @@ public enum ItemMode implements IItemModeSubset { SET_STORAGE_CONTROLLER(3, "set_storage_controller"), SET_MANAGED_MACHINE(4, "set_managed_machine"); - //region Fields private static final Map lookup = new HashMap(); private static final String TRANSLATION_KEY_BASE = "enum." + Occultism.MODID + ".book_of_calling.item_mode"; @@ -618,14 +608,11 @@ public enum ItemMode implements IItemModeSubset { private final int value; private final String translationKey; - //endregion Fields - //region Initialization ItemMode(int value, String translationKey) { this.value = value; this.translationKey = TRANSLATION_KEY_BASE + "." + translationKey; } - //endregion Initialization //region Static Methods public static ItemMode get(int value) { @@ -642,23 +629,20 @@ public String getDescriptionId() { return this.translationKey; } - //region Overrides @Override public ItemMode getItemMode() { return this; } - //endregion Overrides public ItemMode next() { return values()[(this.ordinal() + 1) % values().length]; } //endregion Static Methods - //region Methods public boolean equals(int value) { return this.value == value; } - //endregion Methods + } public interface IItemModeSubset> { @@ -666,8 +650,7 @@ public interface IItemModeSubset> { ItemMode getItemMode(); //endregion Getter / Setter - //region Methods T next(); - //endregion Methods + } } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfCallingLumberjackItem.java b/src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfCallingLumberjackItem.java similarity index 86% rename from src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfCallingLumberjackItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfCallingLumberjackItem.java index dbad90494..0ab0ff604 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfCallingLumberjackItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfCallingLumberjackItem.java @@ -20,34 +20,30 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.spirit; +package com.klikli_dev.occultism.common.item.spirit; -import com.github.klikli_dev.occultism.common.entity.job.LumberjackJob; +import com.klikli_dev.occultism.common.entity.job.LumberjackJob; import net.minecraft.world.item.ItemStack; import java.util.HashMap; import java.util.Map; public class BookOfCallingLumberjackItem extends BookOfCallingItem { - //region Initialization + public BookOfCallingLumberjackItem(Properties properties, String translationKeyBase) { super(properties, translationKeyBase, spirit -> spirit.getJob().orElse(null) instanceof LumberjackJob); } - //endregion Initialization - //region Overrides @Override public IItemModeSubset getItemModeSubset(ItemStack stack) { ItemModeSubset subset = ItemModeSubset.get(ItemMode.get(this.getItemMode(stack))); return subset != null ? subset : ItemModeSubset.SET_BASE; } - //endregion Overrides public enum ItemModeSubset implements IItemModeSubset { SET_BASE(ItemMode.SET_BASE), SET_DEPOSIT(ItemMode.SET_DEPOSIT); - //region Fields private static final Map lookup = new HashMap<>(); static { @@ -57,25 +53,20 @@ public enum ItemModeSubset implements IItemModeSubset { } private final ItemMode itemMode; - //endregion Fields - //region Initialization ItemModeSubset(ItemMode itemMode) { this.itemMode = itemMode; } - //endregion Initialization //region Static Methods public static ItemModeSubset get(ItemMode value) { return lookup.get(value); } - //region Overrides @Override public ItemMode getItemMode() { return this.itemMode; } - //endregion Overrides @Override public ItemModeSubset next() { diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfCallingManageMachineItem.java b/src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfCallingManageMachineItem.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfCallingManageMachineItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfCallingManageMachineItem.java index ee64b4ee8..56044f126 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfCallingManageMachineItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfCallingManageMachineItem.java @@ -20,35 +20,31 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.spirit; +package com.klikli_dev.occultism.common.item.spirit; -import com.github.klikli_dev.occultism.common.entity.job.ManageMachineJob; +import com.klikli_dev.occultism.common.entity.job.ManageMachineJob; import net.minecraft.world.item.ItemStack; import java.util.HashMap; import java.util.Map; public class BookOfCallingManageMachineItem extends BookOfCallingItem { - //region Initialization + public BookOfCallingManageMachineItem(Properties properties, String translationKeyBase) { super(properties, translationKeyBase, spirit -> spirit.getJob().orElse(null) instanceof ManageMachineJob); } - //endregion Initialization - //region Overrides @Override public IItemModeSubset getItemModeSubset(ItemStack stack) { ItemModeSubset subset = ItemModeSubset.get(ItemMode.get(this.getItemMode(stack))); return subset != null ? subset : ItemModeSubset.SET_STORAGE_CONTROLLER; } - //endregion Overrides public enum ItemModeSubset implements IItemModeSubset { SET_MANAGED_MACHINE(ItemMode.SET_MANAGED_MACHINE), SET_EXTRACT(ItemMode.SET_EXTRACT), SET_STORAGE_CONTROLLER(ItemMode.SET_STORAGE_CONTROLLER); - //region Fields private static final Map lookup = new HashMap<>(); static { @@ -58,25 +54,20 @@ public enum ItemModeSubset implements IItemModeSubset { } private final ItemMode itemMode; - //endregion Fields - //region Initialization ItemModeSubset(ItemMode itemMode) { this.itemMode = itemMode; } - //endregion Initialization //region Static Methods public static ItemModeSubset get(ItemMode value) { return lookup.get(value); } - //region Overrides @Override public ItemMode getItemMode() { return this.itemMode; } - //endregion Overrides @Override public ItemModeSubset next() { diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfCallingTransportItems.java b/src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfCallingTransportItems.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfCallingTransportItems.java rename to src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfCallingTransportItems.java index 987b7bc7f..c92ef2126 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/spirit/BookOfCallingTransportItems.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/spirit/BookOfCallingTransportItems.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.spirit; +package com.klikli_dev.occultism.common.item.spirit; -import com.github.klikli_dev.occultism.common.entity.job.TransportItemsJob; -import com.github.klikli_dev.occultism.util.ItemNBTUtil; -import com.github.klikli_dev.occultism.util.TextUtil; +import com.klikli_dev.occultism.common.entity.job.TransportItemsJob; +import com.klikli_dev.occultism.util.ItemNBTUtil; +import com.klikli_dev.occultism.util.TextUtil; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; @@ -37,13 +37,11 @@ import java.util.Map; public class BookOfCallingTransportItems extends BookOfCallingItem { - //region Initialization + public BookOfCallingTransportItems(Properties properties, String translationKeyBase) { super(properties, translationKeyBase, spirit -> spirit.getJob().orElse(null) instanceof TransportItemsJob); } - //endregion Initialization - //region Overrides @Override public IItemModeSubset getItemModeSubset(ItemStack stack) { ItemModeSubset subset = ItemModeSubset.get(ItemMode.get(this.getItemMode(stack))); @@ -68,13 +66,11 @@ public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List { SET_EXTRACT(ItemMode.SET_EXTRACT), SET_DEPOSIT(ItemMode.SET_DEPOSIT); - //region Fields private static final Map lookup = new HashMap<>(); static { @@ -84,25 +80,20 @@ public enum ItemModeSubset implements IItemModeSubset { } private final ItemMode itemMode; - //endregion Fields - //region Initialization ItemModeSubset(ItemMode itemMode) { this.itemMode = itemMode; } - //endregion Initialization //region Static Methods public static ItemModeSubset get(ItemMode value) { return lookup.get(value); } - //region Overrides @Override public ItemMode getItemMode() { return this.itemMode; } - //endregion Overrides @Override public ItemModeSubset next() { diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/spirit/MinerSpiritItem.java b/src/main/java/com/klikli_dev/occultism/common/item/spirit/MinerSpiritItem.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/common/item/spirit/MinerSpiritItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/spirit/MinerSpiritItem.java index 21d1fc37e..343fb923c 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/spirit/MinerSpiritItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/spirit/MinerSpiritItem.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.spirit; +package com.klikli_dev.occultism.common.item.spirit; -import com.github.klikli_dev.occultism.common.blockentity.DimensionalMineshaftBlockEntity; -import com.github.klikli_dev.occultism.util.ItemNBTUtil; -import com.github.klikli_dev.occultism.util.TextUtil; +import com.klikli_dev.occultism.common.blockentity.DimensionalMineshaftBlockEntity; +import com.klikli_dev.occultism.util.ItemNBTUtil; +import com.klikli_dev.occultism.util.TextUtil; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/spirit/SpiritHealingItem.java b/src/main/java/com/klikli_dev/occultism/common/item/spirit/SpiritHealingItem.java similarity index 83% rename from src/main/java/com/github/klikli_dev/occultism/common/item/spirit/SpiritHealingItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/spirit/SpiritHealingItem.java index d79f6950b..259ff32d8 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/spirit/SpiritHealingItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/spirit/SpiritHealingItem.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.spirit; +package com.klikli_dev.occultism.common.item.spirit; -import com.github.klikli_dev.occultism.registry.OccultismTags; +import com.klikli_dev.occultism.registry.OccultismTags; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.LivingEntity; @@ -37,10 +37,10 @@ public SpiritHealingItem(Properties pProperties) { @Override public InteractionResult interactLivingEntity(ItemStack pStack, Player pPlayer, LivingEntity pInteractionTarget, InteractionHand pUsedHand) { - if(pInteractionTarget.getType().is(OccultismTags.HEALED_BY_DEMONS_DREAM_FRUIT) && pInteractionTarget.getHealth() < pInteractionTarget.getMaxHealth()){ + if (pInteractionTarget.getType().is(OccultismTags.HEALED_BY_DEMONS_DREAM_FRUIT) && pInteractionTarget.getHealth() < pInteractionTarget.getMaxHealth()) { pInteractionTarget.heal(2); pStack.shrink(1); - return InteractionResult.sidedSuccess(pPlayer.level.isClientSide); + return InteractionResult.sidedSuccess(pPlayer.level().isClientSide); } return super.interactLivingEntity(pStack, pPlayer, pInteractionTarget, pUsedHand); } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/storage/DimensionalMatrixItem.java b/src/main/java/com/klikli_dev/occultism/common/item/storage/DimensionalMatrixItem.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/common/item/storage/DimensionalMatrixItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/storage/DimensionalMatrixItem.java index 5e545b5a5..bb751ee9c 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/storage/DimensionalMatrixItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/storage/DimensionalMatrixItem.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.storage; +package com.klikli_dev.occultism.common.item.storage; -import com.github.klikli_dev.occultism.util.ItemNBTUtil; -import com.github.klikli_dev.occultism.util.TextUtil; +import com.klikli_dev.occultism.util.ItemNBTUtil; +import com.klikli_dev.occultism.util.TextUtil; import net.minecraft.network.chat.Component; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; @@ -34,16 +34,10 @@ import java.util.List; public class DimensionalMatrixItem extends Item { - //region Fields - //endregion Fields - //region Initialization public DimensionalMatrixItem(Properties properties) { super(properties); } - //endregion Initialization - - //region Overrides @Override public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List tooltip, @@ -52,5 +46,5 @@ public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List use(Level level, Player player, InteractionHand hand) { final ItemStack stack = player.getItemInHand(hand); @@ -75,11 +73,8 @@ public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List familiar rings can be used to trade familiars. ((IFamiliar) e).setFamiliarOwner(player); - var name = ItemNBTUtil.getBoundSpiritName(stack); + var name = ItemNBTUtil.getBoundSpiritName(this.stack); e.setCustomName(Component.literal(name)); //set the name from the ring. the reverse happens when ring is used on entity. level.addFreshEntity(e); @@ -259,14 +259,14 @@ public ItemStack getStack() { @Override public void curioTick(SlotContext slotContext) { - Level level = slotContext.entity().level; + Level level = slotContext.entity().level(); IFamiliar familiar = this.getFamiliar(level); if (familiar != null) { // after portal use the level is still the pre-teleport level, the familiar owner is not found on the next check // hence, we update the level, if the familiar is in a ring if (!familiar.getFamiliarEntity().isAddedToWorld()) - familiar.getFamiliarEntity().level = level; + familiar.getFamiliarEntity().setLevel(level); if (familiar.getFamiliarOwner() != slotContext.entity()) return; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/tool/GuideBookItem.java b/src/main/java/com/klikli_dev/occultism/common/item/tool/GuideBookItem.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/common/item/tool/GuideBookItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/tool/GuideBookItem.java index 0250ea13c..35f875036 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/tool/GuideBookItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/tool/GuideBookItem.java @@ -20,15 +20,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.tool; +package com.klikli_dev.occultism.common.item.tool; -import com.github.klikli_dev.occultism.Occultism; import com.klikli_dev.modonomicon.Modonomicon; import com.klikli_dev.modonomicon.api.ModonomiconConstants; import com.klikli_dev.modonomicon.book.Book; import com.klikli_dev.modonomicon.client.gui.BookGuiManager; import com.klikli_dev.modonomicon.data.BookDataManager; import com.klikli_dev.modonomicon.item.ModonomiconItem; +import com.klikli_dev.occultism.Occultism; import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtUtils; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/item/tool/InfusedPickaxeItem.java b/src/main/java/com/klikli_dev/occultism/common/item/tool/InfusedPickaxeItem.java similarity index 84% rename from src/main/java/com/github/klikli_dev/occultism/common/item/tool/InfusedPickaxeItem.java rename to src/main/java/com/klikli_dev/occultism/common/item/tool/InfusedPickaxeItem.java index b25813c22..3afa3149e 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/item/tool/InfusedPickaxeItem.java +++ b/src/main/java/com/klikli_dev/occultism/common/item/tool/InfusedPickaxeItem.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.item.tool; +package com.klikli_dev.occultism.common.item.tool; -import com.github.klikli_dev.occultism.api.common.data.OtherworldBlockTier; -import com.github.klikli_dev.occultism.api.common.item.IOtherworldTool; -import com.github.klikli_dev.occultism.util.ItemNBTUtil; -import com.github.klikli_dev.occultism.util.TextUtil; +import com.klikli_dev.occultism.api.common.data.OtherworldBlockTier; +import com.klikli_dev.occultism.api.common.item.IOtherworldTool; +import com.klikli_dev.occultism.util.ItemNBTUtil; +import com.klikli_dev.occultism.util.TextUtil; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.PickaxeItem; @@ -37,14 +37,12 @@ import java.util.List; public class InfusedPickaxeItem extends PickaxeItem implements IOtherworldTool { - //region Initialization + public InfusedPickaxeItem(Tier tier, int attackDamageIn, float attackSpeedIn, Properties builder) { super(tier, attackDamageIn, attackSpeedIn, builder); } - //endregion Initialization - //region Overrides @Override public OtherworldBlockTier getHarvestTier(ItemStack stack) { return OtherworldBlockTier.TWO; @@ -57,6 +55,5 @@ public void appendHoverText(ItemStack stack, @Nullable Level worldIn, List floorBlocks = new LinkedList<>(); public final List ceilingBlocks = new LinkedList<>(); public final List insideBlocks = new LinkedList<>(); public final Map wallBlocks = new HashMap<>(); - //endregion Fields + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/level/cave/ICaveDecorator.java b/src/main/java/com/klikli_dev/occultism/common/level/cave/ICaveDecorator.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/common/level/cave/ICaveDecorator.java rename to src/main/java/com/klikli_dev/occultism/common/level/cave/ICaveDecorator.java index bd6b359fc..653c0620a 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/level/cave/ICaveDecorator.java +++ b/src/main/java/com/klikli_dev/occultism/common/level/cave/ICaveDecorator.java @@ -20,16 +20,16 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.level.cave; +package com.klikli_dev.occultism.common.level.cave; -import com.github.klikli_dev.occultism.common.level.multichunk.MultiChunkFeatureConfig; +import com.klikli_dev.occultism.common.level.multichunk.MultiChunkFeatureConfig; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.chunk.ChunkGenerator; public interface ICaveDecorator { - //region Methods + void finalPass(WorldGenLevel seedReader, ChunkGenerator generator, RandomSource rand, CaveDecoratordata data, MultiChunkFeatureConfig config); diff --git a/src/main/java/com/github/klikli_dev/occultism/common/level/cave/SphericalCaveSubFeature.java b/src/main/java/com/klikli_dev/occultism/common/level/cave/SphericalCaveSubFeature.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/common/level/cave/SphericalCaveSubFeature.java rename to src/main/java/com/klikli_dev/occultism/common/level/cave/SphericalCaveSubFeature.java index 7f7fdffbc..2ff50662e 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/level/cave/SphericalCaveSubFeature.java +++ b/src/main/java/com/klikli_dev/occultism/common/level/cave/SphericalCaveSubFeature.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.level.cave; +package com.klikli_dev.occultism.common.level.cave; -import com.github.klikli_dev.occultism.common.level.multichunk.IMultiChunkSubFeature; -import com.github.klikli_dev.occultism.common.level.multichunk.MultiChunkFeatureConfig; -import com.github.klikli_dev.occultism.registry.OccultismTags; -import com.github.klikli_dev.occultism.util.Math3DUtil; +import com.klikli_dev.occultism.common.level.multichunk.IMultiChunkSubFeature; +import com.klikli_dev.occultism.common.level.multichunk.MultiChunkFeatureConfig; +import com.klikli_dev.occultism.registry.OccultismTags; +import com.klikli_dev.occultism.util.Math3DUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.util.Mth; @@ -45,16 +45,12 @@ public class SphericalCaveSubFeature implements IMultiChunkSubFeature { - //region Fields public static Set sphericalCaves = new HashSet<>(); protected ICaveDecorator caveDecorator; protected int radius; protected int maxRandomRadiusOffset; protected int additionalSpheres; protected int maxRandomAdditionalSpheres; - //endregion Fields - - //region Initialization /** * @param caveDecorator the decorator for the generated cave. @@ -80,9 +76,7 @@ public SphericalCaveSubFeature(ICaveDecorator caveDecorator, int radius, int max this.additionalSpheres = additionalSpheres; this.maxRandomAdditionalSpheres = maxRandomAdditionalSpheres; } - //endregion Initialization - //region Overrides @Override public boolean place(WorldGenLevel reader, ChunkGenerator generator, RandomSource rand, BlockPos rootPosition, AABB bounds, MultiChunkFeatureConfig config) { @@ -114,9 +108,7 @@ public boolean place(WorldGenLevel reader, ChunkGenerator generator, RandomSourc spheres.clear(); return true; } - //endregion Overrides - //region Methods protected Sphere generateSphere(WorldGenLevel level, RandomSource rand, BlockPos position, int radius, AABB bounds) { return new Sphere(position, radius); } @@ -162,19 +154,16 @@ protected void setBlockSafely(WorldGenLevel level, BlockPos pPos, BlockState pCu } level.setBlock(pPos, pNewState, pFlags); } - //endregion Methods public class Sphere { - //region Fields + public BlockPos center; public int radius; - //endregion Fields - //region Initialization public Sphere(BlockPos center, int radius) { this.center = center; this.radius = radius; } - //endregion Initialization + } } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/level/cave/UndergroundGroveDecorator.java b/src/main/java/com/klikli_dev/occultism/common/level/cave/UndergroundGroveDecorator.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/common/level/cave/UndergroundGroveDecorator.java rename to src/main/java/com/klikli_dev/occultism/common/level/cave/UndergroundGroveDecorator.java index df8f090b1..7f9819161 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/level/cave/UndergroundGroveDecorator.java +++ b/src/main/java/com/klikli_dev/occultism/common/level/cave/UndergroundGroveDecorator.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.level.cave; +package com.klikli_dev.occultism.common.level.cave; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.level.multichunk.MultiChunkFeatureConfig; -import com.github.klikli_dev.occultism.registry.OccultismBlocks; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.level.multichunk.MultiChunkFeatureConfig; +import com.klikli_dev.occultism.registry.OccultismBlocks; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/level/multichunk/IMultiChunkSubFeature.java b/src/main/java/com/klikli_dev/occultism/common/level/multichunk/IMultiChunkSubFeature.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/common/level/multichunk/IMultiChunkSubFeature.java rename to src/main/java/com/klikli_dev/occultism/common/level/multichunk/IMultiChunkSubFeature.java index 7e91d4d2a..e8996e8c8 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/level/multichunk/IMultiChunkSubFeature.java +++ b/src/main/java/com/klikli_dev/occultism/common/level/multichunk/IMultiChunkSubFeature.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.level.multichunk; +package com.klikli_dev.occultism.common.level.multichunk; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/level/multichunk/MultiChunkFeature.java b/src/main/java/com/klikli_dev/occultism/common/level/multichunk/MultiChunkFeature.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/common/level/multichunk/MultiChunkFeature.java rename to src/main/java/com/klikli_dev/occultism/common/level/multichunk/MultiChunkFeature.java index 1364aa63d..bef4a33bf 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/level/multichunk/MultiChunkFeature.java +++ b/src/main/java/com/klikli_dev/occultism/common/level/multichunk/MultiChunkFeature.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.level.multichunk; +package com.klikli_dev.occultism.common.level.multichunk; -import com.github.klikli_dev.occultism.util.Math3DUtil; +import com.klikli_dev.occultism.util.Math3DUtil; import com.mojang.serialization.Codec; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerChunkCache; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/level/multichunk/MultiChunkFeatureConfig.java b/src/main/java/com/klikli_dev/occultism/common/level/multichunk/MultiChunkFeatureConfig.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/common/level/multichunk/MultiChunkFeatureConfig.java rename to src/main/java/com/klikli_dev/occultism/common/level/multichunk/MultiChunkFeatureConfig.java index ff651e92f..7eed4705b 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/level/multichunk/MultiChunkFeatureConfig.java +++ b/src/main/java/com/klikli_dev/occultism/common/level/multichunk/MultiChunkFeatureConfig.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.level.multichunk; +package com.klikli_dev.occultism.common.level.multichunk; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; @@ -77,7 +77,7 @@ public class MultiChunkFeatureConfig implements FeatureConfiguration { public MultiChunkFeatureConfig(int maxChunksToRoot, int chanceToGenerate, int minGenerationHeight, - int maxGenerationHeight, int featureSeedSalt, float grassChance,float treeChance, + int maxGenerationHeight, int featureSeedSalt, float grassChance, float treeChance, float vineChance, float ceilingLightChance, Holder otherworldTreeFeature) { this.maxChunksToRoot = maxChunksToRoot; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/level/tree/OtherworldNaturalTreeGrower.java b/src/main/java/com/klikli_dev/occultism/common/level/tree/OtherworldNaturalTreeGrower.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/common/level/tree/OtherworldNaturalTreeGrower.java rename to src/main/java/com/klikli_dev/occultism/common/level/tree/OtherworldNaturalTreeGrower.java index 361ba58bb..ce424ce9b 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/level/tree/OtherworldNaturalTreeGrower.java +++ b/src/main/java/com/klikli_dev/occultism/common/level/tree/OtherworldNaturalTreeGrower.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.level.tree; +package com.klikli_dev.occultism.common.level.tree; -import com.github.klikli_dev.occultism.datagen.worldgen.ConfiguredFeatures; +import com.klikli_dev.occultism.datagen.worldgen.ConfiguredFeatures; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; import net.minecraft.core.registries.Registries; @@ -45,7 +45,7 @@ public OtherworldNaturalTreeGrower() { protected ResourceKey> getConfiguredFeature(RandomSource p_222910_, boolean p_222911_) { return ConfiguredFeatures.TREE_OTHERWORLD_NATURAL; } - + @Override public boolean growTree(ServerLevel level, ChunkGenerator p_222906_, BlockPos p_222907_, BlockState p_222908_, RandomSource p_222909_) { Holder> holder = level.registryAccess().registryOrThrow(Registries.CONFIGURED_FEATURE).getHolderOrThrow(ConfiguredFeatures.TREE_OTHERWORLD_NATURAL); diff --git a/src/main/java/com/github/klikli_dev/occultism/common/level/tree/OtherworldTreeGrower.java b/src/main/java/com/klikli_dev/occultism/common/level/tree/OtherworldTreeGrower.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/common/level/tree/OtherworldTreeGrower.java rename to src/main/java/com/klikli_dev/occultism/common/level/tree/OtherworldTreeGrower.java index d608365f9..f1f3942a8 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/level/tree/OtherworldTreeGrower.java +++ b/src/main/java/com/klikli_dev/occultism/common/level/tree/OtherworldTreeGrower.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.level.tree; +package com.klikli_dev.occultism.common.level.tree; -import com.github.klikli_dev.occultism.datagen.worldgen.ConfiguredFeatures; +import com.klikli_dev.occultism.datagen.worldgen.ConfiguredFeatures; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; import net.minecraft.core.registries.Registries; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/misc/DepositOrder.java b/src/main/java/com/klikli_dev/occultism/common/misc/DepositOrder.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/common/misc/DepositOrder.java rename to src/main/java/com/klikli_dev/occultism/common/misc/DepositOrder.java index 246024afd..6217f83bb 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/misc/DepositOrder.java +++ b/src/main/java/com/klikli_dev/occultism/common/misc/DepositOrder.java @@ -20,19 +20,16 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.misc; +package com.klikli_dev.occultism.common.misc; import net.minecraft.nbt.CompoundTag; import net.minecraftforge.common.util.INBTSerializable; public class DepositOrder implements INBTSerializable { - //region Fields public ItemStackComparator comparator; public int amount; - //endregion Fields - //region Initialization protected DepositOrder() { } @@ -40,7 +37,6 @@ public DepositOrder(ItemStackComparator comparator, int amount) { this.comparator = comparator; this.amount = amount; } - //endregion Initialization //region Static Methods public static DepositOrder from(CompoundTag compound) { @@ -50,7 +46,6 @@ public static DepositOrder from(CompoundTag compound) { } //endregion Static Methods - //region Methods public CompoundTag writeToNBT(CompoundTag compound) { compound.put("comparator", this.comparator.serializeNBT()); compound.putInt("amount", this.amount); @@ -71,5 +66,5 @@ public CompoundTag serializeNBT() { public void deserializeNBT(CompoundTag nbt) { this.readFromNBT(nbt); } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/misc/ItemStackComparator.java b/src/main/java/com/klikli_dev/occultism/common/misc/ItemStackComparator.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/common/misc/ItemStackComparator.java rename to src/main/java/com/klikli_dev/occultism/common/misc/ItemStackComparator.java index d28c9838c..e66af46b9 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/misc/ItemStackComparator.java +++ b/src/main/java/com/klikli_dev/occultism/common/misc/ItemStackComparator.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.misc; +package com.klikli_dev.occultism.common.misc; -import com.github.klikli_dev.occultism.api.common.container.IItemStackComparator; +import com.klikli_dev.occultism.api.common.container.IItemStackComparator; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.ItemStack; @@ -32,12 +32,10 @@ * Based on https://github.com/Lothrazar/Storage-Network */ public class ItemStackComparator implements IItemStackComparator { - //region Fields + protected ItemStack filterStack; protected boolean matchNbt; - //endregion Fields - //region Initialization public ItemStackComparator(ItemStack stack) { this(stack, false); } @@ -49,7 +47,6 @@ public ItemStackComparator(ItemStack filterStack, boolean matchNbt) { private ItemStackComparator() { } - //endregion Initialization //region Static Methods public static ItemStackComparator from(CompoundTag nbt) { @@ -76,7 +73,6 @@ public void setFilterStack(@Nonnull ItemStack filterStack) { this.filterStack = filterStack; } - //region Overrides @Override public boolean matches(@Nonnull ItemStack stack) { if (stack.isEmpty()) @@ -91,7 +87,6 @@ public boolean matches(@Nonnull ItemStack stack) { public CompoundTag serializeNBT() { return this.write(new CompoundTag()); } - //endregion Overrides @Override public void deserializeNBT(CompoundTag nbt) { @@ -99,7 +94,6 @@ public void deserializeNBT(CompoundTag nbt) { } //endregion Static Methods - //region Methods public void read(CompoundTag compound) { CompoundTag nbt = compound.getCompound("stack"); this.filterStack = ItemStack.of(nbt); @@ -111,5 +105,5 @@ public CompoundTag write(CompoundTag compound) { compound.putBoolean("matchNbt", this.matchNbt); return compound; } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/misc/ItemTagComparator.java b/src/main/java/com/klikli_dev/occultism/common/misc/ItemTagComparator.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/common/misc/ItemTagComparator.java rename to src/main/java/com/klikli_dev/occultism/common/misc/ItemTagComparator.java index f817f0ad4..e0a872923 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/misc/ItemTagComparator.java +++ b/src/main/java/com/klikli_dev/occultism/common/misc/ItemTagComparator.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.misc; +package com.klikli_dev.occultism.common.misc; -import com.github.klikli_dev.occultism.api.common.container.IItemStackComparator; +import com.klikli_dev.occultism.api.common.container.IItemStackComparator; import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/misc/OutputIngredient.java b/src/main/java/com/klikli_dev/occultism/common/misc/OutputIngredient.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/common/misc/OutputIngredient.java rename to src/main/java/com/klikli_dev/occultism/common/misc/OutputIngredient.java index 1d563918c..fca3be6dc 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/misc/OutputIngredient.java +++ b/src/main/java/com/klikli_dev/occultism/common/misc/OutputIngredient.java @@ -1,6 +1,6 @@ -package com.github.klikli_dev.occultism.common.misc; +package com.klikli_dev.occultism.common.misc; -import com.github.klikli_dev.occultism.integration.almostunified.AlmostUnifiedIntegration; +import com.klikli_dev.occultism.integration.almostunified.AlmostUnifiedIntegration; import net.minecraft.core.Holder; import net.minecraft.core.HolderSet; import net.minecraft.core.registries.BuiltInRegistries; @@ -32,7 +32,8 @@ public OutputIngredient(Ingredient ingredient) { /** * Creates a new OutputIngredient - * @param ingredient the ingredient to source the output item from + * + * @param ingredient the ingredient to source the output item from * @param outputStackInfo the additional required stack info (count, nbt) will be read from this */ public OutputIngredient(Ingredient ingredient, ItemStack outputStackInfo) { @@ -48,14 +49,14 @@ public ItemStack getStack() { if (value instanceof Ingredient.TagValue tagValue) { var item = AlmostUnifiedIntegration.getPreferredItemForTag(tagValue.tag); - if(item == null) + if (item == null) item = BuiltInRegistries.ITEM.getTag(tagValue.tag) .map(HolderSet.ListBacked::stream) .flatMap(Stream::findFirst) .map(Holder::value) .orElse(null); - if(item != null) { + if (item != null) { return Stream.of(new ItemStack(item)); } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/misc/StorageControllerCraftingInventory.java b/src/main/java/com/klikli_dev/occultism/common/misc/StorageControllerCraftingInventory.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/common/misc/StorageControllerCraftingInventory.java rename to src/main/java/com/klikli_dev/occultism/common/misc/StorageControllerCraftingInventory.java index a1ed6eb82..04fce4f48 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/misc/StorageControllerCraftingInventory.java +++ b/src/main/java/com/klikli_dev/occultism/common/misc/StorageControllerCraftingInventory.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.misc; +package com.klikli_dev.occultism.common.misc; import net.minecraft.world.inventory.AbstractContainerMenu; -import net.minecraft.world.inventory.CraftingContainer; +import net.minecraft.world.inventory.TransientCraftingContainer; import net.minecraft.world.item.ItemStack; import java.util.List; @@ -32,18 +32,14 @@ /** * A cached version of InventoryCrafting. Allows to control when events are sent with the disableEvents field. */ -public class StorageControllerCraftingInventory extends CraftingContainer { - - //region Fields +public class StorageControllerCraftingInventory extends TransientCraftingContainer { protected final AbstractContainerMenu container; /** * set to true to disable sending events (usually temporarily to perform multiple actions) */ public boolean disableEvents; - //endregion Fields - //region Initialization public StorageControllerCraftingInventory(AbstractContainerMenu container, int width, int height) { super(container, width, height); this.container = container; @@ -68,9 +64,6 @@ public StorageControllerCraftingInventory(AbstractContainerMenu container, List< } this.disableEvents = false; } - //endregion Initialization - - //region Overrides @Override public void setItem(int index, ItemStack stack) { @@ -80,5 +73,4 @@ public void setItem(int index, ItemStack stack) { } } - //endregion Overrides } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/misc/StorageControllerItemStackHandler.java b/src/main/java/com/klikli_dev/occultism/common/misc/StorageControllerItemStackHandler.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/common/misc/StorageControllerItemStackHandler.java rename to src/main/java/com/klikli_dev/occultism/common/misc/StorageControllerItemStackHandler.java index 30aec93a0..4ed83948a 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/misc/StorageControllerItemStackHandler.java +++ b/src/main/java/com/klikli_dev/occultism/common/misc/StorageControllerItemStackHandler.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.misc; +package com.klikli_dev.occultism.common.misc; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.common.data.NonNullArrayList; +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.common.data.NonNullArrayList; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; @@ -36,14 +36,11 @@ public class StorageControllerItemStackHandler extends ItemStackHandler { - //region Fields protected int maxStackSize; protected int maxSlots; protected boolean overrideItemStackSizes; protected IStorageController storageController; - //endregion Fields - //region Initialization public StorageControllerItemStackHandler(IStorageController storageController, int size, int maxStackSize, boolean overrideItemStackSizes) { super(); @@ -53,9 +50,7 @@ public StorageControllerItemStackHandler(IStorageController storageController, i this.maxStackSize = maxStackSize; this.overrideItemStackSizes = overrideItemStackSizes; } - //endregion Initialization - //region Overrides @Override public void setSize(int size) { if (size < 0) @@ -181,7 +176,6 @@ protected void onContentsChanged(int slot) { this.storageController.onContentsChanged(); } - //region Methods public void prune() { //iterate from the end and remove empty stuff until we have our desired size for (int i = this.stacks.size() - 1; i >= 0 && this.stacks.size() > this.maxSlots; i--) { @@ -189,6 +183,5 @@ public void prune() { this.stacks.remove(i); } } - //endregion Methods } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/misc/StorageControllerSlot.java b/src/main/java/com/klikli_dev/occultism/common/misc/StorageControllerSlot.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/common/misc/StorageControllerSlot.java rename to src/main/java/com/klikli_dev/occultism/common/misc/StorageControllerSlot.java index 29afb5fe5..edb031f0c 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/misc/StorageControllerSlot.java +++ b/src/main/java/com/klikli_dev/occultism/common/misc/StorageControllerSlot.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.misc; +package com.klikli_dev.occultism.common.misc; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.container.IStorageControllerContainer; +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.container.IStorageControllerContainer; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.AbstractContainerMenu; @@ -38,12 +38,10 @@ * Extension of slot crafting that sends network updates. Based on https://github.com/Lothrazar/Storage-Network */ public class StorageControllerSlot extends ResultSlot { - //region Fields + IStorageControllerContainer storageControllerContainer; CraftingContainer matrix; - //endregion Fields - //region Initialization public StorageControllerSlot(Player player, CraftingContainer matrix, Container inventory, IStorageControllerContainer storageControllerContainer, int slotIndex, int xPosition, int yPosition) { @@ -51,13 +49,10 @@ public StorageControllerSlot(Player player, CraftingContainer matrix, Container this.storageControllerContainer = storageControllerContainer; this.matrix = matrix; } - //endregion Initialization - - //region Overrides @Override public void onTake(Player player, ItemStack stack) { - if (player.level.isClientSide) { + if (player.level().isClientSide) { // return stack; return; } @@ -82,6 +77,5 @@ public void onTake(Player player, ItemStack stack) { ((AbstractContainerMenu) this.storageControllerContainer).broadcastChanges(); //return stack; } - //endregion Overrides } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/misc/WeightedOutputIngredient.java b/src/main/java/com/klikli_dev/occultism/common/misc/WeightedOutputIngredient.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/common/misc/WeightedOutputIngredient.java rename to src/main/java/com/klikli_dev/occultism/common/misc/WeightedOutputIngredient.java index 27b2c5ff2..c16b96e9e 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/misc/WeightedOutputIngredient.java +++ b/src/main/java/com/klikli_dev/occultism/common/misc/WeightedOutputIngredient.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.misc; +package com.klikli_dev.occultism.common.misc; import net.minecraft.util.random.WeightedEntry; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/ritual/CommandRitual.java b/src/main/java/com/klikli_dev/occultism/common/ritual/CommandRitual.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/common/ritual/CommandRitual.java rename to src/main/java/com/klikli_dev/occultism/common/ritual/CommandRitual.java index be9b17c6f..84d3895e1 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/ritual/CommandRitual.java +++ b/src/main/java/com/klikli_dev/occultism/common/ritual/CommandRitual.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.ritual; +package com.klikli_dev.occultism.common.ritual; -import com.github.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; import net.minecraft.CrashReport; import net.minecraft.CrashReportCategory; import net.minecraft.ReportedException; @@ -56,14 +56,14 @@ public void finish(Level level, BlockPos goldenBowlPosition, GoldenSacrificialBo ((ServerLevel) level).sendParticles(ParticleTypes.LARGE_SMOKE, goldenBowlPosition.getX() + 0.5, goldenBowlPosition.getY() + 0.5, goldenBowlPosition.getZ() + 0.5, 1, 0, 0, 0, 0); - if(this.recipe.getCommand() != null){ + if (this.recipe.getCommand() != null) { this.execute(this.recipe.getCommand(), (ServerLevel) level, goldenBowlPosition, castingPlayer); } } private void execute(String command, ServerLevel level, BlockPos pos, Player castingPlayer) { MinecraftServer minecraftserver = level.getServer(); - var name = Component.literal("@"); + var name = Component.literal("@"); try { CommandSourceStack commandsourcestack = new CommandSourceStack( CommandSource.NULL, Vec3.atCenterOf(pos), Vec2.ZERO, level, 2, name.getString(), name, minecraftserver, castingPlayer); diff --git a/src/main/java/com/github/klikli_dev/occultism/common/ritual/CraftMinerSpiritRitual.java b/src/main/java/com/klikli_dev/occultism/common/ritual/CraftMinerSpiritRitual.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/common/ritual/CraftMinerSpiritRitual.java rename to src/main/java/com/klikli_dev/occultism/common/ritual/CraftMinerSpiritRitual.java index c5979dc68..923d28e3c 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/ritual/CraftMinerSpiritRitual.java +++ b/src/main/java/com/klikli_dev/occultism/common/ritual/CraftMinerSpiritRitual.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.ritual; +package com.klikli_dev.occultism.common.ritual; -import com.github.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; -import com.github.klikli_dev.occultism.util.ItemNBTUtil; +import com.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.util.ItemNBTUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.server.level.ServerLevel; @@ -34,13 +34,9 @@ public class CraftMinerSpiritRitual extends Ritual { - //region Initialization public CraftMinerSpiritRitual(RitualRecipe recipe) { super(recipe); } - //endregion Initialization - - //region Overrides @Override public void finish(Level level, BlockPos goldenBowlPosition, GoldenSacrificialBowlBlockEntity BlockEntity, @@ -62,5 +58,5 @@ public void finish(Level level, BlockPos goldenBowlPosition, GoldenSacrificialBo this.dropResult(level, goldenBowlPosition, BlockEntity, castingPlayer, result); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/ritual/CraftRitual.java b/src/main/java/com/klikli_dev/occultism/common/ritual/CraftRitual.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/common/ritual/CraftRitual.java rename to src/main/java/com/klikli_dev/occultism/common/ritual/CraftRitual.java index 136c6531b..9aab6cbda 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/ritual/CraftRitual.java +++ b/src/main/java/com/klikli_dev/occultism/common/ritual/CraftRitual.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.ritual; +package com.klikli_dev.occultism.common.ritual; -import com.github.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/ritual/CraftWithSpiritNameRitual.java b/src/main/java/com/klikli_dev/occultism/common/ritual/CraftWithSpiritNameRitual.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/common/ritual/CraftWithSpiritNameRitual.java rename to src/main/java/com/klikli_dev/occultism/common/ritual/CraftWithSpiritNameRitual.java index 2473b5ed1..a804134c1 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/ritual/CraftWithSpiritNameRitual.java +++ b/src/main/java/com/klikli_dev/occultism/common/ritual/CraftWithSpiritNameRitual.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.ritual; +package com.klikli_dev.occultism.common.ritual; -import com.github.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; -import com.github.klikli_dev.occultism.util.ItemNBTUtil; +import com.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.util.ItemNBTUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/ritual/FamiliarRitual.java b/src/main/java/com/klikli_dev/occultism/common/ritual/FamiliarRitual.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/common/ritual/FamiliarRitual.java rename to src/main/java/com/klikli_dev/occultism/common/ritual/FamiliarRitual.java index 137d6eff0..a6184b7a6 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/ritual/FamiliarRitual.java +++ b/src/main/java/com/klikli_dev/occultism/common/ritual/FamiliarRitual.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.ritual; +package com.klikli_dev.occultism.common.ritual; -import com.github.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; -import com.github.klikli_dev.occultism.common.entity.familiar.FamiliarEntity; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; -import com.github.klikli_dev.occultism.util.ItemNBTUtil; +import com.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; +import com.klikli_dev.occultism.common.entity.familiar.FamiliarEntity; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.util.ItemNBTUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/ritual/Ritual.java b/src/main/java/com/klikli_dev/occultism/common/ritual/Ritual.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/common/ritual/Ritual.java rename to src/main/java/com/klikli_dev/occultism/common/ritual/Ritual.java index 8e6cb2646..f23d0773d 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/ritual/Ritual.java +++ b/src/main/java/com/klikli_dev/occultism/common/ritual/Ritual.java @@ -20,14 +20,14 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.ritual; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; -import com.github.klikli_dev.occultism.common.blockentity.SacrificialBowlBlockEntity; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; -import com.github.klikli_dev.occultism.registry.OccultismSounds; +package com.klikli_dev.occultism.common.ritual; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; +import com.klikli_dev.occultism.common.blockentity.SacrificialBowlBlockEntity; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.registry.OccultismAdvancements; +import com.klikli_dev.occultism.registry.OccultismSounds; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.network.chat.Component; @@ -52,8 +52,6 @@ public abstract class Ritual { - //region Fields - /** * The default range to look for sacrificial bowls with additional ingredients */ @@ -75,18 +73,12 @@ public abstract class Ritual { public ResourceLocation factoryId; - //endregion Fields - - - //region Initialization - /** * Constructs a ritual. */ public Ritual(RitualRecipe recipe) { this.recipe = recipe; } - //endregion Initialization //region Getter / Setter @@ -158,8 +150,6 @@ public String getInterruptedMessage() { } //endregion Getter / Setter - //region Methods - /** * @return the finished message translation key for this ritual. */ @@ -527,5 +517,5 @@ public void dropResult(Level level, BlockPos goldenBowlPosition, GoldenSacrifici entity.setPickUpDelay(10); level.addFreshEntity(entity); } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/common/ritual/RitualFactory.java b/src/main/java/com/klikli_dev/occultism/common/ritual/RitualFactory.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/common/ritual/RitualFactory.java rename to src/main/java/com/klikli_dev/occultism/common/ritual/RitualFactory.java index 5af68245c..3793b247a 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/ritual/RitualFactory.java +++ b/src/main/java/com/klikli_dev/occultism/common/ritual/RitualFactory.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.ritual; +package com.klikli_dev.occultism.common.ritual; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; -import com.github.klikli_dev.occultism.registry.OccultismRituals; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.registry.OccultismRituals; import java.util.function.Function; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/ritual/SummonRitual.java b/src/main/java/com/klikli_dev/occultism/common/ritual/SummonRitual.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/common/ritual/SummonRitual.java rename to src/main/java/com/klikli_dev/occultism/common/ritual/SummonRitual.java index 1b56b2c1c..8915bc127 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/ritual/SummonRitual.java +++ b/src/main/java/com/klikli_dev/occultism/common/ritual/SummonRitual.java @@ -20,13 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.ritual; +package com.klikli_dev.occultism.common.ritual; -import com.github.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; -import com.github.klikli_dev.occultism.registry.OccultismItems; -import com.github.klikli_dev.occultism.util.ItemNBTUtil; +import com.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.registry.OccultismItems; +import com.klikli_dev.occultism.util.ItemNBTUtil; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; import net.minecraft.core.RegistryAccess; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/ritual/SummonSpiritWithJobRitual.java b/src/main/java/com/klikli_dev/occultism/common/ritual/SummonSpiritWithJobRitual.java similarity index 82% rename from src/main/java/com/github/klikli_dev/occultism/common/ritual/SummonSpiritWithJobRitual.java rename to src/main/java/com/klikli_dev/occultism/common/ritual/SummonSpiritWithJobRitual.java index d8535a4d5..1e4eb0a9b 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/ritual/SummonSpiritWithJobRitual.java +++ b/src/main/java/com/klikli_dev/occultism/common/ritual/SummonSpiritWithJobRitual.java @@ -20,13 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.ritual; +package com.klikli_dev.occultism.common.ritual; -import com.github.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; -import com.github.klikli_dev.occultism.common.entity.job.SpiritJob; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; -import com.github.klikli_dev.occultism.registry.OccultismSpiritJobs; +import com.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; +import com.klikli_dev.occultism.common.entity.job.SpiritJob; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.registry.OccultismSpiritJobs; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/com/github/klikli_dev/occultism/common/ritual/SummonWildHuntRitual.java b/src/main/java/com/klikli_dev/occultism/common/ritual/SummonWildHuntRitual.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/common/ritual/SummonWildHuntRitual.java rename to src/main/java/com/klikli_dev/occultism/common/ritual/SummonWildHuntRitual.java index 1899d4622..91f735426 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/ritual/SummonWildHuntRitual.java +++ b/src/main/java/com/klikli_dev/occultism/common/ritual/SummonWildHuntRitual.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.ritual; +package com.klikli_dev.occultism.common.ritual; -import com.github.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; -import com.github.klikli_dev.occultism.util.TextUtil; +import com.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.util.TextUtil; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.network.chat.Component; @@ -78,6 +78,6 @@ public void finish(Level level, BlockPos goldenBowlPosition, GoldenSacrificialBo } } } - //endregion Overrides + } } \ No newline at end of file diff --git a/src/main/java/com/github/klikli_dev/occultism/common/ritual/SummonWithChanceOfChickenRitual.java b/src/main/java/com/klikli_dev/occultism/common/ritual/SummonWithChanceOfChickenRitual.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/common/ritual/SummonWithChanceOfChickenRitual.java rename to src/main/java/com/klikli_dev/occultism/common/ritual/SummonWithChanceOfChickenRitual.java index e209289b4..d59ab61d3 100644 --- a/src/main/java/com/github/klikli_dev/occultism/common/ritual/SummonWithChanceOfChickenRitual.java +++ b/src/main/java/com/klikli_dev/occultism/common/ritual/SummonWithChanceOfChickenRitual.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.common.ritual; +package com.klikli_dev.occultism.common.ritual; -import com.github.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.common.blockentity.GoldenSacrificialBowlBlockEntity; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; diff --git a/src/main/java/com/github/klikli_dev/occultism/config/OccultismClientConfig.java b/src/main/java/com/klikli_dev/occultism/config/OccultismClientConfig.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/config/OccultismClientConfig.java rename to src/main/java/com/klikli_dev/occultism/config/OccultismClientConfig.java index 23ca971b4..a47cadd1d 100644 --- a/src/main/java/com/github/klikli_dev/occultism/config/OccultismClientConfig.java +++ b/src/main/java/com/klikli_dev/occultism/config/OccultismClientConfig.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.config; +package com.klikli_dev.occultism.config; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.common.ForgeConfigSpec.BooleanValue; diff --git a/src/main/java/com/github/klikli_dev/occultism/config/OccultismCommonConfig.java b/src/main/java/com/klikli_dev/occultism/config/OccultismCommonConfig.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/config/OccultismCommonConfig.java rename to src/main/java/com/klikli_dev/occultism/config/OccultismCommonConfig.java index 6eb13a6d8..3e24f4ec7 100644 --- a/src/main/java/com/github/klikli_dev/occultism/config/OccultismCommonConfig.java +++ b/src/main/java/com/klikli_dev/occultism/config/OccultismCommonConfig.java @@ -20,14 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.config; +package com.klikli_dev.occultism.config; import net.minecraftforge.common.ForgeConfigSpec; public class OccultismCommonConfig { public final ForgeConfigSpec spec; - //region Initialization public OccultismCommonConfig() { ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder(); this.spec = builder.build(); diff --git a/src/main/java/com/github/klikli_dev/occultism/config/OccultismServerConfig.java b/src/main/java/com/klikli_dev/occultism/config/OccultismServerConfig.java similarity index 99% rename from src/main/java/com/github/klikli_dev/occultism/config/OccultismServerConfig.java rename to src/main/java/com/klikli_dev/occultism/config/OccultismServerConfig.java index 2ab5571e4..1b19dabab 100644 --- a/src/main/java/com/github/klikli_dev/occultism/config/OccultismServerConfig.java +++ b/src/main/java/com/klikli_dev/occultism/config/OccultismServerConfig.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.config; +package com.klikli_dev.occultism.config; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.common.ForgeConfigSpec.BooleanValue; @@ -153,6 +153,7 @@ public static class DimensionalMineshaftSettings { public final MinerSpiritSettings minerDjinniOres; public final MinerSpiritSettings minerAfritDeeps; public final MinerSpiritSettings minerMaridMaster; + public DimensionalMineshaftSettings(ForgeConfigSpec.Builder builder) { builder.comment("Dimensional Mineshaft Settings").push("dimensional_mineshaft"); diff --git a/src/main/java/com/github/klikli_dev/occultism/crafting/recipe/CrushingRecipe.java b/src/main/java/com/klikli_dev/occultism/crafting/recipe/CrushingRecipe.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/crafting/recipe/CrushingRecipe.java rename to src/main/java/com/klikli_dev/occultism/crafting/recipe/CrushingRecipe.java index b57ae5e8b..60bca6dbf 100644 --- a/src/main/java/com/github/klikli_dev/occultism/crafting/recipe/CrushingRecipe.java +++ b/src/main/java/com/klikli_dev/occultism/crafting/recipe/CrushingRecipe.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.crafting.recipe; +package com.klikli_dev.occultism.crafting.recipe; -import com.github.klikli_dev.occultism.common.misc.OutputIngredient; -import com.github.klikli_dev.occultism.registry.OccultismRecipes; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import com.klikli_dev.occultism.common.misc.OutputIngredient; +import com.klikli_dev.occultism.registry.OccultismRecipes; import net.minecraft.core.RegistryAccess; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; @@ -107,7 +107,7 @@ public CrushingRecipe fromJson(ResourceLocation recipeId, JsonObject json) { //the ingredient loader does not handle count and nbt, so we use the item loader //The item loader requires and "item" field, so we add it if it is missing - if(!resultElement.has("item")) + if (!resultElement.has("item")) //just a dummy, OutputIngredient will not use the item type. //however, cannot be air as that will make ItemStack report as empty resultElement.addProperty("item", "minecraft:dirt"); @@ -119,7 +119,7 @@ public CrushingRecipe fromJson(ResourceLocation recipeId, JsonObject json) { //helper to get count and nbt for our output ingredient ItemStack outputStackInfo = CraftingHelper.getItemStack(GsonHelper.getAsJsonObject(json, "result"), true); - return new CrushingRecipe(recipeId, ingredient, new OutputIngredient(outputIngredient, outputStackInfo), minTier, crushingTime, ignoreCrushingMultiplier); + return new CrushingRecipe(recipeId, ingredient, new OutputIngredient(outputIngredient, outputStackInfo), minTier, crushingTime, ignoreCrushingMultiplier); } @Override diff --git a/src/main/java/com/github/klikli_dev/occultism/crafting/recipe/ItemStackFakeInventory.java b/src/main/java/com/klikli_dev/occultism/crafting/recipe/ItemStackFakeInventory.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/crafting/recipe/ItemStackFakeInventory.java rename to src/main/java/com/klikli_dev/occultism/crafting/recipe/ItemStackFakeInventory.java index 28b688a9c..eb8916f70 100644 --- a/src/main/java/com/github/klikli_dev/occultism/crafting/recipe/ItemStackFakeInventory.java +++ b/src/main/java/com/klikli_dev/occultism/crafting/recipe/ItemStackFakeInventory.java @@ -20,24 +20,19 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.crafting.recipe; +package com.klikli_dev.occultism.crafting.recipe; import net.minecraft.world.Container; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; public class ItemStackFakeInventory implements Container { - //region Fields + protected ItemStack input; - //endregion Fields - //region Initialization public ItemStackFakeInventory(ItemStack input) { this.input = input; } - //endregion Initialization - - //region Overrides @Override public int getContainerSize() { @@ -85,5 +80,4 @@ public void clearContent() { this.input = ItemStack.EMPTY; } - //endregion Overrides } diff --git a/src/main/java/com/github/klikli_dev/occultism/crafting/recipe/ItemStackFakeInventoryRecipe.java b/src/main/java/com/klikli_dev/occultism/crafting/recipe/ItemStackFakeInventoryRecipe.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/crafting/recipe/ItemStackFakeInventoryRecipe.java rename to src/main/java/com/klikli_dev/occultism/crafting/recipe/ItemStackFakeInventoryRecipe.java index 6dc683471..7630f435a 100644 --- a/src/main/java/com/github/klikli_dev/occultism/crafting/recipe/ItemStackFakeInventoryRecipe.java +++ b/src/main/java/com/klikli_dev/occultism/crafting/recipe/ItemStackFakeInventoryRecipe.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.crafting.recipe; +package com.klikli_dev.occultism.crafting.recipe; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -36,22 +36,18 @@ import net.minecraftforge.common.crafting.CraftingHelper; public abstract class ItemStackFakeInventoryRecipe implements Recipe { - //region Fields + public static Serializer SERIALIZER = new Serializer(); protected final ResourceLocation id; protected final Ingredient input; protected final ItemStack output; - //endregion Fields - //region Initialization public ItemStackFakeInventoryRecipe(ResourceLocation id, Ingredient input, ItemStack output) { this.input = input; this.output = output; this.id = id; } - //endregion Initialization - //region Overrides @Override public boolean matches(ItemStackFakeInventory inv, Level level) { return this.input.test(inv.getItem(0)); @@ -69,7 +65,7 @@ public boolean canCraftInDimensions(int width, int height) { } @Override - public ItemStack getResultItem(RegistryAccess registryAccess){ + public ItemStack getResultItem(RegistryAccess registryAccess) { return this.output; } @@ -83,20 +79,14 @@ public ResourceLocation getId() { return this.id; } - //endregion Overrides - public interface IItemStackFakeInventoryRecipeFactory { - //region Methods + T create(ResourceLocation id, Ingredient input, ItemStack output); - //endregion Methods + } public static class Serializer { - //region Overrides - //endregion Overrides - - //region Methods public T read(IItemStackFakeInventoryRecipeFactory factory, ResourceLocation recipeId, JsonObject json) { //we also allow arrays, but only one ingredient will be used. @@ -119,6 +109,6 @@ public void write(FriendlyByteBuf buffe recipe.input.toNetwork(buffer); buffer.writeItem(recipe.output); } - //endregion Methods + } } \ No newline at end of file diff --git a/src/main/java/com/github/klikli_dev/occultism/crafting/recipe/MinerRecipe.java b/src/main/java/com/klikli_dev/occultism/crafting/recipe/MinerRecipe.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/crafting/recipe/MinerRecipe.java rename to src/main/java/com/klikli_dev/occultism/crafting/recipe/MinerRecipe.java index 1b9a3ebbe..e72429876 100644 --- a/src/main/java/com/github/klikli_dev/occultism/crafting/recipe/MinerRecipe.java +++ b/src/main/java/com/klikli_dev/occultism/crafting/recipe/MinerRecipe.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.crafting.recipe; +package com.klikli_dev.occultism.crafting.recipe; -import com.github.klikli_dev.occultism.common.misc.WeightedOutputIngredient; -import com.github.klikli_dev.occultism.registry.OccultismRecipes; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import com.klikli_dev.occultism.common.misc.WeightedOutputIngredient; +import com.klikli_dev.occultism.registry.OccultismRecipes; import net.minecraft.core.NonNullList; import net.minecraft.core.RegistryAccess; import net.minecraft.network.FriendlyByteBuf; @@ -99,7 +99,6 @@ public RecipeType getType() { public static class Serializer implements RecipeSerializer { - //region Overrides @Override public MinerRecipe fromJson(ResourceLocation recipeId, JsonObject json) { JsonElement ingredientElement = GsonHelper.isArrayNode(json, "ingredient") ? GsonHelper.getAsJsonArray(json, diff --git a/src/main/java/com/github/klikli_dev/occultism/crafting/recipe/RitualRecipe.java b/src/main/java/com/klikli_dev/occultism/crafting/recipe/RitualRecipe.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/crafting/recipe/RitualRecipe.java rename to src/main/java/com/klikli_dev/occultism/crafting/recipe/RitualRecipe.java index 03bc79135..568996157 100644 --- a/src/main/java/com/github/klikli_dev/occultism/crafting/recipe/RitualRecipe.java +++ b/src/main/java/com/klikli_dev/occultism/crafting/recipe/RitualRecipe.java @@ -20,17 +20,17 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.crafting.recipe; +package com.klikli_dev.occultism.crafting.recipe; -import com.github.klikli_dev.occultism.common.ritual.Ritual; -import com.github.klikli_dev.occultism.registry.OccultismRecipes; -import com.github.klikli_dev.occultism.registry.OccultismRituals; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.klikli_dev.modonomicon.api.ModonomiconAPI; import com.klikli_dev.modonomicon.api.multiblock.Multiblock; +import com.klikli_dev.occultism.common.ritual.Ritual; +import com.klikli_dev.occultism.registry.OccultismRecipes; +import com.klikli_dev.occultism.registry.OccultismRituals; import net.minecraft.core.BlockPos; import net.minecraft.core.NonNullList; import net.minecraft.core.RegistryAccess; diff --git a/src/main/java/com/github/klikli_dev/occultism/crafting/recipe/SpiritFireRecipe.java b/src/main/java/com/klikli_dev/occultism/crafting/recipe/SpiritFireRecipe.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/crafting/recipe/SpiritFireRecipe.java rename to src/main/java/com/klikli_dev/occultism/crafting/recipe/SpiritFireRecipe.java index 371ad62c7..12138dd9c 100644 --- a/src/main/java/com/github/klikli_dev/occultism/crafting/recipe/SpiritFireRecipe.java +++ b/src/main/java/com/klikli_dev/occultism/crafting/recipe/SpiritFireRecipe.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.crafting.recipe; +package com.klikli_dev.occultism.crafting.recipe; -import com.github.klikli_dev.occultism.registry.OccultismBlocks; -import com.github.klikli_dev.occultism.registry.OccultismRecipes; import com.google.gson.JsonObject; +import com.klikli_dev.occultism.registry.OccultismBlocks; +import com.klikli_dev.occultism.registry.OccultismRecipes; import net.minecraft.core.NonNullList; import net.minecraft.core.RegistryAccess; import net.minecraft.network.FriendlyByteBuf; @@ -36,17 +36,13 @@ import net.minecraft.world.level.Level; public class SpiritFireRecipe extends ItemStackFakeInventoryRecipe { - //region Fields + public static Serializer SERIALIZER = new Serializer(); - //endregion Fields - //region Initialization public SpiritFireRecipe(ResourceLocation id, Ingredient input, ItemStack output) { super(id, input, output); } - //endregion Initialization - //region Overrides @Override public boolean matches(ItemStackFakeInventory inv, Level level) { return this.input.test(inv.getItem(0)); @@ -94,11 +90,9 @@ public ItemStack getToastSymbol() { public RecipeType getType() { return OccultismRecipes.SPIRIT_FIRE_TYPE.get(); } - //endregion Overrides public static class Serializer implements RecipeSerializer { - //region Overrides @Override public SpiritFireRecipe fromJson(ResourceLocation recipeId, JsonObject json) { return ItemStackFakeInventoryRecipe.SERIALIZER.read(SpiritFireRecipe::new, recipeId, json); @@ -113,6 +107,6 @@ public SpiritFireRecipe fromNetwork(ResourceLocation recipeId, FriendlyByteBuf b public void toNetwork(FriendlyByteBuf buffer, SpiritFireRecipe recipe) { ItemStackFakeInventoryRecipe.SERIALIZER.write(buffer, recipe); } - //endregion Overrides + } } \ No newline at end of file diff --git a/src/main/java/com/github/klikli_dev/occultism/crafting/recipe/SpiritTradeRecipe.java b/src/main/java/com/klikli_dev/occultism/crafting/recipe/SpiritTradeRecipe.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/crafting/recipe/SpiritTradeRecipe.java rename to src/main/java/com/klikli_dev/occultism/crafting/recipe/SpiritTradeRecipe.java index d8c14752c..80dd44b01 100644 --- a/src/main/java/com/github/klikli_dev/occultism/crafting/recipe/SpiritTradeRecipe.java +++ b/src/main/java/com/klikli_dev/occultism/crafting/recipe/SpiritTradeRecipe.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.crafting.recipe; +package com.klikli_dev.occultism.crafting.recipe; -import com.github.klikli_dev.occultism.registry.OccultismRecipes; import com.google.gson.JsonObject; +import com.klikli_dev.occultism.registry.OccultismRecipes; import net.minecraft.core.NonNullList; import net.minecraft.core.RegistryAccess; import net.minecraft.network.FriendlyByteBuf; @@ -42,13 +42,10 @@ public class SpiritTradeRecipe extends ShapelessRecipe { public static Serializer SERIALIZER = new Serializer(); - //region Initialization public SpiritTradeRecipe(ResourceLocation id, String group, ItemStack result, NonNullList input) { super(id, group, CraftingBookCategory.MISC, result, input); } - //endregion Initialization - //region Overrides @Override public RecipeSerializer getSerializer() { return SERIALIZER; @@ -70,10 +67,6 @@ public RecipeType getType() { return OccultismRecipes.SPIRIT_TRADE_TYPE.get(); } - //endregion Overrides - - //region Methods - /** * Consumes the given input and returns all unused items. isValid needs to be called first! * @@ -119,32 +112,29 @@ public boolean isValid(List input) { } return true; } - //endregion Methods public static class Serializer implements RecipeSerializer { - //region Fields + private static final ShapelessRecipe.Serializer serializer = new ShapelessRecipe.Serializer(); - //endregion Fields - //region Overrides @Override public SpiritTradeRecipe fromJson(ResourceLocation recipeId, JsonObject json) { ShapelessRecipe recipe = serializer.fromJson(recipeId, json); //we can pass null because shapeless recipe doesn't use the registryaccess. - return new SpiritTradeRecipe(recipe.getId(), recipe.getGroup(), recipe.getResultItem(null), recipe.getIngredients()); + return new SpiritTradeRecipe(recipe.getId(), recipe.getGroup(), recipe.getResultItem(RegistryAccess.EMPTY), recipe.getIngredients()); } @Override public SpiritTradeRecipe fromNetwork(ResourceLocation recipeId, FriendlyByteBuf buffer) { ShapelessRecipe recipe = serializer.fromNetwork(recipeId, buffer); //we can pass null because shapeless recipe doesn't use the registryaccess. - return new SpiritTradeRecipe(recipe.getId(), recipe.getGroup(), recipe.getResultItem(null), recipe.getIngredients()); + return new SpiritTradeRecipe(recipe.getId(), recipe.getGroup(), recipe.getResultItem(RegistryAccess.EMPTY), recipe.getIngredients()); } @Override public void toNetwork(FriendlyByteBuf buffer, SpiritTradeRecipe recipe) { serializer.toNetwork(buffer, recipe); } - //endregion Overrides + } } diff --git a/src/main/java/com/github/klikli_dev/occultism/crafting/recipe/TieredItemStackFakeInventory.java b/src/main/java/com/klikli_dev/occultism/crafting/recipe/TieredItemStackFakeInventory.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/crafting/recipe/TieredItemStackFakeInventory.java rename to src/main/java/com/klikli_dev/occultism/crafting/recipe/TieredItemStackFakeInventory.java index ae3ed8f2d..929907839 100644 --- a/src/main/java/com/github/klikli_dev/occultism/crafting/recipe/TieredItemStackFakeInventory.java +++ b/src/main/java/com/klikli_dev/occultism/crafting/recipe/TieredItemStackFakeInventory.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.crafting.recipe; +package com.klikli_dev.occultism.crafting.recipe; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/github/klikli_dev/occultism/datagen/CrushingRecipeProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/CrushingRecipeProvider.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/datagen/CrushingRecipeProvider.java rename to src/main/java/com/klikli_dev/occultism/datagen/CrushingRecipeProvider.java index 7a3daa1d5..cfa672257 100644 --- a/src/main/java/com/github/klikli_dev/occultism/datagen/CrushingRecipeProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/CrushingRecipeProvider.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.datagen; +package com.klikli_dev.occultism.datagen; -import com.github.klikli_dev.occultism.Occultism; import com.google.common.collect.Sets; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import com.klikli_dev.occultism.Occultism; import com.mojang.datafixers.util.Pair; import net.minecraft.data.CachedOutput; import net.minecraft.data.DataProvider; diff --git a/src/main/java/com/github/klikli_dev/occultism/datagen/DataGenerators.java b/src/main/java/com/klikli_dev/occultism/datagen/DataGenerators.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/datagen/DataGenerators.java rename to src/main/java/com/klikli_dev/occultism/datagen/DataGenerators.java index a6530da7e..a5d742c50 100644 --- a/src/main/java/com/github/klikli_dev/occultism/datagen/DataGenerators.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/DataGenerators.java @@ -20,15 +20,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.datagen; +package com.klikli_dev.occultism.datagen; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.datagen.lang.ENUSProvider; -import com.github.klikli_dev.occultism.datagen.lang.FRFRProvider; -import com.github.klikli_dev.occultism.datagen.lang.PTBRProvider; -import com.github.klikli_dev.occultism.datagen.lang.loot.OccultismBlockLoot; -import com.github.klikli_dev.occultism.datagen.lang.loot.OccultismEntityLoot; -import com.github.klikli_dev.occultism.datagen.worldgen.OccultismRegistries; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.datagen.lang.ENUSProvider; +import com.klikli_dev.occultism.datagen.lang.FRFRProvider; +import com.klikli_dev.occultism.datagen.lang.PTBRProvider; +import com.klikli_dev.occultism.datagen.lang.loot.OccultismBlockLoot; +import com.klikli_dev.occultism.datagen.lang.loot.OccultismEntityLoot; +import com.klikli_dev.occultism.datagen.worldgen.OccultismRegistries; import net.minecraft.data.DataGenerator; import net.minecraft.data.DataProvider; import net.minecraft.data.loot.LootTableProvider; diff --git a/src/main/java/com/github/klikli_dev/occultism/datagen/ItemModelsGenerator.java b/src/main/java/com/klikli_dev/occultism/datagen/ItemModelsGenerator.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/datagen/ItemModelsGenerator.java rename to src/main/java/com/klikli_dev/occultism/datagen/ItemModelsGenerator.java index 4789f6ffa..b599a0c5b 100644 --- a/src/main/java/com/github/klikli_dev/occultism/datagen/ItemModelsGenerator.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/ItemModelsGenerator.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.datagen; +package com.klikli_dev.occultism.datagen; -import com.github.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.Occultism; import net.minecraft.data.PackOutput; import net.minecraftforge.client.model.generators.ItemModelBuilder; import net.minecraftforge.client.model.generators.ItemModelProvider; diff --git a/src/main/java/com/github/klikli_dev/occultism/datagen/MinerRecipeProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/MinerRecipeProvider.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/datagen/MinerRecipeProvider.java rename to src/main/java/com/klikli_dev/occultism/datagen/MinerRecipeProvider.java index 1486940df..9af5b3155 100644 --- a/src/main/java/com/github/klikli_dev/occultism/datagen/MinerRecipeProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/MinerRecipeProvider.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.datagen; +package com.klikli_dev.occultism.datagen; -import com.github.klikli_dev.occultism.Occultism; import com.google.common.collect.Sets; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import com.klikli_dev.occultism.Occultism; import com.mojang.datafixers.util.Pair; import net.minecraft.data.CachedOutput; import net.minecraft.data.DataProvider; diff --git a/src/main/java/com/github/klikli_dev/occultism/datagen/OccultismAdvancementProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/OccultismAdvancementProvider.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/datagen/OccultismAdvancementProvider.java rename to src/main/java/com/klikli_dev/occultism/datagen/OccultismAdvancementProvider.java index 688aafa2c..9b3522f8d 100644 --- a/src/main/java/com/github/klikli_dev/occultism/datagen/OccultismAdvancementProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/OccultismAdvancementProvider.java @@ -20,16 +20,17 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.datagen; +package com.klikli_dev.occultism.datagen; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.common.advancement.RitualTrigger; -import com.github.klikli_dev.occultism.registry.OccultismItems; -import com.github.klikli_dev.occultism.registry.OccultismRituals; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.common.advancement.RitualTrigger; +import com.klikli_dev.occultism.registry.OccultismItems; +import com.klikli_dev.occultism.registry.OccultismRituals; import net.minecraft.advancements.Advancement; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.advancements.FrameType; +import net.minecraft.advancements.critereon.ContextAwarePredicate; import net.minecraft.advancements.critereon.EntityPredicate; import net.minecraft.advancements.critereon.PlayerTrigger; import net.minecraft.data.CachedOutput; @@ -116,7 +117,7 @@ private void start() { // new ResourceLocation("textures/gui/advancements/backgrounds/stone.png"), FrameType.TASK, true, // true, true) .addCriterion("occultism_present", - new PlayerTrigger.TriggerInstance(CriteriaTriggers.TICK.getId(), EntityPredicate.Composite.ANY)) + new PlayerTrigger.TriggerInstance(CriteriaTriggers.TICK.getId(), ContextAwarePredicate.ANY)) .build(new ResourceLocation(Occultism.MODID, "occultism/root"))); Advancement familiarsRoot = this.add(Advancement.Builder.advancement() diff --git a/src/main/java/com/github/klikli_dev/occultism/datagen/OccultismBookProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/OccultismBookProvider.java similarity index 99% rename from src/main/java/com/github/klikli_dev/occultism/datagen/OccultismBookProvider.java rename to src/main/java/com/klikli_dev/occultism/datagen/OccultismBookProvider.java index 7d2584c52..960ed7b91 100644 --- a/src/main/java/com/github/klikli_dev/occultism/datagen/OccultismBookProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/OccultismBookProvider.java @@ -1,10 +1,5 @@ -package com.github.klikli_dev.occultism.datagen; +package com.klikli_dev.occultism.datagen; -import com.github.klikli_dev.occultism.integration.modonomicon.pages.BookRitualRecipePageModel; -import com.github.klikli_dev.occultism.integration.modonomicon.pages.BookSpiritFireRecipePageModel; -import com.github.klikli_dev.occultism.integration.modonomicon.pages.BookSpiritTradeRecipePageModel; -import com.github.klikli_dev.occultism.registry.OccultismBlocks; -import com.github.klikli_dev.occultism.registry.OccultismItems; import com.klikli_dev.modonomicon.api.ModonomiconAPI; import com.klikli_dev.modonomicon.api.datagen.BookLangHelper; import com.klikli_dev.modonomicon.api.datagen.BookProvider; @@ -18,6 +13,11 @@ import com.klikli_dev.modonomicon.api.datagen.book.condition.BookModLoadedConditionModel; import com.klikli_dev.modonomicon.api.datagen.book.condition.BookTrueConditionModel; import com.klikli_dev.modonomicon.api.datagen.book.page.*; +import com.klikli_dev.occultism.integration.modonomicon.pages.BookRitualRecipePageModel; +import com.klikli_dev.occultism.integration.modonomicon.pages.BookSpiritFireRecipePageModel; +import com.klikli_dev.occultism.integration.modonomicon.pages.BookSpiritTradeRecipePageModel; +import com.klikli_dev.occultism.registry.OccultismBlocks; +import com.klikli_dev.occultism.registry.OccultismItems; import com.klikli_dev.theurgy.registry.ItemRegistry; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; @@ -1465,8 +1465,6 @@ private BookEntryModel.Builder makeCraftingRitualsEntry(BookLangHelper helper, E //endregion - //region Spirits - private BookCategoryModel makeSpiritsSubcategory(BookLangHelper helper) { helper.category("spirits"); @@ -1731,7 +1729,6 @@ private BookEntryModel.Builder makeWildHuntEntry(BookLangHelper helper, EntryLoc //endregion - //region Pentacles private BookCategoryModel makePentaclesCategory(BookLangHelper helper) { helper.category("pentacles"); @@ -2462,7 +2459,6 @@ private BookEntryModel.Builder makeSummonWildGreaterSpiritEntry(BookLangHelper h } //endregion - //region Rituals private BookCategoryModel makeRitualsCategory(BookLangHelper helper) { helper.category("rituals"); @@ -5101,7 +5097,6 @@ private BookEntryModel.Builder makeFamiliarShubNiggurathEntry(BookLangHelper hel } //endregion - //region Storage private BookCategoryModel makeStorageCategory(BookLangHelper helper) { helper.category("storage"); @@ -5328,6 +5323,4 @@ private BookEntryModel.Builder makeStorageStabilizerEntry(BookLangHelper helper, demo ); } - - //endregion } diff --git a/src/main/java/com/github/klikli_dev/occultism/datagen/PentacleProvider.java b/src/main/java/com/klikli_dev/occultism/datagen/PentacleProvider.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/datagen/PentacleProvider.java rename to src/main/java/com/klikli_dev/occultism/datagen/PentacleProvider.java index a1c83e150..623790475 100644 --- a/src/main/java/com/github/klikli_dev/occultism/datagen/PentacleProvider.java +++ b/src/main/java/com/klikli_dev/occultism/datagen/PentacleProvider.java @@ -20,15 +20,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.datagen; +package com.klikli_dev.occultism.datagen; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.registry.OccultismBlocks; -import com.github.klikli_dev.occultism.registry.OccultismTags; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.klikli_dev.modonomicon.data.MultiblockDataManager; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.registry.OccultismBlocks; +import com.klikli_dev.occultism.registry.OccultismTags; import net.minecraft.data.CachedOutput; import net.minecraft.data.DataGenerator; import net.minecraft.data.DataProvider; @@ -252,7 +252,7 @@ private void start() { private List createPattern(String... rows) { List pattern = new ArrayList<>(); for (String row : rows) { - pattern.add(row.replace(" ","_")); + pattern.add(row.replace(" ", "_")); } return pattern; } @@ -273,11 +273,11 @@ private void addPentacle(ResourceLocation rl, List pattern, Map cap.setJumps(0)); } } @@ -52,8 +52,7 @@ public static void onPlayerTick(final TickEvent.PlayerTickEvent evt) { @SubscribeEvent public static void onEntityJoinWorld(final EntityJoinLevelEvent evt) { - if (evt.getEntity() instanceof ServerPlayer) { - ServerPlayer player = (ServerPlayer) evt.getEntity(); + if (evt.getEntity() instanceof ServerPlayer player) { int jumps = player.getCapability(OccultismCapabilities.DOUBLE_JUMP).map(DoubleJumpCapability::getJumps).orElse(0); if (jumps > 0) { OccultismPackets.sendTo(player, new MessageSetJumps(jumps)); diff --git a/src/main/java/com/github/klikli_dev/occultism/handlers/ClientPlayerEventHandler.java b/src/main/java/com/klikli_dev/occultism/handlers/ClientPlayerEventHandler.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/handlers/ClientPlayerEventHandler.java rename to src/main/java/com/klikli_dev/occultism/handlers/ClientPlayerEventHandler.java index f28df021b..de8deee34 100644 --- a/src/main/java/com/github/klikli_dev/occultism/handlers/ClientPlayerEventHandler.java +++ b/src/main/java/com/klikli_dev/occultism/handlers/ClientPlayerEventHandler.java @@ -20,14 +20,14 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.handlers; +package com.klikli_dev.occultism.handlers; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.gui.storage.SatchelScreen; -import com.github.klikli_dev.occultism.client.gui.storage.StorageRemoteGui; -import com.github.klikli_dev.occultism.network.*; -import com.github.klikli_dev.occultism.util.CuriosUtil; -import com.github.klikli_dev.occultism.util.MovementUtil; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.gui.storage.SatchelScreen; +import com.klikli_dev.occultism.client.gui.storage.StorageRemoteGui; +import com.klikli_dev.occultism.network.*; +import com.klikli_dev.occultism.util.CuriosUtil; +import com.klikli_dev.occultism.util.MovementUtil; import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.sounds.SimpleSoundInstance; diff --git a/src/main/java/com/github/klikli_dev/occultism/handlers/ClientRegistryEventHandler.java b/src/main/java/com/klikli_dev/occultism/handlers/ClientRegistryEventHandler.java similarity index 83% rename from src/main/java/com/github/klikli_dev/occultism/handlers/ClientRegistryEventHandler.java rename to src/main/java/com/klikli_dev/occultism/handlers/ClientRegistryEventHandler.java index 266bcfae1..c15bb98f6 100644 --- a/src/main/java/com/github/klikli_dev/occultism/handlers/ClientRegistryEventHandler.java +++ b/src/main/java/com/klikli_dev/occultism/handlers/ClientRegistryEventHandler.java @@ -20,15 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.handlers; +package com.klikli_dev.occultism.handlers; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.particle.RitualWaitingParticle; -import com.github.klikli_dev.occultism.client.particle.SnowflakeParticle; -import com.github.klikli_dev.occultism.registry.OccultismParticles; -import net.minecraft.client.Minecraft; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.particle.RitualWaitingParticle; +import com.klikli_dev.occultism.client.particle.SnowflakeParticle; +import com.klikli_dev.occultism.registry.OccultismParticles; import net.minecraft.client.particle.FlameParticle; -import net.minecraft.client.particle.ParticleEngine; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RegisterParticleProvidersEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; diff --git a/src/main/java/com/github/klikli_dev/occultism/handlers/ClientSetupEventHandler.java b/src/main/java/com/klikli_dev/occultism/handlers/ClientSetupEventHandler.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/handlers/ClientSetupEventHandler.java rename to src/main/java/com/klikli_dev/occultism/handlers/ClientSetupEventHandler.java index a39f09158..e919c9e92 100644 --- a/src/main/java/com/github/klikli_dev/occultism/handlers/ClientSetupEventHandler.java +++ b/src/main/java/com/klikli_dev/occultism/handlers/ClientSetupEventHandler.java @@ -20,31 +20,29 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.handlers; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.client.gui.DimensionalMineshaftScreen; -import com.github.klikli_dev.occultism.client.gui.spirit.SpiritGui; -import com.github.klikli_dev.occultism.client.gui.spirit.SpiritTransporterGui; -import com.github.klikli_dev.occultism.client.gui.storage.SatchelScreen; -import com.github.klikli_dev.occultism.client.gui.storage.StableWormholeGui; -import com.github.klikli_dev.occultism.client.gui.storage.StorageControllerGui; -import com.github.klikli_dev.occultism.client.gui.storage.StorageRemoteGui; -import com.github.klikli_dev.occultism.client.itemproperties.*; -import com.github.klikli_dev.occultism.client.keybindings.BackpackKeyConflictContext; -import com.github.klikli_dev.occultism.client.keybindings.StorageRemoteKeyConflictContext; -import com.github.klikli_dev.occultism.client.model.entity.*; -import com.github.klikli_dev.occultism.client.render.ThirdEyeEffectRenderer; -import com.github.klikli_dev.occultism.client.render.blockentity.SacrificialBowlRenderer; -import com.github.klikli_dev.occultism.client.render.blockentity.StorageControllerGeoRenderer; -import com.github.klikli_dev.occultism.client.render.entity.*; -import com.github.klikli_dev.occultism.client.render.entity.MummyFamiliarRenderer.KapowModel; -import com.github.klikli_dev.occultism.common.capability.FamiliarSettingsCapability; -import com.github.klikli_dev.occultism.common.container.spirit.SpiritContainer; -import com.github.klikli_dev.occultism.integration.modonomicon.PageRenderers; -import com.github.klikli_dev.occultism.registry.*; +package com.klikli_dev.occultism.handlers; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.client.gui.DimensionalMineshaftScreen; +import com.klikli_dev.occultism.client.gui.spirit.SpiritGui; +import com.klikli_dev.occultism.client.gui.spirit.SpiritTransporterGui; +import com.klikli_dev.occultism.client.gui.storage.SatchelScreen; +import com.klikli_dev.occultism.client.gui.storage.StableWormholeGui; +import com.klikli_dev.occultism.client.gui.storage.StorageControllerGui; +import com.klikli_dev.occultism.client.gui.storage.StorageRemoteGui; +import com.klikli_dev.occultism.client.itemproperties.*; +import com.klikli_dev.occultism.client.keybindings.BackpackKeyConflictContext; +import com.klikli_dev.occultism.client.keybindings.StorageRemoteKeyConflictContext; +import com.klikli_dev.occultism.client.model.entity.*; +import com.klikli_dev.occultism.client.render.ThirdEyeEffectRenderer; +import com.klikli_dev.occultism.client.render.blockentity.SacrificialBowlRenderer; +import com.klikli_dev.occultism.client.render.blockentity.StorageControllerGeoRenderer; +import com.klikli_dev.occultism.client.render.entity.*; +import com.klikli_dev.occultism.common.capability.FamiliarSettingsCapability; +import com.klikli_dev.occultism.common.container.spirit.SpiritContainer; +import com.klikli_dev.occultism.integration.modonomicon.PageRenderers; +import com.klikli_dev.occultism.registry.*; import com.mojang.blaze3d.platform.InputConstants; -import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.KeyMapping; import net.minecraft.client.gui.screens.MenuScreens; import net.minecraft.client.renderer.blockentity.BlockEntityRenderers; @@ -105,7 +103,7 @@ public static void onRegisterEntityRendererLayerDefinitions(EntityRenderersEvent event.registerLayerDefinition(OccultismModelLayers.DJINNI, DjinniModel::createBodyLayer); event.registerLayerDefinition(OccultismModelLayers.FOLIOT, FoliotModel::createBodyLayer); event.registerLayerDefinition(OccultismModelLayers.MARID, MaridModel::createBodyLayer); - event.registerLayerDefinition(OccultismModelLayers.KAPOW, KapowModel::createBodyLayer); + event.registerLayerDefinition(OccultismModelLayers.KAPOW, MummyFamiliarRenderer.KapowModel::createBodyLayer); } @SubscribeEvent @@ -145,7 +143,7 @@ public static void onRegisterEntityRenderers(EntityRenderersEvent.RegisterRender } @SubscribeEvent - public static void onRegisterKeyMappings(RegisterKeyMappingsEvent event){ + public static void onRegisterKeyMappings(RegisterKeyMappingsEvent event) { event.register(KEY_BACKPACK); event.register(KEY_STORAGE_REMOTE); @@ -211,12 +209,13 @@ public static void registerItemModelProperties(FMLClientSetupEvent event) { Occultism.LOGGER.debug("Registered Item Properties"); }); } + @SubscribeEvent - public static void onRegisterGuiOverlays(RegisterGuiOverlaysEvent event){ - event.registerAboveAll("third_eye", (gui, poseStack, partialTick, screenWidth, screenHeight) -> { - if( Occultism.THIRD_EYE_EFFECT_RENDERER.gogglesActiveLastTick || Occultism.THIRD_EYE_EFFECT_RENDERER.thirdEyeActiveLastTick){ - gui.setupOverlayRenderState(true, false, ThirdEyeEffectRenderer.THIRD_EYE_TEXTURE); - Occultism.THIRD_EYE_EFFECT_RENDERER.renderOverlay(poseStack); + public static void onRegisterGuiOverlays(RegisterGuiOverlaysEvent event) { + event.registerAboveAll("third_eye", (gui, guiGraphics, partialTick, screenWidth, screenHeight) -> { + if (Occultism.THIRD_EYE_EFFECT_RENDERER.gogglesActiveLastTick || Occultism.THIRD_EYE_EFFECT_RENDERER.thirdEyeActiveLastTick) { + gui.setupOverlayRenderState(true, false); + Occultism.THIRD_EYE_EFFECT_RENDERER.renderOverlay(guiGraphics.pose()); } }); } diff --git a/src/main/java/com/github/klikli_dev/occultism/handlers/ColorEventHandler.java b/src/main/java/com/klikli_dev/occultism/handlers/ColorEventHandler.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/handlers/ColorEventHandler.java rename to src/main/java/com/klikli_dev/occultism/handlers/ColorEventHandler.java index b10daa56c..58ee015a3 100644 --- a/src/main/java/com/github/klikli_dev/occultism/handlers/ColorEventHandler.java +++ b/src/main/java/com/klikli_dev/occultism/handlers/ColorEventHandler.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.handlers; +package com.klikli_dev.occultism.handlers; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.block.otherworld.IOtherworldBlock; -import com.github.klikli_dev.occultism.registry.OccultismBlocks; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.block.otherworld.IOtherworldBlock; +import com.klikli_dev.occultism.registry.OccultismBlocks; import net.minecraft.client.color.block.BlockColors; import net.minecraft.client.renderer.BiomeColors; import net.minecraft.world.item.BlockItem; diff --git a/src/main/java/com/github/klikli_dev/occultism/handlers/FamiliarEventHandler.java b/src/main/java/com/klikli_dev/occultism/handlers/FamiliarEventHandler.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/handlers/FamiliarEventHandler.java rename to src/main/java/com/klikli_dev/occultism/handlers/FamiliarEventHandler.java index 30fd12357..45c524c58 100644 --- a/src/main/java/com/github/klikli_dev/occultism/handlers/FamiliarEventHandler.java +++ b/src/main/java/com/klikli_dev/occultism/handlers/FamiliarEventHandler.java @@ -20,15 +20,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.handlers; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.common.entity.familiar.*; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; -import com.github.klikli_dev.occultism.registry.OccultismEffects; -import com.github.klikli_dev.occultism.registry.OccultismEntities; -import com.github.klikli_dev.occultism.util.FamiliarUtil; +package com.klikli_dev.occultism.handlers; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.common.entity.familiar.*; +import com.klikli_dev.occultism.registry.OccultismAdvancements; +import com.klikli_dev.occultism.registry.OccultismEffects; +import com.klikli_dev.occultism.registry.OccultismEntities; +import com.klikli_dev.occultism.util.FamiliarUtil; import net.minecraft.core.BlockPos; import net.minecraft.tags.BlockTags; import net.minecraft.tags.DamageTypeTags; @@ -114,11 +114,9 @@ public static void livingDeathEvent(LivingDeathEvent event) { } private static void lifesteal(LivingDeathEvent event) { - if (!(event.getSource().getEntity() instanceof LivingEntity)) + if (!(event.getSource().getEntity() instanceof LivingEntity attacker)) return; - LivingEntity attacker = (LivingEntity) event.getSource().getEntity(); - if (!attacker.hasEffect(OccultismEffects.BAT_LIFESTEAL.get())) return; @@ -128,13 +126,11 @@ private static void lifesteal(LivingDeathEvent event) { private static void fairySave(LivingDeathEvent event) { LivingEntity entity = event.getEntity(); - if (event.getSource().is(DamageTypeTags.BYPASSES_INVULNERABILITY) || !(entity instanceof IFamiliar) + if (event.getSource().is(DamageTypeTags.BYPASSES_INVULNERABILITY) || !(entity instanceof IFamiliar familiar) || entity.getType() == OccultismEntities.GUARDIAN_FAMILIAR.get() || entity.getType() == OccultismEntities.FAIRY_FAMILIAR.get()) return; - IFamiliar familiar = (IFamiliar) entity; - LivingEntity owner = familiar.getFamiliarOwner(); if (owner == null || !FamiliarUtil.isFamiliarEnabled(owner, OccultismEntities.FAIRY_FAMILIAR.get())) @@ -149,15 +145,14 @@ private static void fairySave(LivingDeathEvent event) { entity.setHealth(2); entity.addEffect(new MobEffectInstance(MobEffects.ABSORPTION, 20 * 5, 2)); - if (!owner.level.isClientSide) + if (!owner.level().isClientSide) OccultismAdvancements.FAMILIAR.trigger(owner, FamiliarTrigger.Type.FAIRY_SAVE); } @SubscribeEvent public static void livingDamageEvent(LivingDamageEvent event) { - if (!(event.getSource().getEntity() instanceof Player)) + if (!(event.getSource().getEntity() instanceof Player player)) return; - Player player = (Player) event.getSource().getEntity(); if (!FamiliarUtil.isFamiliarEnabled(player, OccultismEntities.HEADLESS_FAMILIAR.get())) return; @@ -172,9 +167,8 @@ public static void livingDamageEvent(LivingDamageEvent event) { } private static void headlessStealHead(LivingDeathEvent event) { - if (!(event.getSource().getEntity() instanceof Player)) + if (!(event.getSource().getEntity() instanceof Player player)) return; - Player player = (Player) event.getSource().getEntity(); if (!FamiliarUtil.isFamiliarEnabled(player, OccultismEntities.HEADLESS_FAMILIAR.get())) return; @@ -189,10 +183,9 @@ private static void headlessStealHead(LivingDeathEvent event) { } private static void guardianUltimateSacrifice(LivingDeathEvent event) { - if (event.getSource().is(DamageTypeTags.BYPASSES_INVULNERABILITY) || !(event.getEntity() instanceof Player)) + if (event.getSource().is(DamageTypeTags.BYPASSES_INVULNERABILITY) || !(event.getEntity() instanceof Player player)) return; - Player player = (Player) event.getEntity(); if (!FamiliarUtil.isFamiliarEnabled(player, OccultismEntities.GUARDIAN_FAMILIAR.get())) return; diff --git a/src/main/java/com/github/klikli_dev/occultism/handlers/ForgeEventHandler.java b/src/main/java/com/klikli_dev/occultism/handlers/ForgeEventHandler.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/handlers/ForgeEventHandler.java rename to src/main/java/com/klikli_dev/occultism/handlers/ForgeEventHandler.java index 7058d48bd..16e81280c 100644 --- a/src/main/java/com/github/klikli_dev/occultism/handlers/ForgeEventHandler.java +++ b/src/main/java/com/klikli_dev/occultism/handlers/ForgeEventHandler.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.handlers; +package com.klikli_dev.occultism.handlers; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.registry.OccultismCommands; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.registry.OccultismCommands; import net.minecraftforge.event.RegisterCommandsEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/com/github/klikli_dev/occultism/handlers/LootEventHandler.java b/src/main/java/com/klikli_dev/occultism/handlers/LootEventHandler.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/handlers/LootEventHandler.java rename to src/main/java/com/klikli_dev/occultism/handlers/LootEventHandler.java index f4ec34393..0ec68846b 100644 --- a/src/main/java/com/github/klikli_dev/occultism/handlers/LootEventHandler.java +++ b/src/main/java/com/klikli_dev/occultism/handlers/LootEventHandler.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.handlers; +package com.klikli_dev.occultism.handlers; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.registry.OccultismEffects; -import com.github.klikli_dev.occultism.registry.OccultismEntities; -import com.github.klikli_dev.occultism.util.FamiliarUtil; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.registry.OccultismEffects; +import com.klikli_dev.occultism.registry.OccultismEntities; +import com.klikli_dev.occultism.util.FamiliarUtil; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.item.ItemEntity; diff --git a/src/main/java/com/github/klikli_dev/occultism/handlers/PlayerEventHandler.java b/src/main/java/com/klikli_dev/occultism/handlers/PlayerEventHandler.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/handlers/PlayerEventHandler.java rename to src/main/java/com/klikli_dev/occultism/handlers/PlayerEventHandler.java index 0e58e0784..2f0ed7bcc 100644 --- a/src/main/java/com/github/klikli_dev/occultism/handlers/PlayerEventHandler.java +++ b/src/main/java/com/klikli_dev/occultism/handlers/PlayerEventHandler.java @@ -20,15 +20,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.handlers; +package com.klikli_dev.occultism.handlers; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.common.entity.familiar.IFamiliar; -import com.github.klikli_dev.occultism.registry.OccultismAdvancements; -import com.github.klikli_dev.occultism.registry.OccultismBlocks; -import com.github.klikli_dev.occultism.registry.OccultismItems; -import com.github.klikli_dev.occultism.util.Math3DUtil; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.common.entity.familiar.IFamiliar; +import com.klikli_dev.occultism.registry.OccultismAdvancements; +import com.klikli_dev.occultism.registry.OccultismBlocks; +import com.klikli_dev.occultism.registry.OccultismItems; +import com.klikli_dev.occultism.util.Math3DUtil; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/github/klikli_dev/occultism/handlers/TooltipHandler.java b/src/main/java/com/klikli_dev/occultism/handlers/TooltipHandler.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/handlers/TooltipHandler.java rename to src/main/java/com/klikli_dev/occultism/handlers/TooltipHandler.java index cb820b3b5..70ac4532b 100644 --- a/src/main/java/com/github/klikli_dev/occultism/handlers/TooltipHandler.java +++ b/src/main/java/com/klikli_dev/occultism/handlers/TooltipHandler.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.handlers; +package com.klikli_dev.occultism.handlers; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.util.ItemNBTUtil; -import com.github.klikli_dev.occultism.util.TextUtil; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.util.ItemNBTUtil; +import com.klikli_dev.occultism.util.TextUtil; import net.minecraft.ChatFormatting; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; @@ -49,11 +49,11 @@ public static void onAddInformation(ItemTooltipEvent event) { TextUtil.formatDemonName(ItemNBTUtil.getBoundSpiritName(stack)))); } - if(Occultism.CLIENT_CONFIG.visuals.showItemTagsInTooltip.get() && event.getFlags().isAdvanced()){ + if (Occultism.CLIENT_CONFIG.visuals.showItemTagsInTooltip.get() && event.getFlags().isAdvanced()) { var tooltips = event.getToolTip(); var item = event.getItemStack().getItem(); - ForgeRegistries.ITEMS.tags().getReverseTag(item).ifPresent((tag)->{ - tag.getTagKeys().forEach((key)->{ + ForgeRegistries.ITEMS.tags().getReverseTag(item).ifPresent((tag) -> { + tag.getTagKeys().forEach((key) -> { tooltips.add(Component.literal(key.toString()).withStyle(ChatFormatting.DARK_GRAY)); }); }); diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/almostunified/AlmostUnifiedIntegration.java b/src/main/java/com/klikli_dev/occultism/integration/almostunified/AlmostUnifiedIntegration.java similarity index 74% rename from src/main/java/com/github/klikli_dev/occultism/integration/almostunified/AlmostUnifiedIntegration.java rename to src/main/java/com/klikli_dev/occultism/integration/almostunified/AlmostUnifiedIntegration.java index fb5605268..b61cc2b52 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/almostunified/AlmostUnifiedIntegration.java +++ b/src/main/java/com/klikli_dev/occultism/integration/almostunified/AlmostUnifiedIntegration.java @@ -1,6 +1,5 @@ -package com.github.klikli_dev.occultism.integration.almostunified; +package com.klikli_dev.occultism.integration.almostunified; -import com.almostreliable.unified.api.AlmostUnifiedLookup; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraftforge.fml.ModList; @@ -20,7 +19,9 @@ public static Item getPreferredItemForTag(TagKey tag) { public static class AlmostUnifiedHelper { public static Item getPreferredItemForTag(TagKey tag) { - return AlmostUnifiedLookup.INSTANCE.getPreferredItemForTag(tag); + //TODO: enable once updated +// return AlmostUnifiedLookup.INSTANCE.getPreferredItemForTag(tag); + return null; } } } diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/jei/JeiAccess.java b/src/main/java/com/klikli_dev/occultism/integration/jei/JeiAccess.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/integration/jei/JeiAccess.java rename to src/main/java/com/klikli_dev/occultism/integration/jei/JeiAccess.java index 78655484f..9d0498cc3 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/jei/JeiAccess.java +++ b/src/main/java/com/klikli_dev/occultism/integration/jei/JeiAccess.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.integration.jei; +package com.klikli_dev.occultism.integration.jei; import com.google.common.base.Strings; import mezz.jei.api.runtime.IJeiRuntime; diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/jei/JeiPlugin.java b/src/main/java/com/klikli_dev/occultism/integration/jei/JeiPlugin.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/integration/jei/JeiPlugin.java rename to src/main/java/com/klikli_dev/occultism/integration/jei/JeiPlugin.java index ee35ecf54..1be35f092 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/jei/JeiPlugin.java +++ b/src/main/java/com/klikli_dev/occultism/integration/jei/JeiPlugin.java @@ -20,23 +20,23 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.integration.jei; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.container.storage.StableWormholeContainer; -import com.github.klikli_dev.occultism.common.container.storage.StorageControllerContainer; -import com.github.klikli_dev.occultism.common.container.storage.StorageRemoteContainer; -import com.github.klikli_dev.occultism.crafting.recipe.CrushingRecipe; -import com.github.klikli_dev.occultism.crafting.recipe.MinerRecipe; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; -import com.github.klikli_dev.occultism.crafting.recipe.SpiritFireRecipe; -import com.github.klikli_dev.occultism.integration.jei.recipes.CrushingRecipeCategory; -import com.github.klikli_dev.occultism.integration.jei.recipes.MinerRecipeCategory; -import com.github.klikli_dev.occultism.integration.jei.recipes.RitualRecipeCategory; -import com.github.klikli_dev.occultism.integration.jei.recipes.SpiritFireRecipeCategory; -import com.github.klikli_dev.occultism.registry.OccultismBlocks; -import com.github.klikli_dev.occultism.registry.OccultismItems; -import com.github.klikli_dev.occultism.registry.OccultismRecipes; +package com.klikli_dev.occultism.integration.jei; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.container.storage.StableWormholeContainer; +import com.klikli_dev.occultism.common.container.storage.StorageControllerContainer; +import com.klikli_dev.occultism.common.container.storage.StorageRemoteContainer; +import com.klikli_dev.occultism.crafting.recipe.CrushingRecipe; +import com.klikli_dev.occultism.crafting.recipe.MinerRecipe; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.crafting.recipe.SpiritFireRecipe; +import com.klikli_dev.occultism.integration.jei.recipes.CrushingRecipeCategory; +import com.klikli_dev.occultism.integration.jei.recipes.MinerRecipeCategory; +import com.klikli_dev.occultism.integration.jei.recipes.RitualRecipeCategory; +import com.klikli_dev.occultism.integration.jei.recipes.SpiritFireRecipeCategory; +import com.klikli_dev.occultism.registry.OccultismBlocks; +import com.klikli_dev.occultism.registry.OccultismItems; +import com.klikli_dev.occultism.registry.OccultismRecipes; import mezz.jei.api.IModPlugin; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.helpers.IStackHelper; diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/jei/JeiRecipeTypes.java b/src/main/java/com/klikli_dev/occultism/integration/jei/JeiRecipeTypes.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/integration/jei/JeiRecipeTypes.java rename to src/main/java/com/klikli_dev/occultism/integration/jei/JeiRecipeTypes.java index f0aef91f8..695977516 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/jei/JeiRecipeTypes.java +++ b/src/main/java/com/klikli_dev/occultism/integration/jei/JeiRecipeTypes.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.integration.jei; +package com.klikli_dev.occultism.integration.jei; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.crafting.recipe.*; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.crafting.recipe.*; import mezz.jei.api.recipe.RecipeType; public class JeiRecipeTypes { diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/jei/JeiSettings.java b/src/main/java/com/klikli_dev/occultism/integration/jei/JeiSettings.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/integration/jei/JeiSettings.java rename to src/main/java/com/klikli_dev/occultism/integration/jei/JeiSettings.java index 4fa43f426..4c4df53dc 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/jei/JeiSettings.java +++ b/src/main/java/com/klikli_dev/occultism/integration/jei/JeiSettings.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.integration.jei; +package com.klikli_dev.occultism.integration.jei; -import com.github.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.Occultism; public class JeiSettings { diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/jei/StorageControllerRecipeTransferHandler.java b/src/main/java/com/klikli_dev/occultism/integration/jei/StorageControllerRecipeTransferHandler.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/integration/jei/StorageControllerRecipeTransferHandler.java rename to src/main/java/com/klikli_dev/occultism/integration/jei/StorageControllerRecipeTransferHandler.java index b3d411a2c..dc2376c64 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/jei/StorageControllerRecipeTransferHandler.java +++ b/src/main/java/com/klikli_dev/occultism/integration/jei/StorageControllerRecipeTransferHandler.java @@ -20,13 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.integration.jei; +package com.klikli_dev.occultism.integration.jei; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.api.common.container.IStorageControllerContainer; -import com.github.klikli_dev.occultism.network.MessageSetRecipe; -import com.github.klikli_dev.occultism.network.MessageSetRecipeByID; -import com.github.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.api.common.container.IStorageControllerContainer; +import com.klikli_dev.occultism.network.MessageSetRecipe; +import com.klikli_dev.occultism.network.MessageSetRecipeByID; +import com.klikli_dev.occultism.network.OccultismPackets; import mezz.jei.api.constants.RecipeTypes; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/jei/recipes/CrushingRecipeCategory.java b/src/main/java/com/klikli_dev/occultism/integration/jei/recipes/CrushingRecipeCategory.java similarity index 75% rename from src/main/java/com/github/klikli_dev/occultism/integration/jei/recipes/CrushingRecipeCategory.java rename to src/main/java/com/klikli_dev/occultism/integration/jei/recipes/CrushingRecipeCategory.java index a832ef4ea..c87b4f150 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/jei/recipes/CrushingRecipeCategory.java +++ b/src/main/java/com/klikli_dev/occultism/integration/jei/recipes/CrushingRecipeCategory.java @@ -20,14 +20,14 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.integration.jei.recipes; +package com.klikli_dev.occultism.integration.jei.recipes; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.TranslationKeys; -import com.github.klikli_dev.occultism.crafting.recipe.CrushingRecipe; -import com.github.klikli_dev.occultism.integration.jei.JeiRecipeTypes; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.TranslationKeys; +import com.klikli_dev.occultism.crafting.recipe.CrushingRecipe; +import com.klikli_dev.occultism.integration.jei.JeiRecipeTypes; +import com.klikli_dev.occultism.util.GuiGraphicsExt; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.drawable.IDrawable; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; @@ -38,6 +38,7 @@ import mezz.jei.api.recipe.category.IRecipeCategory; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; @@ -54,8 +55,8 @@ public CrushingRecipeCategory(IGuiHelper guiHelper) { new ResourceLocation(Occultism.MODID, "textures/gui/jei/arrow.png"), 0, 0, 64, 46); } - protected void drawStringCentered(PoseStack poseStack, Font fontRenderer, Component text, int x, int y) { - fontRenderer.draw(poseStack, text, (x - fontRenderer.width(text) / 2.0f), y, 0); + protected void drawStringCentered(GuiGraphics guiGraphics, Font font, Component text, int x, int y) { + GuiGraphicsExt.drawString(guiGraphics, font, text, (x - font.width(text) / 2.0f), y, 0, false); } @Override @@ -88,12 +89,12 @@ public void setRecipe(IRecipeLayoutBuilder builder, CrushingRecipe recipe, IFocu } @Override - public void draw(CrushingRecipe recipe, IRecipeSlotsView recipeSlotsView, PoseStack stack, double mouseX, double mouseY) { + public void draw(CrushingRecipe recipe, IRecipeSlotsView recipeSlotsView, GuiGraphics guiGraphics, double mouseX, double mouseY) { RenderSystem.enableBlend(); - this.overlay.draw(stack, 76, 14); //(center=84) - (width/16=8) = 76 - this.drawStringCentered(stack, Minecraft.getInstance().font, this.getTitle(), 84, 0); - if(recipe.getMinTier() >= 0){ - this.drawStringCentered(stack, Minecraft.getInstance().font, Component.translatable(TranslationKeys.JEI_CRUSHING_RECIPE_TIER, recipe.getMinTier()), 84, 35); + this.overlay.draw(guiGraphics, 76, 14); //(center=84) - (width/16=8) = 76 + this.drawStringCentered(guiGraphics, Minecraft.getInstance().font, this.getTitle(), 84, 0); + if (recipe.getMinTier() >= 0) { + this.drawStringCentered(guiGraphics, Minecraft.getInstance().font, Component.translatable(TranslationKeys.JEI_CRUSHING_RECIPE_TIER, recipe.getMinTier()), 84, 35); } } } diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/jei/recipes/MinerRecipeCategory.java b/src/main/java/com/klikli_dev/occultism/integration/jei/recipes/MinerRecipeCategory.java similarity index 83% rename from src/main/java/com/github/klikli_dev/occultism/integration/jei/recipes/MinerRecipeCategory.java rename to src/main/java/com/klikli_dev/occultism/integration/jei/recipes/MinerRecipeCategory.java index d11154d6e..798f3b166 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/jei/recipes/MinerRecipeCategory.java +++ b/src/main/java/com/klikli_dev/occultism/integration/jei/recipes/MinerRecipeCategory.java @@ -20,13 +20,14 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.integration.jei.recipes; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.misc.WeightedOutputIngredient; -import com.github.klikli_dev.occultism.crafting.recipe.MinerRecipe; -import com.github.klikli_dev.occultism.integration.jei.JeiRecipeTypes; -import com.github.klikli_dev.occultism.registry.OccultismRecipes; +package com.klikli_dev.occultism.integration.jei.recipes; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.misc.WeightedOutputIngredient; +import com.klikli_dev.occultism.crafting.recipe.MinerRecipe; +import com.klikli_dev.occultism.integration.jei.JeiRecipeTypes; +import com.klikli_dev.occultism.registry.OccultismRecipes; +import com.klikli_dev.occultism.util.GuiGraphicsExt; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; @@ -39,6 +40,7 @@ import mezz.jei.api.recipe.category.IRecipeCategory; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.random.WeightedRandom; @@ -66,8 +68,8 @@ public MinerRecipeCategory(IGuiHelper guiHelper) { new ResourceLocation(Occultism.MODID, "textures/gui/jei/arrow.png"), 0, 0, 64, 46); } - protected void drawStringCentered(PoseStack poseStack, Font fontRenderer, Component text, int x, int y) { - fontRenderer.draw(poseStack, text, (x - fontRenderer.width(text) / 2.0f), y, 0); + protected void drawStringCentered(GuiGraphics guiGraphics, Font font, Component text, int x, int y) { + GuiGraphicsExt.drawString(guiGraphics, font, text, x - font.width(text) / 2.0f, y, 0, false); } @Override @@ -114,10 +116,10 @@ public void setRecipe(IRecipeLayoutBuilder builder, MinerRecipe recipe, IFocusGr } @Override - public void draw(MinerRecipe recipe, IRecipeSlotsView recipeSlotsView, PoseStack stack, double mouseX, double mouseY) { + public void draw(MinerRecipe recipe, IRecipeSlotsView recipeSlotsView, GuiGraphics guiGraphics, double mouseX, double mouseY) { RenderSystem.enableBlend(); - this.overlay.draw(stack, 76, 14); //(center=84) - (width/16=8) = 76 - this.drawStringCentered(stack, Minecraft.getInstance().font, + this.overlay.draw(guiGraphics, 76, 14); //(center=84) - (width/16=8) = 76 + this.drawStringCentered(guiGraphics, Minecraft.getInstance().font, Component.translatable(Occultism.MODID + ".jei.miner.chance", this.chances.get(recipe)), 84, 0); } } diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/jei/recipes/RitualRecipeCategory.java b/src/main/java/com/klikli_dev/occultism/integration/jei/recipes/RitualRecipeCategory.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/integration/jei/recipes/RitualRecipeCategory.java rename to src/main/java/com/klikli_dev/occultism/integration/jei/recipes/RitualRecipeCategory.java index e87836f71..2928c4762 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/jei/recipes/RitualRecipeCategory.java +++ b/src/main/java/com/klikli_dev/occultism/integration/jei/recipes/RitualRecipeCategory.java @@ -20,16 +20,16 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.integration.jei.recipes; +package com.klikli_dev.occultism.integration.jei.recipes; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; -import com.github.klikli_dev.occultism.integration.jei.JeiRecipeTypes; -import com.github.klikli_dev.occultism.registry.OccultismBlocks; -import com.github.klikli_dev.occultism.registry.OccultismItems; import com.klikli_dev.modonomicon.api.ModonomiconAPI; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.integration.jei.JeiRecipeTypes; +import com.klikli_dev.occultism.registry.OccultismBlocks; +import com.klikli_dev.occultism.registry.OccultismItems; +import com.klikli_dev.occultism.util.GuiGraphicsExt; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.PoseStack; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.drawable.IDrawable; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; @@ -41,6 +41,7 @@ import net.minecraft.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.core.Vec3i; import net.minecraft.network.chat.Component; @@ -83,12 +84,12 @@ protected int getStringCenteredMaxX(Font font, Component text, int x, int y) { return actualX + width; } - protected void drawStringCentered(PoseStack poseStack, Font font, Component text, int x, int y) { - font.draw(poseStack, text, (x - font.width(text) / 2.0f), y, 0); + protected void drawStringCentered(GuiGraphics guiGraphics, Font font, Component text, int x, int y) { + GuiGraphicsExt.drawString(guiGraphics, font, text, (x - font.width(text) / 2.0f), y, 0, false); } - protected void drawStringCentered(PoseStack poseStack, Font font, FormattedCharSequence text, int x, int y) { - font.draw(poseStack, text, (x - font.width(text) / 2.0f), y, 0); + protected void drawStringCentered(GuiGraphics guiGraphics, Font font, FormattedCharSequence text, int x, int y) { + GuiGraphicsExt.drawString(guiGraphics, font, text, (x - font.width(text) / 2.0f), y, 0, false); } @Override @@ -192,7 +193,6 @@ public void setRecipe(IRecipeLayoutBuilder builder, RitualRecipe recipe, IFocusG .addItemStack(recipe.getRitualDummy()); - //draw item to use if (recipe.requiresItemUse()) { @@ -203,9 +203,9 @@ public void setRecipe(IRecipeLayoutBuilder builder, RitualRecipe recipe, IFocusG //simulate pentacle id rendering, to get the correct Y level to draw at if (pentacle != null) { - var pentacleName = Minecraft.getInstance().font.split( Component.translatable(Util.makeDescriptionId("multiblock", pentacle.getId())), 150); + var pentacleName = Minecraft.getInstance().font.split(Component.translatable(Util.makeDescriptionId("multiblock", pentacle.getId())), 150); - for(var line : pentacleName){ + for (var line : pentacleName) { //Don't actually draw //this.drawStringCentered(poseStack, Minecraft.getInstance().font, line , infoTextX, infotextY); infotextY += lineHeight; @@ -227,9 +227,9 @@ public void setRecipe(IRecipeLayoutBuilder builder, RitualRecipe recipe, IFocusG } @Override - public void draw(RitualRecipe recipe, IRecipeSlotsView recipeSlotsView, PoseStack poseStack, double mouseX, double mouseY) { + public void draw(RitualRecipe recipe, IRecipeSlotsView recipeSlotsView, GuiGraphics guiGraphics, double mouseX, double mouseY) { RenderSystem.enableBlend(); - this.arrow.draw(poseStack, this.ritualCenterX + this.recipeOutputOffsetX - 20, this.ritualCenterY); + this.arrow.draw(guiGraphics, this.ritualCenterX + this.recipeOutputOffsetX - 20, this.ritualCenterY); RenderSystem.disableBlend(); int infotextY = 0; @@ -237,38 +237,38 @@ public void draw(RitualRecipe recipe, IRecipeSlotsView recipeSlotsView, PoseStac int lineHeight = Minecraft.getInstance().font.lineHeight; var pentacle = ModonomiconAPI.get().getMultiblock(recipe.getPentacleId()); if (pentacle != null) { - var pentacleName = Minecraft.getInstance().font.split( Component.translatable(Util.makeDescriptionId("multiblock", pentacle.getId())), 150); + var pentacleName = Minecraft.getInstance().font.split(Component.translatable(Util.makeDescriptionId("multiblock", pentacle.getId())), 150); - for(var line : pentacleName){ - this.drawStringCentered(poseStack, Minecraft.getInstance().font, - line , infoTextX, infotextY); + for (var line : pentacleName) { + this.drawStringCentered(guiGraphics, Minecraft.getInstance().font, + line, infoTextX, infotextY); infotextY += lineHeight; } } else { - this.drawStringCentered(poseStack, Minecraft.getInstance().font, + this.drawStringCentered(guiGraphics, Minecraft.getInstance().font, Component.translatable("jei.occultism.error.pentacle_not_loaded"), infoTextX, 0); } if (recipe.requiresSacrifice()) { - this.drawStringCentered(poseStack, Minecraft.getInstance().font, + this.drawStringCentered(guiGraphics, Minecraft.getInstance().font, Component.translatable("jei.occultism.sacrifice", Component.translatable(recipe.getEntityToSacrificeDisplayName())), infoTextX, infotextY); infotextY += lineHeight; } if (recipe.requiresItemUse()) { - this.drawStringCentered(poseStack, Minecraft.getInstance().font, Component.translatable("jei.occultism.item_to_use"), infoTextX, infotextY); + this.drawStringCentered(guiGraphics, Minecraft.getInstance().font, Component.translatable("jei.occultism.item_to_use"), infoTextX, infotextY); infotextY += lineHeight; } if (recipe.getEntityToSummon() != null) { - this.drawStringCentered(poseStack, Minecraft.getInstance().font, + this.drawStringCentered(guiGraphics, Minecraft.getInstance().font, Component.translatable("jei.occultism.summon", Component.translatable(recipe.getEntityToSummon().getDescriptionId())), infoTextX, infotextY); infotextY += lineHeight; } if (recipe.getSpiritJobType() != null) { - this.drawStringCentered(poseStack, Minecraft.getInstance().font, + this.drawStringCentered(guiGraphics, Minecraft.getInstance().font, Component.translatable("jei.occultism.job", Component.translatable("job." + recipe.getSpiritJobType().toString().replace(":", "."))), infoTextX, infotextY); diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/jei/recipes/SpiritFireRecipeCategory.java b/src/main/java/com/klikli_dev/occultism/integration/jei/recipes/SpiritFireRecipeCategory.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/integration/jei/recipes/SpiritFireRecipeCategory.java rename to src/main/java/com/klikli_dev/occultism/integration/jei/recipes/SpiritFireRecipeCategory.java index 896bbdacc..e424561b8 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/jei/recipes/SpiritFireRecipeCategory.java +++ b/src/main/java/com/klikli_dev/occultism/integration/jei/recipes/SpiritFireRecipeCategory.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.integration.jei.recipes; +package com.klikli_dev.occultism.integration.jei.recipes; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.crafting.recipe.SpiritFireRecipe; -import com.github.klikli_dev.occultism.integration.jei.JeiRecipeTypes; -import com.github.klikli_dev.occultism.registry.OccultismItems; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.crafting.recipe.SpiritFireRecipe; +import com.klikli_dev.occultism.integration.jei.JeiRecipeTypes; +import com.klikli_dev.occultism.registry.OccultismItems; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import mezz.jei.api.constants.VanillaTypes; @@ -38,6 +38,7 @@ import mezz.jei.api.recipe.RecipeType; import mezz.jei.api.recipe.category.IRecipeCategory; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ItemStack; @@ -92,8 +93,8 @@ public void setRecipe(IRecipeLayoutBuilder builder, SpiritFireRecipe recipe, IFo } @Override - public void draw(SpiritFireRecipe recipe, IRecipeSlotsView recipeSlotsView, PoseStack stack, double mouseX, double mouseY) { + public void draw(SpiritFireRecipe recipe, IRecipeSlotsView recipeSlotsView, GuiGraphics guiGraphics, double mouseX, double mouseY) { RenderSystem.enableBlend(); - this.overlay.draw(stack, 48, 0); + this.overlay.draw(guiGraphics, 48, 0); } } diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/OccultismModonomiconConstants.java b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/OccultismModonomiconConstants.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/OccultismModonomiconConstants.java rename to src/main/java/com/klikli_dev/occultism/integration/modonomicon/OccultismModonomiconConstants.java index 68a8371f9..b26113747 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/OccultismModonomiconConstants.java +++ b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/OccultismModonomiconConstants.java @@ -1,6 +1,6 @@ -package com.github.klikli_dev.occultism.integration.modonomicon; +package com.klikli_dev.occultism.integration.modonomicon; -import com.github.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.Occultism; import net.minecraft.resources.ResourceLocation; public class OccultismModonomiconConstants { @@ -10,7 +10,7 @@ public static class Page { public static final ResourceLocation RITUAL_RECIPE = new ResourceLocation(Occultism.MODID, "ritual_recipe"); } - public static class I18n{ + public static class I18n { public static final String PREFIX = Occultism.MODID + "."; public static final String RITUAL_RECIPE_ITEM_USE = PREFIX + "modonomicon.ritual_recipe.item_to_use"; public static final String RITUAL_RECIPE_SUMMON = PREFIX + "modonomicon.ritual_recipe.summon"; diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/PageLoaders.java b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/PageLoaders.java similarity index 68% rename from src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/PageLoaders.java rename to src/main/java/com/klikli_dev/occultism/integration/modonomicon/PageLoaders.java index b205f557a..854ffe84f 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/PageLoaders.java +++ b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/PageLoaders.java @@ -1,9 +1,9 @@ -package com.github.klikli_dev.occultism.integration.modonomicon; +package com.klikli_dev.occultism.integration.modonomicon; -import com.github.klikli_dev.occultism.integration.modonomicon.pages.BookRitualRecipePage; -import com.github.klikli_dev.occultism.integration.modonomicon.pages.BookSpiritFireRecipePage; -import com.github.klikli_dev.occultism.integration.modonomicon.pages.BookSpiritTradeRecipePage; import com.klikli_dev.modonomicon.data.LoaderRegistry; +import com.klikli_dev.occultism.integration.modonomicon.pages.BookRitualRecipePage; +import com.klikli_dev.occultism.integration.modonomicon.pages.BookSpiritFireRecipePage; +import com.klikli_dev.occultism.integration.modonomicon.pages.BookSpiritTradeRecipePage; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; public class PageLoaders { diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/PageRenderers.java b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/PageRenderers.java similarity index 71% rename from src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/PageRenderers.java rename to src/main/java/com/klikli_dev/occultism/integration/modonomicon/PageRenderers.java index f58547fb5..c952aa964 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/PageRenderers.java +++ b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/PageRenderers.java @@ -1,8 +1,7 @@ -package com.github.klikli_dev.occultism.integration.modonomicon; +package com.klikli_dev.occultism.integration.modonomicon; -import com.github.klikli_dev.occultism.integration.modonomicon.OccultismModonomiconConstants.Page; -import com.github.klikli_dev.occultism.integration.modonomicon.pages.*; import com.klikli_dev.modonomicon.client.render.page.PageRendererRegistry; +import com.klikli_dev.occultism.integration.modonomicon.pages.*; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; public class PageRenderers { @@ -13,11 +12,11 @@ public static void onClientSetup(FMLClientSetupEvent event) { p -> new BookSpiritFireRecipePageRenderer<>((BookSpiritFireRecipePage) p) { }); PageRendererRegistry.registerPageRenderer( - Page.SPIRIT_TRADE_RECIPE, + OccultismModonomiconConstants.Page.SPIRIT_TRADE_RECIPE, p -> new BookSpiritTradeRecipePageRenderer<>((BookSpiritTradeRecipePage) p) { }); PageRendererRegistry.registerPageRenderer( - Page.RITUAL_RECIPE, + OccultismModonomiconConstants.Page.RITUAL_RECIPE, p -> new BookRitualRecipePageRenderer((BookRitualRecipePage) p) { }); } diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePage.java b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePage.java similarity index 84% rename from src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePage.java rename to src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePage.java index 7477f3e56..c39efc1ac 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePage.java +++ b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePage.java @@ -4,14 +4,14 @@ * SPDX-License-Identifier: MIT */ -package com.github.klikli_dev.occultism.integration.modonomicon.pages; +package com.klikli_dev.occultism.integration.modonomicon.pages; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; -import com.github.klikli_dev.occultism.integration.modonomicon.OccultismModonomiconConstants.Page; -import com.github.klikli_dev.occultism.registry.OccultismRecipes; import com.google.gson.JsonObject; import com.klikli_dev.modonomicon.book.BookTextHolder; import com.klikli_dev.modonomicon.book.page.BookRecipePage; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.integration.modonomicon.OccultismModonomiconConstants; +import com.klikli_dev.occultism.registry.OccultismRecipes; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.GsonHelper; @@ -22,11 +22,6 @@ public BookRitualRecipePage(BookTextHolder title1, ResourceLocation recipeId1, B super(OccultismRecipes.RITUAL_TYPE.get(), title1, recipeId1, title2, recipeId2, text, anchor); } - @Override - public ResourceLocation getType() { - return Page.RITUAL_RECIPE; - } - public static BookRitualRecipePage fromJson(JsonObject json) { var common = BookRecipePage.commonFromJson(json); var anchor = GsonHelper.getAsString(json, "anchor", ""); @@ -39,6 +34,11 @@ public static BookRitualRecipePage fromNetwork(FriendlyByteBuf buffer) { return new BookRitualRecipePage(common.title1(), common.recipeId1(), common.title2(), common.recipeId2(), common.text(), anchor); } + @Override + public ResourceLocation getType() { + return OccultismModonomiconConstants.Page.RITUAL_RECIPE; + } + @Override protected ItemStack getRecipeOutput(RitualRecipe recipe) { if (recipe == null) { diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePageModel.java b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePageModel.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePageModel.java rename to src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePageModel.java index 09deee508..5896aa7e1 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePageModel.java +++ b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePageModel.java @@ -4,17 +4,17 @@ * SPDX-License-Identifier: MIT */ -package com.github.klikli_dev.occultism.integration.modonomicon.pages; +package com.klikli_dev.occultism.integration.modonomicon.pages; -import com.github.klikli_dev.occultism.integration.modonomicon.OccultismModonomiconConstants.Page; import com.klikli_dev.modonomicon.api.datagen.book.page.BookRecipePageModel; +import com.klikli_dev.occultism.integration.modonomicon.OccultismModonomiconConstants; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import org.jetbrains.annotations.NotNull; public class BookRitualRecipePageModel extends BookRecipePageModel { protected BookRitualRecipePageModel(@NotNull String anchor) { - super(Page.RITUAL_RECIPE, anchor); + super(OccultismModonomiconConstants.Page.RITUAL_RECIPE, anchor); } public static Builder builder() { diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePageRenderer.java b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePageRenderer.java similarity index 61% rename from src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePageRenderer.java rename to src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePageRenderer.java index 5918569ea..64bf952fe 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePageRenderer.java +++ b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookRitualRecipePageRenderer.java @@ -4,16 +4,16 @@ * SPDX-License-Identifier: MIT */ -package com.github.klikli_dev.occultism.integration.modonomicon.pages; +package com.klikli_dev.occultism.integration.modonomicon.pages; -import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe; -import com.github.klikli_dev.occultism.integration.modonomicon.OccultismModonomiconConstants; -import com.github.klikli_dev.occultism.registry.OccultismBlocks; import com.klikli_dev.modonomicon.book.page.BookRecipePage; import com.klikli_dev.modonomicon.client.gui.book.BookContentScreen; import com.klikli_dev.modonomicon.client.render.page.BookRecipePageRenderer; -import com.mojang.blaze3d.vertex.PoseStack; +import com.klikli_dev.occultism.crafting.recipe.RitualRecipe; +import com.klikli_dev.occultism.integration.modonomicon.OccultismModonomiconConstants; +import com.klikli_dev.occultism.registry.OccultismBlocks; import net.minecraft.Util; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.resources.language.I18n; import net.minecraft.core.Vec3i; import net.minecraft.network.chat.ClickEvent; @@ -45,19 +45,19 @@ protected int getRecipeHeight() { } @Override - public void render(PoseStack poseStack, int mouseX, int mouseY, float ticks) { + public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float ticks) { int recipeX = X; int recipeY = Y; if (this.page.getRecipe1() != null) { //rituals only support one recipe - drawRecipe(poseStack, this.page.getRecipe1(), recipeX, recipeY, mouseX, mouseY, false); + this.drawRecipe(guiGraphics, this.page.getRecipe1(), recipeX, recipeY, mouseX, mouseY, false); } var style = this.getClickedComponentStyleAt(mouseX, mouseY); if (style != null) - this.parentScreen.renderComponentHoverEffect(poseStack, style, mouseX, mouseY); + this.parentScreen.renderComponentHoverEffect(guiGraphics, style, mouseX, mouseY); } @Nullable @@ -77,14 +77,13 @@ public Style getClickedComponentStyleAt(double pMouseX, double pMouseY) { var nameWidth = this.font.width(pentacleName); int maxWidth = BookContentScreen.MAX_TITLE_WIDTH - RITUAL_DUMMY_OFFSET - 10; //account for the ritual dummy icon, 10 is a magic constant - var scale = Math.min(1.0f, (float) maxWidth / (float) nameWidth); - if (scale < 1) - { + var scale = Math.min(1.0f, (float) maxWidth / (float) nameWidth); + if (scale < 1) { nameWidth = (int) (nameWidth * scale); } - if(pMouseX > pentacleNameX && pMouseX < pentacleNameX + nameWidth && pMouseY > pentacleNameY && pMouseY < pentacleNameY + this.font.lineHeight) { - var goToText = "book.occultism.dictionary_of_spirits.pentacles."+this.page.getRecipe1().getPentacleId().getPath()+".name"; + if (pMouseX > pentacleNameX && pMouseX < pentacleNameX + nameWidth && pMouseY > pentacleNameY && pMouseY < pentacleNameY + this.font.lineHeight) { + var goToText = "book.occultism.dictionary_of_spirits.pentacles." + this.page.getRecipe1().getPentacleId().getPath() + ".name"; var hoverComponent = Component.translatable(OccultismModonomiconConstants.I18n.RITUAL_RECIPE_GO_TO_PENTACLE, Component.translatable(goToText)); return Style.EMPTY @@ -98,18 +97,18 @@ public Style getClickedComponentStyleAt(double pMouseX, double pMouseY) { @Override - protected void drawRecipe(PoseStack poseStack, RitualRecipe recipe, int recipeX, int recipeY, int mouseX, int mouseY, boolean second) { + protected void drawRecipe(GuiGraphics guiGraphics, RitualRecipe recipe, int recipeX, int recipeY, int mouseX, int mouseY, boolean second) { recipeY += 10; - if(!second){ + if (!second) { //rituals only support one recipe if (!this.page.getTitle1().isEmpty()) { - this.renderTitle(this.page.getTitle1(), false, poseStack, BookContentScreen.PAGE_WIDTH / 2, 0); + this.renderTitle(guiGraphics, this.page.getTitle1(), false, BookContentScreen.PAGE_WIDTH / 2, 0); } } - + int ritualCenterX = recipeX + 30; int ritualCenterY = recipeY + 70; int sacrificialCircleRadius = 30; @@ -150,17 +149,17 @@ protected void drawRecipe(PoseStack poseStack, RitualRecipe recipe, int recipeX, for (int i = 0; i < recipe.getIngredients().size(); i++) { Vec3i pos = sacrificialBowlPosition.get(i); - this.parentScreen.renderItemStack(poseStack, pos.getX(), pos.getY(), mouseX, mouseY, this.sacrificialBowl); - this.parentScreen.renderIngredient(poseStack, pos.getX(), pos.getY() - 5, mouseX, mouseY, recipe.getIngredients().get(i)); + this.parentScreen.renderItemStack(guiGraphics, pos.getX(), pos.getY(), mouseX, mouseY, this.sacrificialBowl); + this.parentScreen.renderIngredient(guiGraphics, pos.getX(), pos.getY() - 5, mouseX, mouseY, recipe.getIngredients().get(i)); } - this.parentScreen.renderItemStack(poseStack, recipeX + 85, recipeY + 110, mouseX, mouseY, this.goldenSacrificialBowl); - this.parentScreen.renderItemStack(poseStack, recipeX + 85, recipeY + 105, mouseX, mouseY, recipe.getResultItem(this.parentScreen.getMinecraft().level.registryAccess())); + this.parentScreen.renderItemStack(guiGraphics, recipeX + 85, recipeY + 110, mouseX, mouseY, this.goldenSacrificialBowl); + this.parentScreen.renderItemStack(guiGraphics, recipeX + 85, recipeY + 105, mouseX, mouseY, recipe.getResultItem(this.parentScreen.getMinecraft().level.registryAccess())); - this.parentScreen.renderItemStack(poseStack, recipeX - 10, recipeY - 5, mouseX, mouseY, recipe.getRitualDummy()); + this.parentScreen.renderItemStack(guiGraphics, recipeX - 10, recipeY - 5, mouseX, mouseY, recipe.getRitualDummy()); if (recipe.getPentacle() != null) { - poseStack.pushPose(); + guiGraphics.pose().pushPose(); String pentacleName = I18n.get(Util.makeDescriptionId("multiblock", recipe.getPentacleId())); @@ -168,29 +167,28 @@ protected void drawRecipe(PoseStack poseStack, RitualRecipe recipe, int recipeX, int y = recipeY - 1; int x = recipeX; int maxWidth = BookContentScreen.MAX_TITLE_WIDTH - RITUAL_DUMMY_OFFSET - 10; //account for the ritual dummy icon, 10 is a magic constant - var scale = Math.min(1.0f, (float) maxWidth / (float) this.font.width(pentacleName)); - if (scale < 1) - { - poseStack.translate(x - x * scale, y - y * scale, 0); - poseStack.scale(scale, scale, scale); + var scale = Math.min(1.0f, (float) maxWidth / (float) this.font.width(pentacleName)); + if (scale < 1) { + guiGraphics.pose().translate(x - x * scale, y - y * scale, 0); + guiGraphics.pose().scale(scale, scale, scale); } - this.drawScaledStringNoShadow(poseStack, pentacleName, x + RITUAL_DUMMY_OFFSET, y, 0x3366CC , scale); + this.drawScaledStringNoShadow(guiGraphics, pentacleName, x + RITUAL_DUMMY_OFFSET, y, 0x3366CC, scale); - poseStack.popPose(); + guiGraphics.pose().popPose(); } - if(recipe.requiresItemUse()){ - this.parentScreen.renderIngredient(poseStack, recipeX + 50, recipeY + 21, mouseX, mouseY, recipe.getItemToUse()); - this.font.draw(poseStack, I18n.get(OccultismModonomiconConstants.I18n.RITUAL_RECIPE_ITEM_USE),recipeX - 15, recipeY + 25, 0); + if (recipe.requiresItemUse()) { + this.parentScreen.renderIngredient(guiGraphics, recipeX + 50, recipeY + 21, mouseX, mouseY, recipe.getItemToUse()); + guiGraphics.drawString(this.font, I18n.get(OccultismModonomiconConstants.I18n.RITUAL_RECIPE_ITEM_USE), recipeX - 15, recipeY + 25, 0, false); } - this.parentScreen.renderItemStack(poseStack, recipeX + 30, recipeY + 70, mouseX, mouseY, this.goldenSacrificialBowl); - this.parentScreen.renderIngredient(poseStack, recipeX + 30, recipeY + 65, mouseX, mouseY, recipe.getActivationItem()); + this.parentScreen.renderItemStack(guiGraphics, recipeX + 30, recipeY + 70, mouseX, mouseY, this.goldenSacrificialBowl); + this.parentScreen.renderIngredient(guiGraphics, recipeX + 30, recipeY + 65, mouseX, mouseY, recipe.getActivationItem()); if (recipe.getEntityToSummon() != null) { - poseStack.pushPose(); + guiGraphics.pose().pushPose(); var text = I18n.get(OccultismModonomiconConstants.I18n.RITUAL_RECIPE_SUMMON, I18n.get(recipe.getEntityToSummon().getDescriptionId())); @@ -198,20 +196,19 @@ protected void drawRecipe(PoseStack poseStack, RitualRecipe recipe, int recipeX, int y = recipeY + 120; int x = recipeX - 15; int maxWidth = BookContentScreen.MAX_TITLE_WIDTH - RITUAL_DUMMY_OFFSET - 10; //account for the ritual output, 10 is our magic constant - var scale = Math.min(1.0f, (float) maxWidth / (float) this.font.width(text)); - if (scale < 1) - { - poseStack.translate(x - x * scale, y - y * scale, 0); - poseStack.scale(scale, scale, scale); + var scale = Math.min(1.0f, (float) maxWidth / (float) this.font.width(text)); + if (scale < 1) { + guiGraphics.pose().translate(x - x * scale, y - y * scale, 0); + guiGraphics.pose().scale(scale, scale, scale); } - this.drawScaledStringNoShadow(poseStack, text, x, y, 0x000000 , scale); + this.drawScaledStringNoShadow(guiGraphics, text, x, y, 0x000000, scale); - poseStack.popPose(); + guiGraphics.pose().popPose(); } if (recipe.getSpiritJobType() != null) { - poseStack.pushPose(); + guiGraphics.pose().pushPose(); var text = I18n.get(OccultismModonomiconConstants.I18n.RITUAL_RECIPE_JOB, I18n.get("job." + recipe.getSpiritJobType().toString().replace(":", "."))); @@ -219,20 +216,19 @@ protected void drawRecipe(PoseStack poseStack, RitualRecipe recipe, int recipeX, int y = recipeY + 130; int x = recipeX; int maxWidth = BookContentScreen.MAX_TITLE_WIDTH - 15; //account for the ritual dummy icon, 10 is a magic constant - var scale = Math.min(1.0f, (float) maxWidth / (float) this.font.width(text)); - if (scale < 1) - { - poseStack.translate(x - x * scale, y - y * scale, 0); - poseStack.scale(scale, scale, scale); + var scale = Math.min(1.0f, (float) maxWidth / (float) this.font.width(text)); + if (scale < 1) { + guiGraphics.pose().translate(x - x * scale, y - y * scale, 0); + guiGraphics.pose().scale(scale, scale, scale); } - this.drawScaledStringNoShadow(poseStack, text, x - 15, y, 0x3366CC , scale); + this.drawScaledStringNoShadow(guiGraphics, text, x - 15, y, 0x3366CC, scale); - poseStack.popPose(); + guiGraphics.pose().popPose(); } if (recipe.requiresSacrifice()) { - poseStack.pushPose(); + guiGraphics.pose().pushPose(); var text = I18n.get(OccultismModonomiconConstants.I18n.RITUAL_RECIPE_SACRIFICE, I18n.get(recipe.getEntityToSacrificeDisplayName())); @@ -240,20 +236,19 @@ protected void drawRecipe(PoseStack poseStack, RitualRecipe recipe, int recipeX, int y = recipeY + 15; int x = recipeX - 15; int maxWidth = BookContentScreen.MAX_TITLE_WIDTH; - var scale = Math.min(1.0f, (float) maxWidth / (float) this.font.width(text)); - if (scale < 1) - { - poseStack.translate(x - x * scale, y - y * scale, 0); - poseStack.scale(scale, scale, scale); + var scale = Math.min(1.0f, (float) maxWidth / (float) this.font.width(text)); + if (scale < 1) { + guiGraphics.pose().translate(x - x * scale, y - y * scale, 0); + guiGraphics.pose().scale(scale, scale, scale); } - this.drawScaledStringNoShadow(poseStack, text, x, y, 0x000000 , scale); + this.drawScaledStringNoShadow(guiGraphics, text, x, y, 0x000000, scale); - poseStack.popPose(); + guiGraphics.pose().popPose(); } } - public void drawScaledStringNoShadow(PoseStack poseStack, String s, int x, int y, int color, float scale) { - this.font.draw(poseStack, s, x, y + (this.font.lineHeight * (1 - scale)), color); + public void drawScaledStringNoShadow(GuiGraphics guiGraphics, String s, int x, int y, int color, float scale) { + guiGraphics.drawString(this.font, s, x, y + (this.font.lineHeight * (1 - scale)), color, false); } } diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePage.java b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePage.java similarity index 83% rename from src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePage.java rename to src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePage.java index 7cff66606..9e5a632f0 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePage.java +++ b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePage.java @@ -4,15 +4,15 @@ * SPDX-License-Identifier: MIT */ -package com.github.klikli_dev.occultism.integration.modonomicon.pages; +package com.klikli_dev.occultism.integration.modonomicon.pages; -import com.github.klikli_dev.occultism.crafting.recipe.SpiritFireRecipe; -import com.github.klikli_dev.occultism.integration.modonomicon.OccultismModonomiconConstants.Page; -import com.github.klikli_dev.occultism.registry.OccultismRecipes; import com.google.gson.JsonObject; import com.klikli_dev.modonomicon.book.BookTextHolder; import com.klikli_dev.modonomicon.book.page.BookProcessingRecipePage; import com.klikli_dev.modonomicon.book.page.BookRecipePage; +import com.klikli_dev.occultism.crafting.recipe.SpiritFireRecipe; +import com.klikli_dev.occultism.integration.modonomicon.OccultismModonomiconConstants; +import com.klikli_dev.occultism.registry.OccultismRecipes; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.GsonHelper; @@ -22,11 +22,6 @@ public BookSpiritFireRecipePage(BookTextHolder title1, ResourceLocation recipeId super(OccultismRecipes.SPIRIT_FIRE_TYPE.get(), title1, recipeId1, title2, recipeId2, text, anchor); } - @Override - public ResourceLocation getType() { - return Page.SPIRIT_FIRE_RECIPE; - } - public static BookSpiritFireRecipePage fromJson(JsonObject json) { var common = BookRecipePage.commonFromJson(json); var anchor = GsonHelper.getAsString(json, "anchor", ""); @@ -39,6 +34,11 @@ public static BookSpiritFireRecipePage fromNetwork(FriendlyByteBuf buffer) { return new BookSpiritFireRecipePage(common.title1(), common.recipeId1(), common.title2(), common.recipeId2(), common.text(), anchor); } + @Override + public ResourceLocation getType() { + return OccultismModonomiconConstants.Page.SPIRIT_FIRE_RECIPE; + } + @Override public void toNetwork(FriendlyByteBuf buffer) { super.toNetwork(buffer); diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePageModel.java b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePageModel.java similarity index 81% rename from src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePageModel.java rename to src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePageModel.java index ba64856d3..7bfc80280 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePageModel.java +++ b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePageModel.java @@ -4,15 +4,15 @@ * SPDX-License-Identifier: MIT */ -package com.github.klikli_dev.occultism.integration.modonomicon.pages; +package com.klikli_dev.occultism.integration.modonomicon.pages; -import com.github.klikli_dev.occultism.integration.modonomicon.OccultismModonomiconConstants.Page; import com.klikli_dev.modonomicon.api.datagen.book.page.BookRecipePageModel; +import com.klikli_dev.occultism.integration.modonomicon.OccultismModonomiconConstants; import org.jetbrains.annotations.NotNull; public class BookSpiritFireRecipePageModel extends BookRecipePageModel { protected BookSpiritFireRecipePageModel(@NotNull String anchor) { - super(Page.SPIRIT_FIRE_RECIPE, anchor); + super(OccultismModonomiconConstants.Page.SPIRIT_FIRE_RECIPE, anchor); } public static Builder builder() { diff --git a/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePageRenderer.java b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePageRenderer.java new file mode 100644 index 000000000..b15dd88fb --- /dev/null +++ b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritFireRecipePageRenderer.java @@ -0,0 +1,52 @@ +/* + * SPDX-FileCopyrightText: 2022 klikli-dev + * + * SPDX-License-Identifier: MIT + */ + +package com.klikli_dev.occultism.integration.modonomicon.pages; + +import com.klikli_dev.modonomicon.book.page.BookProcessingRecipePage; +import com.klikli_dev.modonomicon.client.gui.book.BookContentScreen; +import com.klikli_dev.modonomicon.client.render.page.BookRecipePageRenderer; +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.world.item.crafting.Recipe; + +public abstract class BookSpiritFireRecipePageRenderer> extends BookRecipePageRenderer> { + public BookSpiritFireRecipePageRenderer(BookProcessingRecipePage page) { + super(page); + } + + @Override + protected int getRecipeHeight() { + return 45; + } + + @Override + protected void drawRecipe(GuiGraphics guiGraphics, T recipe, int recipeX, int recipeY, int mouseX, int mouseY, boolean second) { + + recipeY += 10; + + + if (!second) { + if (!this.page.getTitle1().isEmpty()) { + this.renderTitle(guiGraphics, this.page.getTitle1(), false, BookContentScreen.PAGE_WIDTH / 2, 0); + } + } else { + if (!this.page.getTitle2().isEmpty()) { + this.renderTitle(guiGraphics, this.page.getTitle2(), false, BookContentScreen.PAGE_WIDTH / 2, + recipeY - (this.page.getTitle2().getString().isEmpty() ? 10 : 0) - 10); + } + } + + RenderSystem.enableBlend(); + guiGraphics.blit(this.page.getBook().getCraftingTexture(), recipeX, recipeY, 11, 71, 24, 24, 128, 256); + guiGraphics.blit(this.page.getBook().getCraftingTexture(), recipeX + 22, recipeY + 7, 0, 246, 18, 10, 128, 256); //"throw arrow" + guiGraphics.blit(this.page.getBook().getCraftingTexture(), recipeX + 61, recipeY, 72, 71, 36, 24, 128, 256); //straight arrow and second box + + this.parentScreen.renderIngredient(guiGraphics, recipeX + 4, recipeY + 4, mouseX, mouseY, recipe.getIngredients().get(0)); + this.parentScreen.renderItemStack(guiGraphics, recipeX + 40, recipeY + 4, mouseX, mouseY, recipe.getToastSymbol()); + this.parentScreen.renderItemStack(guiGraphics, recipeX + 76, recipeY + 4, mouseX, mouseY, recipe.getResultItem(this.parentScreen.getMinecraft().level.registryAccess())); + } +} diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePage.java b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePage.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePage.java rename to src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePage.java index c3c3df5ed..3bbef195d 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePage.java +++ b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePage.java @@ -4,15 +4,15 @@ * SPDX-License-Identifier: MIT */ -package com.github.klikli_dev.occultism.integration.modonomicon.pages; +package com.klikli_dev.occultism.integration.modonomicon.pages; -import com.github.klikli_dev.occultism.crafting.recipe.SpiritTradeRecipe; -import com.github.klikli_dev.occultism.integration.modonomicon.OccultismModonomiconConstants; -import com.github.klikli_dev.occultism.registry.OccultismRecipes; import com.google.gson.JsonObject; import com.klikli_dev.modonomicon.book.BookTextHolder; import com.klikli_dev.modonomicon.book.page.BookProcessingRecipePage; import com.klikli_dev.modonomicon.book.page.BookRecipePage; +import com.klikli_dev.occultism.crafting.recipe.SpiritTradeRecipe; +import com.klikli_dev.occultism.integration.modonomicon.OccultismModonomiconConstants; +import com.klikli_dev.occultism.registry.OccultismRecipes; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.GsonHelper; diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePageModel.java b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePageModel.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePageModel.java rename to src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePageModel.java index 813905bc1..17972c07b 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePageModel.java +++ b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePageModel.java @@ -4,10 +4,10 @@ * SPDX-License-Identifier: MIT */ -package com.github.klikli_dev.occultism.integration.modonomicon.pages; +package com.klikli_dev.occultism.integration.modonomicon.pages; -import com.github.klikli_dev.occultism.integration.modonomicon.OccultismModonomiconConstants; import com.klikli_dev.modonomicon.api.datagen.book.page.BookRecipePageModel; +import com.klikli_dev.occultism.integration.modonomicon.OccultismModonomiconConstants; import org.jetbrains.annotations.NotNull; public class BookSpiritTradeRecipePageModel extends BookRecipePageModel { diff --git a/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePageRenderer.java b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePageRenderer.java new file mode 100644 index 000000000..bd140ad04 --- /dev/null +++ b/src/main/java/com/klikli_dev/occultism/integration/modonomicon/pages/BookSpiritTradeRecipePageRenderer.java @@ -0,0 +1,52 @@ +/* + * SPDX-FileCopyrightText: 2022 klikli-dev + * + * SPDX-License-Identifier: MIT + */ + +package com.klikli_dev.occultism.integration.modonomicon.pages; + +import com.klikli_dev.modonomicon.book.page.BookProcessingRecipePage; +import com.klikli_dev.modonomicon.client.gui.book.BookContentScreen; +import com.klikli_dev.modonomicon.client.render.page.BookRecipePageRenderer; +import com.mojang.blaze3d.systems.RenderSystem; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.world.item.crafting.Recipe; + +public abstract class BookSpiritTradeRecipePageRenderer> extends BookRecipePageRenderer> { + public BookSpiritTradeRecipePageRenderer(BookProcessingRecipePage page) { + super(page); + } + + @Override + protected int getRecipeHeight() { + return 45; + } + + @Override + protected void drawRecipe(GuiGraphics guiGraphics, T recipe, int recipeX, int recipeY, int mouseX, int mouseY, boolean second) { + + recipeY += 10; + + + if (!second) { + if (!this.page.getTitle1().isEmpty()) { + this.renderTitle(guiGraphics, this.page.getTitle1(), false, BookContentScreen.PAGE_WIDTH / 2, 0); + } + } else { + if (!this.page.getTitle2().isEmpty()) { + this.renderTitle(guiGraphics, this.page.getTitle2(), false, BookContentScreen.PAGE_WIDTH / 2, + recipeY - (this.page.getTitle2().getString().isEmpty() ? 10 : 0) - 10); + } + } + + RenderSystem.enableBlend(); + guiGraphics.blit(this.page.getBook().getCraftingTexture(), recipeX, recipeY, 11, 71, 24, 24, 128, 256); //first box + guiGraphics.blit(this.page.getBook().getCraftingTexture(), recipeX + 22, recipeY + 7, 0, 246, 18, 10, 128, 256); //"throw arrow" + guiGraphics.blit(this.page.getBook().getCraftingTexture(), recipeX + 61, recipeY, 72, 71, 36, 24, 128, 256); //straight arrow and second box + + this.parentScreen.renderIngredient(guiGraphics, recipeX + 4, recipeY + 4, mouseX, mouseY, recipe.getIngredients().get(0)); + this.parentScreen.renderItemStack(guiGraphics, recipeX + 40, recipeY + 4, mouseX, mouseY, recipe.getToastSymbol()); + this.parentScreen.renderItemStack(guiGraphics, recipeX + 76, recipeY + 4, mouseX, mouseY, recipe.getResultItem(this.parentScreen.getMinecraft().level.registryAccess())); + } +} diff --git a/src/main/java/com/github/klikli_dev/occultism/integration/theurgy/TheurgyIntegration.java b/src/main/java/com/klikli_dev/occultism/integration/theurgy/TheurgyIntegration.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/integration/theurgy/TheurgyIntegration.java rename to src/main/java/com/klikli_dev/occultism/integration/theurgy/TheurgyIntegration.java index d185c270c..18cd647bc 100644 --- a/src/main/java/com/github/klikli_dev/occultism/integration/theurgy/TheurgyIntegration.java +++ b/src/main/java/com/klikli_dev/occultism/integration/theurgy/TheurgyIntegration.java @@ -1,6 +1,6 @@ -package com.github.klikli_dev.occultism.integration.theurgy; +package com.klikli_dev.occultism.integration.theurgy; -import com.github.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.Occultism; import com.klikli_dev.theurgy.entity.FollowProjectile; import com.klikli_dev.theurgy.item.DivinationRodItem; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/github/klikli_dev/occultism/loot/AddItemModifier.java b/src/main/java/com/klikli_dev/occultism/loot/AddItemModifier.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/loot/AddItemModifier.java rename to src/main/java/com/klikli_dev/occultism/loot/AddItemModifier.java index 6de85851a..23a08fa0d 100644 --- a/src/main/java/com/github/klikli_dev/occultism/loot/AddItemModifier.java +++ b/src/main/java/com/klikli_dev/occultism/loot/AddItemModifier.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.loot; +package com.klikli_dev.occultism.loot; import com.google.common.base.Suppliers; import com.mojang.serialization.Codec; @@ -39,14 +39,14 @@ public class AddItemModifier extends LootModifier { public static final Supplier> CODEC = Suppliers.memoize(() -> - RecordCodecBuilder.create( instance -> + RecordCodecBuilder.create(instance -> instance.group( - LOOT_CONDITIONS_CODEC.fieldOf("conditions").forGetter(lm -> lm.conditions), + LOOT_CONDITIONS_CODEC.fieldOf("conditions").forGetter(lm -> lm.conditions), ForgeRegistries.ITEMS.getCodec().fieldOf("item").forGetter(lm -> lm.addedItem), Codec.intRange(0, Integer.MAX_VALUE).fieldOf("count").forGetter((lm) -> lm.count) ) - .apply(instance, AddItemModifier::new))); + .apply(instance, AddItemModifier::new))); private final Item addedItem; private final int count; @@ -59,7 +59,7 @@ protected AddItemModifier(LootItemCondition[] conditionsIn, Item addedItemIn, in @Override protected ObjectArrayList doApply(ObjectArrayList generatedLoot, LootContext context) { - generatedLoot.add(new ItemStack(this.addedItem, count)); + generatedLoot.add(new ItemStack(this.addedItem, this.count)); return generatedLoot; } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/IMessage.java b/src/main/java/com/klikli_dev/occultism/network/IMessage.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/network/IMessage.java rename to src/main/java/com/klikli_dev/occultism/network/IMessage.java index 48a0ad194..f1be07da3 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/IMessage.java +++ b/src/main/java/com/klikli_dev/occultism/network/IMessage.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; @@ -32,7 +32,7 @@ import net.minecraftforge.network.NetworkEvent; public interface IMessage { - //region Methods + void encode(FriendlyByteBuf buf); void decode(FriendlyByteBuf buf); @@ -42,5 +42,5 @@ public interface IMessage { void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, NetworkEvent.Context context); - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageBase.java b/src/main/java/com/klikli_dev/occultism/network/MessageBase.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageBase.java rename to src/main/java/com/klikli_dev/occultism/network/MessageBase.java index d72ada4b6..f71ec0dc1 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageBase.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageBase.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; import net.minecraft.client.Minecraft; import net.minecraft.server.MinecraftServer; @@ -32,14 +32,9 @@ public abstract class MessageBase implements IMessage { - //region Initialization - protected MessageBase() { } - //endregion Initialization - - //region Overrides @OnlyIn(Dist.CLIENT) public void onClientReceived(Minecraft minecraft, Player player, NetworkEvent.Context context) { } @@ -47,9 +42,5 @@ public void onClientReceived(Minecraft minecraft, Player player, NetworkEvent.Co public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, NetworkEvent.Context context) { } - //endregion Overrides - - //region Methods - //endregion Methods } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageBeholderAttack.java b/src/main/java/com/klikli_dev/occultism/network/MessageBeholderAttack.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageBeholderAttack.java rename to src/main/java/com/klikli_dev/occultism/network/MessageBeholderAttack.java index aa604025a..619ed8dc7 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageBeholderAttack.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageBeholderAttack.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.common.entity.familiar.BeholderFamiliarEntity; +import com.klikli_dev.occultism.common.entity.familiar.BeholderFamiliarEntity; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageClearCraftingMatrix.java b/src/main/java/com/klikli_dev/occultism/network/MessageClearCraftingMatrix.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageClearCraftingMatrix.java rename to src/main/java/com/klikli_dev/occultism/network/MessageClearCraftingMatrix.java index 8d6e158e0..85ded6e95 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageClearCraftingMatrix.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageClearCraftingMatrix.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.util.StorageUtil; +import com.klikli_dev.occultism.util.StorageUtil; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -30,7 +30,6 @@ public class MessageClearCraftingMatrix extends MessageBase { - //region Initialization public MessageClearCraftingMatrix() { } @@ -38,9 +37,6 @@ public MessageClearCraftingMatrix() { public MessageClearCraftingMatrix(FriendlyByteBuf buf) { this.decode(buf); } - //endregion Initialization - - //region Overrides @Override public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, @@ -58,5 +54,4 @@ public void decode(FriendlyByteBuf buf) { } - //endregion Overrides } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageDoubleJump.java b/src/main/java/com/klikli_dev/occultism/network/MessageDoubleJump.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageDoubleJump.java rename to src/main/java/com/klikli_dev/occultism/network/MessageDoubleJump.java index 97d04517f..448530a02 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageDoubleJump.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageDoubleJump.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.util.MovementUtil; +import com.klikli_dev.occultism.util.MovementUtil; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; @@ -31,7 +31,6 @@ public class MessageDoubleJump extends MessageBase { - //region Initialization public MessageDoubleJump() { } @@ -39,16 +38,13 @@ public MessageDoubleJump() { public MessageDoubleJump(FriendlyByteBuf buf) { this.decode(buf); } - //endregion Initialization - - //region Overrides @Override public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, NetworkEvent.Context context) { if (MovementUtil.doubleJump(player)) { //Show cloud on jump. - player.getLevel() + player.serverLevel() .sendParticles(ParticleTypes.CLOUD, player.position().x, player.position().y, player.position().z, 5, 0, 0, 0, 0.01F); } @@ -63,5 +59,5 @@ public void encode(FriendlyByteBuf buf) { public void decode(FriendlyByteBuf buf) { } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageFairySupport.java b/src/main/java/com/klikli_dev/occultism/network/MessageFairySupport.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageFairySupport.java rename to src/main/java/com/klikli_dev/occultism/network/MessageFairySupport.java index e0e587cde..e8b174947 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageFairySupport.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageFairySupport.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.common.entity.familiar.FairyFamiliarEntity; +import com.klikli_dev.occultism.common.entity.familiar.FairyFamiliarEntity; import net.minecraft.client.Minecraft; import net.minecraft.core.particles.DustParticleOptions; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageHeadlessDie.java b/src/main/java/com/klikli_dev/occultism/network/MessageHeadlessDie.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageHeadlessDie.java rename to src/main/java/com/klikli_dev/occultism/network/MessageHeadlessDie.java index 7cefc3083..03e308809 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageHeadlessDie.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageHeadlessDie.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.common.entity.familiar.HeadlessFamiliarEntity; +import com.klikli_dev.occultism.common.entity.familiar.HeadlessFamiliarEntity; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageInsertMouseHeldItem.java b/src/main/java/com/klikli_dev/occultism/network/MessageInsertMouseHeldItem.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageInsertMouseHeldItem.java rename to src/main/java/com/klikli_dev/occultism/network/MessageInsertMouseHeldItem.java index 7a4138a8b..e3a7d908f 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageInsertMouseHeldItem.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageInsertMouseHeldItem.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.container.IStorageControllerContainer; -import com.github.klikli_dev.occultism.util.InputUtil; +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.container.IStorageControllerContainer; +import com.klikli_dev.occultism.util.InputUtil; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -36,12 +36,8 @@ * Inserts the mouse held item into the opened storage controller. */ public class MessageInsertMouseHeldItem extends MessageBase { - //region Fields - private int mouseButton; - //endregion Fields - - //region Initialization + private int mouseButton; public MessageInsertMouseHeldItem(FriendlyByteBuf buf) { this.decode(buf); @@ -50,10 +46,6 @@ public MessageInsertMouseHeldItem(FriendlyByteBuf buf) { public MessageInsertMouseHeldItem(int mouseButton) { this.mouseButton = mouseButton; } - //endregion Initialization - - //region Overrides - @Override public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, @@ -104,5 +96,5 @@ public void encode(FriendlyByteBuf buf) { public void decode(FriendlyByteBuf buf) { this.mouseButton = buf.readInt(); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageOpenSatchel.java b/src/main/java/com/klikli_dev/occultism/network/MessageOpenSatchel.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageOpenSatchel.java rename to src/main/java/com/klikli_dev/occultism/network/MessageOpenSatchel.java index 7b2c8ee32..a45bdf677 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageOpenSatchel.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageOpenSatchel.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.common.container.storage.SatchelContainer; -import com.github.klikli_dev.occultism.common.item.storage.SatchelItem; -import com.github.klikli_dev.occultism.util.CuriosUtil; +import com.klikli_dev.occultism.common.container.storage.SatchelContainer; +import com.klikli_dev.occultism.common.item.storage.SatchelItem; +import com.klikli_dev.occultism.util.CuriosUtil; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -35,8 +35,6 @@ public class MessageOpenSatchel extends MessageBase { - //region Initialization - public MessageOpenSatchel(FriendlyByteBuf buf) { this.decode(buf); } @@ -44,9 +42,6 @@ public MessageOpenSatchel(FriendlyByteBuf buf) { public MessageOpenSatchel() { } - //endregion Initialization - - //region Overrides @Override public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, @@ -85,5 +80,5 @@ public void encode(FriendlyByteBuf buf) { public void decode(FriendlyByteBuf buf) { } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageOpenStorageRemote.java b/src/main/java/com/klikli_dev/occultism/network/MessageOpenStorageRemote.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageOpenStorageRemote.java rename to src/main/java/com/klikli_dev/occultism/network/MessageOpenStorageRemote.java index cc09a2204..de9231c2d 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageOpenStorageRemote.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageOpenStorageRemote.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.data.GlobalBlockPos; -import com.github.klikli_dev.occultism.registry.OccultismItems; -import com.github.klikli_dev.occultism.util.CuriosUtil; +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.data.GlobalBlockPos; +import com.klikli_dev.occultism.registry.OccultismItems; +import com.klikli_dev.occultism.util.CuriosUtil; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageRequestOrder.java b/src/main/java/com/klikli_dev/occultism/network/MessageRequestOrder.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageRequestOrder.java rename to src/main/java/com/klikli_dev/occultism/network/MessageRequestOrder.java index a5a9ea1e1..49362cca3 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageRequestOrder.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageRequestOrder.java @@ -20,13 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.data.GlobalBlockPos; -import com.github.klikli_dev.occultism.common.misc.ItemStackComparator; -import com.github.klikli_dev.occultism.util.StorageUtil; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.data.GlobalBlockPos; +import com.klikli_dev.occultism.common.misc.ItemStackComparator; +import com.klikli_dev.occultism.util.StorageUtil; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.MinecraftServer; @@ -41,13 +41,9 @@ */ public class MessageRequestOrder extends MessageBase { - //region Fields private GlobalBlockPos storageControllerPosition; private GlobalBlockPos targetMachinePosition; private ItemStack stack = ItemStack.EMPTY; - //endregion Fields - - //region Initialization public MessageRequestOrder(FriendlyByteBuf buf) { this.decode(buf); @@ -60,11 +56,6 @@ public MessageRequestOrder(GlobalBlockPos storageControllerPosition, GlobalBlock this.stack = stack; } - //endregion Initialization - - - //region Overrides - @Override public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, NetworkEvent.Context context) { @@ -102,5 +93,5 @@ public void decode(FriendlyByteBuf buf) { this.targetMachinePosition = GlobalBlockPos.from(buf); this.stack = buf.readItem(); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageRequestStacks.java b/src/main/java/com/klikli_dev/occultism/network/MessageRequestStacks.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageRequestStacks.java rename to src/main/java/com/klikli_dev/occultism/network/MessageRequestStacks.java index abd0f0221..6a0172426 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageRequestStacks.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageRequestStacks.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.container.IStorageControllerContainer; +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.container.IStorageControllerContainer; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -32,7 +32,6 @@ public class MessageRequestStacks extends MessageBase { - //region Initialization public MessageRequestStacks() { } @@ -40,10 +39,6 @@ public MessageRequestStacks() { public MessageRequestStacks(FriendlyByteBuf buf) { this.decode(buf); } - //endregion Initialization - - - //region Overrides @Override public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, @@ -69,5 +64,5 @@ public void encode(FriendlyByteBuf buf) { public void decode(FriendlyByteBuf buf) { } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageSelectBlock.java b/src/main/java/com/klikli_dev/occultism/network/MessageSelectBlock.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageSelectBlock.java rename to src/main/java/com/klikli_dev/occultism/network/MessageSelectBlock.java index e379d8402..0b2fc9131 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageSelectBlock.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageSelectBlock.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.Occultism; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; @@ -33,13 +33,9 @@ public class MessageSelectBlock extends MessageBase { - //region Fields public BlockPos blockPos; public int durationMilliseconds; public int color; - //endregion Fields - - //region Initialization public MessageSelectBlock(FriendlyByteBuf buf) { this.decode(buf); @@ -50,9 +46,6 @@ public MessageSelectBlock(BlockPos blockPos, int durationMilliseconds, int color this.durationMilliseconds = durationMilliseconds; this.color = color; } - //endregion Initialization - - //region Overrides @Override public void onClientReceived(Minecraft minecraft, Player player, NetworkEvent.Context context) { @@ -73,5 +66,5 @@ public void decode(FriendlyByteBuf buf) { this.durationMilliseconds = buf.readInt(); this.color = buf.readInt(); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetDivinationResult.java b/src/main/java/com/klikli_dev/occultism/network/MessageSetDivinationResult.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageSetDivinationResult.java rename to src/main/java/com/klikli_dev/occultism/network/MessageSetDivinationResult.java index 890a24cbe..80e4f3885 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetDivinationResult.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageSetDivinationResult.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.OccultismConstants; -import com.github.klikli_dev.occultism.common.item.tool.DivinationRodItem; +import com.klikli_dev.occultism.OccultismConstants; +import com.klikli_dev.occultism.common.item.tool.DivinationRodItem; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetFilterMode.java b/src/main/java/com/klikli_dev/occultism/network/MessageSetFilterMode.java similarity index 84% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageSetFilterMode.java rename to src/main/java/com/klikli_dev/occultism/network/MessageSetFilterMode.java index 3b8caa545..271d2b655 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetFilterMode.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageSetFilterMode.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -31,12 +31,9 @@ public class MessageSetFilterMode extends MessageBase { - //region Fields public boolean isBlacklistFilter; public int entityId; - //endregion Fields - //region Initialization public MessageSetFilterMode(FriendlyByteBuf buf) { this.decode(buf); } @@ -45,17 +42,13 @@ public MessageSetFilterMode(boolean isBlacklistFilter, int entityId) { this.isBlacklistFilter = isBlacklistFilter; this.entityId = entityId; } - //endregion Initialization - - //region Overrides @Override public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, NetworkEvent.Context context) { - Entity e = player.level.getEntity(this.entityId); - if (e instanceof SpiritEntity) { - SpiritEntity spirit = (SpiritEntity) e; + Entity e = player.level().getEntity(this.entityId); + if (e instanceof SpiritEntity spirit) { spirit.setFilterBlacklist(this.isBlacklistFilter); } } @@ -71,5 +64,5 @@ public void decode(FriendlyByteBuf buf) { this.isBlacklistFilter = buf.readBoolean(); this.entityId = buf.readInt(); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetItemMode.java b/src/main/java/com/klikli_dev/occultism/network/MessageSetItemMode.java similarity index 84% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageSetItemMode.java rename to src/main/java/com/klikli_dev/occultism/network/MessageSetItemMode.java index 10d05244f..137d55418 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetItemMode.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageSetItemMode.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.api.common.item.IHandleItemMode; +import com.klikli_dev.occultism.api.common.item.IHandleItemMode; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -32,11 +32,7 @@ public class MessageSetItemMode extends MessageBase { - //region Fields public int mode; - //endregion Fields - - //region Initialization public MessageSetItemMode(FriendlyByteBuf buf) { this.decode(buf); @@ -45,15 +41,12 @@ public MessageSetItemMode(FriendlyByteBuf buf) { public MessageSetItemMode(int mode) { this.mode = mode; } - //endregion Initialization - //region Overrides @Override public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, NetworkEvent.Context context) { ItemStack stack = player.getItemInHand(InteractionHand.MAIN_HAND); - if (stack.getItem() instanceof IHandleItemMode) { - IHandleItemMode itemModeHandler = (IHandleItemMode) stack.getItem(); + if (stack.getItem() instanceof IHandleItemMode itemModeHandler) { itemModeHandler.setItemMode(stack, this.mode); player.inventoryMenu.broadcastChanges(); } @@ -68,5 +61,5 @@ public void encode(FriendlyByteBuf buf) { public void decode(FriendlyByteBuf buf) { this.mode = buf.readInt(); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetJumps.java b/src/main/java/com/klikli_dev/occultism/network/MessageSetJumps.java similarity index 86% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageSetJumps.java rename to src/main/java/com/klikli_dev/occultism/network/MessageSetJumps.java index 0b654eec0..15a73fe8e 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetJumps.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageSetJumps.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.registry.OccultismCapabilities; +import com.klikli_dev.occultism.registry.OccultismCapabilities; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Player; @@ -30,11 +30,7 @@ public class MessageSetJumps extends MessageBase { - //region Fields public int jumps; - //endregion Fields - - //region Initialization public MessageSetJumps(FriendlyByteBuf buf) { this.decode(buf); @@ -43,13 +39,10 @@ public MessageSetJumps(FriendlyByteBuf buf) { public MessageSetJumps(int jumps) { this.jumps = jumps; } - //endregion Initialization - - //region Overrides @Override public void onClientReceived(Minecraft minecraft, Player player, NetworkEvent.Context context) { - if (!player.isOnGround()) { + if (!player.onGround()) { player.getCapability(OccultismCapabilities.DOUBLE_JUMP).ifPresent(cap -> cap.setJumps(this.jumps)); } } @@ -63,5 +56,5 @@ public void encode(FriendlyByteBuf buf) { public void decode(FriendlyByteBuf buf) { this.jumps = buf.readInt(); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetManagedMachine.java b/src/main/java/com/klikli_dev/occultism/network/MessageSetManagedMachine.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageSetManagedMachine.java rename to src/main/java/com/klikli_dev/occultism/network/MessageSetManagedMachine.java index ce06ff37f..c5912a987 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetManagedMachine.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageSetManagedMachine.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.api.common.data.MachineReference; -import com.github.klikli_dev.occultism.common.entity.job.ManageMachineJob; -import com.github.klikli_dev.occultism.common.item.spirit.BookOfCallingItem; -import com.github.klikli_dev.occultism.util.ItemNBTUtil; +import com.klikli_dev.occultism.api.common.data.MachineReference; +import com.klikli_dev.occultism.common.entity.job.ManageMachineJob; +import com.klikli_dev.occultism.common.item.spirit.BookOfCallingItem; +import com.klikli_dev.occultism.util.ItemNBTUtil; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -35,11 +35,8 @@ public class MessageSetManagedMachine extends MessageBase { - //region Fields public MachineReference managedMachine; - //endregion Fields - //region Initialization public MessageSetManagedMachine(FriendlyByteBuf buf) { this.decode(buf); } @@ -47,9 +44,6 @@ public MessageSetManagedMachine(FriendlyByteBuf buf) { public MessageSetManagedMachine(MachineReference managedMachine) { this.managedMachine = managedMachine; } - //endregion Initialization - - //region Overrides @Override public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, @@ -82,5 +76,5 @@ public void encode(FriendlyByteBuf buf) { public void decode(FriendlyByteBuf buf) { this.managedMachine = MachineReference.from(buf); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetRecipe.java b/src/main/java/com/klikli_dev/occultism/network/MessageSetRecipe.java similarity index 89% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageSetRecipe.java rename to src/main/java/com/klikli_dev/occultism/network/MessageSetRecipe.java index b25837143..3683767c7 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetRecipe.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageSetRecipe.java @@ -19,12 +19,12 @@ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.container.IStorageControllerContainer; -import com.github.klikli_dev.occultism.common.misc.ItemStackComparator; -import com.github.klikli_dev.occultism.util.StorageUtil; +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.container.IStorageControllerContainer; +import com.klikli_dev.occultism.common.misc.ItemStackComparator; +import com.klikli_dev.occultism.util.StorageUtil; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.nbt.Tag; @@ -44,12 +44,9 @@ */ public class MessageSetRecipe extends MessageBase { - //region Fields private CompoundTag nbt; private int index = 0; - //endregion Fields - //region Initialization public MessageSetRecipe(FriendlyByteBuf buf) { this.decode(buf); } @@ -57,18 +54,13 @@ public MessageSetRecipe(FriendlyByteBuf buf) { public MessageSetRecipe(CompoundTag nbt) { this.nbt = nbt; } - //endregion Initialization - - //region Overrides - @Override public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, NetworkEvent.Context context) { - if (!(player.containerMenu instanceof IStorageControllerContainer)) { + if (!(player.containerMenu instanceof IStorageControllerContainer container)) { return; } - IStorageControllerContainer container = (IStorageControllerContainer) player.containerMenu; IStorageController storageController = container.getStorageController(); if (storageController == null) { return; @@ -136,5 +128,5 @@ public void decode(FriendlyByteBuf buf) { this.nbt = buf.readNbt(); this.index = buf.readInt(); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetRecipeByID.java b/src/main/java/com/klikli_dev/occultism/network/MessageSetRecipeByID.java similarity index 87% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageSetRecipeByID.java rename to src/main/java/com/klikli_dev/occultism/network/MessageSetRecipeByID.java index 31567fc73..88170757e 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetRecipeByID.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageSetRecipeByID.java @@ -19,12 +19,12 @@ * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.container.IStorageControllerContainer; -import com.github.klikli_dev.occultism.util.StorageUtil; import com.google.common.base.Preconditions; +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.container.IStorageControllerContainer; +import com.klikli_dev.occultism.util.StorageUtil; import net.minecraft.core.NonNullList; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; @@ -43,11 +43,8 @@ */ public class MessageSetRecipeByID extends MessageBase { - //region Fields private ResourceLocation id; - //endregion Fields - //region Initialization public MessageSetRecipeByID(FriendlyByteBuf buf) { this.decode(buf); } @@ -55,24 +52,19 @@ public MessageSetRecipeByID(FriendlyByteBuf buf) { public MessageSetRecipeByID(ResourceLocation id) { this.id = id; } - //endregion Initialization - - //region Overrides - @Override public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, NetworkEvent.Context context) { - if (!(player.containerMenu instanceof IStorageControllerContainer)) { + if (!(player.containerMenu instanceof IStorageControllerContainer container)) { return; } - IStorageControllerContainer container = (IStorageControllerContainer) player.containerMenu; IStorageController storageController = container.getStorageController(); if (storageController == null) { return; } - Recipe recipe = player.getLevel().getRecipeManager().byKey(this.id).orElse(null); + Recipe recipe = player.level().getRecipeManager().byKey(this.id).orElse(null); Preconditions.checkArgument(recipe != null); //should not happen StorageUtil.clearOpenCraftingMatrix(player, false); @@ -115,9 +107,7 @@ public void encode(FriendlyByteBuf buf) { public void decode(FriendlyByteBuf buf) { this.id = buf.readResourceLocation(); } - //endregion Overrides - //region Methods private NonNullList getIngredientsForRecipe(Recipe recipe) { NonNullList ingredients = recipe.getIngredients(); NonNullList ingredientsMatrixGrid = NonNullList.withSize(9, Ingredient.EMPTY); @@ -125,8 +115,7 @@ private NonNullList getIngredientsForRecipe(Recipe recipe) { Preconditions.checkArgument(ingredients.size() <= 9); - if (recipe instanceof IShapedRecipe) { - IShapedRecipe shapedRecipe = (IShapedRecipe) recipe; + if (recipe instanceof IShapedRecipe shapedRecipe) { int width = shapedRecipe.getRecipeWidth(); int height = shapedRecipe.getRecipeHeight(); Preconditions.checkArgument(width <= 3 && height <= 3); @@ -147,5 +136,5 @@ private NonNullList getIngredientsForRecipe(Recipe recipe) { return ingredientsMatrixGrid; } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetTagFilterText.java b/src/main/java/com/klikli_dev/occultism/network/MessageSetTagFilterText.java similarity index 84% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageSetTagFilterText.java rename to src/main/java/com/klikli_dev/occultism/network/MessageSetTagFilterText.java index 8687d6192..b609453da 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetTagFilterText.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageSetTagFilterText.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -31,12 +31,9 @@ public class MessageSetTagFilterText extends MessageBase { - //region Fields public String tagFilterText; public int entityId; - //endregion Fields - //region Initialization public MessageSetTagFilterText(FriendlyByteBuf buf) { this.decode(buf); } @@ -45,17 +42,13 @@ public MessageSetTagFilterText(String tagFilterText, int entityId) { this.tagFilterText = tagFilterText; this.entityId = entityId; } - //endregion Initialization - - //region Overrides @Override public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, NetworkEvent.Context context) { - Entity e = player.level.getEntity(this.entityId); - if (e instanceof SpiritEntity) { - SpiritEntity spirit = (SpiritEntity) e; + Entity e = player.level().getEntity(this.entityId); + if (e instanceof SpiritEntity spirit) { spirit.setTagFilter(this.tagFilterText); } } @@ -71,5 +64,5 @@ public void decode(FriendlyByteBuf buf) { this.tagFilterText = buf.readUtf(255); this.entityId = buf.readInt(); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetWorkAreaSize.java b/src/main/java/com/klikli_dev/occultism/network/MessageSetWorkAreaSize.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageSetWorkAreaSize.java rename to src/main/java/com/klikli_dev/occultism/network/MessageSetWorkAreaSize.java index d42ef956c..4e7ccc43d 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageSetWorkAreaSize.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageSetWorkAreaSize.java @@ -20,13 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.TranslationKeys; -import com.github.klikli_dev.occultism.api.common.data.WorkAreaSize; -import com.github.klikli_dev.occultism.common.item.spirit.BookOfCallingItem; -import com.github.klikli_dev.occultism.util.ItemNBTUtil; -import com.github.klikli_dev.occultism.util.TextUtil; +import com.klikli_dev.occultism.TranslationKeys; +import com.klikli_dev.occultism.api.common.data.WorkAreaSize; +import com.klikli_dev.occultism.common.item.spirit.BookOfCallingItem; +import com.klikli_dev.occultism.util.ItemNBTUtil; +import com.klikli_dev.occultism.util.TextUtil; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; @@ -38,11 +38,8 @@ public class MessageSetWorkAreaSize extends MessageBase { - //region Fields public int workAreaSize; - //endregion Fields - //region Initialization public MessageSetWorkAreaSize(FriendlyByteBuf buf) { this.decode(buf); } @@ -50,9 +47,6 @@ public MessageSetWorkAreaSize(FriendlyByteBuf buf) { public MessageSetWorkAreaSize(int workAreaSize) { this.workAreaSize = workAreaSize; } - //endregion Initialization - - //region Overrides @Override public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, @@ -85,5 +79,5 @@ public void encode(FriendlyByteBuf buf) { public void decode(FriendlyByteBuf buf) { this.workAreaSize = buf.readInt(); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageSortItems.java b/src/main/java/com/klikli_dev/occultism/network/MessageSortItems.java similarity index 80% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageSortItems.java rename to src/main/java/com/klikli_dev/occultism/network/MessageSortItems.java index af7bf0615..a5c609605 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageSortItems.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageSortItems.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageAccessor; -import com.github.klikli_dev.occultism.api.common.container.IStorageControllerContainer; -import com.github.klikli_dev.occultism.api.common.data.SortDirection; -import com.github.klikli_dev.occultism.api.common.data.SortType; +import com.klikli_dev.occultism.api.common.blockentity.IStorageAccessor; +import com.klikli_dev.occultism.api.common.container.IStorageControllerContainer; +import com.klikli_dev.occultism.api.common.data.SortDirection; +import com.klikli_dev.occultism.api.common.data.SortType; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; @@ -36,13 +36,9 @@ public class MessageSortItems extends MessageBase { - //region Fields private BlockPos entityPosition; private SortDirection sortDirection; private SortType sortType; - //endregion Fields - - //region Initialization public MessageSortItems(FriendlyByteBuf buf) { this.decode(buf); @@ -53,9 +49,6 @@ public MessageSortItems(BlockPos entityPosition, SortDirection sortDirection, So this.sortDirection = sortDirection; this.sortType = sortType; } - //endregion Initialization - - //region Overrides @Override public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, @@ -64,12 +57,11 @@ public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer playe if (!((IStorageControllerContainer) player.containerMenu).isContainerItem()) { //ensure players cannot load arbitrary chunks - if (!player.level.hasChunkAt(this.entityPosition)) + if (!player.level().hasChunkAt(this.entityPosition)) return; - BlockEntity blockEntity = player.level.getBlockEntity(this.entityPosition); - if (blockEntity instanceof IStorageAccessor) { - IStorageAccessor storageAccessor = (IStorageAccessor) blockEntity; + BlockEntity blockEntity = player.level().getBlockEntity(this.entityPosition); + if (blockEntity instanceof IStorageAccessor storageAccessor) { storageAccessor.setSortType(this.sortType); storageAccessor.setSortDirection(this.sortDirection); blockEntity.setChanged(); @@ -96,5 +88,5 @@ public void decode(FriendlyByteBuf byteBuf) { this.sortDirection = SortDirection.get(byteBuf.readByte()); this.sortType = SortType.get(byteBuf.readByte()); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageSplitPacket.java b/src/main/java/com/klikli_dev/occultism/network/MessageSplitPacket.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageSplitPacket.java rename to src/main/java/com/klikli_dev/occultism/network/MessageSplitPacket.java index a9920101f..4777b9ae2 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageSplitPacket.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageSplitPacket.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.network.NetworkEvent.Context; diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageSyncFamiliarSettings.java b/src/main/java/com/klikli_dev/occultism/network/MessageSyncFamiliarSettings.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageSyncFamiliarSettings.java rename to src/main/java/com/klikli_dev/occultism/network/MessageSyncFamiliarSettings.java index 20020e8d8..cd1692fff 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageSyncFamiliarSettings.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageSyncFamiliarSettings.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.common.capability.FamiliarSettingsCapability; -import com.github.klikli_dev.occultism.registry.OccultismCapabilities; +import com.klikli_dev.occultism.common.capability.FamiliarSettingsCapability; +import com.klikli_dev.occultism.registry.OccultismCapabilities; import net.minecraft.client.Minecraft; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageTakeItem.java b/src/main/java/com/klikli_dev/occultism/network/MessageTakeItem.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageTakeItem.java rename to src/main/java/com/klikli_dev/occultism/network/MessageTakeItem.java index 4731ef9fb..cfdff3357 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageTakeItem.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageTakeItem.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.container.IStorageControllerContainer; -import com.github.klikli_dev.occultism.common.misc.ItemStackComparator; -import com.github.klikli_dev.occultism.util.InputUtil; +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.container.IStorageControllerContainer; +import com.klikli_dev.occultism.common.misc.ItemStackComparator; +import com.klikli_dev.occultism.util.InputUtil; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -39,14 +39,10 @@ */ public class MessageTakeItem extends MessageBase { - //region Fields private ItemStack stack = ItemStack.EMPTY; private int mouseButton; private boolean isShiftDown; private boolean isCtrlDown; - //endregion Fields - - //region Initialization public MessageTakeItem(FriendlyByteBuf buf) { this.decode(buf); @@ -58,9 +54,6 @@ public MessageTakeItem(ItemStack stack, int mouseButton, boolean isShiftDown, bo this.isShiftDown = isShiftDown; this.isCtrlDown = isCtrlDown; } - //endregion Initialization - - //region Overrides @Override public void onServerReceived(MinecraftServer minecraftServer, ServerPlayer player, @@ -136,5 +129,5 @@ public void decode(FriendlyByteBuf buf) { this.isShiftDown = buf.readBoolean(); this.isCtrlDown = buf.readBoolean(); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageToggleFamiliarSettings.java b/src/main/java/com/klikli_dev/occultism/network/MessageToggleFamiliarSettings.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageToggleFamiliarSettings.java rename to src/main/java/com/klikli_dev/occultism/network/MessageToggleFamiliarSettings.java index ac9442af0..f6ccb9935 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageToggleFamiliarSettings.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageToggleFamiliarSettings.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.capability.FamiliarSettingsCapability; -import com.github.klikli_dev.occultism.registry.OccultismCapabilities; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.capability.FamiliarSettingsCapability; +import com.klikli_dev.occultism.registry.OccultismCapabilities; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageUpdateLinkedMachines.java b/src/main/java/com/klikli_dev/occultism/network/MessageUpdateLinkedMachines.java similarity index 83% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageUpdateLinkedMachines.java rename to src/main/java/com/klikli_dev/occultism/network/MessageUpdateLinkedMachines.java index ca927b212..4118f98e9 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageUpdateLinkedMachines.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageUpdateLinkedMachines.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.api.client.gui.IStorageControllerGui; -import com.github.klikli_dev.occultism.api.common.data.GlobalBlockPos; -import com.github.klikli_dev.occultism.api.common.data.MachineReference; +import com.klikli_dev.occultism.api.client.gui.IStorageControllerGui; +import com.klikli_dev.occultism.api.common.data.GlobalBlockPos; +import com.klikli_dev.occultism.api.common.data.MachineReference; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.entity.player.Player; @@ -41,11 +41,7 @@ */ public class MessageUpdateLinkedMachines extends MessageBase { - //region Fields private List linkedMachines; - //endregion Fields - - //region Initialization public MessageUpdateLinkedMachines(FriendlyByteBuf buf) { this.decode(buf); @@ -58,15 +54,11 @@ public MessageUpdateLinkedMachines(List linkedMachines) { public MessageUpdateLinkedMachines(Map linkedMachines) { this.linkedMachines = new ArrayList<>(linkedMachines.values()); } - //endregion Initialization - - //region Overrides @Override @OnlyIn(Dist.CLIENT) public void onClientReceived(Minecraft minecraft, Player player, NetworkEvent.Context context) { - if (minecraft.screen instanceof IStorageControllerGui) { - IStorageControllerGui gui = (IStorageControllerGui) minecraft.screen; + if (minecraft.screen instanceof IStorageControllerGui gui) { if (gui != null) { gui.setLinkedMachines(this.linkedMachines); } @@ -92,5 +84,4 @@ public void decode(FriendlyByteBuf buf) { } } - //endregion Overrides } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageUpdateMouseHeldItem.java b/src/main/java/com/klikli_dev/occultism/network/MessageUpdateMouseHeldItem.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageUpdateMouseHeldItem.java rename to src/main/java/com/klikli_dev/occultism/network/MessageUpdateMouseHeldItem.java index b2453bce6..da3b126b6 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageUpdateMouseHeldItem.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageUpdateMouseHeldItem.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; @@ -35,11 +35,7 @@ */ public class MessageUpdateMouseHeldItem extends MessageBase { - //region Fields private ItemStack stack; - //endregion Fields - - //region Initialization public MessageUpdateMouseHeldItem(FriendlyByteBuf buf) { this.decode(buf); @@ -48,9 +44,6 @@ public MessageUpdateMouseHeldItem(FriendlyByteBuf buf) { public MessageUpdateMouseHeldItem(ItemStack itemStack) { this.stack = itemStack; } - //endregion Initialization - - //region Overrides @Override @OnlyIn(Dist.CLIENT) @@ -67,5 +60,5 @@ public void encode(FriendlyByteBuf buf) { public void decode(FriendlyByteBuf buf) { this.stack = buf.readItem(); } - //endregion Overrides + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageUpdateStacks.java b/src/main/java/com/klikli_dev/occultism/network/MessageUpdateStacks.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageUpdateStacks.java rename to src/main/java/com/klikli_dev/occultism/network/MessageUpdateStacks.java index c916604e5..559a388d3 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageUpdateStacks.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageUpdateStacks.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.api.client.gui.IStorageControllerGui; +import com.klikli_dev.occultism.api.client.gui.IStorageControllerGui; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.client.Minecraft; @@ -43,7 +43,6 @@ */ public class MessageUpdateStacks extends MessageBase { - //region Fields private static final int DEFAULT_BUFFER_SIZE = 2 * 1024; private List stacks; @@ -51,9 +50,6 @@ public class MessageUpdateStacks extends MessageBase { private int maxSlots; private ByteBuf payload; - //endregion Fields - - //region Initialization public MessageUpdateStacks(FriendlyByteBuf buf) { this.decode(buf); } @@ -64,16 +60,12 @@ public MessageUpdateStacks(List stacks, int usedSlots, int maxSlots) this.maxSlots = maxSlots; this.compress(); } - //endregion Initialization - - //region Overrides @Override @OnlyIn(Dist.CLIENT) public void onClientReceived(Minecraft minecraft, Player player, NetworkEvent.Context context) { this.uncompress(); - if (minecraft.screen instanceof IStorageControllerGui) { - IStorageControllerGui gui = (IStorageControllerGui) minecraft.screen; + if (minecraft.screen instanceof IStorageControllerGui gui) { if (gui != null) { gui.setStacks(this.stacks); gui.setUsedSlots(this.usedSlots); @@ -102,9 +94,7 @@ public void decode(FriendlyByteBuf buf) { this.payload = Unpooled.buffer(compressedSize); buf.readBytes(this.payload, 0, compressedSize); } - //endregion Overrides - //region Methods public void uncompress() { Inflater decompressor = new Inflater(); decompressor.setInput(this.payload.array()); @@ -157,5 +147,5 @@ public void compress() { this.payload.writeBytes(buf, 0, count); } } - //endregion Methods + } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/MessageUpdateStorageSettings.java b/src/main/java/com/klikli_dev/occultism/network/MessageUpdateStorageSettings.java similarity index 86% rename from src/main/java/com/github/klikli_dev/occultism/network/MessageUpdateStorageSettings.java rename to src/main/java/com/klikli_dev/occultism/network/MessageUpdateStorageSettings.java index 992d0457c..7539bf650 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/MessageUpdateStorageSettings.java +++ b/src/main/java/com/klikli_dev/occultism/network/MessageUpdateStorageSettings.java @@ -20,15 +20,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.container.IStorageControllerContainer; -import com.github.klikli_dev.occultism.api.common.data.SortDirection; -import com.github.klikli_dev.occultism.api.common.data.SortType; -import com.github.klikli_dev.occultism.common.container.storage.StableWormholeContainer; -import com.github.klikli_dev.occultism.common.container.storage.StorageControllerContainer; -import com.github.klikli_dev.occultism.common.container.storage.StorageRemoteContainer; +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.container.IStorageControllerContainer; +import com.klikli_dev.occultism.api.common.data.SortDirection; +import com.klikli_dev.occultism.api.common.data.SortType; +import com.klikli_dev.occultism.common.container.storage.StableWormholeContainer; +import com.klikli_dev.occultism.common.container.storage.StorageControllerContainer; +import com.klikli_dev.occultism.common.container.storage.StorageRemoteContainer; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/com/github/klikli_dev/occultism/network/OccultismPacketHandler.java b/src/main/java/com/klikli_dev/occultism/network/OccultismPacketHandler.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/network/OccultismPacketHandler.java rename to src/main/java/com/klikli_dev/occultism/network/OccultismPacketHandler.java index 77d82be4f..018084a75 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/OccultismPacketHandler.java +++ b/src/main/java/com/klikli_dev/occultism/network/OccultismPacketHandler.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; import net.minecraft.client.Minecraft; import net.minecraft.server.MinecraftServer; @@ -46,7 +46,7 @@ public static void handle(T message, Supplier void handleServer(T message, Supplier ctx) { - MinecraftServer server = ctx.get().getSender().level.getServer(); + MinecraftServer server = ctx.get().getSender().level().getServer(); message.onServerReceived(server, ctx.get().getSender(), ctx.get()); } diff --git a/src/main/java/com/github/klikli_dev/occultism/network/OccultismPackets.java b/src/main/java/com/klikli_dev/occultism/network/OccultismPackets.java similarity index 99% rename from src/main/java/com/github/klikli_dev/occultism/network/OccultismPackets.java rename to src/main/java/com/klikli_dev/occultism/network/OccultismPackets.java index c2b9acdf1..fadfa2f00 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/OccultismPackets.java +++ b/src/main/java/com/klikli_dev/occultism/network/OccultismPackets.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; -import com.github.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.Occultism; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/com/github/klikli_dev/occultism/network/PacketSplitter.java b/src/main/java/com/klikli_dev/occultism/network/PacketSplitter.java similarity index 99% rename from src/main/java/com/github/klikli_dev/occultism/network/PacketSplitter.java rename to src/main/java/com/klikli_dev/occultism/network/PacketSplitter.java index d0d50062b..3fa627842 100644 --- a/src/main/java/com/github/klikli_dev/occultism/network/PacketSplitter.java +++ b/src/main/java/com/klikli_dev/occultism/network/PacketSplitter.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.network; +package com.klikli_dev.occultism.network; import com.google.common.primitives.Bytes; import io.netty.buffer.Unpooled; diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismAdvancements.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismAdvancements.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismAdvancements.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismAdvancements.java index 99f2be87a..2369b8150 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismAdvancements.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismAdvancements.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.common.advancement.FamiliarTrigger; -import com.github.klikli_dev.occultism.common.advancement.RitualTrigger; +import com.klikli_dev.occultism.common.advancement.FamiliarTrigger; +import com.klikli_dev.occultism.common.advancement.RitualTrigger; import net.minecraft.advancements.CriteriaTriggers; public class OccultismAdvancements { diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismBlocks.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismBlocks.java similarity index 74% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismBlocks.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismBlocks.java index 5dfba6d8e..9a4f95a90 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismBlocks.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismBlocks.java @@ -20,20 +20,20 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.block.CandleBlock; -import com.github.klikli_dev.occultism.common.block.*; -import com.github.klikli_dev.occultism.common.block.crops.ReplantableCropsBlock; -import com.github.klikli_dev.occultism.common.block.otherworld.*; -import com.github.klikli_dev.occultism.common.block.storage.StableWormholeBlock; -import com.github.klikli_dev.occultism.common.block.storage.StorageControllerBlock; -import com.github.klikli_dev.occultism.common.block.storage.StorageStabilizerBlock; -import com.github.klikli_dev.occultism.common.entity.familiar.CthulhuFamiliarEntity; -import com.github.klikli_dev.occultism.common.entity.familiar.FamiliarEntity; -import com.github.klikli_dev.occultism.common.level.tree.OtherworldNaturalTreeGrower; -import com.github.klikli_dev.occultism.common.level.tree.OtherworldTreeGrower; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.block.CandleBlock; +import com.klikli_dev.occultism.common.block.*; +import com.klikli_dev.occultism.common.block.crops.ReplantableCropsBlock; +import com.klikli_dev.occultism.common.block.otherworld.*; +import com.klikli_dev.occultism.common.block.storage.StableWormholeBlock; +import com.klikli_dev.occultism.common.block.storage.StorageControllerBlock; +import com.klikli_dev.occultism.common.block.storage.StorageStabilizerBlock; +import com.klikli_dev.occultism.common.entity.familiar.CthulhuFamiliarEntity; +import com.klikli_dev.occultism.common.entity.familiar.FamiliarEntity; +import com.klikli_dev.occultism.common.level.tree.OtherworldNaturalTreeGrower; +import com.klikli_dev.occultism.common.level.tree.OtherworldTreeGrower; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; @@ -44,8 +44,7 @@ import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.Material; -import net.minecraft.world.level.material.MaterialColor; +import net.minecraft.world.level.material.MapColor; import net.minecraft.world.level.material.PushReaction; import net.minecraft.world.phys.AABB; import net.minecraftforge.registries.DeferredRegister; @@ -65,12 +64,15 @@ public class OccultismBlocks { //Blocks without item public static final RegistryObject SPIRIT_FIRE = register("spirit_fire", () -> new SpiritFireBlock( - Block.Properties.of(Material.FIRE, MaterialColor.COLOR_PURPLE).noCollission().instabreak() + Block.Properties.of() + .mapColor(MapColor.COLOR_PURPLE) + .noCollission() + .instabreak() .lightLevel((state) -> 12) .sound(SoundType.WOOL)), false, LootTableType.EMPTY); public static final RegistryObject LIGHTED_AIR = register("lighted_air", () -> new AirBlock( - Block.Properties.of(Material.AIR).noCollission().air().noLootTable().lightLevel(s -> 15).randomTicks()) { + Block.Properties.of().noCollission().air().noLootTable().lightLevel(s -> 15).randomTicks()) { @Override @SuppressWarnings("deprecation") public void tick(BlockState pState, ServerLevel pLevel, BlockPos pPos, RandomSource pRandom) { @@ -80,13 +82,10 @@ public void tick(BlockState pState, ServerLevel pLevel, BlockPos pPos, RandomSou } }); - - //can't use builder here because of random private builder methods .. - public static final Material GLYPH_MATERIAL = new Material(MaterialColor.NONE, false, false, - false, true, false, true, PushReaction.DESTROY); - - public static final Block.Properties GLYPH_PROPERTIES = Block.Properties.of(GLYPH_MATERIAL) - .sound(SoundType.WOOL).noCollission() + public static final Block.Properties GLYPH_PROPERTIES = Block.Properties.of() + .sound(SoundType.WOOL) + .pushReaction(PushReaction.DESTROY) + .noCollission() .strength(5f, 30); public static final RegistryObject CHALK_GLYPH_WHITE = register("chalk_glyph_white", () -> new ChalkGlyphBlock(GLYPH_PROPERTIES, 0xffffff, () -> OccultismItems.CHALK_WHITE.get()), @@ -103,7 +102,7 @@ public void tick(BlockState pState, ServerLevel pLevel, BlockPos pPos, RandomSou //Resources public static final RegistryObject OTHERSTONE = register("otherstone", () -> new Block( - Block.Properties.of(Material.STONE).sound(SoundType.STONE).strength(1.5f, 30))); + Block.Properties.of().mapColor(MapColor.STONE).sound(SoundType.STONE).strength(1.5f, 30))); //Components public static final RegistryObject OTHERSTONE_SLAB = register("otherstone_slab", () -> new SlabBlock(Block.Properties.copy(OTHERSTONE.get()))); public static final RegistryObject OTHERSTONE_PEDESTAL = register("otherstone_pedestal", () -> new Block(Block.Properties.copy(OTHERSTONE.get()))); @@ -111,31 +110,37 @@ public void tick(BlockState pState, ServerLevel pLevel, BlockPos pPos, RandomSou () -> new NonPathfindableBlock(Block.Properties.copy(OTHERSTONE.get()).noOcclusion())); public static final RegistryObject OTHERSTONE_NATURAL = register("otherstone_natural", () -> new OtherstoneNaturalBlock( - Block.Properties.of(Material.STONE).sound(SoundType.STONE).strength(1.5f, 30)), + Block.Properties.of().mapColor(MapColor.STONE).sound(SoundType.STONE).strength(1.5f, 30)), true, LootTableType.OTHERWORLD_BLOCK); public static final RegistryObject OTHERWORLD_LOG = - register("otherworld_log", () -> new RotatedPillarBlock(Block.Properties.of(Material.WOOD, (state) -> { - return state.getValue(RotatedPillarBlock.AXIS) == Direction.Axis.Y ? MaterialColor.WOOD : MaterialColor.COLOR_PURPLE; - }).strength(2.0F).sound(SoundType.WOOD).strength(2.0f))); + register("otherworld_log", () -> new RotatedPillarBlock(Block.Properties.of() + .mapColor((state) -> state.getValue(RotatedPillarBlock.AXIS) == Direction.Axis.Y ? MapColor.WOOD : MapColor.COLOR_PURPLE) + .strength(2.0F).sound(SoundType.WOOD).strength(2.0f))); public static final RegistryObject OTHERWORLD_LOG_NATURAL = - register("otherworld_log_natural", () -> new OtherworldLogNaturalBlock(Block.Properties.of(Material.WOOD, (state) -> { - return state.getValue(RotatedPillarBlock.AXIS) == Direction.Axis.Y ? MaterialColor.WOOD : MaterialColor.COLOR_PURPLE; - }).strength(2.0f)), true, LootTableType.OTHERWORLD_BLOCK); + register("otherworld_log_natural", () -> new OtherworldLogNaturalBlock(Block.Properties.of() + .mapColor((state) -> state.getValue(RotatedPillarBlock.AXIS) == Direction.Axis.Y ? MapColor.WOOD : MapColor.COLOR_PURPLE).strength(2.0f)), true, LootTableType.OTHERWORLD_BLOCK); public static final RegistryObject OTHERWORLD_LEAVES = register("otherworld_leaves", () -> new LeavesBlock( - Block.Properties.of(Material.LEAVES).sound(SoundType.GRASS) + Block.Properties.of() + .mapColor(MapColor.PLANT) + .sound(SoundType.GRASS) .strength(0.2f).randomTicks().noOcclusion()), true, LootTableType.CUSTOM); public static final RegistryObject OTHERWORLD_LEAVES_NATURAL = register("otherworld_leaves_natural", () -> new OtherworldLeavesNaturalBlock( - Block.Properties.of(Material.LEAVES).sound(SoundType.GRASS) + Block.Properties.of() + .mapColor(MapColor.PLANT).sound(SoundType.GRASS) .strength(0.2f).randomTicks().noOcclusion()), true, LootTableType.CUSTOM); public static final RegistryObject OTHERWORLD_SAPLING = register("otherworld_sapling", () -> new OtherworldSaplingBlock(new OtherworldTreeGrower(), - Block.Properties.of(Material.PLANT).sound(SoundType.GRASS) + Block.Properties.of() + .mapColor(MapColor.PLANT) + .sound(SoundType.GRASS) .strength(0.0f).randomTicks().noCollission())); public static final RegistryObject OTHERWORLD_SAPLING_NATURAL = register("otherworld_sapling_natural", () -> new OtherworldSaplingNaturalBlock(new OtherworldNaturalTreeGrower(), - Block.Properties.of(Material.PLANT).sound(SoundType.GRASS) + Block.Properties.of() + .mapColor(MapColor.PLANT) + .sound(SoundType.GRASS) .strength(0.0f).randomTicks().noCollission()), false, LootTableType.OTHERWORLD_BLOCK); public static final RegistryObject SILVER_ORE = register("silver_ore", () -> new Block(Block.Properties.copy(Blocks.IRON_ORE)), true, LootTableType.CUSTOM); public static final RegistryObject SILVER_ORE_DEEPSLATE = register("silver_ore_deepslate", () -> new Block(Block.Properties.copy(Blocks.IRON_ORE)), true, LootTableType.CUSTOM); @@ -148,52 +153,73 @@ public void tick(BlockState pState, ServerLevel pLevel, BlockPos pPos, RandomSou //Decorative and Ritual Blocks public static final RegistryObject CANDLE_WHITE = register("candle_white", () -> new CandleBlock( - Block.Properties.of(Material.DECORATION).sound(SoundType.WOOL).noCollission() + Block.Properties.of() + .mapColor(MapColor.WOOL) + .sound(SoundType.WOOL).noCollission() .strength(0.1f, 0).lightLevel((state) -> 12))); + public static final RegistryObject SPIRIT_ATTUNED_CRYSTAL = register("spirit_attuned_crystal", () -> new SpiritAttunedCrystalBlock( - Block.Properties.of(Material.STONE).sound(SoundType.STONE).noOcclusion() + Block.Properties.of() + .mapColor(MapColor.STONE) + .sound(SoundType.STONE).noOcclusion() .strength(1.5f, 30).lightLevel((state) -> 8))); //Machines public static final RegistryObject SACRIFICIAL_BOWL = register("sacrificial_bowl", () -> new SacrificialBowlBlock( - Block.Properties.of(Material.STONE).sound(SoundType.STONE).strength(1.5f, 30) + Block.Properties.of() + .mapColor(MapColor.STONE) + .sound(SoundType.STONE).strength(1.5f, 30) .noOcclusion())); public static final RegistryObject GOLDEN_SACRIFICIAL_BOWL = register("golden_sacrificial_bowl", () -> new GoldenSacrificialBowlBlock( - Block.Properties.of(Material.STONE).sound(SoundType.STONE).strength(1.5f, 30) + Block.Properties.of() + .mapColor(MapColor.STONE) + .sound(SoundType.STONE).strength(1.5f, 30) .noOcclusion())); public static final RegistryObject STORAGE_CONTROLLER = register("storage_controller", () -> new StorageControllerBlock( - Block.Properties.of(Material.STONE).sound(SoundType.STONE) + Block.Properties.of() + .mapColor(MapColor.STONE) + .sound(SoundType.STONE) .strength(5f, 100).noOcclusion()), false, LootTableType.EMPTY); public static final RegistryObject STORAGE_STABILIZER_TIER1 = register( "storage_stabilizer_tier1", () -> new StorageStabilizerBlock( - Block.Properties.of(Material.STONE).sound(SoundType.STONE).strength(1.5f, 30) + Block.Properties.of() + .mapColor(MapColor.STONE) + .sound(SoundType.STONE).strength(1.5f, 30) .noOcclusion())); public static final RegistryObject STORAGE_STABILIZER_TIER2 = register( "storage_stabilizer_tier2", () -> new StorageStabilizerBlock( - Block.Properties.of(Material.STONE).sound(SoundType.STONE).strength(1.5f, 30) + Block.Properties.of() + .mapColor(MapColor.STONE) + .sound(SoundType.STONE).strength(1.5f, 30) .noOcclusion())); public static final RegistryObject STORAGE_STABILIZER_TIER3 = register( "storage_stabilizer_tier3", () -> new StorageStabilizerBlock( - Block.Properties.of(Material.STONE).sound(SoundType.STONE).strength(1.5f, 30) + Block.Properties.of() + .mapColor(MapColor.STONE) + .sound(SoundType.STONE).strength(1.5f, 30) .noOcclusion())); public static final RegistryObject STORAGE_STABILIZER_TIER4 = register( "storage_stabilizer_tier4", () -> new StorageStabilizerBlock( - Block.Properties.of(Material.STONE).sound(SoundType.STONE).strength(1.5f, 30) + Block.Properties.of() + .mapColor(MapColor.STONE) + .sound(SoundType.STONE).strength(1.5f, 30) .noOcclusion())); public static final RegistryObject STABLE_WORMHOLE = register("stable_wormhole", () -> new StableWormholeBlock( - Block.Properties.of(Material.STONE).sound(SoundType.STONE).noCollission() + Block.Properties.of() + .mapColor(MapColor.STONE) + .sound(SoundType.STONE).noCollission() .strength(2f, 2).noOcclusion()), false, LootTableType.EMPTY); public static final RegistryObject DIMENSIONAL_MINESHAFT = register("dimensional_mineshaft", () -> new DimensionalMineshaftBlock( - Block.Properties.of(Material.STONE).sound(SoundType.STONE) + Block.Properties.of().sound(SoundType.STONE) .strength(1.5f, 30) .noOcclusion() )); @@ -201,33 +227,37 @@ public void tick(BlockState pState, ServerLevel pLevel, BlockPos pPos, RandomSou //Crops public static final RegistryObject DATURA = register("datura", () -> new ReplantableCropsBlock( - Block.Properties.of(Material.PLANT).sound(SoundType.CROP).noCollission().randomTicks() + Block.Properties.of() + .mapColor(MapColor.PLANT) + .sound(SoundType.CROP).noCollission().randomTicks() //registry object is wrapped in lambda to account for load order and circular dependencies .strength(0, 0), () -> OccultismItems.DATURA_SEEDS.get(), () -> OccultismItems.DATURA.get()), false, LootTableType.REPLANTABLE_CROP); //Dummy public static final RegistryObject SKELETON_SKULL_DUMMY = register("skeleton_skull_dummy", () -> new Block( - Block.Properties.of(Material.DECORATION).strength(1.0F)), false); + Block.Properties.of().strength(1.0F)), false); public static final RegistryObject WITHER_SKELETON_SKULL_DUMMY = register("wither_skeleton_skull_dummy", () -> new Block( - Block.Properties.of(Material.DECORATION).strength(1.0F)), false); + Block.Properties.of().strength(1.0F)), false); //Deco public static final RegistryObject SPIRIT_LANTERN = register("spirit_lantern", - () -> new LanternBlock(BlockBehaviour.Properties.of(Material.METAL) + () -> new LanternBlock(BlockBehaviour.Properties.of() + .mapColor(MapColor.METAL) .requiresCorrectToolForDrops().strength(3.5F).sound(SoundType.LANTERN) .lightLevel((state) -> 10).noOcclusion())); public static final RegistryObject SPIRIT_CAMPFIRE = register("spirit_campfire", - () -> new CampfireBlock(false, 2, BlockBehaviour.Properties.of(Material.WOOD, MaterialColor.PODZOL) + () -> new CampfireBlock(false, 2, BlockBehaviour.Properties.of() + .mapColor(MapColor.PODZOL) .strength(2.0F).sound(SoundType.WOOD).lightLevel((state) -> 10).noOcclusion())); public static final RegistryObject SPIRIT_TORCH = register("spirit_torch", - () -> new SpiritTorchBlock(BlockBehaviour.Properties.of(Material.DECORATION) + () -> new SpiritTorchBlock(BlockBehaviour.Properties.of() .noCollission().instabreak().lightLevel((state) -> 10).sound(SoundType.WOOD)), false); public static final RegistryObject SPIRIT_WALL_TORCH = register("spirit_wall_torch", - () -> new SpiritWallTorchBlock(BlockBehaviour.Properties.of(Material.DECORATION) + () -> new SpiritWallTorchBlock(BlockBehaviour.Properties.of() .noCollission().instabreak().lightLevel((state) -> 10).sound(SoundType.WOOD).lootFrom(SPIRIT_TORCH)), false); public static RegistryObject register(final String name, final Supplier sup) { @@ -245,7 +275,7 @@ public static RegistryObject register(final String name, fi RegistryObject object = BLOCKS.register(name, sup); BLOCK_DATA_GEN_SETTINGS.put(object.getId(), new BlockDataGenSettings(generateDefaultBlockItem, lootTableType)); - if(generateDefaultBlockItem) { + if (generateDefaultBlockItem) { OccultismItems.ITEMS.register(name, () -> new BlockItem(object.get(), new Item.Properties())); } diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismCapabilities.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismCapabilities.java similarity index 88% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismCapabilities.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismCapabilities.java index 7d2d8657f..bc877f715 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismCapabilities.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismCapabilities.java @@ -20,10 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.common.capability.DoubleJumpCapability; -import com.github.klikli_dev.occultism.common.capability.FamiliarSettingsCapability; +import com.klikli_dev.occultism.common.capability.DoubleJumpCapability; +import com.klikli_dev.occultism.common.capability.FamiliarSettingsCapability; +import com.klikli_dev.occultism.util.StaticUtil; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.common.capabilities.Capability; @@ -33,12 +34,10 @@ import net.minecraftforge.event.entity.EntityJoinLevelEvent; import net.minecraftforge.event.entity.player.PlayerEvent; -import static com.github.klikli_dev.occultism.util.StaticUtil.modLoc; - public class OccultismCapabilities { - public static final ResourceLocation DOUBLE_JUMP_ID = modLoc("double_jump"); - public static final ResourceLocation FAMILIAR_SETTINGS_ID = modLoc("familiar_settings"); + public static final ResourceLocation DOUBLE_JUMP_ID = StaticUtil.modLoc("double_jump"); + public static final ResourceLocation FAMILIAR_SETTINGS_ID = StaticUtil.modLoc("familiar_settings"); public static Capability DOUBLE_JUMP = CapabilityManager.get(new CapabilityToken<>() { }); diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismCommands.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismCommands.java similarity index 90% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismCommands.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismCommands.java index fcd30ca9c..2ec17bf8e 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismCommands.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismCommands.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.command.DebugAICommand; -import com.github.klikli_dev.occultism.common.command.NbtCommand; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.command.DebugAICommand; +import com.klikli_dev.occultism.common.command.NbtCommand; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.tree.LiteralCommandNode; import net.minecraft.commands.CommandSourceStack; diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismContainers.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismContainers.java similarity index 77% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismContainers.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismContainers.java index bdba9a92b..2fb3c80d7 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismContainers.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismContainers.java @@ -20,20 +20,20 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.blockentity.DimensionalMineshaftBlockEntity; -import com.github.klikli_dev.occultism.common.blockentity.StableWormholeBlockEntity; -import com.github.klikli_dev.occultism.common.blockentity.StorageControllerBlockEntity; -import com.github.klikli_dev.occultism.common.container.DimensionalMineshaftContainer; -import com.github.klikli_dev.occultism.common.container.spirit.SpiritContainer; -import com.github.klikli_dev.occultism.common.container.spirit.SpiritTransporterContainer; -import com.github.klikli_dev.occultism.common.container.storage.SatchelContainer; -import com.github.klikli_dev.occultism.common.container.storage.StableWormholeContainer; -import com.github.klikli_dev.occultism.common.container.storage.StorageControllerContainer; -import com.github.klikli_dev.occultism.common.container.storage.StorageRemoteContainer; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.blockentity.DimensionalMineshaftBlockEntity; +import com.klikli_dev.occultism.common.blockentity.StableWormholeBlockEntity; +import com.klikli_dev.occultism.common.blockentity.StorageControllerBlockEntity; +import com.klikli_dev.occultism.common.container.DimensionalMineshaftContainer; +import com.klikli_dev.occultism.common.container.spirit.SpiritContainer; +import com.klikli_dev.occultism.common.container.spirit.SpiritTransporterContainer; +import com.klikli_dev.occultism.common.container.storage.SatchelContainer; +import com.klikli_dev.occultism.common.container.storage.StableWormholeContainer; +import com.klikli_dev.occultism.common.container.storage.StorageControllerContainer; +import com.klikli_dev.occultism.common.container.storage.StorageRemoteContainer; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; import net.minecraft.world.inventory.MenuType; import net.minecraftforge.common.extensions.IForgeMenuType; import net.minecraftforge.registries.DeferredRegister; @@ -41,7 +41,7 @@ import net.minecraftforge.registries.RegistryObject; public class OccultismContainers { - //region Fields + public static final DeferredRegister> CONTAINERS = DeferredRegister.create( ForgeRegistries.MENU_TYPES, Occultism.MODID); @@ -49,14 +49,14 @@ public class OccultismContainers { CONTAINERS.register("storage_controller", () -> IForgeMenuType .create((windowId, inv, data) -> new StorageControllerContainer(windowId, inv, - (StorageControllerBlockEntity) inv.player.level + (StorageControllerBlockEntity) inv.player.level() .getBlockEntity(data.readBlockPos())))); public static final RegistryObject> STABLE_WORMHOLE = CONTAINERS.register("stable_wormhole", () -> IForgeMenuType .create((windowId, inv, data) -> new StableWormholeContainer(windowId, inv, - (StableWormholeBlockEntity) inv.player.level + (StableWormholeBlockEntity) inv.player.level() .getBlockEntity(data.readBlockPos())))); public static final RegistryObject> STORAGE_REMOTE = @@ -69,7 +69,7 @@ public class OccultismContainers { () -> IForgeMenuType .create((windowId, inv, data) -> { return new SpiritContainer(windowId, inv, - (SpiritEntity) inv.player.level.getEntity(data.readInt())); + (SpiritEntity) inv.player.level().getEntity(data.readInt())); })); public static final RegistryObject> SPIRIT_TRANSPORTER = @@ -77,18 +77,17 @@ public class OccultismContainers { () -> IForgeMenuType .create((windowId, inv, data) -> { return new SpiritTransporterContainer(windowId, inv, - (SpiritEntity) inv.player.level.getEntity(data.readInt())); + (SpiritEntity) inv.player.level().getEntity(data.readInt())); })); public static final RegistryObject> OTHERWORLD_MINER = CONTAINERS.register("otherworld_miner", () -> IForgeMenuType .create((windowId, inv, data) -> new DimensionalMineshaftContainer(windowId, inv, - (DimensionalMineshaftBlockEntity) inv.player.level.getBlockEntity( + (DimensionalMineshaftBlockEntity) inv.player.level().getBlockEntity( data.readBlockPos())))); public static final RegistryObject> SATCHEL = CONTAINERS.register("satchel", () -> IForgeMenuType.create(SatchelContainer::createClientContainer)); - //endregion Fields } diff --git a/src/main/java/com/klikli_dev/occultism/registry/OccultismCreativeModeTabs.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismCreativeModeTabs.java new file mode 100644 index 000000000..f076d84ab --- /dev/null +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismCreativeModeTabs.java @@ -0,0 +1,30 @@ +package com.klikli_dev.occultism.registry; + +import com.klikli_dev.occultism.Occultism; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.RegistryObject; + +public class OccultismCreativeModeTabs { + public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, Occultism.MODID); + + + public static final RegistryObject OCCULTISM = CREATIVE_MODE_TABS.register(Occultism.MODID, () -> CreativeModeTab.builder() + .withTabsBefore(CreativeModeTabs.COMBAT) + .icon(() -> OccultismItems.PENTACLE.get().getDefaultInstance()) + .title(Component.translatable("itemGroup.occultism")) + .displayItems((parameters, output) -> { + OccultismItems.ITEMS.getEntries().forEach(i -> { + + if (!OccultismItems.shouldSkipCreativeModTab(i.get())) { + output.accept(i.get()); + } + }); + + output.accept(OccultismItems.DICTIONARY_OF_SPIRITS.get().getCreativeModeTabDisplayStack()); + }).build()); + +} diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismEffects.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismEffects.java similarity index 91% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismEffects.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismEffects.java index 6c1f8c42e..b19e630d5 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismEffects.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismEffects.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.effect.DoubleJumpEffect; -import com.github.klikli_dev.occultism.common.effect.ThirdEyeEffect; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.effect.DoubleJumpEffect; +import com.klikli_dev.occultism.common.effect.ThirdEyeEffect; import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffectCategory; import net.minecraftforge.registries.DeferredRegister; diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismEntities.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismEntities.java similarity index 84% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismEntities.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismEntities.java index 812cb6f80..bd0286323 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismEntities.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismEntities.java @@ -20,15 +20,16 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.entity.familiar.*; -import com.github.klikli_dev.occultism.common.entity.possessed.PossessedEndermanEntity; -import com.github.klikli_dev.occultism.common.entity.possessed.PossessedEndermiteEntity; -import com.github.klikli_dev.occultism.common.entity.possessed.PossessedGhastEntity; -import com.github.klikli_dev.occultism.common.entity.possessed.PossessedSkeletonEntity; -import com.github.klikli_dev.occultism.common.entity.spirit.*; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.entity.familiar.*; +import com.klikli_dev.occultism.common.entity.possessed.PossessedEndermanEntity; +import com.klikli_dev.occultism.common.entity.possessed.PossessedEndermiteEntity; +import com.klikli_dev.occultism.common.entity.possessed.PossessedGhastEntity; +import com.klikli_dev.occultism.common.entity.possessed.PossessedSkeletonEntity; +import com.klikli_dev.occultism.common.entity.spirit.*; +import com.klikli_dev.occultism.util.StaticUtil; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.MobCategory; import net.minecraft.world.level.Level; @@ -37,10 +38,8 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; -import static com.github.klikli_dev.occultism.util.StaticUtil.modLoc; - public class OccultismEntities { - //region Fields + public static final DeferredRegister> ENTITIES = DeferredRegister.create(ForgeRegistries.ENTITY_TYPES, Occultism.MODID); @@ -48,167 +47,167 @@ public class OccultismEntities { NonNullLazy.of(() -> EntityType.Builder.of(FoliotEntity::new, MobCategory.CREATURE) .sized(0.6f, 1.1f) .clientTrackingRange(8) - .build(modLoc("foliot").toString())); + .build(StaticUtil.modLoc("foliot").toString())); public static final NonNullLazy> DJINNI_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(DjinniEntity::new, MobCategory.CREATURE) .sized(0.6f, 1.1f) .clientTrackingRange(8) - .build(modLoc("djinni").toString())); + .build(StaticUtil.modLoc("djinni").toString())); public static final NonNullLazy> AFRIT_TYPE = NonNullLazy.of(() -> EntityType.Builder.of((EntityType t, Level l) -> new AfritEntity(t, l), MobCategory.CREATURE) .fireImmune() .sized(1.2f, 2.4f) .clientTrackingRange(8) - .build(modLoc("afrit").toString())); + .build(StaticUtil.modLoc("afrit").toString())); public static final NonNullLazy> AFRIT_WILD_TYPE = NonNullLazy.of(() -> EntityType.Builder.of((EntityType t, Level l) -> new AfritWildEntity(t, l), MobCategory.CREATURE) .fireImmune() .sized(1.2f, 2.4f) .clientTrackingRange(8) - .build(modLoc("afrit_wild").toString())); + .build(StaticUtil.modLoc("afrit_wild").toString())); public static final NonNullLazy> MARID_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(MaridEntity::new, MobCategory.CREATURE) .sized(1.2f, 2.4f) .clientTrackingRange(8) - .build(modLoc("marid").toString())); + .build(StaticUtil.modLoc("marid").toString())); public static final NonNullLazy> POSSESSED_ENDERMITE_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(PossessedEndermiteEntity::new, MobCategory.MONSTER) .sized(0.4F, 0.3F) .clientTrackingRange(8) - .build(modLoc("possessed_endermite").toString())); + .build(StaticUtil.modLoc("possessed_endermite").toString())); public static final NonNullLazy> POSSESSED_SKELETON_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(PossessedSkeletonEntity::new, MobCategory.MONSTER) .sized(0.6F, 1.99F) .clientTrackingRange(8) - .build(modLoc("possessed_skeleton").toString())); + .build(StaticUtil.modLoc("possessed_skeleton").toString())); public static final NonNullLazy> POSSESSED_ENDERMAN_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(PossessedEndermanEntity::new, MobCategory.MONSTER) .sized(0.6F, 2.9F) .clientTrackingRange(8) - .build(modLoc("possessed_enderman").toString())); + .build(StaticUtil.modLoc("possessed_enderman").toString())); public static final NonNullLazy> POSSESSED_GHAST_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(PossessedGhastEntity::new, MobCategory.MONSTER) .fireImmune() .sized(4.0F, 4.0F) .clientTrackingRange(10) - .build(modLoc("possessed_ghast").toString())); + .build(StaticUtil.modLoc("possessed_ghast").toString())); public static final NonNullLazy> WILD_HUNT_SKELETON_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(WildHuntSkeletonEntity::new, MobCategory.MONSTER) .sized(0.6F, 2.9F) .clientTrackingRange(8) - .build(modLoc("wild_hunt_skeleton").toString())); + .build(StaticUtil.modLoc("wild_hunt_skeleton").toString())); public static final NonNullLazy> WILD_HUNT_WITHER_SKELETON_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(WildHuntWitherSkeletonEntity::new, MobCategory.MONSTER) .sized(0.6F, 2.9F) .clientTrackingRange(8) - .build(modLoc("wild_hunt_wither_skeleton").toString())); + .build(StaticUtil.modLoc("wild_hunt_wither_skeleton").toString())); public static final NonNullLazy> OTHERWORLD_BIRD_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(OtherworldBirdEntity::new, MobCategory.CREATURE) .sized(0.5F, 0.9F) .clientTrackingRange(8) - .build(modLoc("otherworld_bird").toString())); + .build(StaticUtil.modLoc("otherworld_bird").toString())); public static final NonNullLazy> GREEDY_FAMILIAR_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(GreedyFamiliarEntity::new, MobCategory.CREATURE) .sized(0.5F, 0.9F) .clientTrackingRange(8) - .build(modLoc("greedy_familiar").toString())); + .build(StaticUtil.modLoc("greedy_familiar").toString())); public static final NonNullLazy> BAT_FAMILIAR_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(BatFamiliarEntity::new, MobCategory.CREATURE) .sized(0.5F, 0.9F) .clientTrackingRange(8) - .build(modLoc("bat_familiar").toString())); + .build(StaticUtil.modLoc("bat_familiar").toString())); public static final NonNullLazy> DEER_FAMILIAR_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(DeerFamiliarEntity::new, MobCategory.CREATURE) .sized(0.6F, 1.0F) .clientTrackingRange(8) - .build(modLoc("deer_familiar").toString())); + .build(StaticUtil.modLoc("deer_familiar").toString())); public static final NonNullLazy> CTHULHU_FAMILIAR_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(CthulhuFamiliarEntity::new, MobCategory.CREATURE) .sized(0.6F, 1.0F) .clientTrackingRange(8) - .build(modLoc("cthulhu_familiar").toString())); + .build(StaticUtil.modLoc("cthulhu_familiar").toString())); public static final NonNullLazy> DEVIL_FAMILIAR_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(DevilFamiliarEntity::new, MobCategory.CREATURE) .sized(0.8F, 1.0F) .clientTrackingRange(8) - .build(modLoc("devil_familiar").toString())); + .build(StaticUtil.modLoc("devil_familiar").toString())); public static final NonNullLazy> DRAGON_FAMILIAR_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(DragonFamiliarEntity::new, MobCategory.CREATURE) .sized(1F, 0.8F) .clientTrackingRange(8) - .build(modLoc("dragon_familiar").toString())); + .build(StaticUtil.modLoc("dragon_familiar").toString())); public static final NonNullLazy> BLACKSMITH_FAMILIAR_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(BlacksmithFamiliarEntity::new, MobCategory.CREATURE) .sized(0.65F, 1F) .clientTrackingRange(8) - .build(modLoc("blacksmith_familiar").toString())); + .build(StaticUtil.modLoc("blacksmith_familiar").toString())); public static final NonNullLazy> GUARDIAN_FAMILIAR_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(GuardianFamiliarEntity::new, MobCategory.CREATURE) .sized(0.8F, 1.5F) .clientTrackingRange(8) .fireImmune() - .build(modLoc("guardian_familiar").toString())); + .build(StaticUtil.modLoc("guardian_familiar").toString())); public static final NonNullLazy> HEADLESS_FAMILIAR_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(HeadlessFamiliarEntity::new, MobCategory.CREATURE) .sized(0.7F, 1.1F) .clientTrackingRange(8) - .build(modLoc("headless_familiar").toString())); + .build(StaticUtil.modLoc("headless_familiar").toString())); public static final NonNullLazy> CHIMERA_FAMILIAR_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(ChimeraFamiliarEntity::new, MobCategory.CREATURE) .sized(0.85F, 1.05F) .clientTrackingRange(8) - .build(modLoc("chimera_familiar").toString())); + .build(StaticUtil.modLoc("chimera_familiar").toString())); public static final NonNullLazy> GOAT_FAMILIAR_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(GoatFamiliarEntity::new, MobCategory.CREATURE) .sized(0.7F, 0.8F) .clientTrackingRange(8) - .build(modLoc("goat_familiar").toString())); + .build(StaticUtil.modLoc("goat_familiar").toString())); public static final NonNullLazy> SHUB_NIGGURATH_FAMILIAR_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(ShubNiggurathFamiliarEntity::new, MobCategory.CREATURE) .sized(0.7F, 0.8F) .clientTrackingRange(8) - .build(modLoc("shub_niggurath_familiar").toString())); + .build(StaticUtil.modLoc("shub_niggurath_familiar").toString())); public static final NonNullLazy> BEHOLDER_FAMILIAR_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(BeholderFamiliarEntity::new, MobCategory.CREATURE) .sized(0.6F, 1F) .clientTrackingRange(8) - .build(modLoc("beholder_familiar").toString())); + .build(StaticUtil.modLoc("beholder_familiar").toString())); public static final NonNullLazy> FAIRY_FAMILIAR_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(FairyFamiliarEntity::new, MobCategory.CREATURE) .sized(0.6F, 1F) .clientTrackingRange(8) .fireImmune() - .build(modLoc("fairy_familiar").toString())); + .build(StaticUtil.modLoc("fairy_familiar").toString())); public static final NonNullLazy> MUMMY_FAMILIAR_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(MummyFamiliarEntity::new, MobCategory.CREATURE) .sized(0.6F, 1.2F) .clientTrackingRange(8) - .build(modLoc("mummy_familiar").toString())); + .build(StaticUtil.modLoc("mummy_familiar").toString())); public static final NonNullLazy> BEAVER_FAMILIAR_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(BeaverFamiliarEntity::new, MobCategory.CREATURE) .sized(0.7F, 0.6F) .clientTrackingRange(8) - .build(modLoc("beaver_familiar").toString())); + .build(StaticUtil.modLoc("beaver_familiar").toString())); public static final NonNullLazy> THROWN_SWORD_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(ThrownSwordEntity::new, MobCategory.MISC) .sized(0.5F, 0.5F) .clientTrackingRange(8) - .build(modLoc("thrown_sword").toString())); + .build(StaticUtil.modLoc("thrown_sword").toString())); public static final NonNullLazy> SHUB_NIGGURATH_SPAWN_TYPE = NonNullLazy.of(() -> EntityType.Builder.of(ShubNiggurathSpawnEntity::new, MobCategory.CREATURE) .sized(0.6F, 0.6F) .clientTrackingRange(8) - .build(modLoc("shub_niggurath_spawn").toString())); + .build(StaticUtil.modLoc("shub_niggurath_spawn").toString())); public static final RegistryObject> FOLIOT = ENTITIES.register("foliot", FOLIOT_TYPE::get); public static final RegistryObject> DJINNI = ENTITIES.register("djinni", DJINNI_TYPE::get); @@ -267,5 +266,5 @@ public class OccultismEntities { ENTITIES.register("thrown_sword", THROWN_SWORD_TYPE::get); public static final RegistryObject> SHUB_NIGGURATH_SPAWN = ENTITIES.register("shub_niggurath_spawn", SHUB_NIGGURATH_SPAWN_TYPE::get); - //endregion Fields + } diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismFeatures.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismFeatures.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismFeatures.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismFeatures.java index 881e76a4d..fd7c2062f 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismFeatures.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismFeatures.java @@ -20,13 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.level.cave.SphericalCaveSubFeature; -import com.github.klikli_dev.occultism.common.level.cave.UndergroundGroveDecorator; -import com.github.klikli_dev.occultism.common.level.multichunk.MultiChunkFeature; -import com.github.klikli_dev.occultism.common.level.multichunk.MultiChunkFeatureConfig; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.level.cave.SphericalCaveSubFeature; +import com.klikli_dev.occultism.common.level.cave.UndergroundGroveDecorator; +import com.klikli_dev.occultism.common.level.multichunk.MultiChunkFeature; +import com.klikli_dev.occultism.common.level.multichunk.MultiChunkFeatureConfig; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.placement.*; import net.minecraftforge.registries.DeferredRegister; diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismFoods.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismFoods.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismFoods.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismFoods.java index f3326d8bc..0fe67d1f2 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismFoods.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismFoods.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismItems.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismItems.java similarity index 94% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismItems.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismItems.java index f84bedcbb..1959c68f1 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismItems.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismItems.java @@ -20,27 +20,24 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; - -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.TranslationKeys; -import com.github.klikli_dev.occultism.api.common.misc.OccultismItemTier; -import com.github.klikli_dev.occultism.common.item.DummyTooltipItem; -import com.github.klikli_dev.occultism.common.item.armor.OtherworldGogglesItem; -import com.github.klikli_dev.occultism.common.item.debug.*; -import com.github.klikli_dev.occultism.common.item.otherworld.OtherworldBlockItem; -import com.github.klikli_dev.occultism.common.item.spirit.*; -import com.github.klikli_dev.occultism.common.item.storage.*; -import com.github.klikli_dev.occultism.common.item.tool.BrushItem; -import com.github.klikli_dev.occultism.common.item.tool.*; +package com.klikli_dev.occultism.registry; + +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.TranslationKeys; +import com.klikli_dev.occultism.api.common.misc.OccultismItemTier; +import com.klikli_dev.occultism.common.item.DummyTooltipItem; +import com.klikli_dev.occultism.common.item.armor.OtherworldGogglesItem; +import com.klikli_dev.occultism.common.item.debug.*; +import com.klikli_dev.occultism.common.item.otherworld.OtherworldBlockItem; +import com.klikli_dev.occultism.common.item.spirit.*; +import com.klikli_dev.occultism.common.item.storage.*; +import com.klikli_dev.occultism.common.item.tool.BrushItem; +import com.klikli_dev.occultism.common.item.tool.*; import net.minecraft.core.Direction; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EntityType; import net.minecraft.world.item.*; import net.minecraft.world.level.block.ComposterBlock; import net.minecraftforge.common.ForgeSpawnEggItem; -import net.minecraftforge.event.CreativeModeTabEvent; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; @@ -437,27 +434,6 @@ public static void registerCompostables() { Occultism.LOGGER.info("Registered compostable Items"); } - public static void onRegisterCreativeModeTabs(CreativeModeTabEvent.Register event) { - event.registerCreativeModeTab(new ResourceLocation(Occultism.MODID + ":" + Occultism.MODID), - (builder) -> { - builder.icon(() -> new ItemStack(OccultismItems.PENTACLE.get())) - .title(Component.translatable("itemGroup.occultism")).build(); - - builder.displayItems((parameters, output) -> { - ITEMS.getEntries().forEach(i -> { - - if (!shouldSkipCreativeModTab(i.get())) { - output.accept(i.get()); - } - }); - - output.accept(DICTIONARY_OF_SPIRITS.get().getCreativeModeTabDisplayStack()); - }); - - } - ); - } - public static boolean shouldSkipCreativeModTab(Item item) { if (item == PENTACLE.get() || item == DICTIONARY_OF_SPIRITS_ICON.get() diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismLootModifiers.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismLootModifiers.java similarity index 79% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismLootModifiers.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismLootModifiers.java index 74c1f5beb..7a22ae41e 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismLootModifiers.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismLootModifiers.java @@ -1,7 +1,7 @@ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.loot.AddItemModifier; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.loot.AddItemModifier; import com.mojang.serialization.Codec; import net.minecraftforge.common.loot.IGlobalLootModifier; import net.minecraftforge.registries.DeferredRegister; diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismMemoryTypes.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismMemoryTypes.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismMemoryTypes.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismMemoryTypes.java index 2022bd602..1b7a7bce7 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismMemoryTypes.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismMemoryTypes.java @@ -1,6 +1,6 @@ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.Occultism; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.entity.ai.memory.MemoryModuleType; diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismModelLayers.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismModelLayers.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismModelLayers.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismModelLayers.java index a8388b9ca..ff2dc4530 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismModelLayers.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismModelLayers.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; import net.minecraft.client.model.geom.ModelLayerLocation; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismParticles.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismParticles.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismParticles.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismParticles.java index bd11d678e..9db8374dd 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismParticles.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismParticles.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.Occultism; import net.minecraft.core.particles.ParticleType; import net.minecraft.core.particles.SimpleParticleType; import net.minecraftforge.registries.DeferredRegister; diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismRecipes.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismRecipes.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismRecipes.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismRecipes.java index d13ea72e3..e2f30d899 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismRecipes.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismRecipes.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.crafting.recipe.*; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.crafting.recipe.*; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.RecipeType; diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismRituals.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismRituals.java similarity index 96% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismRituals.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismRituals.java index 978249b1f..f16d4fba5 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismRituals.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismRituals.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.ritual.*; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.ritual.*; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.IForgeRegistry; diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismSensors.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismSensors.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismSensors.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismSensors.java index cc9cb93fa..c5e3c1011 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismSensors.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismSensors.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.entity.ai.sensor.NearestJobItemSensor; -import com.github.klikli_dev.occultism.common.entity.ai.sensor.NearestTreeSensor; -import com.github.klikli_dev.occultism.common.entity.ai.sensor.UnreachableTreeWalkTargetSensor; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.entity.ai.sensor.NearestJobItemSensor; +import com.klikli_dev.occultism.common.entity.ai.sensor.NearestTreeSensor; +import com.klikli_dev.occultism.common.entity.ai.sensor.UnreachableTreeWalkTargetSensor; import net.minecraft.world.entity.ai.sensing.SensorType; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismSounds.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismSounds.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismSounds.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismSounds.java index 1adf671b4..a89ce1de6 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismSounds.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismSounds.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.Occultism; import net.minecraft.resources.ResourceLocation; import net.minecraft.sounds.SoundEvent; import net.minecraftforge.registries.DeferredRegister; @@ -31,7 +31,6 @@ public class OccultismSounds { - //region Fields public static DeferredRegister SOUNDS = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, Occultism.MODID); public static final RegistryObject CHALK = SOUNDS.register("chalk", () -> loadSoundEvent("chalk")); @@ -41,8 +40,6 @@ public class OccultismSounds { public static final RegistryObject CRUNCHING = SOUNDS.register("crunching", () -> loadSoundEvent("crunching")); public static final RegistryObject POOF = SOUNDS.register("poof", () -> loadSoundEvent("poof")); - //endregion Fields - /** * Creates the sound event object for the given sound event name, as specified in sounds.json Automatically appends * MODID. diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismSpiritJobs.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismSpiritJobs.java similarity index 92% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismSpiritJobs.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismSpiritJobs.java index 169e97a94..0205c0319 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismSpiritJobs.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismSpiritJobs.java @@ -20,10 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.entity.job.*; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.entity.job.*; +import com.klikli_dev.occultism.util.StaticUtil; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.IForgeRegistry; @@ -32,10 +33,8 @@ import java.util.function.Supplier; -import static com.github.klikli_dev.occultism.util.StaticUtil.modLoc; - public class OccultismSpiritJobs { - //region Fields + public static DeferredRegister JOBS = DeferredRegister.create(new ResourceLocation(Occultism.MODID, "spirit_job_factory"), Occultism.MODID); public static final Supplier> REGISTRY = JOBS.makeRegistry(() -> @@ -53,14 +52,14 @@ public class OccultismSpiritJobs { //Trade jobs public static final RegistryObject TRADE_OTHERSTONE_T1 = JOBS.register("trade_otherstone_t1", () -> new SpiritJobFactory((entity) -> { - TraderJob job = new TraderJob(entity, modLoc("spirit_trade/stone_to_otherstone")); + TraderJob job = new TraderJob(entity, StaticUtil.modLoc("spirit_trade/stone_to_otherstone")); job.setTimeToConvert(15); job.setMaxTradesPerRound(4); return job; })); public static final RegistryObject TRADE_OTHERWORLD_SAPLINGS_T2 = JOBS.register("trade_otherworld_saplings_t1", () -> new SpiritJobFactory((entity) -> { - TraderJob job = new TraderJob(entity, modLoc("spirit_trade/otherworld_sapling")); + TraderJob job = new TraderJob(entity, StaticUtil.modLoc("spirit_trade/otherworld_sapling")); job.setTimeToConvert(20); job.setMaxTradesPerRound(1); return job; @@ -106,5 +105,4 @@ public class OccultismSpiritJobs { public static final RegistryObject NIGHT_TIME = JOBS.register("night_time", () -> new SpiritJobFactory((entity) -> new NightTimeJob(entity, 20 * 5))); - //endregion Fields } diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismTags.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismTags.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java index 345954def..ae9acc9ae 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismTags.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.Occultism; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; diff --git a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismTiles.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismTiles.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/registry/OccultismTiles.java rename to src/main/java/com/klikli_dev/occultism/registry/OccultismTiles.java index 725a689a0..9cd939cdf 100644 --- a/src/main/java/com/github/klikli_dev/occultism/registry/OccultismTiles.java +++ b/src/main/java/com/klikli_dev/occultism/registry/OccultismTiles.java @@ -20,17 +20,17 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.registry; +package com.klikli_dev.occultism.registry; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.blockentity.*; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.blockentity.*; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; public class OccultismTiles { - //region Fields + public static final DeferredRegister> TILES = DeferredRegister.create( ForgeRegistries.BLOCK_ENTITY_TYPES, Occultism.MODID); @@ -56,6 +56,4 @@ public class OccultismTiles { "dimensional_mineshaft", () -> BlockEntityType.Builder.of(DimensionalMineshaftBlockEntity::new, OccultismBlocks.DIMENSIONAL_MINESHAFT.get()).build(null)); - //endregion Fields - } diff --git a/src/main/java/com/github/klikli_dev/occultism/util/BlockEntityUtil.java b/src/main/java/com/klikli_dev/occultism/util/BlockEntityUtil.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/util/BlockEntityUtil.java rename to src/main/java/com/klikli_dev/occultism/util/BlockEntityUtil.java index 84db50ffb..d88aaca6a 100644 --- a/src/main/java/com/github/klikli_dev/occultism/util/BlockEntityUtil.java +++ b/src/main/java/com/klikli_dev/occultism/util/BlockEntityUtil.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.util; +package com.klikli_dev.occultism.util; -import com.github.klikli_dev.occultism.api.common.data.GlobalBlockPos; +import com.klikli_dev.occultism.api.common.data.GlobalBlockPos; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -40,7 +40,7 @@ public class BlockEntityUtil { //region Static Methods - public static boolean isLoaded(Level level, GlobalBlockPos pos){ + public static boolean isLoaded(Level level, GlobalBlockPos pos) { if (pos == null) return false; diff --git a/src/main/java/com/github/klikli_dev/occultism/util/CuriosUtil.java b/src/main/java/com/klikli_dev/occultism/util/CuriosUtil.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/util/CuriosUtil.java rename to src/main/java/com/klikli_dev/occultism/util/CuriosUtil.java index a65e45408..7a7973e4f 100644 --- a/src/main/java/com/github/klikli_dev/occultism/util/CuriosUtil.java +++ b/src/main/java/com/klikli_dev/occultism/util/CuriosUtil.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.util; +package com.klikli_dev.occultism.util; -import com.github.klikli_dev.occultism.common.item.armor.OtherworldGogglesItem; -import com.github.klikli_dev.occultism.common.item.storage.SatchelItem; -import com.github.klikli_dev.occultism.common.item.storage.StorageRemoteItem; +import com.klikli_dev.occultism.common.item.armor.OtherworldGogglesItem; +import com.klikli_dev.occultism.common.item.storage.SatchelItem; +import com.klikli_dev.occultism.common.item.storage.StorageRemoteItem; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/github/klikli_dev/occultism/util/EntityUtil.java b/src/main/java/com/klikli_dev/occultism/util/EntityUtil.java similarity index 98% rename from src/main/java/com/github/klikli_dev/occultism/util/EntityUtil.java rename to src/main/java/com/klikli_dev/occultism/util/EntityUtil.java index 800acc800..de79a2c4a 100644 --- a/src/main/java/com/github/klikli_dev/occultism/util/EntityUtil.java +++ b/src/main/java/com/klikli_dev/occultism/util/EntityUtil.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.util; +package com.klikli_dev.occultism.util; import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/github/klikli_dev/occultism/util/EnumUtil.java b/src/main/java/com/klikli_dev/occultism/util/EnumUtil.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/util/EnumUtil.java rename to src/main/java/com/klikli_dev/occultism/util/EnumUtil.java index a4662b3f6..346e67393 100644 --- a/src/main/java/com/github/klikli_dev/occultism/util/EnumUtil.java +++ b/src/main/java/com/klikli_dev/occultism/util/EnumUtil.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.util; +package com.klikli_dev.occultism.util; import net.minecraft.core.Direction; diff --git a/src/main/java/com/github/klikli_dev/occultism/util/FamiliarUtil.java b/src/main/java/com/klikli_dev/occultism/util/FamiliarUtil.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/util/FamiliarUtil.java rename to src/main/java/com/klikli_dev/occultism/util/FamiliarUtil.java index 3a8845262..82c027e4c 100644 --- a/src/main/java/com/github/klikli_dev/occultism/util/FamiliarUtil.java +++ b/src/main/java/com/klikli_dev/occultism/util/FamiliarUtil.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.util; +package com.klikli_dev.occultism.util; -import com.github.klikli_dev.occultism.Occultism; -import com.github.klikli_dev.occultism.common.entity.familiar.IFamiliar; -import com.github.klikli_dev.occultism.common.item.tool.FamiliarRingItem; -import com.github.klikli_dev.occultism.registry.OccultismCapabilities; +import com.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.common.entity.familiar.IFamiliar; +import com.klikli_dev.occultism.common.item.tool.FamiliarRingItem; +import com.klikli_dev.occultism.registry.OccultismCapabilities; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; @@ -96,7 +96,7 @@ public static T getFamiliar(LivingEntity owner, E public static List getAllNearbyFamiliars(LivingEntity owner, EntityType type, Predicate pred) { - return owner.level.getEntities(type, owner.getBoundingBox().inflate(10), + return owner.level().getEntities(type, owner.getBoundingBox().inflate(10), e -> pred.test(e) && e.getFamiliarOwner() == owner && e.isAlive()); } @@ -115,7 +115,7 @@ public static List getAllEquippedFamiliars(Liv return familiars; for (int i = 0; i < curios.getSlots(); i++) { - IFamiliar familiar = FamiliarRingItem.getFamiliar(curios.getStackInSlot(i), owner.level); + IFamiliar familiar = FamiliarRingItem.getFamiliar(curios.getStackInSlot(i), owner.level()); if (familiar != null && familiar.getFamiliarEntity().getType() == type) { T fam = (T) familiar.getFamiliarEntity(); if (pred.test(fam)) diff --git a/src/main/java/com/klikli_dev/occultism/util/GuiGraphicsExt.java b/src/main/java/com/klikli_dev/occultism/util/GuiGraphicsExt.java new file mode 100644 index 000000000..2f2bfcf75 --- /dev/null +++ b/src/main/java/com/klikli_dev/occultism/util/GuiGraphicsExt.java @@ -0,0 +1,55 @@ +/* + * MIT License + * + * Copyright 2023 klikli-dev + * + * 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. + */ + +package com.klikli_dev.occultism.util; + +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.network.chat.Component; +import net.minecraft.util.FormattedCharSequence; +import org.jetbrains.annotations.Nullable; + +public class GuiGraphicsExt { + + + /** + * Copy of {@link GuiGraphics#drawString(Font, String, float, float, int, boolean)} for Component rendering. + */ + public static int drawString(GuiGraphics guiGraphics, Font font, @Nullable Component component, float x, float y, int color, boolean drawShadow) { + if (component == null) { + return 0; + } else { + int i = font.drawInBatch(component, x, y, color, drawShadow, guiGraphics.pose().last().pose(), guiGraphics.bufferSource(), Font.DisplayMode.NORMAL, 0, 15728880); + guiGraphics.flushIfUnmanaged(); + return i; + } + } + + /** + * Copy of {@link GuiGraphics#drawString(Font, String, float, float, int, boolean)} for FormattedCharSequence rendering. + */ + public static int drawString(GuiGraphics guiGraphics, Font font, FormattedCharSequence text, float x, float y, int color, boolean drawShadow) { + int i = font.drawInBatch(text, x, y, color, drawShadow, guiGraphics.pose().last().pose(), guiGraphics.bufferSource(), Font.DisplayMode.NORMAL, 0, 15728880); + guiGraphics.flushIfUnmanaged(); + return i; + } +} diff --git a/src/main/java/com/github/klikli_dev/occultism/util/InputUtil.java b/src/main/java/com/klikli_dev/occultism/util/InputUtil.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/util/InputUtil.java rename to src/main/java/com/klikli_dev/occultism/util/InputUtil.java index c7fdd4363..854a3d551 100644 --- a/src/main/java/com/github/klikli_dev/occultism/util/InputUtil.java +++ b/src/main/java/com/klikli_dev/occultism/util/InputUtil.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.util; +package com.klikli_dev.occultism.util; public class InputUtil { - //region Fields + public static final int MOUSE_BUTTON_LEFT = 0; public static final int MOUSE_BUTTON_RIGHT = 1; public static final int MOUSE_BUTTON_MIDDLE = 2; - //endregion Fields + } diff --git a/src/main/java/com/github/klikli_dev/occultism/util/ItemNBTUtil.java b/src/main/java/com/klikli_dev/occultism/util/ItemNBTUtil.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/util/ItemNBTUtil.java rename to src/main/java/com/klikli_dev/occultism/util/ItemNBTUtil.java index 6a7ee8afb..38fc3d5a5 100644 --- a/src/main/java/com/github/klikli_dev/occultism/util/ItemNBTUtil.java +++ b/src/main/java/com/klikli_dev/occultism/util/ItemNBTUtil.java @@ -20,13 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.util; +package com.klikli_dev.occultism.util; -import com.github.klikli_dev.occultism.api.common.data.GlobalBlockPos; -import com.github.klikli_dev.occultism.api.common.data.MachineReference; -import com.github.klikli_dev.occultism.api.common.data.WorkAreaSize; -import com.github.klikli_dev.occultism.common.entity.job.ManageMachineJob; -import com.github.klikli_dev.occultism.common.entity.spirit.SpiritEntity; +import com.klikli_dev.occultism.api.common.data.GlobalBlockPos; +import com.klikli_dev.occultism.api.common.data.MachineReference; +import com.klikli_dev.occultism.api.common.data.WorkAreaSize; +import com.klikli_dev.occultism.common.entity.job.ManageMachineJob; +import com.klikli_dev.occultism.common.entity.spirit.SpiritEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -37,7 +37,6 @@ public class ItemNBTUtil { - //region Fields public static final String SPIRIT_NAME_TAG = "spiritName"; public static final String SPIRIT_UUID_TAG = "spiritUUID"; public static final String SPIRIT_DEAD_TAG = "spiritDead"; @@ -54,8 +53,6 @@ public class ItemNBTUtil { public static final String STORAGE_CONTROLLER_POSITION_TAG = "storageControllerPosition"; public static final String MANAGED_MACHINE = "managedMachine"; - //endregion Fields - //region Static Methods public static void updateItemNBTFromEntity(ItemStack stack, SpiritEntity entity) { diff --git a/src/main/java/com/github/klikli_dev/occultism/util/Math3DUtil.java b/src/main/java/com/klikli_dev/occultism/util/Math3DUtil.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/util/Math3DUtil.java rename to src/main/java/com/klikli_dev/occultism/util/Math3DUtil.java index 3825d4f81..bd672a095 100644 --- a/src/main/java/com/github/klikli_dev/occultism/util/Math3DUtil.java +++ b/src/main/java/com/klikli_dev/occultism/util/Math3DUtil.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.util; +package com.klikli_dev.occultism.util; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -113,7 +113,7 @@ public static BlockPos simpleTrace(BlockPos start, Direction direction, int dist /** * Checks if a is within distance of b, allowing a different distance for each axis. */ - public static boolean withinAxisDistances(Vec3 a, Vec3 b, double distanceX, double distanceY, double distanceZ){ + public static boolean withinAxisDistances(Vec3 a, Vec3 b, double distanceX, double distanceY, double distanceZ) { double d0 = Math.abs(a.x - b.x); double d1 = Math.abs(a.y - b.y); double d2 = Math.abs(a.z - b.z); diff --git a/src/main/java/com/github/klikli_dev/occultism/util/MovementUtil.java b/src/main/java/com/klikli_dev/occultism/util/MovementUtil.java similarity index 85% rename from src/main/java/com/github/klikli_dev/occultism/util/MovementUtil.java rename to src/main/java/com/klikli_dev/occultism/util/MovementUtil.java index 40b130845..a6c2e05b5 100644 --- a/src/main/java/com/github/klikli_dev/occultism/util/MovementUtil.java +++ b/src/main/java/com/klikli_dev/occultism/util/MovementUtil.java @@ -20,12 +20,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.util; +package com.klikli_dev.occultism.util; -import com.github.klikli_dev.occultism.common.capability.DoubleJumpCapability; -import com.github.klikli_dev.occultism.common.effect.DoubleJumpEffect; -import com.github.klikli_dev.occultism.registry.OccultismCapabilities; -import com.github.klikli_dev.occultism.registry.OccultismTags; +import com.klikli_dev.occultism.common.capability.DoubleJumpCapability; +import com.klikli_dev.occultism.common.effect.DoubleJumpEffect; +import com.klikli_dev.occultism.registry.OccultismCapabilities; +import com.klikli_dev.occultism.registry.OccultismTags; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ElytraItem; @@ -53,7 +53,7 @@ public static boolean allowDoubleJump(Player player) { //If swimming, flying, on the ground(= normal jump) or mounted, no double jump boolean swimming = player.isInWater() || player.isInLava(); - if (player.isOnGround() || player.isPassenger() || player.getAbilities().flying || swimming) { + if (player.onGround() || player.isPassenger() || player.getAbilities().flying || swimming) { return false; } diff --git a/src/main/java/com/github/klikli_dev/occultism/util/OtherworldUtil.java b/src/main/java/com/klikli_dev/occultism/util/OtherworldUtil.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/util/OtherworldUtil.java rename to src/main/java/com/klikli_dev/occultism/util/OtherworldUtil.java index 83c041ed0..f94c8e8eb 100644 --- a/src/main/java/com/github/klikli_dev/occultism/util/OtherworldUtil.java +++ b/src/main/java/com/klikli_dev/occultism/util/OtherworldUtil.java @@ -20,10 +20,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.util; +package com.klikli_dev.occultism.util; -import com.github.klikli_dev.occultism.common.item.otherworld.OtherworldBlockItem; -import com.github.klikli_dev.occultism.registry.OccultismEffects; +import com.klikli_dev.occultism.common.item.otherworld.OtherworldBlockItem; +import com.klikli_dev.occultism.registry.OccultismEffects; import net.minecraft.client.Minecraft; import net.minecraft.world.item.ItemStack; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/com/github/klikli_dev/occultism/util/RecipeUtil.java b/src/main/java/com/klikli_dev/occultism/util/RecipeUtil.java similarity index 97% rename from src/main/java/com/github/klikli_dev/occultism/util/RecipeUtil.java rename to src/main/java/com/klikli_dev/occultism/util/RecipeUtil.java index ca8bda58e..d7417b4b2 100644 --- a/src/main/java/com/github/klikli_dev/occultism/util/RecipeUtil.java +++ b/src/main/java/com/klikli_dev/occultism/util/RecipeUtil.java @@ -20,7 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.util; +package com.klikli_dev.occultism.util; import net.minecraft.world.Container; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/github/klikli_dev/occultism/util/StaticUtil.java b/src/main/java/com/klikli_dev/occultism/util/StaticUtil.java similarity index 93% rename from src/main/java/com/github/klikli_dev/occultism/util/StaticUtil.java rename to src/main/java/com/klikli_dev/occultism/util/StaticUtil.java index 5a2a52160..fcdde5fd4 100644 --- a/src/main/java/com/github/klikli_dev/occultism/util/StaticUtil.java +++ b/src/main/java/com/klikli_dev/occultism/util/StaticUtil.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.util; +package com.klikli_dev.occultism.util; -import com.github.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.Occultism; import net.minecraft.resources.ResourceLocation; public class StaticUtil { diff --git a/src/main/java/com/github/klikli_dev/occultism/util/StorageUtil.java b/src/main/java/com/klikli_dev/occultism/util/StorageUtil.java similarity index 95% rename from src/main/java/com/github/klikli_dev/occultism/util/StorageUtil.java rename to src/main/java/com/klikli_dev/occultism/util/StorageUtil.java index a31fee1a0..a479e68ed 100644 --- a/src/main/java/com/github/klikli_dev/occultism/util/StorageUtil.java +++ b/src/main/java/com/klikli_dev/occultism/util/StorageUtil.java @@ -20,11 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.util; +package com.klikli_dev.occultism.util; -import com.github.klikli_dev.occultism.api.common.blockentity.IStorageController; -import com.github.klikli_dev.occultism.api.common.container.IStorageControllerContainer; -import com.github.klikli_dev.occultism.network.OccultismPackets; +import com.klikli_dev.occultism.api.common.blockentity.IStorageController; +import com.klikli_dev.occultism.api.common.container.IStorageControllerContainer; +import com.klikli_dev.occultism.network.OccultismPackets; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; import net.minecraft.tags.TagKey; @@ -57,8 +57,7 @@ public class StorageUtil { * @param sendStackUpdate true to resend the current stacks to the client. */ public static void clearOpenCraftingMatrix(ServerPlayer player, boolean sendStackUpdate) { - if (player.containerMenu instanceof IStorageControllerContainer) { - IStorageControllerContainer container = (IStorageControllerContainer) player.containerMenu; + if (player.containerMenu instanceof IStorageControllerContainer container) { CraftingContainer craftMatrix = container.getCraftMatrix(); IStorageController storageController = container.getStorageController(); @@ -104,8 +103,7 @@ public static void clearOpenCraftingMatrix(ServerPlayer player, boolean sendStac * @param sendStackUpdate true to resend the current stacks to the client. */ public static void clearOpenOrderSlot(ServerPlayer player, boolean sendStackUpdate) { - if (player.containerMenu instanceof IStorageControllerContainer) { - IStorageControllerContainer container = (IStorageControllerContainer) player.containerMenu; + if (player.containerMenu instanceof IStorageControllerContainer container) { SimpleContainer orderSlot = container.getOrderSlot(); IStorageController storageController = container.getStorageController(); @@ -217,7 +215,7 @@ public static boolean matchesFilter(ItemStack stack, IItemHandler filter) { for (int i = 0; i < filter.getSlots(); i++) { ItemStack filtered = filter.getStackInSlot(i); - boolean equals = filtered.sameItem(stack); + boolean equals = ItemStack.isSameItem(filtered, stack); if (equals) { return true; @@ -280,7 +278,7 @@ public static void dropInventoryItems(Level worldIn, BlockPos pos, IItemHandler public static int getFirstMatchingSlot(IItemHandler handler, TagKey tag) { for (int i = 0; i < handler.getSlots(); i++) { - if(handler.getStackInSlot(i).is(tag)) + if (handler.getStackInSlot(i).is(tag)) return i; } return -1; diff --git a/src/main/java/com/github/klikli_dev/occultism/util/TextUtil.java b/src/main/java/com/klikli_dev/occultism/util/TextUtil.java similarity index 99% rename from src/main/java/com/github/klikli_dev/occultism/util/TextUtil.java rename to src/main/java/com/klikli_dev/occultism/util/TextUtil.java index e0bffeb36..24154bb94 100644 --- a/src/main/java/com/github/klikli_dev/occultism/util/TextUtil.java +++ b/src/main/java/com/klikli_dev/occultism/util/TextUtil.java @@ -20,9 +20,9 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -package com.github.klikli_dev.occultism.util; +package com.klikli_dev.occultism.util; -import com.github.klikli_dev.occultism.Occultism; +import com.klikli_dev.occultism.Occultism; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index b2c335a7e..52cfaa8f0 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -5,6 +5,8 @@ public net.minecraft.data.loot.BlockLootSubProvider f_244248_ # HAS_NO_SHEARS_OR public net.minecraft.data.loot.BlockLootSubProvider f_244441_ # map public net.minecraft.data.loot.EntityLootSubProvider f_244213_ # map public-f net.minecraft.world.item.Item f_41378_ # craftingRemainingItem -public net.minecraft.world.inventory.CraftingContainer f_39320_ # items +public net.minecraft.world.inventory.TransientCraftingContainer f_286951_ # items public net.minecraft.world.item.crafting.Ingredient f_43902_ # values -public net.minecraft.world.item.crafting.Ingredient$TagValue f_43959_ # tag \ No newline at end of file +public net.minecraft.world.item.crafting.Ingredient$TagValue f_43959_ # tag +public net.minecraft.client.gui.GuiGraphics m_286081_()V # flushIfUnmanaged +public net.minecraft.world.entity.Entity m_284535_(Lnet/minecraft/world/level/Level;)V # setLevel \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 576a67e12..5805b8e4e 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -6,22 +6,20 @@ # The name of the mod loader type to load - for regular FML @Mod mods it should be javafml modLoader = "javafml" #mandatory # A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion = "[45,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. +loaderVersion = "${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. # The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. # Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. -license = "MIT" +license = "${mod_license}" # A URL to refer people to when problems occur with this mod issueTrackerURL = "https://github.com/klikli-dev/occultism/issues" #optional # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory # The modid of the mod -modId = "occultism" #mandatory -# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it -# ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata -# see the associated build.gradle script for how to populate this completely automatically during a build -version = "${file.jarVersion}" #mandatory +modId="${mod_id}" #mandatory +# The version number of the mod +version="${mod_version}" #mandatory # A display name for the mod -displayName = "Occultism" #mandatory +displayName="${mod_name}" #mandatory # A URL to query for updates for this mod. See the JSON update specification updateJSONURL = "https://raw.githubusercontent.com/klikli-dev/occultism/meta/updates.json" #optional # A URL for the "homepage" for this mod, displayed in the mod UI @@ -31,55 +29,60 @@ logoFile = "occultism.png" #optional # A text field displayed in the mod UI credits = """See https://github.com/klikli-dev/occultism#licensing""" #optional # A text field displayed in the mod UI -authors = "Kli Kli" #optional +authors="${mod_authors}" #optional # The description text for the mod (multi line!) (#mandatory) -description = '''A magic mod inspired by the world of Jonathan Stroud's Bartimaeus. With the help of occult rituals players can summon entities from the "Other Side" to perform magic.''' +description='''${mod_description}''' + +[[dependencies.occultism]] +modId = "forge" +mandatory = true +versionRange = "${forge_version_range}" +side = "BOTH" [[dependencies.occultism]] modId = "modonomicon" mandatory = true -versionRange = "[1.19.4-1.30.0,)" +versionRange = "${modonomicon_version_range}" side = "BOTH" [[dependencies.occultism]] modId = "theurgy" mandatory = false -versionRange = "[1.19.4-1.3.0,)" +versionRange = "${theurgy_version_range}" side = "BOTH" [[dependencies.occultism]] modId = "curios" mandatory = true -versionRange = "[1.19.4-5.1.4.2,)" +versionRange = "${curios_version_range}" side = "BOTH" [[dependencies.occultism]] modId = "geckolib" mandatory = true -versionRange = "[1.19.4-4.1.2,)" +versionRange = "${geckolib_version_range}" side = "BOTH" [[dependencies.occultism]] modId = "smartbrainlib" mandatory = true -versionRange="[1.9,)" +versionRange = "${smartbrainlib_version_range}" side = "BOTH" [[dependencies.occultism]] modId = "almostunified" mandatory = false -versionRange="[0.3.8,)" +versionRange = "${almostunified_version_range}" side = "BOTH" [[dependencies.occultism]] modId = "per_viam_invenire" mandatory = false -versionRange="[0.1.57,)" +versionRange = "${per_viam_invenire_version_range}" side = "BOTH" - [[dependencies.occultism]] -modId = "forge" -mandatory = true -versionRange = "[1.19.4-45.0.24,)" -side = "BOTH" \ No newline at end of file +modId = "jei" +mandatory = false +versionRange = "${jei_version_range}" +side = "BOTH" diff --git a/src/main/resources/data/minecraft/tags/items/pickaxes.json b/src/main/resources/data/minecraft/tags/items/pickaxes.json new file mode 100644 index 000000000..2665b2888 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/pickaxes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "occultism:infused_pickaxe", + "occultism:iesnium_pickaxe" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/swords.json b/src/main/resources/data/minecraft/tags/items/swords.json new file mode 100644 index 000000000..31faa5047 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/items/swords.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "occultism:butcher_knife" + ] +} \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 757ed004e..add527bcf 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,8 +1,8 @@ { "pack": { - "description": "occultism resources", - "pack_format": 12, - "forge:resource_pack_format": 12, - "forge:data_pack_format": 10 + "description": { + "text": "${mod_id} resources" + }, + "pack_format": 15 } -} +} \ No newline at end of file