diff --git a/build.gradle b/build.gradle index c30a762..ac9c89e 100644 --- a/build.gradle +++ b/build.gradle @@ -35,9 +35,10 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modApi "me.shedaniel:RoughlyEnoughItems-fabric:17.0.807" - modApi "dev.architectury:architectury-fabric:14.0.4" - modApi "me.shedaniel.cloth:cloth-config-fabric:16.0.143" + // SHITS FUCKED NO MORE REI +// modApi "me.shedaniel:RoughlyEnoughItems-fabric:17.0.807" +// modApi "dev.architectury:architectury-fabric:14.0.4" +// modApi "me.shedaniel.cloth:cloth-config-fabric:16.0.143" } processResources { diff --git a/gradle.properties b/gradle.properties index c598d1e..214c470 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,13 +4,13 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.3 -yarn_mappings=1.21.3+build.2 +minecraft_version=1.21.4 +yarn_mappings=1.21.4+build.8 loader_version=0.18.4 loom_version=1.15-SNAPSHOT # Fabric API -fabric_version=0.114.1+1.21.3 +fabric_version=0.119.4+1.21.4 # Mod Properties mod_version=2.0.0 diff --git a/src/main/generated/assets/acesbs/items/aquarium_gravel.json b/src/main/generated/assets/acesbs/items/aquarium_gravel.json new file mode 100644 index 0000000..e1399ba --- /dev/null +++ b/src/main/generated/assets/acesbs/items/aquarium_gravel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/aquarium_gravel" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/ashen_armor_trim_smithing_template.json b/src/main/generated/assets/acesbs/items/ashen_armor_trim_smithing_template.json new file mode 100644 index 0000000..a8c29c0 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/ashen_armor_trim_smithing_template.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_armor_trim_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/ashen_steel.json b/src/main/generated/assets/acesbs/items/ashen_steel.json new file mode 100644 index 0000000..fd6b94d --- /dev/null +++ b/src/main/generated/assets/acesbs/items/ashen_steel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/ashen_steel_axe.json b/src/main/generated/assets/acesbs/items/ashen_steel_axe.json new file mode 100644 index 0000000..c11f6e5 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/ashen_steel_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_axe" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/ashen_steel_block.json b/src/main/generated/assets/acesbs/items/ashen_steel_block.json new file mode 100644 index 0000000..23c1a61 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/ashen_steel_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/ashen_steel_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/ashen_steel_boots.json b/src/main/generated/assets/acesbs/items/ashen_steel_boots.json new file mode 100644 index 0000000..cb33753 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/ashen_steel_boots.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_boots_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_boots_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_boots_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_boots_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_boots_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_boots_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_boots_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_boots_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_boots_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_boots_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_boots_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_boots" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/ashen_steel_chestplate.json b/src/main/generated/assets/acesbs/items/ashen_steel_chestplate.json new file mode 100644 index 0000000..d277a6e --- /dev/null +++ b/src/main/generated/assets/acesbs/items/ashen_steel_chestplate.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_chestplate_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_chestplate_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_chestplate_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_chestplate_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_chestplate_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_chestplate_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_chestplate_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_chestplate_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_chestplate_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_chestplate_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_chestplate_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_chestplate" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/ashen_steel_hammer.json b/src/main/generated/assets/acesbs/items/ashen_steel_hammer.json new file mode 100644 index 0000000..8cc60c7 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/ashen_steel_hammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/ashen_steel_helmet.json b/src/main/generated/assets/acesbs/items/ashen_steel_helmet.json new file mode 100644 index 0000000..ce36cbc --- /dev/null +++ b/src/main/generated/assets/acesbs/items/ashen_steel_helmet.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_helmet_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_helmet_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_helmet_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_helmet_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_helmet_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_helmet_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_helmet_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_helmet_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_helmet_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_helmet_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_helmet_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_helmet" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/ashen_steel_hoe.json b/src/main/generated/assets/acesbs/items/ashen_steel_hoe.json new file mode 100644 index 0000000..f225580 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/ashen_steel_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_hoe" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/ashen_steel_leggings.json b/src/main/generated/assets/acesbs/items/ashen_steel_leggings.json new file mode 100644 index 0000000..c1b657b --- /dev/null +++ b/src/main/generated/assets/acesbs/items/ashen_steel_leggings.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_leggings_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_leggings_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_leggings_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_leggings_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_leggings_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_leggings_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_leggings_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_leggings_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_leggings_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_leggings_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_leggings_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_leggings" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/ashen_steel_pickaxe.json b/src/main/generated/assets/acesbs/items/ashen_steel_pickaxe.json new file mode 100644 index 0000000..514a997 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/ashen_steel_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/ashen_steel_shovel.json b/src/main/generated/assets/acesbs/items/ashen_steel_shovel.json new file mode 100644 index 0000000..5d0e986 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/ashen_steel_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_shovel" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/ashen_steel_sword.json b/src/main/generated/assets/acesbs/items/ashen_steel_sword.json new file mode 100644 index 0000000..d0b3104 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/ashen_steel_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ashen_steel_sword" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/berserkers_pauldron.json b/src/main/generated/assets/acesbs/items/berserkers_pauldron.json new file mode 100644 index 0000000..ac77037 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/berserkers_pauldron.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/berserkers_pauldron_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/berserkers_pauldron_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/berserkers_pauldron_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/berserkers_pauldron_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/berserkers_pauldron_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/berserkers_pauldron_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/berserkers_pauldron_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/berserkers_pauldron_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/berserkers_pauldron_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/berserkers_pauldron_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/berserkers_pauldron_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "acesbs:item/berserkers_pauldron" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/bricked_up.json b/src/main/generated/assets/acesbs/items/bricked_up.json new file mode 100644 index 0000000..11fecd4 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/bricked_up.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/bricked_up" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/cooked_lemon.json b/src/main/generated/assets/acesbs/items/cooked_lemon.json new file mode 100644 index 0000000..f14c551 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/cooked_lemon.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/cooked_lemon" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/crab_rave_music_disc.json b/src/main/generated/assets/acesbs/items/crab_rave_music_disc.json new file mode 100644 index 0000000..3949098 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/crab_rave_music_disc.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/crab_rave_music_disc" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/crystal_entropy.json b/src/main/generated/assets/acesbs/items/crystal_entropy.json new file mode 100644 index 0000000..5f8eb45 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/crystal_entropy.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/crystal_entropy" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/crystal_entropy_pane.json b/src/main/generated/assets/acesbs/items/crystal_entropy_pane.json new file mode 100644 index 0000000..f3bef45 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/crystal_entropy_pane.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/crystal_entropy_pane" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/deepslate_entropy_ore.json b/src/main/generated/assets/acesbs/items/deepslate_entropy_ore.json new file mode 100644 index 0000000..71695c4 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/deepslate_entropy_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/deepslate_entropy_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/dust_of_order.json b/src/main/generated/assets/acesbs/items/dust_of_order.json new file mode 100644 index 0000000..8d5f612 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/dust_of_order.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/dust_of_order" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/endtropy_ore.json b/src/main/generated/assets/acesbs/items/endtropy_ore.json new file mode 100644 index 0000000..5ce3894 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/endtropy_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/endtropy_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/entropic_entangler.json b/src/main/generated/assets/acesbs/items/entropic_entangler.json new file mode 100644 index 0000000..82d6add --- /dev/null +++ b/src/main/generated/assets/acesbs/items/entropic_entangler.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/entropic_entangler" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/entropic_eviscerator.json b/src/main/generated/assets/acesbs/items/entropic_eviscerator.json new file mode 100644 index 0000000..9b16913 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/entropic_eviscerator.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/entropic_eviscerator" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/entropic_stabilizer.json b/src/main/generated/assets/acesbs/items/entropic_stabilizer.json new file mode 100644 index 0000000..40c5f18 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/entropic_stabilizer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/entropic_stabilizer" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/entropy_ore.json b/src/main/generated/assets/acesbs/items/entropy_ore.json new file mode 100644 index 0000000..44bba4d --- /dev/null +++ b/src/main/generated/assets/acesbs/items/entropy_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/entropy_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/evil_block.json b/src/main/generated/assets/acesbs/items/evil_block.json new file mode 100644 index 0000000..2263530 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/evil_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/evil_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/fren_spawn_egg.json b/src/main/generated/assets/acesbs/items/fren_spawn_egg.json new file mode 100644 index 0000000..4255032 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/fren_spawn_egg.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/fren_spawn_egg" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/green_bricks.json b/src/main/generated/assets/acesbs/items/green_bricks.json new file mode 100644 index 0000000..adb78bc --- /dev/null +++ b/src/main/generated/assets/acesbs/items/green_bricks.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/green_bricks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/infernal_ashes.json b/src/main/generated/assets/acesbs/items/infernal_ashes.json new file mode 100644 index 0000000..87ed480 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/infernal_ashes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/infernal_ashes" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/infernal_ashes_block.json b/src/main/generated/assets/acesbs/items/infernal_ashes_block.json new file mode 100644 index 0000000..570ef29 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/infernal_ashes_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/infernal_ashes_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/infernal_ashes_ore.json b/src/main/generated/assets/acesbs/items/infernal_ashes_ore.json new file mode 100644 index 0000000..0621c98 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/infernal_ashes_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/infernal_ashes_ore" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/infernal_beef.json b/src/main/generated/assets/acesbs/items/infernal_beef.json new file mode 100644 index 0000000..099ea83 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/infernal_beef.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/infernal_beef" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/ingot_of_order.json b/src/main/generated/assets/acesbs/items/ingot_of_order.json new file mode 100644 index 0000000..7a457b2 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/ingot_of_order.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/ingot_of_order" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/kaupen_bow.json b/src/main/generated/assets/acesbs/items/kaupen_bow.json new file mode 100644 index 0000000..6c8202c --- /dev/null +++ b/src/main/generated/assets/acesbs/items/kaupen_bow.json @@ -0,0 +1,35 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "acesbs:item/kaupen_bow" + }, + "on_true": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/kaupen_bow_pulling_1" + }, + "threshold": 0.65 + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/kaupen_bow_pulling_2" + }, + "threshold": 0.9 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "acesbs:item/kaupen_bow_pulling_0" + }, + "property": "minecraft:use_duration", + "scale": 0.05 + }, + "property": "minecraft:using_item" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemon.json b/src/main/generated/assets/acesbs/items/lemon.json new file mode 100644 index 0000000..b07f260 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lemon.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/lemon" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_button.json b/src/main/generated/assets/acesbs/items/lemonwood_button.json new file mode 100644 index 0000000..86af845 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lemonwood_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/lemonwood_button_inventory" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_door.json b/src/main/generated/assets/acesbs/items/lemonwood_door.json new file mode 100644 index 0000000..8c52812 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lemonwood_door.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/lemonwood_door" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_fence.json b/src/main/generated/assets/acesbs/items/lemonwood_fence.json new file mode 100644 index 0000000..90a50ff --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lemonwood_fence.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/lemonwood_fence_inventory" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_fence_gate.json b/src/main/generated/assets/acesbs/items/lemonwood_fence_gate.json new file mode 100644 index 0000000..69399ce --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lemonwood_fence_gate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/lemonwood_fence_gate" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_leaves.json b/src/main/generated/assets/acesbs/items/lemonwood_leaves.json new file mode 100644 index 0000000..377ae9f --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lemonwood_leaves.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/lemonwood_leaves" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_log.json b/src/main/generated/assets/acesbs/items/lemonwood_log.json new file mode 100644 index 0000000..deaf54e --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lemonwood_log.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/lemonwood_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_planks.json b/src/main/generated/assets/acesbs/items/lemonwood_planks.json new file mode 100644 index 0000000..3c92ee2 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lemonwood_planks.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/lemonwood_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_pressure_plate.json b/src/main/generated/assets/acesbs/items/lemonwood_pressure_plate.json new file mode 100644 index 0000000..c7d28a3 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lemonwood_pressure_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/lemonwood_pressure_plate" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_sapling.json b/src/main/generated/assets/acesbs/items/lemonwood_sapling.json new file mode 100644 index 0000000..36edb36 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lemonwood_sapling.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/lemonwood_sapling" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_slab.json b/src/main/generated/assets/acesbs/items/lemonwood_slab.json new file mode 100644 index 0000000..24b48db --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lemonwood_slab.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/lemonwood_slab" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_stairs.json b/src/main/generated/assets/acesbs/items/lemonwood_stairs.json new file mode 100644 index 0000000..c5172d5 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lemonwood_stairs.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/lemonwood_stairs" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_trapdoor.json b/src/main/generated/assets/acesbs/items/lemonwood_trapdoor.json new file mode 100644 index 0000000..ce81816 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lemonwood_trapdoor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/lemonwood_trapdoor_bottom" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_wall.json b/src/main/generated/assets/acesbs/items/lemonwood_wall.json new file mode 100644 index 0000000..8fe9be4 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lemonwood_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/lemonwood_wall_inventory" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lemonwood_wood.json b/src/main/generated/assets/acesbs/items/lemonwood_wood.json new file mode 100644 index 0000000..2470e24 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lemonwood_wood.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/lemonwood_wood" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lizard_button.json b/src/main/generated/assets/acesbs/items/lizard_button.json new file mode 100644 index 0000000..c01c718 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lizard_button.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/lizard_button_inventory" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/lizard_planks.json b/src/main/generated/assets/acesbs/items/lizard_planks.json new file mode 100644 index 0000000..721beaf --- /dev/null +++ b/src/main/generated/assets/acesbs/items/lizard_planks.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/lizard_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/mote_of_order.json b/src/main/generated/assets/acesbs/items/mote_of_order.json new file mode 100644 index 0000000..64d9d93 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/mote_of_order.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/mote_of_order" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/oracle_lemon.json b/src/main/generated/assets/acesbs/items/oracle_lemon.json new file mode 100644 index 0000000..d738b9f --- /dev/null +++ b/src/main/generated/assets/acesbs/items/oracle_lemon.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/oracle_lemon" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/ordered_core.json b/src/main/generated/assets/acesbs/items/ordered_core.json new file mode 100644 index 0000000..c28694c --- /dev/null +++ b/src/main/generated/assets/acesbs/items/ordered_core.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/ordered_core" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/potted_lemonwood_sapling.json b/src/main/generated/assets/acesbs/items/potted_lemonwood_sapling.json new file mode 100644 index 0000000..e9286dd --- /dev/null +++ b/src/main/generated/assets/acesbs/items/potted_lemonwood_sapling.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/potted_lemonwood_sapling" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/prisma_armor_trim_smithing_template.json b/src/main/generated/assets/acesbs/items/prisma_armor_trim_smithing_template.json new file mode 100644 index 0000000..502f425 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/prisma_armor_trim_smithing_template.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_armor_trim_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/prisma_steel.json b/src/main/generated/assets/acesbs/items/prisma_steel.json new file mode 100644 index 0000000..1bbee11 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/prisma_steel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/prisma_steel_axe.json b/src/main/generated/assets/acesbs/items/prisma_steel_axe.json new file mode 100644 index 0000000..f2730ba --- /dev/null +++ b/src/main/generated/assets/acesbs/items/prisma_steel_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_axe" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/prisma_steel_block.json b/src/main/generated/assets/acesbs/items/prisma_steel_block.json new file mode 100644 index 0000000..6a00f5a --- /dev/null +++ b/src/main/generated/assets/acesbs/items/prisma_steel_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/prisma_steel_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/prisma_steel_boots.json b/src/main/generated/assets/acesbs/items/prisma_steel_boots.json new file mode 100644 index 0000000..a5d3499 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/prisma_steel_boots.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_boots_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_boots_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_boots_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_boots_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_boots_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_boots_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_boots_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_boots_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_boots_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_boots_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_boots_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_boots" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/prisma_steel_chestplate.json b/src/main/generated/assets/acesbs/items/prisma_steel_chestplate.json new file mode 100644 index 0000000..e978e7f --- /dev/null +++ b/src/main/generated/assets/acesbs/items/prisma_steel_chestplate.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_chestplate_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_chestplate_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_chestplate_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_chestplate_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_chestplate_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_chestplate_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_chestplate_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_chestplate_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_chestplate_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_chestplate_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_chestplate_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_chestplate" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/prisma_steel_hammer.json b/src/main/generated/assets/acesbs/items/prisma_steel_hammer.json new file mode 100644 index 0000000..b611c4e --- /dev/null +++ b/src/main/generated/assets/acesbs/items/prisma_steel_hammer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_hammer" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/prisma_steel_helmet.json b/src/main/generated/assets/acesbs/items/prisma_steel_helmet.json new file mode 100644 index 0000000..20f40e0 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/prisma_steel_helmet.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_helmet_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_helmet_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_helmet_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_helmet_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_helmet_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_helmet_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_helmet_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_helmet_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_helmet_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_helmet_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_helmet_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_helmet" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/prisma_steel_hoe.json b/src/main/generated/assets/acesbs/items/prisma_steel_hoe.json new file mode 100644 index 0000000..494cde1 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/prisma_steel_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_hoe" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/prisma_steel_leggings.json b/src/main/generated/assets/acesbs/items/prisma_steel_leggings.json new file mode 100644 index 0000000..0b10393 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/prisma_steel_leggings.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_leggings_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_leggings_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_leggings_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_leggings_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_leggings_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_leggings_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_leggings_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_leggings_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_leggings_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_leggings_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_leggings_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_leggings" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/prisma_steel_pickaxe.json b/src/main/generated/assets/acesbs/items/prisma_steel_pickaxe.json new file mode 100644 index 0000000..fa8877e --- /dev/null +++ b/src/main/generated/assets/acesbs/items/prisma_steel_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/prisma_steel_shovel.json b/src/main/generated/assets/acesbs/items/prisma_steel_shovel.json new file mode 100644 index 0000000..9ac8ef8 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/prisma_steel_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_shovel" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/prisma_steel_sword.json b/src/main/generated/assets/acesbs/items/prisma_steel_sword.json new file mode 100644 index 0000000..13f6da8 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/prisma_steel_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/prisma_steel_sword" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/raw_endtropy.json b/src/main/generated/assets/acesbs/items/raw_endtropy.json new file mode 100644 index 0000000..050ec2a --- /dev/null +++ b/src/main/generated/assets/acesbs/items/raw_endtropy.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/raw_endtropy" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/raw_endtropy_block.json b/src/main/generated/assets/acesbs/items/raw_endtropy_block.json new file mode 100644 index 0000000..2300b11 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/raw_endtropy_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/raw_endtropy_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/raw_entropy.json b/src/main/generated/assets/acesbs/items/raw_entropy.json new file mode 100644 index 0000000..c44992d --- /dev/null +++ b/src/main/generated/assets/acesbs/items/raw_entropy.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/raw_entropy" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/raw_entropy_block.json b/src/main/generated/assets/acesbs/items/raw_entropy_block.json new file mode 100644 index 0000000..35168d2 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/raw_entropy_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/raw_entropy_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/sovs_plate_carrier.json b/src/main/generated/assets/acesbs/items/sovs_plate_carrier.json new file mode 100644 index 0000000..02a0097 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/sovs_plate_carrier.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/sovs_plate_carrier_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/sovs_plate_carrier_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/sovs_plate_carrier_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/sovs_plate_carrier_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/sovs_plate_carrier_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/sovs_plate_carrier_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/sovs_plate_carrier_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/sovs_plate_carrier_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/sovs_plate_carrier_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/sovs_plate_carrier_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/sovs_plate_carrier_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "acesbs:item/sovs_plate_carrier" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/stable_endtropy.json b/src/main/generated/assets/acesbs/items/stable_endtropy.json new file mode 100644 index 0000000..e354561 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/stable_endtropy.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/stable_endtropy" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/stable_endtropy_block.json b/src/main/generated/assets/acesbs/items/stable_endtropy_block.json new file mode 100644 index 0000000..436def7 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/stable_endtropy_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/stable_endtropy_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/stable_entropy.json b/src/main/generated/assets/acesbs/items/stable_entropy.json new file mode 100644 index 0000000..debbd7d --- /dev/null +++ b/src/main/generated/assets/acesbs/items/stable_entropy.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/stable_entropy" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/stable_entropy_block.json b/src/main/generated/assets/acesbs/items/stable_entropy_block.json new file mode 100644 index 0000000..7d9806a --- /dev/null +++ b/src/main/generated/assets/acesbs/items/stable_entropy_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/stable_entropy_block" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/stripped_lemonwood_log.json b/src/main/generated/assets/acesbs/items/stripped_lemonwood_log.json new file mode 100644 index 0000000..1536e46 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/stripped_lemonwood_log.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/stripped_lemonwood_log" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/stripped_lemonwood_wood.json b/src/main/generated/assets/acesbs/items/stripped_lemonwood_wood.json new file mode 100644 index 0000000..bbf7583 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/stripped_lemonwood_wood.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:block/stripped_lemonwood_wood" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/thot_begone.json b/src/main/generated/assets/acesbs/items/thot_begone.json new file mode 100644 index 0000000..47df08b --- /dev/null +++ b/src/main/generated/assets/acesbs/items/thot_begone.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/thot_begone" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/tobacco.json b/src/main/generated/assets/acesbs/items/tobacco.json new file mode 100644 index 0000000..81aea7d --- /dev/null +++ b/src/main/generated/assets/acesbs/items/tobacco.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/tobacco" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/tobacco_seeds.json b/src/main/generated/assets/acesbs/items/tobacco_seeds.json new file mode 100644 index 0000000..695c783 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/tobacco_seeds.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/tobacco_seeds" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/vulgar_bones_spawn_egg.json b/src/main/generated/assets/acesbs/items/vulgar_bones_spawn_egg.json new file mode 100644 index 0000000..04e9a93 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/vulgar_bones_spawn_egg.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/vulgar_bones_spawn_egg" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/wand.json b/src/main/generated/assets/acesbs/items/wand.json new file mode 100644 index 0000000..fcc6226 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/wand.json @@ -0,0 +1,15 @@ +{ + "model": { + "type": "minecraft:condition", + "component": "acesbs:coordinates", + "on_false": { + "type": "minecraft:model", + "model": "acesbs:item/wand" + }, + "on_true": { + "type": "minecraft:model", + "model": "acesbs:item/wand_used" + }, + "property": "minecraft:has_component" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/items/wildfire_boots.json b/src/main/generated/assets/acesbs/items/wildfire_boots.json new file mode 100644 index 0000000..bee5c56 --- /dev/null +++ b/src/main/generated/assets/acesbs/items/wildfire_boots.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/wildfire_boots_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/wildfire_boots_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/wildfire_boots_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/wildfire_boots_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/wildfire_boots_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/wildfire_boots_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/wildfire_boots_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/wildfire_boots_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/wildfire_boots_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/wildfire_boots_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "acesbs:item/wildfire_boots_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "acesbs:item/wildfire_boots" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_block.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_block.json deleted file mode 100644 index 5f6a5b5..0000000 --- a/src/main/generated/assets/acesbs/models/item/ashen_steel_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/ashen_steel_block" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_boots.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots.json index fabeee4..8df63ae 100644 --- a/src/main/generated/assets/acesbs/models/item/ashen_steel_boots.json +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "acesbs:item/ashen_steel_boots_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "acesbs:item/ashen_steel_boots_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "acesbs:item/ashen_steel_boots_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "acesbs:item/ashen_steel_boots_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "acesbs:item/ashen_steel_boots_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "acesbs:item/ashen_steel_boots_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "acesbs:item/ashen_steel_boots_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "acesbs:item/ashen_steel_boots_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "acesbs:item/ashen_steel_boots_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "acesbs:item/ashen_steel_boots_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "acesbs:item/ashen_steel_boots" } diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_resin_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_resin_trim.json new file mode 100644 index 0000000..d39dee6 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_boots_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_boots", + "layer1": "minecraft:trims/items/boots_trim_resin" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate.json index dd471b0..2063dab 100644 --- a/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate.json +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "acesbs:item/ashen_steel_chestplate_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "acesbs:item/ashen_steel_chestplate_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "acesbs:item/ashen_steel_chestplate_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "acesbs:item/ashen_steel_chestplate_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "acesbs:item/ashen_steel_chestplate_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "acesbs:item/ashen_steel_chestplate_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "acesbs:item/ashen_steel_chestplate_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "acesbs:item/ashen_steel_chestplate_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "acesbs:item/ashen_steel_chestplate_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "acesbs:item/ashen_steel_chestplate_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "acesbs:item/ashen_steel_chestplate" } diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_resin_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_resin_trim.json new file mode 100644 index 0000000..0d08031 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_chestplate_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_resin" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet.json index 4669cd8..59c5430 100644 --- a/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet.json +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "acesbs:item/ashen_steel_helmet_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "acesbs:item/ashen_steel_helmet_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "acesbs:item/ashen_steel_helmet_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "acesbs:item/ashen_steel_helmet_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "acesbs:item/ashen_steel_helmet_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "acesbs:item/ashen_steel_helmet_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "acesbs:item/ashen_steel_helmet_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "acesbs:item/ashen_steel_helmet_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "acesbs:item/ashen_steel_helmet_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "acesbs:item/ashen_steel_helmet_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "acesbs:item/ashen_steel_helmet" } diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_resin_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_resin_trim.json new file mode 100644 index 0000000..867d6d4 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_helmet_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_helmet", + "layer1": "minecraft:trims/items/helmet_trim_resin" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings.json index b9e9fbb..313a998 100644 --- a/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings.json +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "acesbs:item/ashen_steel_leggings_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "acesbs:item/ashen_steel_leggings_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "acesbs:item/ashen_steel_leggings_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "acesbs:item/ashen_steel_leggings_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "acesbs:item/ashen_steel_leggings_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "acesbs:item/ashen_steel_leggings_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "acesbs:item/ashen_steel_leggings_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "acesbs:item/ashen_steel_leggings_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "acesbs:item/ashen_steel_leggings_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "acesbs:item/ashen_steel_leggings_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "acesbs:item/ashen_steel_leggings" } diff --git a/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_resin_trim.json b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_resin_trim.json new file mode 100644 index 0000000..e347b1f --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/ashen_steel_leggings_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/ashen_steel_leggings", + "layer1": "minecraft:trims/items/leggings_trim_resin" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/berserkers_pauldron.json b/src/main/generated/assets/acesbs/models/item/berserkers_pauldron.json index 09185f3..39201b1 100644 --- a/src/main/generated/assets/acesbs/models/item/berserkers_pauldron.json +++ b/src/main/generated/assets/acesbs/models/item/berserkers_pauldron.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "acesbs:item/berserkers_pauldron_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "acesbs:item/berserkers_pauldron_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "acesbs:item/berserkers_pauldron_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "acesbs:item/berserkers_pauldron_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "acesbs:item/berserkers_pauldron_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "acesbs:item/berserkers_pauldron_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "acesbs:item/berserkers_pauldron_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "acesbs:item/berserkers_pauldron_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "acesbs:item/berserkers_pauldron_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "acesbs:item/berserkers_pauldron_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "acesbs:item/berserkers_pauldron" } diff --git a/src/main/generated/assets/acesbs/models/item/berserkers_pauldron_resin_trim.json b/src/main/generated/assets/acesbs/models/item/berserkers_pauldron_resin_trim.json new file mode 100644 index 0000000..20de146 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/berserkers_pauldron_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/berserkers_pauldron", + "layer1": "minecraft:trims/items/chestplate_trim_resin" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/crystal_entropy.json b/src/main/generated/assets/acesbs/models/item/crystal_entropy.json deleted file mode 100644 index 875cbaf..0000000 --- a/src/main/generated/assets/acesbs/models/item/crystal_entropy.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/crystal_entropy" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/deepslate_entropy_ore.json b/src/main/generated/assets/acesbs/models/item/deepslate_entropy_ore.json deleted file mode 100644 index 35ea031..0000000 --- a/src/main/generated/assets/acesbs/models/item/deepslate_entropy_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/deepslate_entropy_ore" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/endtropy_ore.json b/src/main/generated/assets/acesbs/models/item/endtropy_ore.json deleted file mode 100644 index 66bf866..0000000 --- a/src/main/generated/assets/acesbs/models/item/endtropy_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/endtropy_ore" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/entropy_ore.json b/src/main/generated/assets/acesbs/models/item/entropy_ore.json deleted file mode 100644 index dfaa421..0000000 --- a/src/main/generated/assets/acesbs/models/item/entropy_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/entropy_ore" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/evil_block.json b/src/main/generated/assets/acesbs/models/item/evil_block.json deleted file mode 100644 index c34ced8..0000000 --- a/src/main/generated/assets/acesbs/models/item/evil_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/evil_block" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/infernal_ashes_block.json b/src/main/generated/assets/acesbs/models/item/infernal_ashes_block.json deleted file mode 100644 index ec736bb..0000000 --- a/src/main/generated/assets/acesbs/models/item/infernal_ashes_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/infernal_ashes_block" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/infernal_ashes_ore.json b/src/main/generated/assets/acesbs/models/item/infernal_ashes_ore.json deleted file mode 100644 index f1987b2..0000000 --- a/src/main/generated/assets/acesbs/models/item/infernal_ashes_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/infernal_ashes_ore" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/kaupen_bow.json b/src/main/generated/assets/acesbs/models/item/kaupen_bow.json new file mode 100644 index 0000000..e1dbcb7 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/kaupen_bow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/bow", + "textures": { + "layer0": "acesbs:item/kaupen_bow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/models/item/kaupen_bow_pulling_0.json b/src/main/generated/assets/acesbs/models/item/kaupen_bow_pulling_0.json similarity index 65% rename from src/main/resources/assets/acesbs/models/item/kaupen_bow_pulling_0.json rename to src/main/generated/assets/acesbs/models/item/kaupen_bow_pulling_0.json index 5d5802d..bfd7c7c 100644 --- a/src/main/resources/assets/acesbs/models/item/kaupen_bow_pulling_0.json +++ b/src/main/generated/assets/acesbs/models/item/kaupen_bow_pulling_0.json @@ -1,5 +1,5 @@ { - "parent": "acesbs:item/kaupen_bow", + "parent": "minecraft:item/bow", "textures": { "layer0": "acesbs:item/kaupen_bow_pulling_0" } diff --git a/src/main/resources/assets/acesbs/models/item/kaupen_bow_pulling_1.json b/src/main/generated/assets/acesbs/models/item/kaupen_bow_pulling_1.json similarity index 65% rename from src/main/resources/assets/acesbs/models/item/kaupen_bow_pulling_1.json rename to src/main/generated/assets/acesbs/models/item/kaupen_bow_pulling_1.json index dd5e6cc..7285577 100644 --- a/src/main/resources/assets/acesbs/models/item/kaupen_bow_pulling_1.json +++ b/src/main/generated/assets/acesbs/models/item/kaupen_bow_pulling_1.json @@ -1,5 +1,5 @@ { - "parent": "acesbs:item/kaupen_bow", + "parent": "minecraft:item/bow", "textures": { "layer0": "acesbs:item/kaupen_bow_pulling_1" } diff --git a/src/main/resources/assets/acesbs/models/item/kaupen_bow_pulling_2.json b/src/main/generated/assets/acesbs/models/item/kaupen_bow_pulling_2.json similarity index 65% rename from src/main/resources/assets/acesbs/models/item/kaupen_bow_pulling_2.json rename to src/main/generated/assets/acesbs/models/item/kaupen_bow_pulling_2.json index 93c1613..97f71fc 100644 --- a/src/main/resources/assets/acesbs/models/item/kaupen_bow_pulling_2.json +++ b/src/main/generated/assets/acesbs/models/item/kaupen_bow_pulling_2.json @@ -1,5 +1,5 @@ { - "parent": "acesbs:item/kaupen_bow", + "parent": "minecraft:item/bow", "textures": { "layer0": "acesbs:item/kaupen_bow_pulling_2" } diff --git a/src/main/generated/assets/acesbs/models/item/lemonwood_button.json b/src/main/generated/assets/acesbs/models/item/lemonwood_button.json deleted file mode 100644 index 0e0309a..0000000 --- a/src/main/generated/assets/acesbs/models/item/lemonwood_button.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/lemonwood_button_inventory" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/lemonwood_fence.json b/src/main/generated/assets/acesbs/models/item/lemonwood_fence.json deleted file mode 100644 index b42e1d6..0000000 --- a/src/main/generated/assets/acesbs/models/item/lemonwood_fence.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/lemonwood_fence_inventory" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/lemonwood_fence_gate.json b/src/main/generated/assets/acesbs/models/item/lemonwood_fence_gate.json deleted file mode 100644 index 7880c2e..0000000 --- a/src/main/generated/assets/acesbs/models/item/lemonwood_fence_gate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/lemonwood_fence_gate" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/lemonwood_leaves.json b/src/main/generated/assets/acesbs/models/item/lemonwood_leaves.json deleted file mode 100644 index 97e61dd..0000000 --- a/src/main/generated/assets/acesbs/models/item/lemonwood_leaves.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/lemonwood_leaves" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/lemonwood_log.json b/src/main/generated/assets/acesbs/models/item/lemonwood_log.json deleted file mode 100644 index ed0df11..0000000 --- a/src/main/generated/assets/acesbs/models/item/lemonwood_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/lemonwood_log" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/lemonwood_planks.json b/src/main/generated/assets/acesbs/models/item/lemonwood_planks.json deleted file mode 100644 index 2e4a227..0000000 --- a/src/main/generated/assets/acesbs/models/item/lemonwood_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/lemonwood_planks" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/lemonwood_pressure_plate.json b/src/main/generated/assets/acesbs/models/item/lemonwood_pressure_plate.json deleted file mode 100644 index f99b2e5..0000000 --- a/src/main/generated/assets/acesbs/models/item/lemonwood_pressure_plate.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/lemonwood_pressure_plate" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/lemonwood_slab.json b/src/main/generated/assets/acesbs/models/item/lemonwood_slab.json deleted file mode 100644 index d9b5367..0000000 --- a/src/main/generated/assets/acesbs/models/item/lemonwood_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/lemonwood_slab" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/lemonwood_stairs.json b/src/main/generated/assets/acesbs/models/item/lemonwood_stairs.json deleted file mode 100644 index 522466d..0000000 --- a/src/main/generated/assets/acesbs/models/item/lemonwood_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/lemonwood_stairs" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/lemonwood_trapdoor.json b/src/main/generated/assets/acesbs/models/item/lemonwood_trapdoor.json deleted file mode 100644 index 032ba92..0000000 --- a/src/main/generated/assets/acesbs/models/item/lemonwood_trapdoor.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/lemonwood_trapdoor_bottom" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/lemonwood_wall.json b/src/main/generated/assets/acesbs/models/item/lemonwood_wall.json deleted file mode 100644 index d6ed9b2..0000000 --- a/src/main/generated/assets/acesbs/models/item/lemonwood_wall.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/lemonwood_wall_inventory" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/lemonwood_wood.json b/src/main/generated/assets/acesbs/models/item/lemonwood_wood.json deleted file mode 100644 index c644f85..0000000 --- a/src/main/generated/assets/acesbs/models/item/lemonwood_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/lemonwood_wood" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/lizard_button.json b/src/main/generated/assets/acesbs/models/item/lizard_button.json deleted file mode 100644 index fc2333d..0000000 --- a/src/main/generated/assets/acesbs/models/item/lizard_button.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/lizard_button_inventory" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/lizard_planks.json b/src/main/generated/assets/acesbs/models/item/lizard_planks.json deleted file mode 100644 index 76358b1..0000000 --- a/src/main/generated/assets/acesbs/models/item/lizard_planks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/lizard_planks" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/potted_lemonwood_sapling.json b/src/main/generated/assets/acesbs/models/item/potted_lemonwood_sapling.json deleted file mode 100644 index 93f195f..0000000 --- a/src/main/generated/assets/acesbs/models/item/potted_lemonwood_sapling.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/potted_lemonwood_sapling" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/prisma_steel_block.json b/src/main/generated/assets/acesbs/models/item/prisma_steel_block.json deleted file mode 100644 index 725d0c7..0000000 --- a/src/main/generated/assets/acesbs/models/item/prisma_steel_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/prisma_steel_block" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/prisma_steel_boots.json b/src/main/generated/assets/acesbs/models/item/prisma_steel_boots.json index dbe4013..5472da0 100644 --- a/src/main/generated/assets/acesbs/models/item/prisma_steel_boots.json +++ b/src/main/generated/assets/acesbs/models/item/prisma_steel_boots.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "acesbs:item/prisma_steel_boots_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "acesbs:item/prisma_steel_boots_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "acesbs:item/prisma_steel_boots_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "acesbs:item/prisma_steel_boots_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "acesbs:item/prisma_steel_boots_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "acesbs:item/prisma_steel_boots_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "acesbs:item/prisma_steel_boots_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "acesbs:item/prisma_steel_boots_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "acesbs:item/prisma_steel_boots_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "acesbs:item/prisma_steel_boots_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "acesbs:item/prisma_steel_boots" } diff --git a/src/main/generated/assets/acesbs/models/item/prisma_steel_boots_resin_trim.json b/src/main/generated/assets/acesbs/models/item/prisma_steel_boots_resin_trim.json new file mode 100644 index 0000000..9b8765c --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/prisma_steel_boots_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/prisma_steel_boots", + "layer1": "minecraft:trims/items/boots_trim_resin" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/prisma_steel_chestplate.json b/src/main/generated/assets/acesbs/models/item/prisma_steel_chestplate.json index 28daec8..a913f7f 100644 --- a/src/main/generated/assets/acesbs/models/item/prisma_steel_chestplate.json +++ b/src/main/generated/assets/acesbs/models/item/prisma_steel_chestplate.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "acesbs:item/prisma_steel_chestplate_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "acesbs:item/prisma_steel_chestplate_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "acesbs:item/prisma_steel_chestplate_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "acesbs:item/prisma_steel_chestplate_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "acesbs:item/prisma_steel_chestplate_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "acesbs:item/prisma_steel_chestplate_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "acesbs:item/prisma_steel_chestplate_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "acesbs:item/prisma_steel_chestplate_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "acesbs:item/prisma_steel_chestplate_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "acesbs:item/prisma_steel_chestplate_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "acesbs:item/prisma_steel_chestplate" } diff --git a/src/main/generated/assets/acesbs/models/item/prisma_steel_chestplate_resin_trim.json b/src/main/generated/assets/acesbs/models/item/prisma_steel_chestplate_resin_trim.json new file mode 100644 index 0000000..854519d --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/prisma_steel_chestplate_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/prisma_steel_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_resin" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/prisma_steel_helmet.json b/src/main/generated/assets/acesbs/models/item/prisma_steel_helmet.json index ad71ada..cee99e9 100644 --- a/src/main/generated/assets/acesbs/models/item/prisma_steel_helmet.json +++ b/src/main/generated/assets/acesbs/models/item/prisma_steel_helmet.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "acesbs:item/prisma_steel_helmet_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "acesbs:item/prisma_steel_helmet_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "acesbs:item/prisma_steel_helmet_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "acesbs:item/prisma_steel_helmet_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "acesbs:item/prisma_steel_helmet_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "acesbs:item/prisma_steel_helmet_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "acesbs:item/prisma_steel_helmet_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "acesbs:item/prisma_steel_helmet_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "acesbs:item/prisma_steel_helmet_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "acesbs:item/prisma_steel_helmet_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "acesbs:item/prisma_steel_helmet" } diff --git a/src/main/generated/assets/acesbs/models/item/prisma_steel_helmet_resin_trim.json b/src/main/generated/assets/acesbs/models/item/prisma_steel_helmet_resin_trim.json new file mode 100644 index 0000000..a441f25 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/prisma_steel_helmet_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/prisma_steel_helmet", + "layer1": "minecraft:trims/items/helmet_trim_resin" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/prisma_steel_leggings.json b/src/main/generated/assets/acesbs/models/item/prisma_steel_leggings.json index 9edf975..79d8aae 100644 --- a/src/main/generated/assets/acesbs/models/item/prisma_steel_leggings.json +++ b/src/main/generated/assets/acesbs/models/item/prisma_steel_leggings.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "acesbs:item/prisma_steel_leggings_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "acesbs:item/prisma_steel_leggings_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "acesbs:item/prisma_steel_leggings_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "acesbs:item/prisma_steel_leggings_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "acesbs:item/prisma_steel_leggings_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "acesbs:item/prisma_steel_leggings_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "acesbs:item/prisma_steel_leggings_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "acesbs:item/prisma_steel_leggings_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "acesbs:item/prisma_steel_leggings_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "acesbs:item/prisma_steel_leggings_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "acesbs:item/prisma_steel_leggings" } diff --git a/src/main/generated/assets/acesbs/models/item/prisma_steel_leggings_resin_trim.json b/src/main/generated/assets/acesbs/models/item/prisma_steel_leggings_resin_trim.json new file mode 100644 index 0000000..1eb5e9f --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/prisma_steel_leggings_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/prisma_steel_leggings", + "layer1": "minecraft:trims/items/leggings_trim_resin" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/raw_endtropy_block.json b/src/main/generated/assets/acesbs/models/item/raw_endtropy_block.json deleted file mode 100644 index b9a4200..0000000 --- a/src/main/generated/assets/acesbs/models/item/raw_endtropy_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/raw_endtropy_block" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/sovs_plate_carrier.json b/src/main/generated/assets/acesbs/models/item/sovs_plate_carrier.json index 43d6b21..1ef8568 100644 --- a/src/main/generated/assets/acesbs/models/item/sovs_plate_carrier.json +++ b/src/main/generated/assets/acesbs/models/item/sovs_plate_carrier.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "acesbs:item/sovs_plate_carrier_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "acesbs:item/sovs_plate_carrier_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "acesbs:item/sovs_plate_carrier_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "acesbs:item/sovs_plate_carrier_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "acesbs:item/sovs_plate_carrier_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "acesbs:item/sovs_plate_carrier_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "acesbs:item/sovs_plate_carrier_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "acesbs:item/sovs_plate_carrier_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "acesbs:item/sovs_plate_carrier_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "acesbs:item/sovs_plate_carrier_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "acesbs:item/sovs_plate_carrier" } diff --git a/src/main/generated/assets/acesbs/models/item/sovs_plate_carrier_resin_trim.json b/src/main/generated/assets/acesbs/models/item/sovs_plate_carrier_resin_trim.json new file mode 100644 index 0000000..9f8f9f5 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/sovs_plate_carrier_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/sovs_plate_carrier", + "layer1": "minecraft:trims/items/chestplate_trim_resin" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/stable_endtropy_block.json b/src/main/generated/assets/acesbs/models/item/stable_endtropy_block.json deleted file mode 100644 index 2b88fd0..0000000 --- a/src/main/generated/assets/acesbs/models/item/stable_endtropy_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/stable_endtropy_block" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/stable_entropy_block.json b/src/main/generated/assets/acesbs/models/item/stable_entropy_block.json deleted file mode 100644 index 8d4a343..0000000 --- a/src/main/generated/assets/acesbs/models/item/stable_entropy_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/stable_entropy_block" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/stripped_lemonwood_log.json b/src/main/generated/assets/acesbs/models/item/stripped_lemonwood_log.json deleted file mode 100644 index 60fd3e4..0000000 --- a/src/main/generated/assets/acesbs/models/item/stripped_lemonwood_log.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/stripped_lemonwood_log" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/stripped_lemonwood_wood.json b/src/main/generated/assets/acesbs/models/item/stripped_lemonwood_wood.json deleted file mode 100644 index 6faf777..0000000 --- a/src/main/generated/assets/acesbs/models/item/stripped_lemonwood_wood.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "acesbs:block/stripped_lemonwood_wood" -} \ No newline at end of file diff --git a/src/main/generated/assets/acesbs/models/item/lemonwood_sapling.json b/src/main/generated/assets/acesbs/models/item/wand.json similarity index 57% rename from src/main/generated/assets/acesbs/models/item/lemonwood_sapling.json rename to src/main/generated/assets/acesbs/models/item/wand.json index 7c48953..9632234 100644 --- a/src/main/generated/assets/acesbs/models/item/lemonwood_sapling.json +++ b/src/main/generated/assets/acesbs/models/item/wand.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "acesbs:block/lemonwood_sapling" + "layer0": "acesbs:item/wand" } } \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/models/item/wand_used.json b/src/main/generated/assets/acesbs/models/item/wand_used.json similarity index 58% rename from src/main/resources/assets/acesbs/models/item/wand_used.json rename to src/main/generated/assets/acesbs/models/item/wand_used.json index 0317f6a..9615cc1 100644 --- a/src/main/resources/assets/acesbs/models/item/wand_used.json +++ b/src/main/generated/assets/acesbs/models/item/wand_used.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld_rod", + "parent": "minecraft:item/generated", "textures": { "layer0": "acesbs:item/wand_used" } diff --git a/src/main/generated/assets/acesbs/models/item/wildfire_boots.json b/src/main/generated/assets/acesbs/models/item/wildfire_boots.json index c7ad4ef..f4a3ce3 100644 --- a/src/main/generated/assets/acesbs/models/item/wildfire_boots.json +++ b/src/main/generated/assets/acesbs/models/item/wildfire_boots.json @@ -1,67 +1,5 @@ { "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "acesbs:item/wildfire_boots_quartz_trim", - "predicate": { - "trim_type": 0.1 - } - }, - { - "model": "acesbs:item/wildfire_boots_iron_trim", - "predicate": { - "trim_type": 0.2 - } - }, - { - "model": "acesbs:item/wildfire_boots_netherite_trim", - "predicate": { - "trim_type": 0.3 - } - }, - { - "model": "acesbs:item/wildfire_boots_redstone_trim", - "predicate": { - "trim_type": 0.4 - } - }, - { - "model": "acesbs:item/wildfire_boots_copper_trim", - "predicate": { - "trim_type": 0.5 - } - }, - { - "model": "acesbs:item/wildfire_boots_gold_trim", - "predicate": { - "trim_type": 0.6 - } - }, - { - "model": "acesbs:item/wildfire_boots_emerald_trim", - "predicate": { - "trim_type": 0.7 - } - }, - { - "model": "acesbs:item/wildfire_boots_diamond_trim", - "predicate": { - "trim_type": 0.8 - } - }, - { - "model": "acesbs:item/wildfire_boots_lapis_trim", - "predicate": { - "trim_type": 0.9 - } - }, - { - "model": "acesbs:item/wildfire_boots_amethyst_trim", - "predicate": { - "trim_type": 1.0 - } - } - ], "textures": { "layer0": "acesbs:item/wildfire_boots" } diff --git a/src/main/generated/assets/acesbs/models/item/wildfire_boots_resin_trim.json b/src/main/generated/assets/acesbs/models/item/wildfire_boots_resin_trim.json new file mode 100644 index 0000000..3fd3f58 --- /dev/null +++ b/src/main/generated/assets/acesbs/models/item/wildfire_boots_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "acesbs:item/wildfire_boots", + "layer1": "minecraft:trims/items/boots_trim_resin" + } +} \ No newline at end of file diff --git a/src/main/generated/data/acesbs/trim_material/ashen_steel.json b/src/main/generated/data/acesbs/trim_material/ashen_steel.json index df37ad3..c04d9fb 100644 --- a/src/main/generated/data/acesbs/trim_material/ashen_steel.json +++ b/src/main/generated/data/acesbs/trim_material/ashen_steel.json @@ -4,6 +4,5 @@ "color": "#B93425", "translate": "trim_material.acesbs.ashen_steel" }, - "ingredient": "acesbs:ashen_steel", - "item_model_index": 0.4 + "ingredient": "acesbs:ashen_steel" } \ No newline at end of file diff --git a/src/main/generated/data/acesbs/trim_material/prisma_steel.json b/src/main/generated/data/acesbs/trim_material/prisma_steel.json index cef7650..3ade91c 100644 --- a/src/main/generated/data/acesbs/trim_material/prisma_steel.json +++ b/src/main/generated/data/acesbs/trim_material/prisma_steel.json @@ -4,6 +4,5 @@ "color": "#B16491", "translate": "trim_material.acesbs.prisma_steel" }, - "ingredient": "acesbs:prisma_steel", - "item_model_index": 1.0 + "ingredient": "acesbs:prisma_steel" } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/item/trim_templates.json b/src/main/generated/data/minecraft/tags/item/trim_templates.json deleted file mode 100644 index 95b9a8c..0000000 --- a/src/main/generated/data/minecraft/tags/item/trim_templates.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "acesbs:prisma_armor_trim_smithing_template", - "acesbs:ashen_armor_trim_smithing_template" - ] -} \ No newline at end of file diff --git a/src/main/java/com/acethewildfire/acesbs/AcesBS.java b/src/main/java/com/acethewildfire/acesbs/AcesBS.java index 0f60663..939dfcb 100644 --- a/src/main/java/com/acethewildfire/acesbs/AcesBS.java +++ b/src/main/java/com/acethewildfire/acesbs/AcesBS.java @@ -18,8 +18,6 @@ import com.acethewildfire.acesbs.util.*; import com.acethewildfire.acesbs.villager.ModVillagers; import com.acethewildfire.acesbs.world.gen.ModWorldGeneration; import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerEntityEvents; -import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents; import net.fabricmc.fabric.api.event.player.AttackEntityCallback; import net.fabricmc.fabric.api.event.player.PlayerBlockBreakEvents; import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; @@ -29,14 +27,10 @@ import net.fabricmc.fabric.api.registry.CompostingChanceRegistry; import net.fabricmc.fabric.api.registry.FabricBrewingRecipeRegistryBuilder; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import net.fabricmc.fabric.api.registry.StrippableBlockRegistry; -import net.minecraft.entity.Entity; import net.minecraft.entity.mob.SkeletonEntity; -import net.minecraft.entity.passive.VillagerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; -import net.minecraft.nbt.NbtCompound; import net.minecraft.potion.Potions; -import net.minecraft.server.world.ServerWorld; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java b/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java index dda770e..47314cb 100644 --- a/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java +++ b/src/main/java/com/acethewildfire/acesbs/AcesBSClient.java @@ -13,7 +13,6 @@ import com.acethewildfire.acesbs.screen.ModScreenHandlers; import com.acethewildfire.acesbs.screen.custom.EntropicEntanglerScreen; import com.acethewildfire.acesbs.screen.custom.EntropicEvisceratorScreen; import com.acethewildfire.acesbs.screen.custom.EntropicStabilizerScreen; -import com.acethewildfire.acesbs.util.ModModelPredicates; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry; @@ -34,8 +33,6 @@ public class AcesBSClient implements ClientModInitializer { BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.LEMONWOOD_SAPLING, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(ModBlocks.POTTED_LEMONWOOD_SAPLING, RenderLayer.getCutout()); - ModModelPredicates.registerModelPredicates(); - EntityModelLayerRegistry.registerModelLayer(FrenModel.FREN, FrenModel::getTexturedModelData); EntityRendererRegistry.register(ModEntities.FREN, FrenRenderer::new); EntityRendererRegistry.register(ModEntities.VULGAR_BONES, SkeletonEntityRenderer::new); diff --git a/src/main/java/com/acethewildfire/acesbs/KNOWN_ISSUES b/src/main/java/com/acethewildfire/acesbs/KNOWN_ISSUES index 9d666f8..ee68b25 100644 --- a/src/main/java/com/acethewildfire/acesbs/KNOWN_ISSUES +++ b/src/main/java/com/acethewildfire/acesbs/KNOWN_ISSUES @@ -2,4 +2,6 @@ attribute components on items and armor are not being applied. - Thot-begone - Beserkers Pauldon -REI display does not display custom recipes. \ No newline at end of file +Armor is invisible + +Command Core textures broken \ No newline at end of file diff --git a/src/main/java/com/acethewildfire/acesbs/compat/AcesBSREIClient.java b/src/main/java/com/acethewildfire/acesbs/compat/AcesBSREIClient.java deleted file mode 100644 index cc7a6e2..0000000 --- a/src/main/java/com/acethewildfire/acesbs/compat/AcesBSREIClient.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.acethewildfire.acesbs.compat; - -import com.acethewildfire.acesbs.block.ModBlocks; -import com.acethewildfire.acesbs.recipe.EntropicEntanglerRecipe; -import com.acethewildfire.acesbs.recipe.EntropicEvisceratorRecipe; -import com.acethewildfire.acesbs.recipe.EntropicStabilizerRecipe; -import com.acethewildfire.acesbs.recipe.ModRecipies; -import com.acethewildfire.acesbs.screen.custom.EntropicEntanglerScreen; -import com.acethewildfire.acesbs.screen.custom.EntropicEvisceratorScreen; -import com.acethewildfire.acesbs.screen.custom.EntropicStabilizerScreen; -import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.client.plugins.REIClientPlugin; -import me.shedaniel.rei.api.client.registry.category.CategoryRegistry; -import me.shedaniel.rei.api.client.registry.display.DisplayRegistry; -import me.shedaniel.rei.api.client.registry.screen.ScreenRegistry; -import me.shedaniel.rei.api.common.util.EntryStacks; - -public class AcesBSREIClient implements REIClientPlugin { - - @Override - public void registerCategories(CategoryRegistry registry) { - registry.add(new EntropicStabilizerCategory()); - registry.addWorkstations(EntropicStabilizerCategory.ENTROPIC_STABILIZER, EntryStacks.of(ModBlocks.ENTROPIC_STABILIZER)); - - registry.add(new EntropicEvisceratorCategory()); - registry.addWorkstations(EntropicEvisceratorCategory.ENTROPIC_EVISCERATOR, EntryStacks.of(ModBlocks.ENTROPIC_EVISCERATOR)); - - registry.add(new EntropicEntanglerCategory()); - registry.addWorkstations(EntropicEntanglerCategory.ENTROPIC_ENTANGLER, EntryStacks.of(ModBlocks.ENTROPIC_ENTANGLER)); - } - - @Override - public void registerDisplays(DisplayRegistry registry) { -// registry.registerRecipeFiller(EntropicStabilizerRecipe.class, ModRecipies.ENTROPIC_STABILIZER_TYPE, EntropicStabilizerDisplay::new); -// registry.registerRecipeFiller(EntropicEvisceratorRecipe.class, ModRecipies.ENTROPIC_EVISCERATOR_TYPE, EntropicEvisceratorDisplay::new); -// registry.registerRecipeFiller(EntropicEntanglerRecipe.class, ModRecipies.ENTROPIC_ENTANGLER_TYPE, EntropicEntanglerDisplay::new); - } - - @Override - public void registerScreens(ScreenRegistry registry) { - registry.registerClickArea(screen -> new Rectangle(((screen.width - 176) / 2) + 78, - ((screen.height - 166) / 2) + 30, 20, 25 ), EntropicStabilizerScreen.class, EntropicStabilizerCategory.ENTROPIC_STABILIZER); - registry.registerClickArea(screen -> new Rectangle(((screen.width - 176) / 2) + 78, - ((screen.height - 166) / 2) + 30, 20, 25 ), EntropicEvisceratorScreen.class, EntropicEvisceratorCategory.ENTROPIC_EVISCERATOR); - registry.registerClickArea(screen -> new Rectangle(((screen.width - 176) / 2) + 53, - ((screen.height - 166) / 2) + 25, 37, 9 ), EntropicEntanglerScreen.class, EntropicEntanglerCategory.ENTROPIC_ENTANGLER); - registry.registerClickArea(screen -> new Rectangle(((screen.width - 176) / 2) + 90, - ((screen.height - 166) / 2) + 52, 37, 9 ), EntropicEntanglerScreen.class, EntropicEntanglerCategory.ENTROPIC_ENTANGLER); - } -} diff --git a/src/main/java/com/acethewildfire/acesbs/compat/EntropicEntanglerCategory.java b/src/main/java/com/acethewildfire/acesbs/compat/EntropicEntanglerCategory.java deleted file mode 100644 index 4a5568e..0000000 --- a/src/main/java/com/acethewildfire/acesbs/compat/EntropicEntanglerCategory.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.acethewildfire.acesbs.compat; - -import com.acethewildfire.acesbs.AcesBS; -import com.acethewildfire.acesbs.block.ModBlocks; -import me.shedaniel.math.Point; -import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.client.gui.Renderer; -import me.shedaniel.rei.api.client.gui.widgets.Widget; -import me.shedaniel.rei.api.client.gui.widgets.Widgets; -import me.shedaniel.rei.api.client.registry.display.DisplayCategory; -import me.shedaniel.rei.api.common.category.CategoryIdentifier; -import me.shedaniel.rei.api.common.display.basic.BasicDisplay; -import me.shedaniel.rei.api.common.util.EntryStacks; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; - -import java.util.LinkedList; -import java.util.List; - -public class EntropicEntanglerCategory implements DisplayCategory { - public static final Identifier GUI_TEXTURE = - Identifier.of(AcesBS.MOD_ID, "textures/gui/entropic_entangler/entropic_entangler_gui_rei.png"); - - public static final CategoryIdentifier ENTROPIC_ENTANGLER = - CategoryIdentifier.of(AcesBS.MOD_ID, "entropic_entangler"); - - @Override - public CategoryIdentifier getCategoryIdentifier() { - return ENTROPIC_ENTANGLER; - } - - @Override - public Text getTitle() { - return Text.translatable("block.acesbs.entropic_entangler"); - } - - @Override - public Renderer getIcon() { - return EntryStacks.of(ModBlocks.ENTROPIC_ENTANGLER.asItem().getDefaultStack()); - } - - @Override - public List setupDisplay(BasicDisplay display, Rectangle bounds) { - Point startPoint = new Point(bounds.getCenterX() - 87, bounds.getCenterY() - 41); - List widgets = new LinkedList<>(); - - widgets.add(Widgets.createTexturedWidget(GUI_TEXTURE, new Rectangle(startPoint.x, startPoint.y, 175, 82))); - - widgets.add(Widgets.createSlot(new Point(startPoint.x + 44, startPoint.y + 35)).entries(display.getInputEntries().get(0)).markInput()); - widgets.add(Widgets.createSlot(new Point(startPoint.x + 116, startPoint.y + 35)).entries(display.getInputEntries().get(1)).markInput()); - widgets.add(Widgets.createSlot(new Point(startPoint.x + 80, startPoint.y + 35)).entries(display.getOutputEntries().get(0)).markOutput()); - - return widgets; - } - - @Override - public int getDisplayHeight() { - return 90; - } -} diff --git a/src/main/java/com/acethewildfire/acesbs/compat/EntropicEntanglerDisplay.java b/src/main/java/com/acethewildfire/acesbs/compat/EntropicEntanglerDisplay.java deleted file mode 100644 index bab6b07..0000000 --- a/src/main/java/com/acethewildfire/acesbs/compat/EntropicEntanglerDisplay.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.acethewildfire.acesbs.compat; - -import com.acethewildfire.acesbs.recipe.EntropicEntanglerRecipe; -import me.shedaniel.rei.api.common.category.CategoryIdentifier; -import me.shedaniel.rei.api.common.display.Display; -import me.shedaniel.rei.api.common.display.DisplaySerializer; -import me.shedaniel.rei.api.common.display.basic.BasicDisplay; -import me.shedaniel.rei.api.common.entry.EntryIngredient; -import me.shedaniel.rei.api.common.util.EntryIngredients; -import me.shedaniel.rei.api.common.util.EntryStacks; -import net.minecraft.recipe.RecipeEntry; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class EntropicEntanglerDisplay extends BasicDisplay { - private RecipeEntry recipe; - private float xp; - private double cookTime; - - public EntropicEntanglerDisplay(RecipeEntry recipe){ - super( - List.of(EntryIngredients.ofIngredient(recipe.value().getIngredients().get(0)), EntryIngredients.ofIngredient(recipe.value().getIngredients().get(1))), - List.of(EntryIngredient.of(EntryStacks.of(recipe.value().output())))); - } - - @Override - public CategoryIdentifier getCategoryIdentifier() { - return EntropicEntanglerCategory.ENTROPIC_ENTANGLER; - } - - @Override - public @Nullable DisplaySerializer getSerializer() { - return null; - } -} diff --git a/src/main/java/com/acethewildfire/acesbs/compat/EntropicEvisceratorCategory.java b/src/main/java/com/acethewildfire/acesbs/compat/EntropicEvisceratorCategory.java deleted file mode 100644 index 2b32630..0000000 --- a/src/main/java/com/acethewildfire/acesbs/compat/EntropicEvisceratorCategory.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.acethewildfire.acesbs.compat; - -import com.acethewildfire.acesbs.AcesBS; -import com.acethewildfire.acesbs.block.ModBlocks; -import com.acethewildfire.acesbs.item.ModItems; -import me.shedaniel.math.Point; -import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.client.gui.Renderer; -import me.shedaniel.rei.api.client.gui.widgets.Widget; -import me.shedaniel.rei.api.client.gui.widgets.Widgets; -import me.shedaniel.rei.api.client.registry.display.DisplayCategory; -import me.shedaniel.rei.api.common.category.CategoryIdentifier; -import me.shedaniel.rei.api.common.display.basic.BasicDisplay; -import me.shedaniel.rei.api.common.entry.EntryIngredient; -import me.shedaniel.rei.api.common.util.EntryStacks; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; - -import java.util.LinkedList; -import java.util.List; - -public class EntropicEvisceratorCategory implements DisplayCategory { - public static final Identifier GUI_TEXTURE = - Identifier.of(AcesBS.MOD_ID, "textures/gui/entropic_eviscerator/entropic_eviscerator_gui_rei.png"); - - public static final CategoryIdentifier ENTROPIC_EVISCERATOR = - CategoryIdentifier.of(AcesBS.MOD_ID, "entropic_eviscerator"); - - @Override - public CategoryIdentifier getCategoryIdentifier() { - return ENTROPIC_EVISCERATOR; - } - - @Override - public Text getTitle() { - return Text.translatable("block.acesbs.entropic_eviscerator"); - } - - @Override - public Renderer getIcon() { - return EntryStacks.of(ModBlocks.ENTROPIC_EVISCERATOR.asItem().getDefaultStack()); - } - - @Override - public List setupDisplay(BasicDisplay display, Rectangle bounds) { - Point startPoint = new Point(bounds.getCenterX() - 87, bounds.getCenterY() - 41); - List widgets = new LinkedList<>(); - - widgets.add(Widgets.createTexturedWidget(GUI_TEXTURE, new Rectangle(startPoint.x, startPoint.y, 175, 82))); - - widgets.add(Widgets.createSlot(new Point(startPoint.x + 80, startPoint.y + 17)).entries(display.getInputEntries().get(0)).markInput()); - widgets.add(Widgets.createSlot(new Point(startPoint.x + 8, startPoint.y + 17)).entries(EntryIngredient.of(EntryStacks.of(ModItems.STABLE_ENTROPY)))); - widgets.add(Widgets.createSlot(new Point(startPoint.x + 80, startPoint.y + 53)).entries(display.getOutputEntries().get(0)).markOutput()); - - return widgets; - } - - @Override - public int getDisplayHeight() { - return 90; - } -} diff --git a/src/main/java/com/acethewildfire/acesbs/compat/EntropicEvisceratorDisplay.java b/src/main/java/com/acethewildfire/acesbs/compat/EntropicEvisceratorDisplay.java deleted file mode 100644 index b3cdf0e..0000000 --- a/src/main/java/com/acethewildfire/acesbs/compat/EntropicEvisceratorDisplay.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.acethewildfire.acesbs.compat; - -import com.acethewildfire.acesbs.recipe.EntropicEvisceratorRecipe; -import me.shedaniel.rei.api.common.category.CategoryIdentifier; -import me.shedaniel.rei.api.common.display.Display; -import me.shedaniel.rei.api.common.display.DisplaySerializer; -import me.shedaniel.rei.api.common.display.basic.BasicDisplay; -import me.shedaniel.rei.api.common.entry.EntryIngredient; -import me.shedaniel.rei.api.common.util.EntryIngredients; -import me.shedaniel.rei.api.common.util.EntryStacks; -import net.minecraft.recipe.RecipeEntry; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class EntropicEvisceratorDisplay extends BasicDisplay { - private RecipeEntry recipe; - private float xp; - private double cookTime; - - public EntropicEvisceratorDisplay(RecipeEntry recipe){ - super( - List.of(EntryIngredients.ofIngredient(recipe.value().getIngredients().get(0))), - List.of(EntryIngredient.of(EntryStacks.of(recipe.value().output())))); - } - - @Override - public CategoryIdentifier getCategoryIdentifier() { - return EntropicEvisceratorCategory.ENTROPIC_EVISCERATOR; - } - - @Override - public @Nullable DisplaySerializer getSerializer() { - return null; - } -} diff --git a/src/main/java/com/acethewildfire/acesbs/compat/EntropicStabilizerCategory.java b/src/main/java/com/acethewildfire/acesbs/compat/EntropicStabilizerCategory.java deleted file mode 100644 index 99a4d77..0000000 --- a/src/main/java/com/acethewildfire/acesbs/compat/EntropicStabilizerCategory.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.acethewildfire.acesbs.compat; - -import com.acethewildfire.acesbs.AcesBS; -import com.acethewildfire.acesbs.block.ModBlocks; -import me.shedaniel.math.Point; -import me.shedaniel.math.Rectangle; -import me.shedaniel.rei.api.client.gui.Renderer; -import me.shedaniel.rei.api.client.gui.widgets.Widget; -import me.shedaniel.rei.api.client.gui.widgets.Widgets; -import me.shedaniel.rei.api.client.registry.display.DisplayCategory; -import me.shedaniel.rei.api.common.category.CategoryIdentifier; -import me.shedaniel.rei.api.common.display.basic.BasicDisplay; -import me.shedaniel.rei.api.common.entry.EntryIngredient; -import me.shedaniel.rei.api.common.util.EntryStacks; -import net.minecraft.item.Items; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; - -import java.util.LinkedList; -import java.util.List; - -public class EntropicStabilizerCategory implements DisplayCategory { - public static final Identifier GUI_TEXTURE = - Identifier.of(AcesBS.MOD_ID, "textures/gui/entropic_stabilizer/entropic_stabilizer_gui_rei.png"); - - public static final CategoryIdentifier ENTROPIC_STABILIZER = - CategoryIdentifier.of(AcesBS.MOD_ID, "entropic_stabilizer"); - - @Override - public CategoryIdentifier getCategoryIdentifier() { - return ENTROPIC_STABILIZER; - } - - @Override - public Text getTitle() { - return Text.translatable("block.acesbs.entropic_stabilizer"); - } - - @Override - public Renderer getIcon() { - return EntryStacks.of(ModBlocks.ENTROPIC_STABILIZER.asItem().getDefaultStack()); - } - - @Override - public List setupDisplay(BasicDisplay display, Rectangle bounds) { - Point startPoint = new Point(bounds.getCenterX() - 87, bounds.getCenterY() - 41); - List widgets = new LinkedList<>(); - - widgets.add(Widgets.createTexturedWidget(GUI_TEXTURE, new Rectangle(startPoint.x, startPoint.y, 175, 82))); - - widgets.add(Widgets.createSlot(new Point(startPoint.x + 56, startPoint.y + 17)).entries(display.getInputEntries().get(0)).markInput()); - widgets.add(Widgets.createSlot(new Point(startPoint.x + 56, startPoint.y + 53)).entries(EntryIngredient.of(EntryStacks.of(Items.BLUE_ICE)))); - widgets.add(Widgets.createSlot(new Point(startPoint.x + 116, startPoint.y + 35)).entries(display.getOutputEntries().get(0)).markOutput()); - - return widgets; - } - - @Override - public int getDisplayHeight() { - return 90; - } -} diff --git a/src/main/java/com/acethewildfire/acesbs/compat/EntropicStabilizerDisplay.java b/src/main/java/com/acethewildfire/acesbs/compat/EntropicStabilizerDisplay.java deleted file mode 100644 index 2c8532c..0000000 --- a/src/main/java/com/acethewildfire/acesbs/compat/EntropicStabilizerDisplay.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.acethewildfire.acesbs.compat; - -import com.acethewildfire.acesbs.recipe.EntropicStabilizerRecipe; -import me.shedaniel.rei.api.common.category.CategoryIdentifier; -import me.shedaniel.rei.api.common.display.Display; -import me.shedaniel.rei.api.common.display.DisplaySerializer; -import me.shedaniel.rei.api.common.display.basic.BasicDisplay; -import me.shedaniel.rei.api.common.entry.EntryIngredient; -import me.shedaniel.rei.api.common.util.EntryIngredients; -import me.shedaniel.rei.api.common.util.EntryStacks; -import net.minecraft.recipe.RecipeEntry; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class EntropicStabilizerDisplay extends BasicDisplay { - private RecipeEntry recipe; - private float xp; - private double cookTime; - - public EntropicStabilizerDisplay(RecipeEntry recipe){ - super( - List.of(EntryIngredients.ofIngredient(recipe.value().getIngredients().get(0))), - List.of(EntryIngredient.of(EntryStacks.of(recipe.value().output())))); - } - - @Override - public CategoryIdentifier getCategoryIdentifier() { - return EntropicStabilizerCategory.ENTROPIC_STABILIZER; - } - - @Override - public @Nullable DisplaySerializer getSerializer() { - return null; - } -} diff --git a/src/main/java/com/acethewildfire/acesbs/component/ModDataComponentTypes.java b/src/main/java/com/acethewildfire/acesbs/component/ModDataComponentTypes.java index 7389b28..400f19b 100644 --- a/src/main/java/com/acethewildfire/acesbs/component/ModDataComponentTypes.java +++ b/src/main/java/com/acethewildfire/acesbs/component/ModDataComponentTypes.java @@ -26,7 +26,7 @@ public class ModDataComponentTypes { // register("pipe_variant", integerBuilder -> integerBuilder.codec(Codec.INT).packetCodec(PacketCodecs.INTEGER)); public static final ComponentType COMMAND_ACTIVE = - register("command_active", booleanBuilder -> booleanBuilder.codec(Codec.BOOL).packetCodec(PacketCodecs.BOOL)); + register("command_active", booleanBuilder -> booleanBuilder.codec(Codec.BOOL).packetCodec(PacketCodecs.BOOLEAN)); private static ComponentType register(String name, UnaryOperator> builderOperator){ diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java index d3849f5..bd8cc30 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModItemTagProvider.java @@ -74,9 +74,6 @@ public class ModItemTagProvider extends FabricTagProvider.ItemTagProvider { getOrCreateTagBuilder(ItemTags.TRIM_MATERIALS) .add(PrismaSteelItems.PRISMA_STEEL) .add(AshenSteelItems.ASHEN_STEEL); - getOrCreateTagBuilder(ItemTags.TRIM_TEMPLATES) - .add(PrismaSteelItems.PRISMA_SMITHING_TEMPLATE) - .add(AshenSteelItems.ASHEN_SMITHING_TEMPLATE); getOrCreateTagBuilder(ItemTags.CREEPER_DROP_MUSIC_DISCS) .add(ModItems.CRAB_RAVE_MUSIC_DISC); getOrCreateTagBuilder(ItemTags.LOGS_THAT_BURN) diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java index 2d895a8..eee31bc 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModModelProvider.java @@ -1,17 +1,20 @@ package com.acethewildfire.acesbs.datagen; -import com.acethewildfire.acesbs.AcesBS; import com.acethewildfire.acesbs.block.ModBlocks; import com.acethewildfire.acesbs.block.custom.EvilBlock; import com.acethewildfire.acesbs.block.custom.TobaccoCrop; +import com.acethewildfire.acesbs.component.ModDataComponentTypes; import com.acethewildfire.acesbs.item.AshenSteelItems; import com.acethewildfire.acesbs.item.ModArmorMaterials; import com.acethewildfire.acesbs.item.ModItems; import com.acethewildfire.acesbs.item.PrismaSteelItems; +import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; -import net.minecraft.data.client.*; -import net.minecraft.entity.EquipmentSlot; +import net.minecraft.client.data.*; +import net.minecraft.client.item.ItemAsset; +import net.minecraft.client.render.item.model.ConditionItemModel; +import net.minecraft.client.render.item.model.ItemModel; +import net.minecraft.client.render.item.property.bool.HasComponentProperty; import net.minecraft.item.ArmorItem; import net.minecraft.util.Identifier; @@ -39,7 +42,7 @@ public class ModModelProvider extends FabricModelProvider { blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.INFERNAL_ASHES_BLOCK); // blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.CRYSTAL_ENTROPY); - blockStateModelGenerator.registerGlassPane(ModBlocks.CRYSTAL_ENTROPY, ModBlocks.CRYSTAL_ENTROPY_PANE); + blockStateModelGenerator.registerGlassAndPane(ModBlocks.CRYSTAL_ENTROPY, ModBlocks.CRYSTAL_ENTROPY_PANE); BlockStateModelGenerator.BlockTexturePool lizardPool = blockStateModelGenerator.registerCubeAllModelTexturePool(ModBlocks.LIZARD_PLANKS); lizardPool.button(ModBlocks.LIZARD_BUTTON); @@ -62,7 +65,7 @@ public class ModModelProvider extends FabricModelProvider { blockStateModelGenerator.registerSingleton(ModBlocks.LEMONWOOD_LEAVES, TexturedModel.LEAVES); // blockStateModelGenerator.registerTintableCross(ModBlocks.LEMONWOOD_SAPLING, BlockStateModelGenerator.TintType.NOT_TINTED); - blockStateModelGenerator.registerFlowerPotPlant(ModBlocks.LEMONWOOD_SAPLING, ModBlocks.POTTED_LEMONWOOD_SAPLING, BlockStateModelGenerator.TintType.NOT_TINTED); + blockStateModelGenerator.registerFlowerPotPlant(ModBlocks.LEMONWOOD_SAPLING, ModBlocks.POTTED_LEMONWOOD_SAPLING, BlockStateModelGenerator.CrossType.NOT_TINTED); blockStateModelGenerator.registerDoor(ModBlocks.LEMONWOOD_DOOR); blockStateModelGenerator.registerTrapdoor(ModBlocks.LEMONWOOD_TRAPDOOR); @@ -101,6 +104,8 @@ public class ModModelProvider extends FabricModelProvider { itemModelGenerator.register(ModItems.CRAB_RAVE_MUSIC_DISC, Models.GENERATED); itemModelGenerator.register(ModItems.THOT_BEGONE, Models.HANDHELD); + itemModelGenerator.upload(ModItems.KAUPEN_BOW, Models.BOW); + itemModelGenerator.registerBow(ModItems.KAUPEN_BOW); itemModelGenerator.register(PrismaSteelItems.PRISMA_STEEL_SWORD, Models.HANDHELD); itemModelGenerator.register(PrismaSteelItems.PRISMA_STEEL_PICKAXE, Models.HANDHELD); @@ -109,14 +114,10 @@ public class ModModelProvider extends FabricModelProvider { itemModelGenerator.register(PrismaSteelItems.PRISMA_STEEL_SHOVEL, Models.HANDHELD); itemModelGenerator.register(PrismaSteelItems.PRISMA_STEEL_HOE, Models.HANDHELD); - itemModelGenerator.registerArmor(((ArmorItem) PrismaSteelItems.PRISMA_STEEL_HELMET), Identifier.of(AcesBS.MOD_ID, "prisma_steel"), - ModArmorMaterials.PRISMA, EquipmentSlot.HEAD); - itemModelGenerator.registerArmor(((ArmorItem) PrismaSteelItems.PRISMA_STEEL_CHESTPLATE), Identifier.of(AcesBS.MOD_ID, "prisma_steel"), - ModArmorMaterials.PRISMA, EquipmentSlot.CHEST); - itemModelGenerator.registerArmor(((ArmorItem) PrismaSteelItems.PRISMA_STEEL_LEGGINGS), Identifier.of(AcesBS.MOD_ID, "prisma_steel"), - ModArmorMaterials.PRISMA, EquipmentSlot.LEGS); - itemModelGenerator.registerArmor(((ArmorItem) PrismaSteelItems.PRISMA_STEEL_BOOTS), Identifier.of(AcesBS.MOD_ID, "prisma_steel"), - ModArmorMaterials.PRISMA, EquipmentSlot.FEET); + itemModelGenerator.registerArmor(((ArmorItem) PrismaSteelItems.PRISMA_STEEL_HELMET), ModArmorMaterials.PRISMA_KEY, "helmet", false); + itemModelGenerator.registerArmor(((ArmorItem) PrismaSteelItems.PRISMA_STEEL_CHESTPLATE), ModArmorMaterials.PRISMA_KEY, "chestplate", false); + itemModelGenerator.registerArmor(((ArmorItem) PrismaSteelItems.PRISMA_STEEL_LEGGINGS), ModArmorMaterials.PRISMA_KEY, "leggings", false); + itemModelGenerator.registerArmor(((ArmorItem) PrismaSteelItems.PRISMA_STEEL_BOOTS), ModArmorMaterials.PRISMA_KEY, "boots", false); itemModelGenerator.register(AshenSteelItems.ASHEN_STEEL_SWORD, Models.HANDHELD); itemModelGenerator.register(AshenSteelItems.ASHEN_STEEL_PICKAXE, Models.HANDHELD); @@ -125,26 +126,58 @@ public class ModModelProvider extends FabricModelProvider { itemModelGenerator.register(AshenSteelItems.ASHEN_STEEL_SHOVEL, Models.HANDHELD); itemModelGenerator.register(AshenSteelItems.ASHEN_STEEL_HOE, Models.HANDHELD); - itemModelGenerator.registerArmor(((ArmorItem) AshenSteelItems.ASHEN_STEEL_HELMET), Identifier.of(AcesBS.MOD_ID, "ashen_steel"), - ModArmorMaterials.ASHEN, EquipmentSlot.HEAD); - itemModelGenerator.registerArmor(((ArmorItem) AshenSteelItems.ASHEN_STEEL_CHESTPLATE), Identifier.of(AcesBS.MOD_ID, "ashen_steel"), - ModArmorMaterials.ASHEN, EquipmentSlot.CHEST); - itemModelGenerator.registerArmor(((ArmorItem) AshenSteelItems.ASHEN_STEEL_LEGGINGS), Identifier.of(AcesBS.MOD_ID, "ashen_steel"), - ModArmorMaterials.ASHEN, EquipmentSlot.LEGS); - itemModelGenerator.registerArmor(((ArmorItem) AshenSteelItems.ASHEN_STEEL_BOOTS), Identifier.of(AcesBS.MOD_ID, "ashen_steel"), - ModArmorMaterials.ASHEN, EquipmentSlot.FEET); + itemModelGenerator.registerArmor(((ArmorItem) AshenSteelItems.ASHEN_STEEL_HELMET), ModArmorMaterials.ASHEN_KEY, "helmet", false); + itemModelGenerator.registerArmor(((ArmorItem) AshenSteelItems.ASHEN_STEEL_CHESTPLATE), ModArmorMaterials.ASHEN_KEY, "chestplate", false); + itemModelGenerator.registerArmor(((ArmorItem) AshenSteelItems.ASHEN_STEEL_LEGGINGS), ModArmorMaterials.ASHEN_KEY, "leggings", false); + itemModelGenerator.registerArmor(((ArmorItem) AshenSteelItems.ASHEN_STEEL_BOOTS), ModArmorMaterials.ASHEN_KEY, "boots", false); - itemModelGenerator.registerArmor(((ArmorItem) ModItems.BERSERKERS_PAULDRON), Identifier.of(AcesBS.MOD_ID, "berserkers"), - ModArmorMaterials.BERSERKERS, EquipmentSlot.CHEST); - itemModelGenerator.registerArmor(((ArmorItem) ModItems.WILDFIRE_BOOTS), Identifier.of(AcesBS.MOD_ID, "wildfire"), - ModArmorMaterials.WILDFIRE, EquipmentSlot.FEET); - itemModelGenerator.registerArmor(((ArmorItem) ModItems.SOVS_PLATE_CARRIER), Identifier.of(AcesBS.MOD_ID, "plates"), - ModArmorMaterials.PLATES, EquipmentSlot.CHEST); + itemModelGenerator.registerArmor(((ArmorItem) ModItems.BERSERKERS_PAULDRON), ModArmorMaterials.BERSERKERS_KEY, "chestplate", false); + itemModelGenerator.registerArmor(((ArmorItem) ModItems.WILDFIRE_BOOTS), ModArmorMaterials.WILDFIRE_KEY, "boots", false); + itemModelGenerator.registerArmor(((ArmorItem) ModItems.SOVS_PLATE_CARRIER), ModArmorMaterials.PLATES_KEY, "chestplate", false); itemModelGenerator.register(ModItems.FREN_SPAWN_EGG, new Model(Optional.of(Identifier.of("item/template_spawn_egg")), Optional.empty())); itemModelGenerator.register(ModItems.VULGAR_BONES_SPAWN_EGG, new Model(Optional.of(Identifier.of("item/template_spawn_egg")), Optional.empty())); + + ItemModel.Unbaked unbakedWand = ItemModels.basic(itemModelGenerator.upload(ModItems.WAND, Models.GENERATED)); + ItemModel.Unbaked unbakedUsedWand = ItemModels.basic(itemModelGenerator.registerSubModel(ModItems.WAND, "_used", Models.GENERATED)); + itemModelGenerator.output.accept(ModItems.WAND, + new ItemAsset(new ConditionItemModel.Unbaked(new HasComponentProperty(ModDataComponentTypes.COORDINATES, false), + unbakedUsedWand, unbakedWand), + new ItemAsset.Properties(false)).model()); + +// ItemModel.Unbaked unbakedCigarette = ItemModels.basic(itemModelGenerator.upload(ModItems.CIGARETTE, Models.GENERATED)); +// ItemModel.Unbaked unbakedUsedCigarette = ItemModels.basic(itemModelGenerator.registerSubModel(ModItems.CIGARETTE, "_smoking", Models.GENERATED)); +// itemModelGenerator.output.accept(ModItems.CIGARETTE, +// new ItemAsset(new ConditionItemModel.Unbaked(new HasComponentProperty(ModDataComponentTypes.SMOKING, false), +// unbakedUsedCigarette, unbakedCigarette), +// new ItemAsset.Properties(false)).model()); +// +// itemModelGenerator.output.accept(ModItems.CIGARETTE_FUNNY, +// new ItemAsset(new ConditionItemModel.Unbaked(new HasComponentProperty(ModDataComponentTypes.SMOKING, false), +// unbakedUsedCigarette, unbakedCigarette), +// new ItemAsset.Properties(false)).model()); +// +// itemModelGenerator.output.accept(ModItems.CIGARETTE_LEMON, +// new ItemAsset(new ConditionItemModel.Unbaked(new HasComponentProperty(ModDataComponentTypes.SMOKING, false), +// unbakedUsedCigarette, unbakedCigarette), +// new ItemAsset.Properties(false)).model()); +// +// ItemModel.Unbaked unbakedBubblePipe = ItemModels.basic(itemModelGenerator.upload(ModItems.BUBBLE_PIPE, Models.GENERATED)); +// ItemModel.Unbaked unbakedUsedBubblePipe = ItemModels.basic(itemModelGenerator.registerSubModel(ModItems.BUBBLE_PIPE, "_smoking", Models.GENERATED)); +// itemModelGenerator.output.accept(ModItems.BUBBLE_PIPE, +// new ItemAsset(new ConditionItemModel.Unbaked(new HasComponentProperty(ModDataComponentTypes.SMOKING, false), +// unbakedUsedBubblePipe, unbakedBubblePipe), +// new ItemAsset.Properties(false)).model()); +// +// ItemModel.Unbaked unbakedCommandCore = ItemModels.basic(itemModelGenerator.upload(ModItems.COMMAND_CORE, Models.GENERATED)); +// ItemModel.Unbaked unbakedUsedCommandCore = ItemModels.basic(itemModelGenerator.registerSubModel(ModItems.COMMAND_CORE, "_active", Models.GENERATED)); +// itemModelGenerator.output.accept(ModItems.COMMAND_CORE, +// new ItemAsset(new ConditionItemModel.Unbaked(new HasComponentProperty(ModDataComponentTypes.SMOKING, false), +// unbakedUsedCommandCore, unbakedCommandCore), +// new ItemAsset.Properties(false)).model()); } + } diff --git a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java index c4e5f57..0d72bfa 100644 --- a/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java +++ b/src/main/java/com/acethewildfire/acesbs/datagen/ModRecipeProvider.java @@ -9,10 +9,8 @@ import com.acethewildfire.acesbs.util.ModTags; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.minecraft.block.Blocks; -import net.minecraft.data.server.recipe.RecipeExporter; -import net.minecraft.data.server.recipe.RecipeGenerator; -import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; -import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; +import net.minecraft.data.recipe.RecipeExporter; +import net.minecraft.data.recipe.RecipeGenerator; import net.minecraft.item.Item; import net.minecraft.item.ItemConvertible; import net.minecraft.item.Items; diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModArmorMaterials.java b/src/main/java/com/acethewildfire/acesbs/item/ModArmorMaterials.java index ec84983..faa0517 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModArmorMaterials.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModArmorMaterials.java @@ -2,14 +2,16 @@ package com.acethewildfire.acesbs.item; import com.acethewildfire.acesbs.AcesBS; import com.acethewildfire.acesbs.util.ModTags; +import net.minecraft.client.render.entity.equipment.EquipmentModel; import net.minecraft.item.ArmorItem; import net.minecraft.item.Items; import net.minecraft.item.equipment.ArmorMaterial; -import net.minecraft.item.equipment.EquipmentModel; +import net.minecraft.item.equipment.EquipmentAsset; import net.minecraft.item.equipment.EquipmentType; import net.minecraft.recipe.Ingredient; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.sound.SoundEvents; import net.minecraft.util.Identifier; @@ -26,6 +28,16 @@ public class ModArmorMaterials { public static EquipmentModel PLATES = EquipmentModel.builder().addHumanoidLayers(Identifier.of(AcesBS.MOD_ID, "plates")).build(); public static EquipmentModel BERSERKERS = EquipmentModel.builder().addHumanoidLayers(Identifier.of(AcesBS.MOD_ID, "berserkers")).build(); + static RegistryKey> REGISTRY_KEY = RegistryKey.ofRegistry(Identifier.ofVanilla("equipment_asset")); + + public static final RegistryKey PRISMA_KEY = RegistryKey.of(REGISTRY_KEY, Identifier.of(AcesBS.MOD_ID, "prisma_steel")); + public static final RegistryKey ASHEN_KEY = RegistryKey.of(REGISTRY_KEY, Identifier.of(AcesBS.MOD_ID, "ashen_steel")); + + public static final RegistryKey WILDFIRE_KEY = RegistryKey.of(REGISTRY_KEY, Identifier.of(AcesBS.MOD_ID, "wildfire")); + public static final RegistryKey PLATES_KEY = RegistryKey.of(REGISTRY_KEY, Identifier.of(AcesBS.MOD_ID, "plates")); + public static final RegistryKey BERSERKERS_KEY = RegistryKey.of(REGISTRY_KEY, Identifier.of(AcesBS.MOD_ID, "berserkers")); + + public static final ArmorMaterial PRISMA_STEEL_ARMOR_MATERIAL = new ArmorMaterial( 500, Util.make(new EnumMap<>(EquipmentType.class), map -> { @@ -35,7 +47,7 @@ public class ModArmorMaterials { map.put(EquipmentType.HELMET, 2); map.put(EquipmentType.BODY, 4); }), 20, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 0, 0, ModTags.Items.PRISMA_REPAIR, - Identifier.of(AcesBS.MOD_ID, "prisma_steel")); + PRISMA_KEY); public static final ArmorMaterial ASHEN_STEEL_ARMOR_MATERIAL = new ArmorMaterial( 500, @@ -46,7 +58,7 @@ public class ModArmorMaterials { map.put(EquipmentType.HELMET, 2); map.put(EquipmentType.BODY, 4); }), 20, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 0, 0, ModTags.Items.ASHEN_REPAIR, - Identifier.of(AcesBS.MOD_ID, "ashen_steel")); + ASHEN_KEY); public static final ArmorMaterial WILDFIRE_ARMOR_MATERIAL = new ArmorMaterial( 500, @@ -57,7 +69,7 @@ public class ModArmorMaterials { map.put(EquipmentType.HELMET, 3); map.put(EquipmentType.BODY, 11); }), 20, SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, 0, 0, ModTags.Items.WILDFIRE_REPAIR, - Identifier.of(AcesBS.MOD_ID, "wildfire")); + WILDFIRE_KEY); public static final ArmorMaterial PLATES_ARMOR_MATERIAL = new ArmorMaterial( 500, @@ -68,7 +80,7 @@ public class ModArmorMaterials { map.put(EquipmentType.HELMET, 0); map.put(EquipmentType.BODY, 0); }), 20, SoundEvents.ITEM_ARMOR_EQUIP_NETHERITE, 0, 0, ModTags.Items.PLATES_REPAIR, - Identifier.of(AcesBS.MOD_ID, "plates")); + PLATES_KEY); public static final ArmorMaterial BERSERKERS_ARMOR_MATERIAL = new ArmorMaterial( 500, @@ -79,6 +91,6 @@ public class ModArmorMaterials { map.put(EquipmentType.HELMET, 2); map.put(EquipmentType.BODY, 4); }), 20, SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, 0, 0, ModTags.Items.BERSERKERS_REPAIR, - Identifier.of(AcesBS.MOD_ID, "berserkers")); + BERSERKERS_KEY); } diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModItems.java b/src/main/java/com/acethewildfire/acesbs/item/ModItems.java index fe825d6..36eb93e 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModItems.java +++ b/src/main/java/com/acethewildfire/acesbs/item/ModItems.java @@ -212,9 +212,9 @@ public class ModItems { public static final Item AQUARIUM_GRAVEL = registerItem("aquarium_gravel", setting -> new AquariumGravel(setting.maxCount(1))); public static final Item FREN_SPAWN_EGG = registerItem("fren_spawn_egg", - setting -> new SpawnEggItem(ModEntities.FREN, 894731, 0, setting)); + setting -> new SpawnEggItem(ModEntities.FREN, setting)); public static final Item VULGAR_BONES_SPAWN_EGG = registerItem("vulgar_bones_spawn_egg", - setting -> new SpawnEggItem(ModEntities.VULGAR_BONES, 13082270, 0, setting)); + setting -> new SpawnEggItem(ModEntities.VULGAR_BONES, setting)); diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/ModArmorItem.java b/src/main/java/com/acethewildfire/acesbs/item/custom/ModArmorItem.java index ba5baa5..07f245a 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/ModArmorItem.java +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/ModArmorItem.java @@ -95,7 +95,7 @@ public class ModArmorItem extends ArmorItem { EquippableComponent equippableComponentBreastplate = breastplate.getComponents().get(DataComponentTypes.EQUIPPABLE); EquippableComponent equippableComponentHelmet = helmet.getComponents().get(DataComponentTypes.EQUIPPABLE); - return equippableComponentBoots.model().get().equals(material.modelId()) && equippableComponentLeggings.model().get().equals(material.modelId()) && - equippableComponentBreastplate.model().get().equals(material.modelId()) && equippableComponentHelmet.model().get().equals(material.modelId()); + return equippableComponentBoots.assetId().get().equals(material.assetId()) && equippableComponentLeggings.assetId().get().equals(material.assetId()) && + equippableComponentBreastplate.assetId().get().equals(material.assetId()) && equippableComponentHelmet.assetId().get().equals(material.assetId()); } } \ No newline at end of file diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/WildfireArmorItem.java b/src/main/java/com/acethewildfire/acesbs/item/custom/WildfireArmorItem.java index cfb478c..4ae64b2 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/WildfireArmorItem.java +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/WildfireArmorItem.java @@ -42,7 +42,7 @@ public class WildfireArmorItem extends ArmorItem { packet = switch (tick % 4){ case 0 -> new ParticleS2CPacket( ParticleTypes.FLAME, - true, + true, false, (float) x, (float) y + 0.2f, (float) z, 0.2f, 0f, 0.2f, 0.01f, @@ -50,7 +50,7 @@ public class WildfireArmorItem extends ArmorItem { ); case 1 -> new ParticleS2CPacket( ParticleTypes.SOUL_FIRE_FLAME, - true, + true, false, (float) x, (float) y + 0.2f, (float) z, 0.2f, 0f, 0.2f, 0.01f, @@ -58,7 +58,7 @@ public class WildfireArmorItem extends ArmorItem { ); case 2 -> new ParticleS2CPacket( ModParticles.PURPLE_FLAME, - true, + true, false, (float) x, (float) y + 0.2f, (float) z, 0.2f, 0f, 0.2f, 0.01f, @@ -66,7 +66,7 @@ public class WildfireArmorItem extends ArmorItem { ); case 3 -> new ParticleS2CPacket( ModParticles.GREEN_FLAME, - true, + true, false, (float) x, (float) y + 0.2f, (float) z, 0.2f, 0f, 0.2f, 0.01f, @@ -77,7 +77,7 @@ public class WildfireArmorItem extends ArmorItem { } else { packet = new ParticleS2CPacket( ParticleTypes.FLAME, - true, + true, false, (float) x, (float) y + 0.2f, (float) z, 0.2f, 0f, 0.2f, 0.01f, diff --git a/src/main/java/com/acethewildfire/acesbs/trim/ModTrimMaterials.java b/src/main/java/com/acethewildfire/acesbs/trim/ModTrimMaterials.java index f74c243..179f749 100644 --- a/src/main/java/com/acethewildfire/acesbs/trim/ModTrimMaterials.java +++ b/src/main/java/com/acethewildfire/acesbs/trim/ModTrimMaterials.java @@ -27,15 +27,15 @@ public class ModTrimMaterials { public static void bootstrap (Registerable registerable){ register(registerable, PRISMA_STEEL, Registries.ITEM.getEntry(PrismaSteelItems.PRISMA_STEEL), - Style.EMPTY.withColor(TextColor.parse("#B16491").getOrThrow()), 1.0f); + Style.EMPTY.withColor(TextColor.parse("#B16491").getOrThrow())); register(registerable, ASHEN_STEEL, Registries.ITEM.getEntry(AshenSteelItems.ASHEN_STEEL), - Style.EMPTY.withColor(TextColor.parse("#b93425").getOrThrow()), 0.4f); + Style.EMPTY.withColor(TextColor.parse("#b93425").getOrThrow())); } private static void register(Registerable registerable, RegistryKey armorTrimKey, - RegistryEntry item, Style style, float itemModelIndex) { - ArmorTrimMaterial trimMaterial = new ArmorTrimMaterial(armorTrimKey.getValue().getPath(), item, itemModelIndex, Map.of(), + RegistryEntry item, Style style) { + ArmorTrimMaterial trimMaterial = new ArmorTrimMaterial(armorTrimKey.getValue().getPath(), item, Map.of(), Text.translatable(Util.createTranslationKey("trim_material", armorTrimKey.getValue())).fillStyle(style)); registerable.register(armorTrimKey, trimMaterial); diff --git a/src/main/java/com/acethewildfire/acesbs/util/ModModelPredicates.java b/src/main/java/com/acethewildfire/acesbs/util/ModModelPredicates.java deleted file mode 100644 index 14b4bd7..0000000 --- a/src/main/java/com/acethewildfire/acesbs/util/ModModelPredicates.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.acethewildfire.acesbs.util; - -import com.acethewildfire.acesbs.AcesBS; -import com.acethewildfire.acesbs.component.ModDataComponentTypes; -import com.acethewildfire.acesbs.item.ModItems; -import net.minecraft.client.item.ModelPredicateProviderRegistry; -import net.minecraft.item.Item; -import net.minecraft.util.Identifier; - -public class ModModelPredicates { - - public static void registerModelPredicates () { - ModelPredicateProviderRegistry.register(ModItems.WAND, Identifier.of(AcesBS.MOD_ID, "used"), - (stack, world, entity, seed) -> stack.get(ModDataComponentTypes.COORDINATES) != null ? 1f : 0f); - - ModelPredicateProviderRegistry.register(ModItems.COMMAND_CORE, Identifier.of(AcesBS.MOD_ID, "command_active"), - (stack, world, entity, seed) -> Boolean.TRUE.equals(stack.get(ModDataComponentTypes.COMMAND_ACTIVE)) ? 1f : 0f); - - ModelPredicateProviderRegistry.register(ModItems.CIGARETTE, Identifier.of(AcesBS.MOD_ID, "smoking"), - (stack, world, entity, seed) -> Boolean.TRUE.equals(stack.get(ModDataComponentTypes.SMOKING)) ? 1f : 0f); - - ModelPredicateProviderRegistry.register(ModItems.CIGARETTE_FUNNY, Identifier.of(AcesBS.MOD_ID, "smoking"), - (stack, world, entity, seed) -> Boolean.TRUE.equals(stack.get(ModDataComponentTypes.SMOKING)) ? 1f : 0f); - - ModelPredicateProviderRegistry.register(ModItems.CIGARETTE_LEMON, Identifier.of(AcesBS.MOD_ID, "smoking"), - (stack, world, entity, seed) -> Boolean.TRUE.equals(stack.get(ModDataComponentTypes.SMOKING)) ? 1f : 0f); - - ModelPredicateProviderRegistry.register(ModItems.BUBBLE_PIPE, Identifier.of(AcesBS.MOD_ID, "smoking"), - (stack, world, entity, seed) -> Boolean.TRUE.equals(stack.get(ModDataComponentTypes.SMOKING)) ? 1f : 0f); - -// ModelPredicateProviderRegistry.register(ModItems.BUBBLE_PIPE, Identifier.of(AcesBS.MOD_ID, "pipe_variant"), -// (stack, world, entity, seed) -> stack.get(ModDataComponentTypes.PIPE_VARIANT)); - - registerCustomBow(ModItems.KAUPEN_BOW); - } - - private static void registerCustomBow(Item item){ - ModelPredicateProviderRegistry.register(item, Identifier.ofVanilla("pull"), (stack, world, entity, seed) -> { - if (entity == null) { - return 0.0F; - } else { - return entity.getActiveItem() != stack ? 0.0F : (stack.getMaxUseTime(entity) - entity.getItemUseTimeLeft()) / 20.0F; - } - }); - ModelPredicateProviderRegistry.register( - item, - Identifier.ofVanilla("pulling"), - (stack, world, entity, seed) -> entity != null && entity.isUsingItem() && entity.getActiveItem() == stack ? 1.0F : 0.0F - ); - } -} diff --git a/src/main/resources/assets/acesbs/items/bubble_pipe.json b/src/main/resources/assets/acesbs/items/bubble_pipe.json new file mode 100644 index 0000000..7df704d --- /dev/null +++ b/src/main/resources/assets/acesbs/items/bubble_pipe.json @@ -0,0 +1,15 @@ +{ + "model": { + "type": "minecraft:condition", + "component": "acesbs:smoking", + "on_false": { + "type": "minecraft:model", + "model": "acesbs:item/birch_pipe" + }, + "on_true": { + "type": "minecraft:model", + "model": "acesbs:item/bubble_pipe_smoking" + }, + "property": "minecraft:has_component" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/items/cigarette.json b/src/main/resources/assets/acesbs/items/cigarette.json new file mode 100644 index 0000000..42128df --- /dev/null +++ b/src/main/resources/assets/acesbs/items/cigarette.json @@ -0,0 +1,15 @@ +{ + "model": { + "type": "minecraft:condition", + "component": "acesbs:smoking", + "on_false": { + "type": "minecraft:model", + "model": "acesbs:item/cigarette" + }, + "on_true": { + "type": "minecraft:model", + "model": "acesbs:item/cigarette_smoking" + }, + "property": "minecraft:has_component" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/items/cigarette_funny.json b/src/main/resources/assets/acesbs/items/cigarette_funny.json new file mode 100644 index 0000000..42128df --- /dev/null +++ b/src/main/resources/assets/acesbs/items/cigarette_funny.json @@ -0,0 +1,15 @@ +{ + "model": { + "type": "minecraft:condition", + "component": "acesbs:smoking", + "on_false": { + "type": "minecraft:model", + "model": "acesbs:item/cigarette" + }, + "on_true": { + "type": "minecraft:model", + "model": "acesbs:item/cigarette_smoking" + }, + "property": "minecraft:has_component" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/items/cigarette_lemon.json b/src/main/resources/assets/acesbs/items/cigarette_lemon.json new file mode 100644 index 0000000..42128df --- /dev/null +++ b/src/main/resources/assets/acesbs/items/cigarette_lemon.json @@ -0,0 +1,15 @@ +{ + "model": { + "type": "minecraft:condition", + "component": "acesbs:smoking", + "on_false": { + "type": "minecraft:model", + "model": "acesbs:item/cigarette" + }, + "on_true": { + "type": "minecraft:model", + "model": "acesbs:item/cigarette_smoking" + }, + "property": "minecraft:has_component" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/items/combustible_lemon.json b/src/main/resources/assets/acesbs/items/combustible_lemon.json new file mode 100644 index 0000000..6be2c82 --- /dev/null +++ b/src/main/resources/assets/acesbs/items/combustible_lemon.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "acesbs:item/combustible_lemon" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/items/command_core.json b/src/main/resources/assets/acesbs/items/command_core.json new file mode 100644 index 0000000..7840873 --- /dev/null +++ b/src/main/resources/assets/acesbs/items/command_core.json @@ -0,0 +1,15 @@ +{ + "model": { + "type": "minecraft:condition", + "component": "acesbs:smoking", + "on_false": { + "type": "minecraft:model", + "model": "acesbs:item/command_core" + }, + "on_true": { + "type": "minecraft:model", + "model": "acesbs:item/command_core_active" + }, + "property": "minecraft:has_component" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/models/item/bubble_pipe.json b/src/main/resources/assets/acesbs/models/item/birch_pipe.json similarity index 100% rename from src/main/resources/assets/acesbs/models/item/bubble_pipe.json rename to src/main/resources/assets/acesbs/models/item/birch_pipe.json diff --git a/src/main/resources/assets/acesbs/models/item/smoking_bubble_pipe.json b/src/main/resources/assets/acesbs/models/item/bubble_pipe_smoking.json similarity index 100% rename from src/main/resources/assets/acesbs/models/item/smoking_bubble_pipe.json rename to src/main/resources/assets/acesbs/models/item/bubble_pipe_smoking.json diff --git a/src/main/resources/assets/acesbs/models/item/smoking_cigarette.json b/src/main/resources/assets/acesbs/models/item/cigarette_smoking.json similarity index 100% rename from src/main/resources/assets/acesbs/models/item/smoking_cigarette.json rename to src/main/resources/assets/acesbs/models/item/cigarette_smoking.json diff --git a/src/main/resources/assets/acesbs/models/item/kaupen_bow.json b/src/main/resources/assets/acesbs/models/item/kaupen_bow.json deleted file mode 100644 index b6c18d9..0000000 --- a/src/main/resources/assets/acesbs/models/item/kaupen_bow.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "acesbs:item/kaupen_bow" - }, - "display": { - "thirdperson_righthand": { - "rotation": [ -80, 260, -40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "thirdperson_lefthand": { - "rotation": [ -80, -280, 40 ], - "translation": [ -1, -2, 2.5 ], - "scale": [ 0.9, 0.9, 0.9 ] - }, - "firstperson_righthand": { - "rotation": [ 0, -90, 25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - }, - "firstperson_lefthand": { - "rotation": [ 0, 90, -25 ], - "translation": [ 1.13, 3.2, 1.13], - "scale": [ 0.68, 0.68, 0.68 ] - } - }, - "overrides": [ - { - "predicate": { - "pulling": 1 - }, - "model": "acesbs:item/kaupen_bow_pulling_0" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.65 - }, - "model": "acesbs:item/kaupen_bow_pulling_1" - }, - { - "predicate": { - "pulling": 1, - "pull": 0.9 - }, - "model": "acesbs:item/kaupen_bow_pulling_2" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/acesbs/models/item/wand.json b/src/main/resources/assets/acesbs/models/item/wand.json deleted file mode 100644 index 613b382..0000000 --- a/src/main/resources/assets/acesbs/models/item/wand.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/handheld_rod", - "textures": { - "layer0": "acesbs:item/wand" - }, - "overrides": [ - { - "predicate": { - "acesbs:used": 1 - }, - "model": "acesbs:item/wand_used" - } - ] -} \ No newline at end of file