From bbc144ce70dc5d9d67357139373725787c0c0833 Mon Sep 17 00:00:00 2001 From: bconlon Date: Tue, 19 Mar 2024 20:19:51 -0700 Subject: [PATCH] update: 1.20.2 --- build.gradle | 105 +++++++----------- docs/CHANGELOG.md | 5 +- docs/README.md | 6 +- gradle.properties | 15 ++- settings.gradle | 15 --- src/generated/resources/pack.mcmeta | 2 +- .../com/aetherteam/emissivity/Emissivity.java | 33 +++--- .../emissivity/EmissivityConfig.java | 14 +-- .../client/renderer/EmissivityRenderers.java | 18 +-- .../player/layer/EmissiveArmorLayer.java | 3 +- .../accessor/HumanoidArmorLayerAccessor.java | 20 ++++ src/main/resources/META-INF/mods.toml | 15 ++- .../resources/aether_emissivity.mixins.json | 1 + .../aether/models/block/ambrosium_block.json | 2 +- .../aether/models/block/ambrosium_ore.json | 2 +- .../models/block/light_angelic_stone.json | 2 +- .../models/block/light_hellfire_stone.json | 2 +- .../aether/models/block/sentry_stone.json | 2 +- .../assets/aether/models/block/sun_altar.json | 2 +- .../models/item/aether_portal_frame.json | 4 +- .../aether/models/item/ambrosium_shard.json | 4 +- .../aether/models/item/ambrosium_torch.json | 4 +- .../boss_doorway_light_angelic_stone.json | 4 +- .../boss_doorway_light_hellfire_stone.json | 4 +- .../item/boss_doorway_sentry_stone.json | 4 +- .../aether/models/item/hammer_of_jeb.json | 4 +- .../models/item/hammer_of_kingbdogz.json | 4 +- .../aether/models/item/healing_stone.json | 4 +- .../item/locked_light_angelic_stone.json | 4 +- .../item/locked_light_hellfire_stone.json | 4 +- .../models/item/locked_sentry_stone.json | 4 +- .../aether/models/item/phoenix_boots.json | 4 +- .../aether/models/item/phoenix_bow.json | 4 +- .../models/item/phoenix_bow_pulling_0.json | 4 +- .../models/item/phoenix_bow_pulling_1.json | 4 +- .../models/item/phoenix_bow_pulling_2.json | 4 +- .../models/item/phoenix_chestplate.json | 4 +- .../aether/models/item/phoenix_gloves.json | 4 +- .../aether/models/item/phoenix_helmet.json | 4 +- .../aether/models/item/phoenix_leggings.json | 4 +- .../aether/models/item/sentry_boots.json | 4 +- .../models/item/shield_of_repulsion.json | 4 +- .../item/trapped_light_angelic_stone.json | 4 +- .../item/trapped_light_hellfire_stone.json | 4 +- .../models/item/trapped_sentry_stone.json | 4 +- .../treasure_doorway_light_angelic_stone.json | 4 +- ...treasure_doorway_light_hellfire_stone.json | 4 +- .../item/treasure_doorway_sentry_stone.json | 4 +- update.json | 3 +- 49 files changed, 187 insertions(+), 196 deletions(-) create mode 100644 src/main/java/com/aetherteam/emissivity/mixin/mixins/client/accessor/HumanoidArmorLayerAccessor.java diff --git a/build.gradle b/build.gradle index 94f7434..5b882ca 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,7 @@ plugins { id 'eclipse' id 'maven-publish' - id 'net.neoforged.gradle' version '[6.0.13, 6.2)' - id 'org.spongepowered.mixin' version '[0.7,0.8)' - id 'org.parchmentmc.librarian.forgegradle' version '[1,2)' - id 'org.moddingx.modgradle.mapping' version '[4,5)' - id 'org.moddingx.modgradle.sourcejar' version '[4,5)' apply false + id 'net.neoforged.gradle.userdev' version '7.0.+' id 'io.github.0ffz.github-packages' version '[1,2)' id 'com.matthewprenger.cursegradle' version '[1.4,1.5)' id 'com.modrinth.minotaur' version '[2,3)' @@ -20,47 +16,32 @@ base { java.toolchain.languageVersion = JavaLanguageVersion.of(17) -apply plugin: 'org.moddingx.modgradle.sourcejar' +minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg') -minecraft { - mappings channel: 'sugarcane', version: project.mappings +runs { + configureEach { + workingDirectory project.file('run') + systemProperty "${mod_id}.iside", 'true' + systemProperty 'forge.logging.console.level', 'info' - copyIdeResources = true - accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') - - runs { - configureEach { - workingDirectory project.file('run') - - property "${mod_id}.iside", 'true' - property 'forge.logging.console.level', 'info' - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg" - - mods { - "${mod_id}" { - source sourceSets.main - } - } - } + modSource project.sourceSets.main + } - client { - property 'forge.enabledGameTestNamespaces', mod_id - } + client { + systemProperty 'forge.enabledGameTestNamespaces', mod_id + } - server { - property 'forge.enabledGameTestNamespaces', mod_id - args '--nogui' - } + server { + systemProperty 'forge.enabledGameTestNamespaces', mod_id + programArgument '--nogui' + } - gameTestServer { - property 'forge.enabledGameTestNamespaces', mod_id - } + gameTestServer { + systemProperty 'forge.enabledGameTestNamespaces', mod_id + } - data { - args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/'), '--existing', file('src/generated/resources/'), '--existing-mod', 'aether' - environment 'target', 'fmluserdevdata' - } + data { + programArguments.addAll '--mod', mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath(), '--existing', file('src/generated/resources/').getAbsolutePath(), '--existing-mod', 'aether' } } @@ -68,18 +49,21 @@ sourceSets.main.resources { srcDir 'src/generated/resources' } -dependencies { - minecraft "net.neoforged:forge:${project.mc_version}-${project.neoforge_version}" +subsystems { + parchment { + minecraftVersion = project.mc_version + mappingsVersion = project.mappings + } +} - implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-common:0.2.0-beta.9")) - annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' - implementation('com.github.llamalad7.mixinextras:mixinextras-forge:0.2.0-beta.9') +dependencies { + implementation "net.neoforged:neoforge:${project.neoforge_version}" - implementation fg.deobf("com.aetherteam.aether:aether:${project.aether_version}") + implementation "com.aetherteam.aether:aether:${project.aether_version}" - implementation fg.deobf("com.aetherteam.nitrogen:nitrogen_internals:${project.nitrogen_version}") - implementation fg.deobf("com.aetherteam.cumulus:cumulus_menus:${project.cumulus_version}") - implementation fg.deobf("top.theillusivec4.curios:curios-forge:${project.curios_version}+${project.mc_version}") + implementation "com.aetherteam.nitrogen:nitrogen_internals:${project.nitrogen_version}" + implementation "com.aetherteam.cumulus:cumulus_menus:${project.cumulus_version}" + implementation "top.theillusivec4.curios:curios-neoforge:${project.curios_version}+${project.mc_version}" } repositories { @@ -102,23 +86,24 @@ tasks.named('jar', Jar).configure { "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } - finalizedBy 'reobfJar' -} - -tasks.named(sourceSets.main.compileJavaTaskName) { - outputs.file("${it.temporaryDir}/${it.name}-refmap.json").withPropertyName("mixin refmap") } compileJava { options.incremental = false } +tasks.register('sourceJar', Jar) { + dependsOn 'classes' + from sourceSets.main.allSource + archiveClassifier = 'sources' +} + publishing { publications { mavenJava(MavenPublication) { artifactId project.archivesBaseName - artifact jar - artifact sourceJar + artifact project.jar + artifact project.sourceJar } } repositories { @@ -141,6 +126,7 @@ curseforge { changelog = file("$rootDir/docs/CHANGELOG.md") changelogType = "markdown" addGameVersion("${project.mc_version}") + addGameVersion("NeoForge") mainArtifact(tasks.jar) { displayName = "${project.mod_name} - ${version}" relations { @@ -159,13 +145,8 @@ modrinth { changelog = new File("$rootDir/docs/CHANGELOG.md").text uploadFile = tasks.jar gameVersions = ["${project.mc_version}"] - loaders = ["forge", "neoforge"] + loaders = ["neoforge"] dependencies { required.version "aether", "${project.aether_version}" } -} - -mixin { - config "${project.mod_id}.mixins.json" - add sourceSets.main, "${project.mod_id}.refmap.json" } \ No newline at end of file diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 9e49620..ca1d3ac 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,4 +1,3 @@ -# Emissivity - Forge - 1.19.4-1.0.0 - -Additions +# Emissivity - NeoForge - 1.0.0-1.20.2 +- Port to 1.20.2 \ No newline at end of file diff --git a/docs/README.md b/docs/README.md index 2568fd4..4769165 100644 --- a/docs/README.md +++ b/docs/README.md @@ -32,7 +32,7 @@ If you're interested in sponsoring Emissivity or The Aether Team, please [contac [![Modrinth Version](https://img.shields.io/modrinth/game-versions/sKHHynnb?color=00AF5C&label=latest&logo=modrinth&last=true)](https://modrinth.com/mod/aether-emissivity) [![CurseForge Downloads](http://cf.way2muchnoise.eu/916028.svg)](https://www.curseforge.com/minecraft/mc-mods/aether-emissivity) [![CurseForge Version](http://cf.way2muchnoise.eu/versions/916028_latest.svg)](https://www.curseforge.com/minecraft/mc-mods/aether-emissivity) -[![CircleCI](https://circleci.com/gh/The-Aether-Team/Emissivity/tree/1.19.4-develop.svg?style=shield)](https://app.circleci.com/pipelines/github/The-Aether-Team/Emissivity?branch=1.19.4-develop) +[![CircleCI](https://circleci.com/gh/The-Aether-Team/Emissivity/tree/1.20.2-develop.svg?style=shield)](https://app.circleci.com/pipelines/github/The-Aether-Team/Emissivity?branch=1.20.2-develop) ### Release builds Emissivity has stable release builds available on [Modrinth](https://modrinth.com/mod/aether-emissivity) and [CurseForge](https://www.curseforge.com/minecraft/mc-mods/aether-emissivity). @@ -97,13 +97,13 @@ dependencies { If you're running into bugs or other problems, feel free to open an issue on our [issue tracker](https://github.com/The-Aether-Team/Emissivity/issues). When doing so, make sure to use one of the provided templates and fill out all the requested information. Make sure to keep your issue's description clear and concise. Your issue's title should also be easy to digest, giving our developers and reporters a good idea of what's wrong without including too many details. Failure to follow any of the above may result in your issue being closed. ## :wrench: Contribute to the project -Looking to contribute to the project? We ask that you read over our [Contributor's Guide](https://github.com/The-Aether-Team/Emissivity/blob/1.19.4-develop/docs/CONTRIBUTING.md) for more details as well as our [Contributor License Agreement (CLA)](https://github.com/The-Aether-Team/Emissivity/blob/1.19.4-develop/docs/AGREEMENT.md) before getting started. +Looking to contribute to the project? We ask that you read over our [Contributor's Guide](https://github.com/The-Aether-Team/Emissivity/blob/1.20.2-develop/docs/CONTRIBUTING.md) for more details as well as our [Contributor License Agreement (CLA)](https://github.com/The-Aether-Team/Emissivity/blob/1.20.2-develop/docs/AGREEMENT.md) before getting started. Not sure what to help with? Take a look at our issue tracker for some ideas! [Here's a quick link](https://github.com/The-Aether-Team/Emissivity/labels/status%2Fhelp-wanted) which shows all the currently open issues that we'd love some help on. ## :scroll: License information [![Asset license (Unlicensed)](https://img.shields.io/badge/assets%20license-All%20Rights%20Reserved-red.svg?style=flat-square)](https://en.wikipedia.org/wiki/All_rights_reserved) -[![Code license (LGPL v3.0)](https://img.shields.io/badge/code%20license-LGPL%20v3.0-green.svg?style=flat-square)](https://github.com/The-Aether-Team/Emissivity/blob/1.19.4-develop/LICENSE.txt) +[![Code license (LGPL v3.0)](https://img.shields.io/badge/code%20license-LGPL%20v3.0-green.svg?style=flat-square)](https://github.com/The-Aether-Team/Emissivity/blob/1.20.2-develop/LICENSE.txt) If you're wanting to create a gameplay video/review, extension or addon, parody, or any other fan work of your own for Emissivity, go for it! We love seeing the content our community creates, and we hope to make it as welcoming as possible for everyone. We ask however that you please don't advertise using our brand (our specific logo assets, team name, official social media posts). diff --git a/gradle.properties b/gradle.properties index 83257ea..5dec7e8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,16 +7,15 @@ org.gradle.daemon=false mod_id=aether_emissivity mod_name=Emissivity mod_version=1.0.0 -mc_version=1.20.1 -neoforge_version=47.1.70 -mappings=2023.08.20-1.20.1 +mc_version=1.20.2 +neoforge_version=20.2.88 +mappings=2023.12.10 # Dependencies -aether_version=1.20.1-1.0.0-beta.1.2-neoforge -nitrogen_version=1.20.1-0.1.3-neoforge -cumulus_version=1.20.1-0.1.4-neoforge -curios_version=5.3.1 -mixinextras_version=0.2.0-beta.9 +aether_version=1.20.2-1.3.1-neoforge +nitrogen_version=1.20.2-1.0.23-neoforge +cumulus_version=1.20.2-1.0.0-neoforge +curios_version=6.1.0 # Publishing curseforge_id=916028 diff --git a/settings.gradle b/settings.gradle index bf02080..7d8be9f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,23 +1,8 @@ pluginManagement { - resolutionStrategy { - eachPlugin { - var plugin = requested.id.toString() - - // ModGradle - if (plugin.startsWith('org.moddingx.modgradle.')) { - useModule "org.moddingx:ModGradle:${requested.version}" - } - } - } repositories { gradlePluginPortal() maven { url = 'https://maven.neoforged.net/releases/' } maven { url = 'https://repo.spongepowered.org/maven' } maven { url = 'https://maven.parchmentmc.org' } - maven { url = 'https://maven.moddingx.org' } } } - -plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' -} diff --git a/src/generated/resources/pack.mcmeta b/src/generated/resources/pack.mcmeta index 3f2e375..d575b46 100644 --- a/src/generated/resources/pack.mcmeta +++ b/src/generated/resources/pack.mcmeta @@ -3,7 +3,7 @@ "description": { "translate": "pack.aether_emissivity.mod.description" }, - "forge:server_data_pack_format": 12, + "neoforge:server_data_pack_format": 12, "pack_format": 13 } } \ No newline at end of file diff --git a/src/main/java/com/aetherteam/emissivity/Emissivity.java b/src/main/java/com/aetherteam/emissivity/Emissivity.java index c452422..dcf79bf 100644 --- a/src/main/java/com/aetherteam/emissivity/Emissivity.java +++ b/src/main/java/com/aetherteam/emissivity/Emissivity.java @@ -8,22 +8,24 @@ import net.minecraft.data.metadata.PackMetadataGenerator; import net.minecraft.network.chat.Component; import net.minecraft.server.packs.PackType; +import net.minecraft.server.packs.PathPackResources; import net.minecraft.server.packs.metadata.pack.PackMetadataSection; import net.minecraft.server.packs.repository.Pack; +import net.minecraft.server.packs.repository.PackCompatibility; import net.minecraft.server.packs.repository.PackSource; import net.minecraft.world.flag.FeatureFlagSet; -import net.minecraftforge.data.event.GatherDataEvent; -import net.minecraftforge.event.AddPackFindersEvent; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.ModList; -import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.config.ModConfig; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.resource.PathPackResources; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.ModList; +import net.neoforged.fml.ModLoadingContext; +import net.neoforged.fml.common.Mod; +import net.neoforged.fml.config.ModConfig; +import net.neoforged.neoforge.data.event.GatherDataEvent; +import net.neoforged.neoforge.event.AddPackFindersEvent; import org.slf4j.Logger; import java.nio.file.Path; +import java.util.List; import java.util.Map; @Mod(Emissivity.MODID) @@ -31,10 +33,9 @@ public class Emissivity { public static final String MODID = "aether_emissivity"; public static final Logger LOGGER = LogUtils.getLogger(); - public Emissivity() { - IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); - modEventBus.addListener(this::dataSetup); - modEventBus.addListener(this::packSetup); + public Emissivity(IEventBus bus, Dist dist) { + bus.addListener(this::dataSetup); + bus.addListener(this::packSetup); ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, EmissivityConfig.CLIENT_SPEC); } @@ -60,16 +61,14 @@ public void packSetup(AddPackFindersEvent event) { private void setupRecipeOverridePack(AddPackFindersEvent event) { if (event.getPackType() == PackType.CLIENT_RESOURCES) { Path resourcePath = ModList.get().getModFileById(Emissivity.MODID).getFile().findResource("packs/model_override"); - PathPackResources pack = new PathPackResources(ModList.get().getModFileById(Emissivity.MODID).getFile().getFileName() + ":" + resourcePath, true, resourcePath); PackMetadataSection metadata = new PackMetadataSection(Component.literal(""), SharedConstants.getCurrentVersion().getPackVersion(PackType.CLIENT_RESOURCES)); event.addRepositorySource((source) -> source.accept(Pack.create( "builtin/emissivity_model_override", Component.literal(""), true, - (string) -> pack, - new Pack.Info(metadata.getDescription(), metadata.getPackFormat(PackType.SERVER_DATA), metadata.getPackFormat(PackType.CLIENT_RESOURCES), FeatureFlagSet.of(), true), - PackType.SERVER_DATA, + new PathPackResources.PathResourcesSupplier(resourcePath, true), + new Pack.Info(metadata.description(), metadata.packFormat(PackType.SERVER_DATA), metadata.packFormat(PackType.CLIENT_RESOURCES), PackCompatibility.COMPATIBLE, FeatureFlagSet.of(), List.of(), true), Pack.Position.TOP, false, PackSource.BUILT_IN) diff --git a/src/main/java/com/aetherteam/emissivity/EmissivityConfig.java b/src/main/java/com/aetherteam/emissivity/EmissivityConfig.java index 64ec056..03a6384 100644 --- a/src/main/java/com/aetherteam/emissivity/EmissivityConfig.java +++ b/src/main/java/com/aetherteam/emissivity/EmissivityConfig.java @@ -1,15 +1,15 @@ package com.aetherteam.emissivity; -import net.minecraftforge.common.ForgeConfigSpec; +import net.neoforged.neoforge.common.ModConfigSpec; import org.apache.commons.lang3.tuple.Pair; public class EmissivityConfig { public static class Client { - public final ForgeConfigSpec.ConfigValue emissive_sentry_boots; - public final ForgeConfigSpec.ConfigValue emissive_phoenix_armor; - public final ForgeConfigSpec.ConfigValue emissive_shield_of_repulsion; + public final ModConfigSpec.ConfigValue emissive_sentry_boots; + public final ModConfigSpec.ConfigValue emissive_phoenix_armor; + public final ModConfigSpec.ConfigValue emissive_shield_of_repulsion; - public Client(ForgeConfigSpec.Builder builder) { + public Client(ModConfigSpec.Builder builder) { builder.push("Emissives"); emissive_sentry_boots = builder .comment("Enables emissivity for Sentry Boots") @@ -27,11 +27,11 @@ public Client(ForgeConfigSpec.Builder builder) { } } - public static final ForgeConfigSpec CLIENT_SPEC; + public static final ModConfigSpec CLIENT_SPEC; public static final Client CLIENT; static { - final Pair clientSpecPair = new ForgeConfigSpec.Builder().configure(Client::new); + final Pair clientSpecPair = new ModConfigSpec.Builder().configure(Client::new); CLIENT_SPEC = clientSpecPair.getRight(); CLIENT = clientSpecPair.getLeft(); } diff --git a/src/main/java/com/aetherteam/emissivity/client/renderer/EmissivityRenderers.java b/src/main/java/com/aetherteam/emissivity/client/renderer/EmissivityRenderers.java index 3597a9d..469d3dd 100644 --- a/src/main/java/com/aetherteam/emissivity/client/renderer/EmissivityRenderers.java +++ b/src/main/java/com/aetherteam/emissivity/client/renderer/EmissivityRenderers.java @@ -9,14 +9,16 @@ import net.minecraft.client.model.geom.builders.LayerDefinition; import net.minecraft.client.renderer.entity.LivingEntityRenderer; import net.minecraft.client.renderer.entity.player.PlayerRenderer; +import net.minecraft.client.resources.PlayerSkin; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.EntityRenderersEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.Mod; +import net.neoforged.neoforge.client.event.EntityRenderersEvent; import java.util.List; +import java.util.Set; @Mod.EventBusSubscriber(modid = Emissivity.MODID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) public class EmissivityRenderers { @@ -35,14 +37,14 @@ public static void registerLayerDefinitions(EntityRenderersEvent.RegisterLayerDe @SubscribeEvent public static void addPlayerLayers(EntityRenderersEvent.AddLayers event) { EntityModelSet entityModelSet = event.getEntityModels(); - String[] types = new String[]{"default", "slim"}; - for (String type : types) { + Set types = event.getSkins(); + for (PlayerSkin.Model type : types) { PlayerRenderer playerRenderer = event.getSkin(type); if (playerRenderer != null) { playerRenderer.addLayer(new EmissiveArmorLayer<>( playerRenderer, - new HumanoidArmorModel<>(entityModelSet.bakeLayer(type.equals("slim") ? EmissivityModelLayers.PLAYER_SLIM_INNER_ARMOR_EMISSIVE : EmissivityModelLayers.PLAYER_INNER_ARMOR_EMISSIVE)), - new HumanoidArmorModel<>(entityModelSet.bakeLayer(type.equals("slim") ? EmissivityModelLayers.PLAYER_SLIM_OUTER_ARMOR_EMISSIVE : EmissivityModelLayers.PLAYER_OUTER_ARMOR_EMISSIVE)), + new HumanoidArmorModel<>(entityModelSet.bakeLayer(type == PlayerSkin.Model.SLIM ? EmissivityModelLayers.PLAYER_SLIM_INNER_ARMOR_EMISSIVE : EmissivityModelLayers.PLAYER_INNER_ARMOR_EMISSIVE)), + new HumanoidArmorModel<>(entityModelSet.bakeLayer(type == PlayerSkin.Model.SLIM ? EmissivityModelLayers.PLAYER_SLIM_OUTER_ARMOR_EMISSIVE : EmissivityModelLayers.PLAYER_OUTER_ARMOR_EMISSIVE)), Minecraft.getInstance().getModelManager())); } } diff --git a/src/main/java/com/aetherteam/emissivity/client/renderer/player/layer/EmissiveArmorLayer.java b/src/main/java/com/aetherteam/emissivity/client/renderer/player/layer/EmissiveArmorLayer.java index bb0efcb..5d529cb 100644 --- a/src/main/java/com/aetherteam/emissivity/client/renderer/player/layer/EmissiveArmorLayer.java +++ b/src/main/java/com/aetherteam/emissivity/client/renderer/player/layer/EmissiveArmorLayer.java @@ -3,6 +3,7 @@ import com.aetherteam.aether.item.AetherItems; import com.aetherteam.emissivity.Emissivity; import com.aetherteam.emissivity.EmissivityConfig; +import com.aetherteam.emissivity.mixin.mixins.client.accessor.HumanoidArmorLayerAccessor; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.renderer.LightTexture; @@ -26,7 +27,7 @@ public EmissiveArmorLayer(RenderLayerParent renderer, A innerModel, A oute @Override public void render(PoseStack poseStack, MultiBufferSource buffer, int packedLight, T livingEntity, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { if (livingEntity.getItemBySlot(EquipmentSlot.FEET).is(AetherItems.SENTRY_BOOTS.get()) && EmissivityConfig.CLIENT.emissive_sentry_boots.get()) { - this.renderArmorPiece(poseStack, buffer, livingEntity, EquipmentSlot.FEET, LightTexture.pack(15, 15), this.getArmorModel(EquipmentSlot.FEET)); + ((HumanoidArmorLayerAccessor) this).callRenderArmorPiece(poseStack, buffer, livingEntity, EquipmentSlot.FEET, LightTexture.pack(15, 15), ((HumanoidArmorLayerAccessor) this).callGetArmorModel(EquipmentSlot.FEET)); } } diff --git a/src/main/java/com/aetherteam/emissivity/mixin/mixins/client/accessor/HumanoidArmorLayerAccessor.java b/src/main/java/com/aetherteam/emissivity/mixin/mixins/client/accessor/HumanoidArmorLayerAccessor.java new file mode 100644 index 0000000..e751202 --- /dev/null +++ b/src/main/java/com/aetherteam/emissivity/mixin/mixins/client/accessor/HumanoidArmorLayerAccessor.java @@ -0,0 +1,20 @@ +package com.aetherteam.emissivity.mixin.mixins.client.accessor; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.model.HumanoidModel; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.entity.layers.HumanoidArmorLayer; +import net.minecraft.client.renderer.entity.layers.RenderLayer; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.LivingEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(HumanoidArmorLayer.class) +public interface HumanoidArmorLayerAccessor, A extends HumanoidModel> { + @Invoker + void callRenderArmorPiece(PoseStack pPoseStack, MultiBufferSource pBuffer, T pLivingEntity, EquipmentSlot pSlot, int pPackedLight, A pModel); + + @Invoker + A callGetArmorModel(EquipmentSlot pSlot); +} diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 8e35108..f339de0 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[47,)" +loaderVersion = "[1,)" license = "Assets: All Rights Reserved; Code: LGPL-3.0" issueTrackerURL = "https://github.com/The-Aether-Team/Emissivity/issues" @@ -7,7 +7,7 @@ issueTrackerURL = "https://github.com/The-Aether-Team/Emissivity/issues" modId = "aether_emissivity" version = "${file.jarVersion}" displayName = "Emissivity" -updateJSONURL = "https://github.com/The-Aether-Team/Emissivity/raw/1.20.1-develop/update.json" +updateJSONURL = "https://github.com/The-Aether-Team/Emissivity/raw/1.20.2-develop/update.json" displayURL = "https://modrinth.com/mod/aether-emissivity" logoFile = "emissivity_icon.png" credits = "The Aether Team" @@ -15,9 +15,9 @@ authors = "bconlon" description = '''Adds various emissive textures for the Aether's content.''' [[dependencies.aether_emissivity]] - modId = "forge" - mandatory = true - versionRange = "[47.1.0,)" + modId="neoforge" + mandatory=true + versionRange="[20.2.0,)" ordering = "NONE" side = "BOTH" [[dependencies.aether_emissivity]] @@ -29,6 +29,9 @@ description = '''Adds various emissive textures for the Aether's content.''' [[dependencies.aether_emissivity]] modId = "minecraft" mandatory = true - versionRange = "[1.20.1]" + versionRange="[1.20.2,1.20.3)" ordering = "NONE" side = "BOTH" + +[[mixins]] + config="aether_emissivity.mixins.json" diff --git a/src/main/resources/aether_emissivity.mixins.json b/src/main/resources/aether_emissivity.mixins.json index a452566..60b185e 100644 --- a/src/main/resources/aether_emissivity.mixins.json +++ b/src/main/resources/aether_emissivity.mixins.json @@ -5,6 +5,7 @@ "compatibilityLevel": "JAVA_17", "refmap": "aether_emissivity.refmap.json", "mixins": [ + "client.accessor.HumanoidArmorLayerAccessor" ], "injectors": { "defaultRequire": 1 diff --git a/src/main/resources/packs/model_override/assets/aether/models/block/ambrosium_block.json b/src/main/resources/packs/model_override/assets/aether/models/block/ambrosium_block.json index a010c39..e5a4fac 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/block/ambrosium_block.json +++ b/src/main/resources/packs/model_override/assets/aether/models/block/ambrosium_block.json @@ -27,7 +27,7 @@ "west": { "texture": "#all", "cullface": "west" }, "east": { "texture": "#all", "cullface": "east" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 } diff --git a/src/main/resources/packs/model_override/assets/aether/models/block/ambrosium_ore.json b/src/main/resources/packs/model_override/assets/aether/models/block/ambrosium_ore.json index cbfcdb5..b8d74c4 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/block/ambrosium_ore.json +++ b/src/main/resources/packs/model_override/assets/aether/models/block/ambrosium_ore.json @@ -29,7 +29,7 @@ "west": { "texture": "#overlay", "cullface": "west" }, "east": { "texture": "#overlay", "cullface": "east" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 } diff --git a/src/main/resources/packs/model_override/assets/aether/models/block/light_angelic_stone.json b/src/main/resources/packs/model_override/assets/aether/models/block/light_angelic_stone.json index 717ac2a..8c91620 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/block/light_angelic_stone.json +++ b/src/main/resources/packs/model_override/assets/aether/models/block/light_angelic_stone.json @@ -29,7 +29,7 @@ "west": { "texture": "#overlay", "cullface": "west" }, "east": { "texture": "#overlay", "cullface": "east" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 } diff --git a/src/main/resources/packs/model_override/assets/aether/models/block/light_hellfire_stone.json b/src/main/resources/packs/model_override/assets/aether/models/block/light_hellfire_stone.json index 205505e..8fad9cd 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/block/light_hellfire_stone.json +++ b/src/main/resources/packs/model_override/assets/aether/models/block/light_hellfire_stone.json @@ -29,7 +29,7 @@ "west": { "texture": "#overlay", "cullface": "west" }, "east": { "texture": "#overlay", "cullface": "east" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 } diff --git a/src/main/resources/packs/model_override/assets/aether/models/block/sentry_stone.json b/src/main/resources/packs/model_override/assets/aether/models/block/sentry_stone.json index 3f6d5d6..b8a08a6 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/block/sentry_stone.json +++ b/src/main/resources/packs/model_override/assets/aether/models/block/sentry_stone.json @@ -29,7 +29,7 @@ "west": { "texture": "#overlay", "cullface": "west" }, "east": { "texture": "#overlay", "cullface": "east" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 } diff --git a/src/main/resources/packs/model_override/assets/aether/models/block/sun_altar.json b/src/main/resources/packs/model_override/assets/aether/models/block/sun_altar.json index 738282d..dbd14a2 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/block/sun_altar.json +++ b/src/main/resources/packs/model_override/assets/aether/models/block/sun_altar.json @@ -26,7 +26,7 @@ "faces": { "up": { "texture": "#overlay", "cullface": "up" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 } diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/aether_portal_frame.json b/src/main/resources/packs/model_override/assets/aether/models/item/aether_portal_frame.json index 5d8f1af..de47e5b 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/aether_portal_frame.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/aether_portal_frame.json @@ -1,11 +1,11 @@ { "parent": "minecraft:item/generated", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "textures": { "layer0": "aether:item/miscellaneous/aether_portal_frame", "layer1": "aether:item/miscellaneous/aether_portal_frame_inside" }, - "forge_data": { + "neoforge_data": { "layers": { "0": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/ambrosium_shard.json b/src/main/resources/packs/model_override/assets/aether/models/item/ambrosium_shard.json index fedf7e6..521ac04 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/ambrosium_shard.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/ambrosium_shard.json @@ -1,10 +1,10 @@ { "parent": "minecraft:item/generated", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "textures": { "layer0": "aether:item/materials/ambrosium_shard" }, - "forge_data": { + "neoforge_data": { "layers": { "0": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/ambrosium_torch.json b/src/main/resources/packs/model_override/assets/aether/models/item/ambrosium_torch.json index 84b1d68..4ce742b 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/ambrosium_torch.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/ambrosium_torch.json @@ -1,11 +1,11 @@ { "parent": "minecraft:item/generated", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "textures": { "layer0": "aether_emissivity:block/utility/ambrosium_torch", "layer1": "aether_emissivity:block/utility/ambrosium_torch_overlay" }, - "forge_data": { + "neoforge_data": { "layers": { "1": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/boss_doorway_light_angelic_stone.json b/src/main/resources/packs/model_override/assets/aether/models/item/boss_doorway_light_angelic_stone.json index f7f65d7..05808af 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/boss_doorway_light_angelic_stone.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/boss_doorway_light_angelic_stone.json @@ -162,7 +162,7 @@ "texture": "#face_overlay" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, @@ -180,7 +180,7 @@ { "faces": { "north": { - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/boss_doorway_light_hellfire_stone.json b/src/main/resources/packs/model_override/assets/aether/models/item/boss_doorway_light_hellfire_stone.json index 2dc6615..75821b4 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/boss_doorway_light_hellfire_stone.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/boss_doorway_light_hellfire_stone.json @@ -162,7 +162,7 @@ "texture": "#face_overlay" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, @@ -180,7 +180,7 @@ { "faces": { "north": { - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/boss_doorway_sentry_stone.json b/src/main/resources/packs/model_override/assets/aether/models/item/boss_doorway_sentry_stone.json index 00a2ec1..4a5c923 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/boss_doorway_sentry_stone.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/boss_doorway_sentry_stone.json @@ -162,7 +162,7 @@ "texture": "#face_overlay" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, @@ -180,7 +180,7 @@ { "faces": { "north": { - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/hammer_of_jeb.json b/src/main/resources/packs/model_override/assets/aether/models/item/hammer_of_jeb.json index 9f94131..a5841ac 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/hammer_of_jeb.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/hammer_of_jeb.json @@ -1,11 +1,11 @@ { "parent": "minecraft:item/handheld", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "textures": { "layer0": "aether:item/weapons/hammer_of_jeb", "layer1": "aether_emissivity:item/weapons/hammer_of_jeb_overlay" }, - "forge_data": { + "neoforge_data": { "layers": { "1": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/hammer_of_kingbdogz.json b/src/main/resources/packs/model_override/assets/aether/models/item/hammer_of_kingbdogz.json index bb1bbdc..6582635 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/hammer_of_kingbdogz.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/hammer_of_kingbdogz.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "overrides": [ { "model": "aether:item/hammer_of_jeb", @@ -13,7 +13,7 @@ "layer0": "aether:item/weapons/hammer_of_kingbdogz", "layer1": "aether_emissivity:item/weapons/hammer_of_kingbdogz_overlay" }, - "forge_data": { + "neoforge_data": { "layers": { "1": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/healing_stone.json b/src/main/resources/packs/model_override/assets/aether/models/item/healing_stone.json index f95fd1d..da7e32d 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/healing_stone.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/healing_stone.json @@ -1,11 +1,11 @@ { "parent": "minecraft:item/generated", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "textures": { "layer0": "aether:item/food/healing_stone", "layer1": "aether_emissivity:item/food/healing_stone_overlay" }, - "forge_data": { + "neoforge_data": { "layers": { "1": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/locked_light_angelic_stone.json b/src/main/resources/packs/model_override/assets/aether/models/item/locked_light_angelic_stone.json index eb0dbb7..62f409d 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/locked_light_angelic_stone.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/locked_light_angelic_stone.json @@ -162,7 +162,7 @@ "texture": "#face_overlay" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, @@ -180,7 +180,7 @@ { "faces": { "north": { - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/locked_light_hellfire_stone.json b/src/main/resources/packs/model_override/assets/aether/models/item/locked_light_hellfire_stone.json index 15780ae..6afb8f8 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/locked_light_hellfire_stone.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/locked_light_hellfire_stone.json @@ -162,7 +162,7 @@ "texture": "#face_overlay" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, @@ -180,7 +180,7 @@ { "faces": { "north": { - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/locked_sentry_stone.json b/src/main/resources/packs/model_override/assets/aether/models/item/locked_sentry_stone.json index 401488e..28430d1 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/locked_sentry_stone.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/locked_sentry_stone.json @@ -162,7 +162,7 @@ "texture": "#face_overlay" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, @@ -180,7 +180,7 @@ { "faces": { "north": { - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_boots.json b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_boots.json index 0e9a90c..dd8a643 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_boots.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_boots.json @@ -1,10 +1,10 @@ { "parent": "minecraft:item/generated", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "textures": { "layer0": "aether:item/armor/phoenix_boots" }, - "forge_data": { + "neoforge_data": { "layers": { "0": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_bow.json b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_bow.json index ddc24fc..2abfc29 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_bow.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_bow.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/bow", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "overrides": [ { "model": "aether:item/phoenix_bow_pulling_0", @@ -27,7 +27,7 @@ "layer0": "aether_emissivity:item/weapons/phoenix_bow", "layer1": "aether_emissivity:item/weapons/phoenix_bow_overlay" }, - "forge_data": { + "neoforge_data": { "layers": { "1": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_bow_pulling_0.json b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_bow_pulling_0.json index d29e8db..fb4f90a 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_bow_pulling_0.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_bow_pulling_0.json @@ -1,11 +1,11 @@ { "parent": "minecraft:item/bow", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "textures": { "layer0": "aether_emissivity:item/weapons/phoenix_bow_pulling_0", "layer1": "aether_emissivity:item/weapons/phoenix_bow_pulling_0_overlay" }, - "forge_data": { + "neoforge_data": { "layers": { "1": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_bow_pulling_1.json b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_bow_pulling_1.json index 80d6ce1..050c70e 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_bow_pulling_1.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_bow_pulling_1.json @@ -1,11 +1,11 @@ { "parent": "minecraft:item/bow", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "textures": { "layer0": "aether_emissivity:item/weapons/phoenix_bow_pulling_1", "layer1": "aether_emissivity:item/weapons/phoenix_bow_pulling_1_overlay" }, - "forge_data": { + "neoforge_data": { "layers": { "1": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_bow_pulling_2.json b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_bow_pulling_2.json index 2641007..4756f93 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_bow_pulling_2.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_bow_pulling_2.json @@ -1,11 +1,11 @@ { "parent": "minecraft:item/bow", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "textures": { "layer0": "aether_emissivity:item/weapons/phoenix_bow_pulling_2", "layer1": "aether_emissivity:item/weapons/phoenix_bow_pulling_2_overlay" }, - "forge_data": { + "neoforge_data": { "layers": { "1": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_chestplate.json b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_chestplate.json index 8a3365b..15c33a7 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_chestplate.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_chestplate.json @@ -1,10 +1,10 @@ { "parent": "minecraft:item/generated", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "textures": { "layer0": "aether:item/armor/phoenix_chestplate" }, - "forge_data": { + "neoforge_data": { "layers": { "0": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_gloves.json b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_gloves.json index f3c338b..ba8d3be 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_gloves.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_gloves.json @@ -1,10 +1,10 @@ { "parent": "minecraft:item/generated", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "textures": { "layer0": "aether:item/accessories/phoenix_gloves" }, - "forge_data": { + "neoforge_data": { "layers": { "0": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_helmet.json b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_helmet.json index 5ac3f30..652230a 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_helmet.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_helmet.json @@ -1,10 +1,10 @@ { "parent": "minecraft:item/generated", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "textures": { "layer0": "aether:item/armor/phoenix_helmet" }, - "forge_data": { + "neoforge_data": { "layers": { "0": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_leggings.json b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_leggings.json index cee0bf3..dc55787 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_leggings.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/phoenix_leggings.json @@ -1,10 +1,10 @@ { "parent": "minecraft:item/generated", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "textures": { "layer0": "aether:item/armor/phoenix_leggings" }, - "forge_data": { + "neoforge_data": { "layers": { "0": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/sentry_boots.json b/src/main/resources/packs/model_override/assets/aether/models/item/sentry_boots.json index 9595819..b5be965 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/sentry_boots.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/sentry_boots.json @@ -1,11 +1,11 @@ { "parent": "minecraft:item/generated", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "textures": { "layer0": "aether:item/armor/sentry_boots", "layer1": "aether_emissivity:item/armor/sentry_boots_overlay" }, - "forge_data": { + "neoforge_data": { "layers": { "1": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/shield_of_repulsion.json b/src/main/resources/packs/model_override/assets/aether/models/item/shield_of_repulsion.json index a8da4df..5ab838d 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/shield_of_repulsion.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/shield_of_repulsion.json @@ -1,11 +1,11 @@ { "parent": "minecraft:item/generated", - "loader": "forge:item_layers", + "loader": "neoforge:item_layers", "textures": { "layer0": "aether_emissivity:item/accessories/shield_of_repulsion", "layer1": "aether_emissivity:item/accessories/shield_of_repulsion_overlay" }, - "forge_data": { + "neoforge_data": { "layers": { "1": { "block_light": 15, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/trapped_light_angelic_stone.json b/src/main/resources/packs/model_override/assets/aether/models/item/trapped_light_angelic_stone.json index 267a154..6faf80e 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/trapped_light_angelic_stone.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/trapped_light_angelic_stone.json @@ -162,7 +162,7 @@ "texture": "#face_overlay" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, @@ -180,7 +180,7 @@ { "faces": { "north": { - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/trapped_light_hellfire_stone.json b/src/main/resources/packs/model_override/assets/aether/models/item/trapped_light_hellfire_stone.json index f0a6d63..989c622 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/trapped_light_hellfire_stone.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/trapped_light_hellfire_stone.json @@ -162,7 +162,7 @@ "texture": "#face_overlay" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, @@ -180,7 +180,7 @@ { "faces": { "north": { - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/trapped_sentry_stone.json b/src/main/resources/packs/model_override/assets/aether/models/item/trapped_sentry_stone.json index e71a494..aa48eda 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/trapped_sentry_stone.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/trapped_sentry_stone.json @@ -162,7 +162,7 @@ "texture": "#face_overlay" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, @@ -180,7 +180,7 @@ { "faces": { "north": { - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/treasure_doorway_light_angelic_stone.json b/src/main/resources/packs/model_override/assets/aether/models/item/treasure_doorway_light_angelic_stone.json index 662ff1a..b89bfb3 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/treasure_doorway_light_angelic_stone.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/treasure_doorway_light_angelic_stone.json @@ -162,7 +162,7 @@ "texture": "#face_overlay" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, @@ -180,7 +180,7 @@ { "faces": { "north": { - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/treasure_doorway_light_hellfire_stone.json b/src/main/resources/packs/model_override/assets/aether/models/item/treasure_doorway_light_hellfire_stone.json index c925e14..87a7da6 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/treasure_doorway_light_hellfire_stone.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/treasure_doorway_light_hellfire_stone.json @@ -162,7 +162,7 @@ "texture": "#face_overlay" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, @@ -180,7 +180,7 @@ { "faces": { "north": { - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, diff --git a/src/main/resources/packs/model_override/assets/aether/models/item/treasure_doorway_sentry_stone.json b/src/main/resources/packs/model_override/assets/aether/models/item/treasure_doorway_sentry_stone.json index a8b8e77..6814843 100644 --- a/src/main/resources/packs/model_override/assets/aether/models/item/treasure_doorway_sentry_stone.json +++ b/src/main/resources/packs/model_override/assets/aether/models/item/treasure_doorway_sentry_stone.json @@ -162,7 +162,7 @@ "texture": "#face_overlay" } }, - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, @@ -180,7 +180,7 @@ { "faces": { "north": { - "forge_data": { + "neoforge_data": { "block_light": 15, "sky_light": 15 }, diff --git a/update.json b/update.json index 1eec877..013ea55 100644 --- a/update.json +++ b/update.json @@ -3,6 +3,7 @@ "promos": { "1.19.2-recommended": "1.19.2-1.0.0-forge", "1.19.4-recommended": "1.19.4-1.0.0-forge", - "1.20.1-recommended": "1.20.1-1.0.0-neoforge" + "1.20.1-recommended": "1.20.1-1.0.0-neoforge", + "1.20.2-recommended": "1.20.2-1.0.0-neoforge" } } \ No newline at end of file