Skip to content

Commit

Permalink
Changed the Moved Potions and Tipped Arrow models in models/item/ ins…
Browse files Browse the repository at this point in the history
…tead of models/
  • Loading branch information
Starexify committed Jan 15, 2025
1 parent 1a50fa7 commit f918f39
Show file tree
Hide file tree
Showing 69 changed files with 101 additions and 75 deletions.
3 changes: 1 addition & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java-library'
id 'maven-publish'
id 'net.neoforged.moddev' version '2.0.73'
id 'net.neoforged.moddev' version '2.0.74'
id 'idea'
}

Expand Down Expand Up @@ -75,7 +75,6 @@ configurations {
runtimeClasspath.extendsFrom localRuntime
}


dependencies {
//compileOnly "dev.emi:emi-neoforge:${emi_version}+${minecraft_version}:api"
//localRuntime "dev.emi:emi-neoforge:${emi_version}+${minecraft_version}"
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ org.gradle.configuration-cache=true

# Parchment
parchment_minecraft_version=1.21.4
parchment_mappings_version=2024.12.29
parchment_mappings_version=2025.01.05

# Environment Properties

minecraft_version=1.21.4
minecraft_version_range=[1.21.4, 1.22)

neo_version=21.4.50-beta
neo_version=21.4.58-beta
neo_version_range=[21.4,)
loader_version_range=[4,)

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "nmt:item/blazing_wither_soul"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"model": {
"type": "minecraft:model",
"model": "nmt:item/heart_of_the_hell"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,91 +5,91 @@
{
"model": {
"type": "minecraft:model",
"model": "nmt:lingering_lava_bottle"
"model": "nmt:item/lingering_lava_bottle"
},
"when": "nmt:lava"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:lingering_awfully_potion"
"model": "nmt:item/lingering_awfully_potion"
},
"when": "nmt:awfully"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:lingering_fortifying_potion"
"model": "nmt:item/lingering_fortifying_potion"
},
"when": "nmt:fortifying"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:lingering_cecity_potion"
"model": "nmt:item/lingering_cecity_potion"
},
"when": "nmt:cecity"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:lingering_dimness_potion"
"model": "nmt:item/lingering_dimness_potion"
},
"when": "nmt:dimness"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:lingering_quickness_potion"
"model": "nmt:item/lingering_quickness_potion"
},
"when": "nmt:quickness"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:lingering_titan_potion"
"model": "nmt:item/lingering_titan_potion"
},
"when": "nmt:titan"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:lingering_starvation_potion"
"model": "nmt:item/lingering_starvation_potion"
},
"when": "nmt:starvation"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:lingering_floating_potion"
"model": "nmt:item/lingering_floating_potion"
},
"when": "nmt:floating"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:lingering_exhaustion_potion"
"model": "nmt:item/lingering_exhaustion_potion"
},
"when": "nmt:exhaustion"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:lingering_sickness_potion"
"model": "nmt:item/lingering_sickness_potion"
},
"when": "nmt:sickness"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:lingering_unluck_potion"
"model": "nmt:item/lingering_unluck_potion"
},
"when": "nmt:unluck"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:lingering_withering_potion"
"model": "nmt:item/lingering_withering_potion"
},
"when": "nmt:withering"
}
Expand Down
26 changes: 13 additions & 13 deletions src/generated/resources/assets/nmt/items/obsidian_potion.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,91 +5,91 @@
{
"model": {
"type": "minecraft:model",
"model": "nmt:lava_bottle"
"model": "nmt:item/lava_bottle"
},
"when": "nmt:lava"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:awfully_potion"
"model": "nmt:item/awfully_potion"
},
"when": "nmt:awfully"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:fortifying_potion"
"model": "nmt:item/fortifying_potion"
},
"when": "nmt:fortifying"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:cecity_potion"
"model": "nmt:item/cecity_potion"
},
"when": "nmt:cecity"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:dimness_potion"
"model": "nmt:item/dimness_potion"
},
"when": "nmt:dimness"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:quickness_potion"
"model": "nmt:item/quickness_potion"
},
"when": "nmt:quickness"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:titan_potion"
"model": "nmt:item/titan_potion"
},
"when": "nmt:titan"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:starvation_potion"
"model": "nmt:item/starvation_potion"
},
"when": "nmt:starvation"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:floating_potion"
"model": "nmt:item/floating_potion"
},
"when": "nmt:floating"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:exhaustion_potion"
"model": "nmt:item/exhaustion_potion"
},
"when": "nmt:exhaustion"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:sickness_potion"
"model": "nmt:item/sickness_potion"
},
"when": "nmt:sickness"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:unluck_potion"
"model": "nmt:item/unluck_potion"
},
"when": "nmt:unluck"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:withering_potion"
"model": "nmt:item/withering_potion"
},
"when": "nmt:withering"
}
Expand Down
26 changes: 13 additions & 13 deletions src/generated/resources/assets/nmt/items/obsidian_tipped_arrow.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,91 +5,91 @@
{
"model": {
"type": "minecraft:model",
"model": "nmt:lava_tipped_arrow"
"model": "nmt:item/lava_tipped_arrow"
},
"when": "nmt:lava"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:awfully_tipped_arrow"
"model": "nmt:item/awfully_tipped_arrow"
},
"when": "nmt:awfully"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:fortifying_tipped_arrow"
"model": "nmt:item/fortifying_tipped_arrow"
},
"when": "nmt:fortifying"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:cecity_tipped_arrow"
"model": "nmt:item/cecity_tipped_arrow"
},
"when": "nmt:cecity"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:dimness_tipped_arrow"
"model": "nmt:item/dimness_tipped_arrow"
},
"when": "nmt:dimness"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:quickness_tipped_arrow"
"model": "nmt:item/quickness_tipped_arrow"
},
"when": "nmt:quickness"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:titan_tipped_arrow"
"model": "nmt:item/titan_tipped_arrow"
},
"when": "nmt:titan"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:starvation_tipped_arrow"
"model": "nmt:item/starvation_tipped_arrow"
},
"when": "nmt:starvation"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:floating_tipped_arrow"
"model": "nmt:item/floating_tipped_arrow"
},
"when": "nmt:floating"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:exhaustion_tipped_arrow"
"model": "nmt:item/exhaustion_tipped_arrow"
},
"when": "nmt:exhaustion"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:sickness_tipped_arrow"
"model": "nmt:item/sickness_tipped_arrow"
},
"when": "nmt:sickness"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:unluck_tipped_arrow"
"model": "nmt:item/unluck_tipped_arrow"
},
"when": "nmt:unluck"
},
{
"model": {
"type": "minecraft:model",
"model": "nmt:withering_tipped_arrow"
"model": "nmt:item/withering_tipped_arrow"
},
"when": "nmt:withering"
}
Expand Down
Loading

0 comments on commit f918f39

Please sign in to comment.