From 1064d6e465fb2b0ad8b5f7de6ef85e9ef6b30b80 Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Tue, 14 Apr 2026 22:36:06 +0100 Subject: [PATCH 01/27] 26.1: begin --- build.gradle | 13 +- common/build.gradle | 6 +- .../block/LotusLilyCropBlock.java | 2 +- .../gametest/AAGameTest.java | 4 +- .../gametest/datagen/AAGameTestDatagen.java | 6 +- .../mixin/BrewingStandBlockEntityMixin.java | 2 +- .../additionaladditions/mixin/GuiMixin.java | 5 +- .../recipe/BrewingRecipe.java | 58 +++--- .../recipe/REICommonCompat.java | 25 --- .../additionaladditions/recipe/REICompat.java | 183 ------------------ .../recipe/SuspiciousDyeRecipe.java | 14 +- .../registry/AABlocks.java | 2 +- .../additionaladditions/registry/AAMisc.java | 4 +- .../additionaladditions/util/LootAdder.java | 1 - .../additionaladditions.accesswidener | 7 +- .../resources/additionaladditions.mixins.json | 2 +- fabric/build.gradle | 10 +- .../additionaladditions.fabric.mixins.json | 2 +- fabric/src/main/resources/fabric.mod.json | 6 - gradle.properties | 11 +- gradle/wrapper/gradle-wrapper.properties | 2 +- neoforge/build.gradle | 14 +- .../neoforge/REINeoforgeCommonCompat.java | 8 - .../recipe/neoforge/REINeoforgeCompat.java | 8 - .../additionaladditions.neoforge.mixins.json | 2 +- 25 files changed, 86 insertions(+), 311 deletions(-) delete mode 100644 common/src/main/java/one/dqu/additionaladditions/recipe/REICommonCompat.java delete mode 100644 common/src/main/java/one/dqu/additionaladditions/recipe/REICompat.java delete mode 100644 neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/REINeoforgeCommonCompat.java delete mode 100644 neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/REINeoforgeCompat.java diff --git a/build.gradle b/build.gradle index 34935b8d..138fe0c5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'dev.architectury.loom' version '1.13-SNAPSHOT' apply false - id 'architectury-plugin' version '3.4-SNAPSHOT' + id 'dev.architectury.loom-no-remap' version '1.14-SNAPSHOT' apply false + id 'architectury-plugin' version '3.5-SNAPSHOT' id 'com.gradleup.shadow' version '8.3.6' apply false } @@ -14,7 +14,7 @@ allprojects { } subprojects { - apply plugin: 'dev.architectury.loom' + apply plugin: 'dev.architectury.loom-no-remap' apply plugin: 'architectury-plugin' apply plugin: 'maven-publish' @@ -37,7 +37,6 @@ subprojects { dependencies { minecraft "net.minecraft:minecraft:$rootProject.minecraft_version" - mappings loom.officialMojangMappings() } java { @@ -46,12 +45,12 @@ subprojects { // If you remove this line, sources will not be generated. withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 + sourceCompatibility = JavaVersion.VERSION_25 + targetCompatibility = JavaVersion.VERSION_25 } tasks.withType(JavaCompile).configureEach { - it.options.release = 21 + it.options.release = 25 } // Configure Maven publishing. diff --git a/common/build.gradle b/common/build.gradle index c4260a34..45bb8e1f 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -10,11 +10,9 @@ repositories { } dependencies { - modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version" + implementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version" - modCompileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_api_version}" - modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:${rei_api_version}" - modCompileOnly "me.shedaniel:RoughlyEnoughItems-default-plugin:${rei_api_version}" + compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_api_version}" } loom { diff --git a/common/src/main/java/one/dqu/additionaladditions/block/LotusLilyCropBlock.java b/common/src/main/java/one/dqu/additionaladditions/block/LotusLilyCropBlock.java index d8a14e0a..fb5e75a7 100644 --- a/common/src/main/java/one/dqu/additionaladditions/block/LotusLilyCropBlock.java +++ b/common/src/main/java/one/dqu/additionaladditions/block/LotusLilyCropBlock.java @@ -12,7 +12,7 @@ import net.minecraft.world.level.block.state.properties.IntegerProperty; import one.dqu.additionaladditions.registry.AABlocks; -public class LotusLilyCropBlock extends WaterlilyBlock implements BonemealableBlock { +public class LotusLilyCropBlock extends LilyPadBlock implements BonemealableBlock { public static final IntegerProperty AGE = BlockStateProperties.AGE_1; public LotusLilyCropBlock(Properties properties) { diff --git a/common/src/main/java/one/dqu/additionaladditions/gametest/AAGameTest.java b/common/src/main/java/one/dqu/additionaladditions/gametest/AAGameTest.java index ecb809bb..268261f9 100644 --- a/common/src/main/java/one/dqu/additionaladditions/gametest/AAGameTest.java +++ b/common/src/main/java/one/dqu/additionaladditions/gametest/AAGameTest.java @@ -16,7 +16,7 @@ public class AAGameTest { private Consumer function = null; private String structure = "empty"; private int maxTicks = 100; - private ResourceKey environment = GameTestEnvironments.DEFAULT_KEY; + private ResourceKey> environment = GameTestEnvironments.DEFAULT_KEY; public void create(String name) { if (function == null) { @@ -50,7 +50,7 @@ public AAGameTest maxTicks(int maxTicks) { return this; } - public AAGameTest environment(ResourceKey environment) { + public AAGameTest environment(ResourceKey> environment) { this.environment = environment; return this; } diff --git a/common/src/main/java/one/dqu/additionaladditions/gametest/datagen/AAGameTestDatagen.java b/common/src/main/java/one/dqu/additionaladditions/gametest/datagen/AAGameTestDatagen.java index 74ccb2e4..bda26d49 100644 --- a/common/src/main/java/one/dqu/additionaladditions/gametest/datagen/AAGameTestDatagen.java +++ b/common/src/main/java/one/dqu/additionaladditions/gametest/datagen/AAGameTestDatagen.java @@ -22,7 +22,7 @@ public record Entry( ResourceKey> function, Identifier structure, int maxTicks, - ResourceKey environment + ResourceKey> environment ) {} public static void register(Entry entry) { @@ -33,14 +33,14 @@ public static void register(Entry entry) { public static void bootstrap(BootstrapContext context) { if (entries == null) return; - HolderGetter environments = context.lookup(Registries.TEST_ENVIRONMENT); + HolderGetter> environments = context.lookup(Registries.TEST_ENVIRONMENT); for (Entry entry : entries) { AdditionalAdditions.LOGGER.info("[{}] GameTestDatagen: generating {}", AdditionalAdditions.NAMESPACE, entry.id()); ResourceKey key = ResourceKey.create(Registries.TEST_INSTANCE, entry.id()); - TestData> data = new TestData<>( + TestData>> data = new TestData<>( environments.getOrThrow(entry.environment()), entry.structure(), entry.maxTicks(), diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/BrewingStandBlockEntityMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/BrewingStandBlockEntityMixin.java index 66dbaa5a..84b9ed2a 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/BrewingStandBlockEntityMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/BrewingStandBlockEntityMixin.java @@ -81,7 +81,7 @@ public class BrewingStandBlockEntityMixin { ); if (recipe.isPresent()) { - items.set(i, recipe.get().value().assemble(recipeInput, level.registryAccess())); + items.set(i, recipe.get().value().assemble(recipeInput)); brewed = true; } } diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/GuiMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/GuiMixin.java index 3b740630..d55513b5 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/GuiMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/GuiMixin.java @@ -4,8 +4,7 @@ import one.dqu.additionaladditions.registry.AAItems; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.chat.contents.TranslatableContents; +import net.minecraft.network.chat.Component; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -26,7 +25,7 @@ private void depthMeterMessage(CallbackInfo ci) { if (minecraft.player.isHolding(AAItems.BAROMETER.get())) { if (Config.BAROMETER.get().displayElevationHud()) { String level = String.valueOf((int) minecraft.player.getY()); - minecraft.player.displayClientMessage(MutableComponent.create(new TranslatableContents("additionaladditions.gui.barometer.elevation", null, new String[]{level})), true); + minecraft.player.displayClientMessage(Component.translatable("additionaladditions.gui.barometer.elevation", level), true); } } } diff --git a/common/src/main/java/one/dqu/additionaladditions/recipe/BrewingRecipe.java b/common/src/main/java/one/dqu/additionaladditions/recipe/BrewingRecipe.java index b45b7f0b..3af725ae 100644 --- a/common/src/main/java/one/dqu/additionaladditions/recipe/BrewingRecipe.java +++ b/common/src/main/java/one/dqu/additionaladditions/recipe/BrewingRecipe.java @@ -3,7 +3,6 @@ import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.core.Holder; -import net.minecraft.core.HolderLookup; import net.minecraft.core.component.DataComponents; import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; @@ -33,6 +32,23 @@ * } */ public class BrewingRecipe implements Recipe { + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec( + instance -> instance.group( + Potion.CODEC.fieldOf("potion").forGetter(BrewingRecipe::getPotion), + Ingredient.CODEC.fieldOf("ingredient").forGetter(BrewingRecipe::getIngredient), + ItemStack.CODEC.fieldOf("result").forGetter(BrewingRecipe::getResult) + ).apply(instance, BrewingRecipe::new) + ); + + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + Potion.STREAM_CODEC, BrewingRecipe::getPotion, + Ingredient.CONTENTS_STREAM_CODEC, BrewingRecipe::getIngredient, + ItemStack.STREAM_CODEC, BrewingRecipe::getResult, + BrewingRecipe::new + ); + + public static final RecipeSerializer SERIALIZER = new RecipeSerializer<>(CODEC, STREAM_CODEC); + private final Holder potion; private final Ingredient ingredient; private final ItemStack result; @@ -55,13 +71,13 @@ public boolean matches(BrewingRecipeInput recipeInput, Level level) { } @Override - public ItemStack assemble(BrewingRecipeInput recipeInput, HolderLookup.Provider provider) { + public ItemStack assemble(BrewingRecipeInput recipeInput) { return result.copy(); } @Override public RecipeSerializer> getSerializer() { - return AAMisc.BREWING_RECIPE_SERIALIZER.get(); + return SERIALIZER; } @Override @@ -79,6 +95,16 @@ public RecipeBookCategory recipeBookCategory() { return RecipeBookCategories.CRAFTING_MISC; } + @Override + public String group() { + return ""; + } + + @Override + public boolean showNotification() { + return false; + } + // prevents console warns from recipe book validation @Override public boolean isSpecial() { @@ -111,30 +137,4 @@ public int size() { } } - public static class BrewingRecipeSerializer implements RecipeSerializer { - public static final MapCodec CODEC = RecordCodecBuilder.mapCodec( - instance -> instance.group( - Potion.CODEC.fieldOf("potion").forGetter(BrewingRecipe::getPotion), - Ingredient.CODEC.fieldOf("ingredient").forGetter(BrewingRecipe::getIngredient), - ItemStack.CODEC.fieldOf("result").forGetter(BrewingRecipe::getResult) - ).apply(instance, BrewingRecipe::new) - ); - - public static final StreamCodec STREAM_CODEC = StreamCodec.composite( - Potion.STREAM_CODEC, BrewingRecipe::getPotion, - Ingredient.CONTENTS_STREAM_CODEC, BrewingRecipe::getIngredient, - ItemStack.STREAM_CODEC, BrewingRecipe::getResult, - BrewingRecipe::new - ); - - @Override - public MapCodec codec() { - return CODEC; - } - - @Override - public StreamCodec streamCodec() { - return STREAM_CODEC; - } - } } diff --git a/common/src/main/java/one/dqu/additionaladditions/recipe/REICommonCompat.java b/common/src/main/java/one/dqu/additionaladditions/recipe/REICommonCompat.java deleted file mode 100644 index 53222f7e..00000000 --- a/common/src/main/java/one/dqu/additionaladditions/recipe/REICommonCompat.java +++ /dev/null @@ -1,25 +0,0 @@ -package one.dqu.additionaladditions.recipe; - -import me.shedaniel.rei.api.common.plugins.REICommonPlugin; -import me.shedaniel.rei.api.common.registry.display.ServerDisplayRegistry; -import me.shedaniel.rei.api.common.util.EntryIngredients; -import me.shedaniel.rei.plugin.common.displays.brewing.DefaultBrewingDisplay; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.alchemy.PotionContents; -import one.dqu.additionaladditions.registry.AAMisc; - -public class REICommonCompat implements REICommonPlugin { - @Override - public void registerDisplays(ServerDisplayRegistry registry) { - registry.beginRecipeFiller(BrewingRecipe.class) - .filterType(AAMisc.BREWING_RECIPE_TYPE.get()) - .fill(holder -> { - BrewingRecipe recipe = holder.value(); - return new DefaultBrewingDisplay( - EntryIngredients.of(PotionContents.createItemStack(Items.POTION, recipe.getPotion())), - EntryIngredients.ofIngredient(recipe.getIngredient()), - EntryIngredients.of(recipe.getResult()) - ); - }); - } -} diff --git a/common/src/main/java/one/dqu/additionaladditions/recipe/REICompat.java b/common/src/main/java/one/dqu/additionaladditions/recipe/REICompat.java deleted file mode 100644 index a390c154..00000000 --- a/common/src/main/java/one/dqu/additionaladditions/recipe/REICompat.java +++ /dev/null @@ -1,183 +0,0 @@ -package one.dqu.additionaladditions.recipe; - -import me.shedaniel.rei.api.client.entry.filtering.base.BasicFilteringRule; -import me.shedaniel.rei.api.client.plugins.REIClientPlugin; -import me.shedaniel.rei.api.client.registry.display.DisplayRegistry; -import me.shedaniel.rei.api.client.registry.display.DynamicDisplayGenerator; -import me.shedaniel.rei.api.common.entry.EntryIngredient; -import me.shedaniel.rei.api.common.entry.EntryStack; -import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes; -import me.shedaniel.rei.api.common.util.EntryIngredients; -import me.shedaniel.rei.plugin.common.BuiltinPlugin; -import me.shedaniel.rei.api.common.display.Display; -import me.shedaniel.rei.api.common.display.DisplaySerializer; -import me.shedaniel.rei.plugin.common.displays.crafting.CraftingDisplay; -import me.shedaniel.rei.plugin.common.displays.crafting.DefaultCraftingDisplay; -import net.minecraft.core.component.DataComponents; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.world.item.*; -import one.dqu.additionaladditions.config.Config; -import one.dqu.additionaladditions.config.ConfigProperty; -import one.dqu.additionaladditions.config.Toggleable; -import one.dqu.additionaladditions.feature.glint.GlintColor; -import one.dqu.additionaladditions.item.SuspiciousDyeItem; -import one.dqu.additionaladditions.registry.AAItems; -import one.dqu.additionaladditions.registry.AAMisc; -import one.dqu.additionaladditions.util.ConventionalTags; - -import java.util.*; -import java.util.function.Supplier; - -public class REICompat implements REIClientPlugin { - @Override - public void registerDisplays(DisplayRegistry registry) { - if (Config.SUSPICIOUS_DYE.get().enabled()) { - registry.registerDisplayGenerator(BuiltinPlugin.CRAFTING, new SuspiciousDyeDisplayGenerator()); - } - } - - @Override - public void registerBasicEntryFiltering(BasicFilteringRule rule) { - List> toHide = ConfigProperty.getAll() - .stream() - .filter(property -> property.get() instanceof Toggleable toggleable && !toggleable.enabled()) - .map(AAItems::fromConfigProperty) - .flatMap(Collection::stream) - .map(Supplier::get) - .map(ItemStack::new) - .map(s -> EntryStack.of(VanillaEntryTypes.ITEM, s)) - .toList(); - rule.hide(toHide); - } - - private static class SuspiciousDyeDisplayGenerator implements DynamicDisplayGenerator { - - private List getValidFoilItems() { - List items = new ArrayList<>(); - for (var holder : BuiltInRegistries.ITEM.getTagOrEmpty(ConventionalTags.ENCHANTABLE)) { - ItemStack stack = new ItemStack(holder); - if (!stack.is(AAMisc.SUSPICIOUS_DYES_TAG)) { - stack.set(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true); - items.add(stack); - } - } - return items; - } - - private List getAllDyes() { - List dyes = new ArrayList<>(); - for (var holder : BuiltInRegistries.ITEM.getTagOrEmpty(AAMisc.SUSPICIOUS_DYES_TAG)) { - dyes.add(new ItemStack(holder)); - } - return dyes; - } - - @Override - public Optional> getRecipeFor(EntryStack entry) { - if (!(entry.getValue() instanceof ItemStack output)) return Optional.empty(); - if (output.getItem() instanceof SuspiciousDyeItem) return Optional.empty(); - - // check if the output has a glint color component. if so, this is a suspicious dye result - GlintColor glintColor = output.get(AAMisc.GLINT_COLOR_COMPONENT.get()); - if (glintColor == null) return Optional.empty(); - - DyeColor color = glintColor.color(); - - // find the matching dye - ItemStack dyeStack = null; - for (ItemStack dye : getAllDyes()) { - if (dye.getItem() instanceof SuspiciousDyeItem dyeItem && dyeItem.getDyeColor() == color) { - dyeStack = dye; - break; - } - } - if (dyeStack == null) return Optional.empty(); - - // the focused item is the output, so fix the foil item to match - ItemStack baseItem = output.copy(); - baseItem.remove(AAMisc.GLINT_COLOR_COMPONENT.get()); - - EntryIngredient slot1 = EntryIngredients.of(baseItem); - EntryIngredient slot2 = EntryIngredients.of(dyeStack); - EntryIngredient outputSlot = EntryIngredients.of(output); - - List inputs = List.of(slot1, slot2); - List outputs = List.of(outputSlot); - - return Optional.of(List.of(createDisplay(inputs, outputs))); - } - - @Override - public Optional> getUsageFor(EntryStack entry) { - if (!(entry.getValue() instanceof ItemStack stack)) return Optional.empty(); - - // looking up usage of a suspicious dye - if (stack.getItem() instanceof SuspiciousDyeItem dyeItem) { - DyeColor color = dyeItem.getDyeColor(); - List validItems = getValidFoilItems(); - - List results = new ArrayList<>(); - for (ItemStack item : validItems) { - ItemStack result = item.copy(); - result.set(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(color)); - results.add(result); - } - - EntryIngredient slot1 = EntryIngredients.ofItemStacks(validItems); - EntryIngredient slot2 = EntryIngredients.of(stack); - EntryIngredient outputSlot = EntryIngredients.ofItemStacks(results); - - return Optional.of(List.of(createDisplay(List.of(slot1, slot2), List.of(outputSlot)))); - } - - // looking up usage of an enchantable item - if (stack.is(ConventionalTags.ENCHANTABLE) && !stack.is(AAMisc.SUSPICIOUS_DYES_TAG)) { - List dyes = getAllDyes(); - - ItemStack foilStack = stack.copy(); - foilStack.set(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true); - - List results = new ArrayList<>(); - for (ItemStack dye : dyes) { - if (dye.getItem() instanceof SuspiciousDyeItem dyeItem) { - ItemStack result = foilStack.copy(); - result.set(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(dyeItem.getDyeColor())); - results.add(result); - } - } - - EntryIngredient slot1 = EntryIngredients.of(foilStack); - EntryIngredient slot2 = EntryIngredients.ofItemStacks(dyes); - EntryIngredient outputSlot = EntryIngredients.ofItemStacks(results); - - return Optional.of(List.of(createDisplay(List.of(slot1, slot2), List.of(outputSlot)))); - } - - return Optional.empty(); - } - - private CraftingDisplay createDisplay(List inputs, List outputs) { - return new DefaultCraftingDisplay(inputs, outputs, Optional.empty()) { - @Override - public int getWidth() { - return 2; - } - - @Override - public int getHeight() { - return 1; - } - - @Override - public boolean isShapeless() { - return true; - } - - @Override - public DisplaySerializer getSerializer() { - return null; - } - }; - } - } -} diff --git a/common/src/main/java/one/dqu/additionaladditions/recipe/SuspiciousDyeRecipe.java b/common/src/main/java/one/dqu/additionaladditions/recipe/SuspiciousDyeRecipe.java index 67fae60d..699ec6a0 100644 --- a/common/src/main/java/one/dqu/additionaladditions/recipe/SuspiciousDyeRecipe.java +++ b/common/src/main/java/one/dqu/additionaladditions/recipe/SuspiciousDyeRecipe.java @@ -1,8 +1,10 @@ package one.dqu.additionaladditions.recipe; +import com.mojang.serialization.MapCodec; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.StreamCodec; import one.dqu.additionaladditions.feature.glint.GlintColor; import one.dqu.additionaladditions.item.SuspiciousDyeItem; -import net.minecraft.core.HolderLookup; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Items; import net.minecraft.world.item.ItemStack; @@ -17,8 +19,12 @@ import java.util.List; public class SuspiciousDyeRecipe extends CustomRecipe { - public SuspiciousDyeRecipe(CraftingBookCategory craftingBookCategory) { - super(craftingBookCategory); + public static final RecipeSerializer SERIALIZER = new RecipeSerializer<>( + MapCodec.unit(SuspiciousDyeRecipe::new), + StreamCodec.unit(new SuspiciousDyeRecipe()) + ); + + public SuspiciousDyeRecipe() { } @Override @@ -46,7 +52,7 @@ public boolean matches(CraftingInput recipeInput, Level level) { } @Override - public ItemStack assemble(CraftingInput recipeInput, HolderLookup.Provider provider) { + public ItemStack assemble(CraftingInput recipeInput) { ItemStack itemStack = recipeInput.items().stream().filter(item -> !item.isEmpty() && !item.is(AAMisc.SUSPICIOUS_DYES_TAG)).findFirst().orElse(ItemStack.EMPTY); ItemStack dye = recipeInput.items().stream().filter(item -> !item.isEmpty() && item.is(AAMisc.SUSPICIOUS_DYES_TAG)).findFirst().orElse(ItemStack.EMPTY); diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AABlocks.java b/common/src/main/java/one/dqu/additionaladditions/registry/AABlocks.java index d78f6316..2a98ad49 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AABlocks.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AABlocks.java @@ -174,7 +174,7 @@ public class AABlocks { ); public static final Supplier LOTUS_LILY = register( - "lotus_lily", WaterlilyBlock::new, + "lotus_lily", LilyPadBlock::new, (p) -> p.mapColor(MapColor.PLANT).instabreak().sound(SoundType.LILY_PAD).noOcclusion().pushReaction(PushReaction.DESTROY) ); diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AAMisc.java b/common/src/main/java/one/dqu/additionaladditions/registry/AAMisc.java index bd85f0c5..3e318788 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AAMisc.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AAMisc.java @@ -50,12 +50,12 @@ public class AAMisc { public static final Supplier> SUSPICIOUS_DYE_RECIPE_SERIALIZER = AARegistries.RECIPE_SERIALIZERS.register( Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "suspicious_dye"), - () -> new CustomRecipe.Serializer<>(SuspiciousDyeRecipe::new) + () -> SuspiciousDyeRecipe.SERIALIZER ); public static final Supplier> BREWING_RECIPE_SERIALIZER = AARegistries.RECIPE_SERIALIZERS.register( Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "brewing"), - BrewingRecipe.BrewingRecipeSerializer::new + () -> BrewingRecipe.SERIALIZER ); public static final Supplier> BREWING_RECIPE_TYPE = AARegistries.RECIPE_TYPES.register( diff --git a/common/src/main/java/one/dqu/additionaladditions/util/LootAdder.java b/common/src/main/java/one/dqu/additionaladditions/util/LootAdder.java index 9c59f7ac..eb964d1b 100644 --- a/common/src/main/java/one/dqu/additionaladditions/util/LootAdder.java +++ b/common/src/main/java/one/dqu/additionaladditions/util/LootAdder.java @@ -14,7 +14,6 @@ import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer; -import net.minecraft.world.level.storage.loot.entries.LootPoolEntryType; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator; import one.dqu.additionaladditions.AdditionalAdditions; diff --git a/common/src/main/resources/additionaladditions.accesswidener b/common/src/main/resources/additionaladditions.accesswidener index e6a604ae..1ed6187a 100644 --- a/common/src/main/resources/additionaladditions.accesswidener +++ b/common/src/main/resources/additionaladditions.accesswidener @@ -1,4 +1,4 @@ -accessWidener v2 named +accessWidener v2 official accessible class net/minecraft/client/renderer/ItemInHandRenderer$HandRenderSelection @@ -23,4 +23,7 @@ accessible field net/minecraft/client/renderer/item/properties/numeric/RangeSele accessible method net/minecraft/world/item/crafting/RecipePropertySet create (Ljava/util/Collection;)Lnet/minecraft/world/item/crafting/RecipePropertySet; -accessible field net/minecraft/core/MappedRegistry frozen Z \ No newline at end of file +accessible field net/minecraft/core/MappedRegistry frozen Z + +accessible field net/minecraft/world/level/Level random Lnet/minecraft/util/RandomSource; +accessible method net/minecraft/client/renderer/rendertype/RenderType create (Ljava/lang/String;Lnet/minecraft/client/renderer/rendertype/RenderSetup;)Lnet/minecraft/client/renderer/rendertype/RenderType; \ No newline at end of file diff --git a/common/src/main/resources/additionaladditions.mixins.json b/common/src/main/resources/additionaladditions.mixins.json index c7149c58..9efe8f00 100644 --- a/common/src/main/resources/additionaladditions.mixins.json +++ b/common/src/main/resources/additionaladditions.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "one.dqu.additionaladditions.mixin", - "compatibilityLevel": "JAVA_21", + "compatibilityLevel": "JAVA_25", "minVersion": "0.8", "client": [ "GuiMixin", diff --git a/fabric/build.gradle b/fabric/build.gradle index 03610c74..87da3434 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -43,12 +43,12 @@ configurations { } dependencies { - modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version" + implementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version" // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:$rootProject.fabric_api_version" + implementation "net.fabricmc.fabric-api:fabric-api:$rootProject.fabric_api_version" - common(project(path: ':common', configuration: 'namedElements')) { transitive = false } + common(project(path: ":common")) { transitive false } shadowBundle project(path: ':common', configuration: 'transformProductionFabric') } @@ -69,6 +69,6 @@ shadowJar { archiveClassifier = 'dev-shadow' } -remapJar { - inputFile.set shadowJar.archiveFile +jar { + archiveClassifier = "raw" } diff --git a/fabric/src/main/resources/additionaladditions.fabric.mixins.json b/fabric/src/main/resources/additionaladditions.fabric.mixins.json index b8441a87..c39585c4 100644 --- a/fabric/src/main/resources/additionaladditions.fabric.mixins.json +++ b/fabric/src/main/resources/additionaladditions.fabric.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "one.dqu.additionaladditions.mixin.fabric", - "compatibilityLevel": "JAVA_21", + "compatibilityLevel": "JAVA_25", "minVersion": "0.8", "mixins": [ "AxeItemMixin", diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 5b92433b..21a860f9 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -48,12 +48,6 @@ "jei_mod_plugin": [ "one.dqu.additionaladditions.recipe.JEICompat" ], - "rei_client": [ - "one.dqu.additionaladditions.recipe.REICompat" - ], - "rei_common": [ - "one.dqu.additionaladditions.recipe.REICommonCompat" - ], "fabric-datagen": [ "one.dqu.additionaladditions.fabric.AdditionalAdditionsDatagenFabric" ] diff --git a/gradle.properties b/gradle.properties index 17ded705..30158750 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,11 +6,10 @@ maven_group = one.dqu.additionaladditions archives_name = additionaladditions enabled_platforms = fabric,neoforge -minecraft_version = 1.21.11 +minecraft_version = 26.1.2 -fabric_loader_version = 0.18.0 -fabric_api_version = 0.141.0+1.21.11 -neoforge_version = 21.11.42 +fabric_loader_version = 0.19.1 +fabric_api_version = 0.145.4+26.1.2 +neoforge_version = 26.1.2.10-beta -jei_api_version = 27.3.0.10 -rei_api_version = 21.11.814 \ No newline at end of file +jei_api_version = 29.5.0.26 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d6e308a6..221c4f98 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/neoforge/build.gradle b/neoforge/build.gradle index eed6f0f5..cb01d281 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -59,10 +59,8 @@ repositories { dependencies { neoForge "net.neoforged:neoforge:$rootProject.neoforge_version" - common(project(path: ':common', configuration: 'namedElements')) { transitive = false } + common(project(path: ":common")) { transitive false } shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge') - - modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-neoforge:${rei_api_version}" } processResources { @@ -78,7 +76,11 @@ shadowJar { archiveClassifier = 'dev-shadow' } -remapJar { - inputFile.set shadowJar.archiveFile - atAccessWideners.add("additionaladditions.accesswidener") +jar { + archiveClassifier = "raw" } + +//remapJar { +// inputFile.set shadowJar.archiveFile +// atAccessWideners.add("additionaladditions.accesswidener") +//} diff --git a/neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/REINeoforgeCommonCompat.java b/neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/REINeoforgeCommonCompat.java deleted file mode 100644 index 3e8c4178..00000000 --- a/neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/REINeoforgeCommonCompat.java +++ /dev/null @@ -1,8 +0,0 @@ -package one.dqu.additionaladditions.recipe.neoforge; - -import me.shedaniel.rei.forge.REIPluginCommon; -import one.dqu.additionaladditions.recipe.REICommonCompat; - -@REIPluginCommon -public class REINeoforgeCommonCompat extends REICommonCompat { -} diff --git a/neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/REINeoforgeCompat.java b/neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/REINeoforgeCompat.java deleted file mode 100644 index 193ba79e..00000000 --- a/neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/REINeoforgeCompat.java +++ /dev/null @@ -1,8 +0,0 @@ -package one.dqu.additionaladditions.recipe.neoforge; - -import me.shedaniel.rei.forge.REIPluginClient; -import one.dqu.additionaladditions.recipe.REICompat; - -@REIPluginClient -public class REINeoforgeCompat extends REICompat { -} diff --git a/neoforge/src/main/resources/additionaladditions.neoforge.mixins.json b/neoforge/src/main/resources/additionaladditions.neoforge.mixins.json index fa266e3a..e9a2cd91 100644 --- a/neoforge/src/main/resources/additionaladditions.neoforge.mixins.json +++ b/neoforge/src/main/resources/additionaladditions.neoforge.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "one.dqu.additionaladditions.mixin.neoforge", - "compatibilityLevel": "JAVA_21", + "compatibilityLevel": "JAVA_25", "minVersion": "0.8", "mixins": [ "AxeItemMixin", From a3b92f9f0efce6e11ffdb406101c9e50e2eea9df Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Sat, 23 May 2026 13:04:11 +0100 Subject: [PATCH 02/27] 26.1: fixes --- .../feature/PocketJukeboxPlayer.java | 3 +- .../feature/glint/GlintResourceGenerator.java | 6 +- .../item/PocketJukeboxItem.java | 6 +- .../item/WateringCanItem.java | 10 +- .../material/AAMaterial.java | 8 +- .../mixin/BrewingStandBlockEntityMixin.java | 4 +- .../additionaladditions/mixin/GuiMixin.java | 17 ++-- .../mixin/album/JukeboxBlockEntityMixin.java | 2 +- .../recipe/BrewingRecipe.java | 13 +-- .../additionaladditions/recipe/JEICompat.java | 5 +- .../recipe/SuspiciousDyeRecipe.java | 5 +- .../additionaladditions/registry/AAItems.java | 2 + .../additionaladditions/registry/AAMisc.java | 8 +- .../additionaladditions/util/LootAdder.java | 7 +- .../additionaladditions.accesswidener | 2 + .../AdditionalAdditionsClientFabric.java | 52 +++-------- .../AdditionalAdditionsDatagenFabric.java | 4 +- .../fabric/AdditionalAdditionsFabric.java | 10 +- fabric/src/main/resources/fabric.mod.json | 2 +- .../neoforge/AdditionalAdditionsNeoForge.java | 91 +++++++------------ .../resources/META-INF/neoforge.mods.toml | 4 +- 21 files changed, 107 insertions(+), 154 deletions(-) diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/PocketJukeboxPlayer.java b/common/src/main/java/one/dqu/additionaladditions/feature/PocketJukeboxPlayer.java index cf11f09d..387ea1b8 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/PocketJukeboxPlayer.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/PocketJukeboxPlayer.java @@ -130,8 +130,7 @@ private static JukeboxSong extractSong(ItemStack discStack, Player player) { return null; } - var songOptional = jukeboxPlayable.song().unwrap(player.level().registryAccess()); - return songOptional.map(holder -> holder.value()).orElse(null); + return jukeboxPlayable.song().value(); } private static class SoundInstance extends AbstractTickableSoundInstance { diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintResourceGenerator.java b/common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintResourceGenerator.java index 53aeff2b..e6041002 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintResourceGenerator.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintResourceGenerator.java @@ -5,7 +5,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.ItemRenderer; +import net.minecraft.client.renderer.feature.ItemFeatureRenderer; import net.minecraft.client.renderer.texture.DynamicTexture; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.resources.Identifier; @@ -25,8 +25,8 @@ public static void generateResources(ResourceManager resourceManager) { TextureManager textureManager = Minecraft.getInstance().getTextureManager(); try { - Resource itemResource = resourceManager.getResource(ItemRenderer.ENCHANTED_GLINT_ITEM).orElseThrow(); - Resource entityResource = resourceManager.getResource(ItemRenderer.ENCHANTED_GLINT_ARMOR).orElseThrow(); + Resource itemResource = resourceManager.getResource(ItemFeatureRenderer.ENCHANTED_GLINT_ITEM).orElseThrow(); + Resource entityResource = resourceManager.getResource(ItemFeatureRenderer.ENCHANTED_GLINT_ARMOR).orElseThrow(); NativeImage itemImage = NativeImage.read(itemResource.open()); NativeImage entityImage = NativeImage.read(entityResource.open()); diff --git a/common/src/main/java/one/dqu/additionaladditions/item/PocketJukeboxItem.java b/common/src/main/java/one/dqu/additionaladditions/item/PocketJukeboxItem.java index 8b3e4d9f..aac7a5e0 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/PocketJukeboxItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/item/PocketJukeboxItem.java @@ -24,8 +24,8 @@ public PocketJukeboxItem(Properties settings) { public static ItemStack getStoredDisc(ItemStack stack) { ItemContainerContents contents = stack.get(DataComponents.CONTAINER); - if (contents != null && !contents.stream().toList().isEmpty()) { - return contents.stream().toList().getFirst(); + if (contents != null) { + return contents.copyOne(); } return ItemStack.EMPTY; } @@ -43,7 +43,7 @@ private static void storeDisc(ItemStack stack, ItemStack discStack) { public static boolean hasDisc(ItemStack stack) { ItemContainerContents contents = stack.get(DataComponents.CONTAINER); - return contents != null && !contents.stream().toList().isEmpty(); + return contents != null && !contents.copyOne().isEmpty(); } private boolean insertDisc(ItemStack stack, ItemStack discStack, Player player) { diff --git a/common/src/main/java/one/dqu/additionaladditions/item/WateringCanItem.java b/common/src/main/java/one/dqu/additionaladditions/item/WateringCanItem.java index 5b78c931..2abdfda7 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/WateringCanItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/item/WateringCanItem.java @@ -73,7 +73,7 @@ public InteractionResult use(Level world, Player player, InteractionHand hand) { if (state.getBlock() instanceof BonemealableBlock fertilizable && !(state.getBlock() instanceof GrassBlock)) { boolean canFertilize = fertilizable.isValidBonemealTarget(world, pos, state); - if (!canFertilize && !(stateBelow.getBlock() instanceof FarmBlock)) { + if (!canFertilize && !(stateBelow.getBlock() instanceof FarmlandBlock)) { return InteractionResult.PASS; } @@ -96,8 +96,8 @@ public InteractionResult use(Level world, Player player, InteractionHand hand) { } splashParticles((ServerLevel) world, pos); - if (stateBelow.getBlock() instanceof FarmBlock) { - world.setBlockAndUpdate(posBelow, stateBelow.setValue(BlockStateProperties.MOISTURE, FarmBlock.MAX_MOISTURE)); + if (stateBelow.getBlock() instanceof FarmlandBlock) { + world.setBlockAndUpdate(posBelow, stateBelow.setValue(BlockStateProperties.MOISTURE, FarmlandBlock.MAX_MOISTURE)); } if (!player.isCreative()) { @@ -106,12 +106,12 @@ public InteractionResult use(Level world, Player player, InteractionHand hand) { return InteractionResult.SUCCESS.withoutItem(); } - if (state.getBlock() instanceof FarmBlock) { + if (state.getBlock() instanceof FarmlandBlock) { if (world.isClientSide()) { return InteractionResult.SUCCESS.withoutItem(); } - world.setBlockAndUpdate(pos, state.setValue(BlockStateProperties.MOISTURE, FarmBlock.MAX_MOISTURE)); + world.setBlockAndUpdate(pos, state.setValue(BlockStateProperties.MOISTURE, FarmlandBlock.MAX_MOISTURE)); world.playSound(null, pos, SoundEvents.BOTTLE_EMPTY, SoundSource.BLOCKS); splashParticles((ServerLevel) world, pos.above()); diff --git a/common/src/main/java/one/dqu/additionaladditions/material/AAMaterial.java b/common/src/main/java/one/dqu/additionaladditions/material/AAMaterial.java index e52ed03b..de0693a4 100644 --- a/common/src/main/java/one/dqu/additionaladditions/material/AAMaterial.java +++ b/common/src/main/java/one/dqu/additionaladditions/material/AAMaterial.java @@ -1,6 +1,9 @@ package one.dqu.additionaladditions.material; -import net.minecraft.core.*; +import net.minecraft.core.HolderGetter; +import net.minecraft.core.HolderSet; +import net.minecraft.core.MappedRegistry; +import net.minecraft.core.Registry; import net.minecraft.core.component.DataComponentMap; import net.minecraft.core.component.DataComponents; import net.minecraft.core.registries.BuiltInRegistries; @@ -8,13 +11,11 @@ import net.minecraft.resources.ResourceKey; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; -import net.minecraft.world.damagesource.DamageTypes; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlotGroup; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; -import net.minecraft.world.item.EitherHolder; import net.minecraft.world.item.Item; import net.minecraft.world.item.SwingAnimationType; import net.minecraft.world.item.component.*; @@ -153,7 +154,6 @@ private static DataComponentMap spearProperties(String name, MaterialConfig mate DataComponentMap tool = toolProperties(ToolType.SPEAR, material, toolLike); builder.addAll(tool); - builder.set(DataComponents.DAMAGE_TYPE, new EitherHolder<>(DamageTypes.SPEAR)); builder.set(DataComponents.KINETIC_WEAPON, spear.kineticWeapon()); builder.set(DataComponents.PIERCING_WEAPON, spear.piercingWeapon()); builder.set(DataComponents.SWING_ANIMATION, new SwingAnimation(SwingAnimationType.STAB, spear.swingAnimationTicks())); diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/BrewingStandBlockEntityMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/BrewingStandBlockEntityMixin.java index 84b9ed2a..bc951783 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/BrewingStandBlockEntityMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/BrewingStandBlockEntityMixin.java @@ -4,6 +4,7 @@ import net.minecraft.core.NonNullList; import net.minecraft.world.Containers; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; import net.minecraft.world.item.alchemy.PotionBrewing; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.RecipeManager; @@ -91,7 +92,8 @@ public class BrewingStandBlockEntityMixin { return; } - ItemStack remainder = ingredient.getItem().getCraftingRemainder(); + ItemStackTemplate remainderTemplate = ingredient.getItem().getCraftingRemainder(); + ItemStack remainder = remainderTemplate == null ? ItemStack.EMPTY : remainderTemplate.create(); ingredient.shrink(1); if (!remainder.isEmpty()) { diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/GuiMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/GuiMixin.java index d55513b5..0e621244 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/GuiMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/GuiMixin.java @@ -1,10 +1,12 @@ package one.dqu.additionaladditions.mixin; -import one.dqu.additionaladditions.config.Config; -import one.dqu.additionaladditions.registry.AAItems; +import net.minecraft.client.DeltaTracker; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; +import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.network.chat.Component; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.registry.AAItems; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -17,15 +19,18 @@ */ @Mixin(Gui.class) public abstract class GuiMixin { - @Shadow @Final private Minecraft minecraft; + @Shadow + @Final + private Minecraft minecraft; - @Inject(method = "render", at = @At("TAIL")) - private void depthMeterMessage(CallbackInfo ci) { + @Inject(method = "extractRenderState", at = @At("TAIL")) + private void depthMeterMessage(GuiGraphicsExtractor extractor, DeltaTracker deltaTracker, CallbackInfo ci) { if (!Config.BAROMETER.get().enabled()) return; + if (minecraft.player == null) return; if (minecraft.player.isHolding(AAItems.BAROMETER.get())) { if (Config.BAROMETER.get().displayElevationHud()) { String level = String.valueOf((int) minecraft.player.getY()); - minecraft.player.displayClientMessage(Component.translatable("additionaladditions.gui.barometer.elevation", level), true); + minecraft.player.sendOverlayMessage(Component.translatable("additionaladditions.gui.barometer.elevation", level)); } } } diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/album/JukeboxBlockEntityMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/album/JukeboxBlockEntityMixin.java index 67bb853d..65f570a8 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/album/JukeboxBlockEntityMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/album/JukeboxBlockEntityMixin.java @@ -51,7 +51,7 @@ private static void tick(Level level, BlockPos blockPos, BlockState blockState, ItemStack nextRecord = album.items().get(nextTrack); jukebox.getSongPlayer().play( level, - nextRecord.get(DataComponents.JUKEBOX_PLAYABLE).song().unwrap(level.registryAccess()).orElseThrow() + nextRecord.get(DataComponents.JUKEBOX_PLAYABLE).song() ); albumJukebox.additionaladditions$setTrack(nextTrack); } diff --git a/common/src/main/java/one/dqu/additionaladditions/recipe/BrewingRecipe.java b/common/src/main/java/one/dqu/additionaladditions/recipe/BrewingRecipe.java index 3af725ae..ea61000e 100644 --- a/common/src/main/java/one/dqu/additionaladditions/recipe/BrewingRecipe.java +++ b/common/src/main/java/one/dqu/additionaladditions/recipe/BrewingRecipe.java @@ -7,6 +7,7 @@ import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.ItemStackTemplate; import net.minecraft.world.item.alchemy.Potion; import net.minecraft.world.item.alchemy.PotionContents; import net.minecraft.world.item.crafting.*; @@ -36,14 +37,14 @@ public class BrewingRecipe implements Recipe { instance -> instance.group( Potion.CODEC.fieldOf("potion").forGetter(BrewingRecipe::getPotion), Ingredient.CODEC.fieldOf("ingredient").forGetter(BrewingRecipe::getIngredient), - ItemStack.CODEC.fieldOf("result").forGetter(BrewingRecipe::getResult) + ItemStackTemplate.CODEC.fieldOf("result").forGetter(BrewingRecipe::getResult) ).apply(instance, BrewingRecipe::new) ); public static final StreamCodec STREAM_CODEC = StreamCodec.composite( Potion.STREAM_CODEC, BrewingRecipe::getPotion, Ingredient.CONTENTS_STREAM_CODEC, BrewingRecipe::getIngredient, - ItemStack.STREAM_CODEC, BrewingRecipe::getResult, + ItemStackTemplate.STREAM_CODEC, BrewingRecipe::getResult, BrewingRecipe::new ); @@ -51,14 +52,14 @@ public class BrewingRecipe implements Recipe { private final Holder potion; private final Ingredient ingredient; - private final ItemStack result; + private final ItemStackTemplate result; /** * @param potion potion component of the item in the three bottom slots (bottles) * @param ingredient item in the top slot, the brewing ingredient * @param result the resulting item in the bottom slot */ - public BrewingRecipe(Holder potion, Ingredient ingredient, ItemStack result) { + public BrewingRecipe(Holder potion, Ingredient ingredient, ItemStackTemplate result) { this.potion = potion; this.ingredient = ingredient; this.result = result; @@ -72,7 +73,7 @@ public boolean matches(BrewingRecipeInput recipeInput, Level level) { @Override public ItemStack assemble(BrewingRecipeInput recipeInput) { - return result.copy(); + return result.create(); } @Override @@ -111,7 +112,7 @@ public boolean isSpecial() { return true; } - public ItemStack getResult() { + public ItemStackTemplate getResult() { return result; } diff --git a/common/src/main/java/one/dqu/additionaladditions/recipe/JEICompat.java b/common/src/main/java/one/dqu/additionaladditions/recipe/JEICompat.java index 01345d36..f2572308 100644 --- a/common/src/main/java/one/dqu/additionaladditions/recipe/JEICompat.java +++ b/common/src/main/java/one/dqu/additionaladditions/recipe/JEICompat.java @@ -20,6 +20,7 @@ import net.minecraft.resources.Identifier; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStackTemplate; import net.minecraft.world.item.Items; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.alchemy.PotionContents; @@ -97,7 +98,7 @@ private void brewingRecipes(IRecipeRegistration event) { .map(ItemStack::new) .filter(recipe.getIngredient()::test) .toList(); - ItemStack output = recipe.getResult(); + ItemStack output = recipe.getResult().create(); return factory.createBrewingRecipe(ingredients, List.of(input), output, id); }) @@ -115,7 +116,7 @@ public List getIngredients(RecipeHolder recipe ItemStack stack = new ItemStack(item); if (stack.is(AAMisc.SUSPICIOUS_DYES_TAG)) continue; stack.set(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true); - foilStacks.add(new SlotDisplay.ItemStackSlotDisplay(stack)); + foilStacks.add(new SlotDisplay.ItemStackSlotDisplay(ItemStackTemplate.fromNonEmptyStack(stack))); } return List.of( diff --git a/common/src/main/java/one/dqu/additionaladditions/recipe/SuspiciousDyeRecipe.java b/common/src/main/java/one/dqu/additionaladditions/recipe/SuspiciousDyeRecipe.java index 699ec6a0..3cfe51cb 100644 --- a/common/src/main/java/one/dqu/additionaladditions/recipe/SuspiciousDyeRecipe.java +++ b/common/src/main/java/one/dqu/additionaladditions/recipe/SuspiciousDyeRecipe.java @@ -19,9 +19,10 @@ import java.util.List; public class SuspiciousDyeRecipe extends CustomRecipe { + public static final SuspiciousDyeRecipe INSTANCE = new SuspiciousDyeRecipe(); public static final RecipeSerializer SERIALIZER = new RecipeSerializer<>( - MapCodec.unit(SuspiciousDyeRecipe::new), - StreamCodec.unit(new SuspiciousDyeRecipe()) + MapCodec.unit(INSTANCE), + StreamCodec.unit(INSTANCE) ); public SuspiciousDyeRecipe() { diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AAItems.java b/common/src/main/java/one/dqu/additionaladditions/registry/AAItems.java index 189eaf7c..fcb0a2dc 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AAItems.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AAItems.java @@ -2,6 +2,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.component.DataComponents; +import net.minecraft.world.damagesource.DamageTypes; import net.minecraft.core.dispenser.BlockSource; import net.minecraft.core.dispenser.DefaultDispenseItemBehavior; import net.minecraft.world.item.component.TooltipDisplay; @@ -333,6 +334,7 @@ public static Collection> fromConfigProperty(ConfigProp public static final Supplier ROSE_GOLD_SPEAR = new Builder("rose_gold_spear") .config(Config.ROSE_GOLD) + .properties(p -> p.delayedHolderComponent(DataComponents.DAMAGE_TYPE, DamageTypes.SPEAR)) .creativeAfter(Items.GOLDEN_SPEAR, CreativeModeTabs.COMBAT) .build(p -> new ToolItem(AAMaterials.ROSE_GOLD, ToolType.SPEAR, p)); diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AAMisc.java b/common/src/main/java/one/dqu/additionaladditions/registry/AAMisc.java index 3e318788..83452ae1 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AAMisc.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AAMisc.java @@ -4,11 +4,10 @@ import net.minecraft.core.component.DataComponentType; import net.minecraft.core.registries.Registries; import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.resources.ResourceKey; import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; -import net.minecraft.world.item.crafting.CustomRecipe; import net.minecraft.world.item.crafting.RecipePropertySet; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.RecipeType; @@ -16,14 +15,15 @@ import one.dqu.additionaladditions.AdditionalAdditions; import one.dqu.additionaladditions.feature.album.AlbumContents; import one.dqu.additionaladditions.feature.glint.GlintColor; -import one.dqu.additionaladditions.recipe.*; +import one.dqu.additionaladditions.recipe.BrewingRecipe; +import one.dqu.additionaladditions.recipe.SuspiciousDyeRecipe; import one.dqu.additionaladditions.util.SimplePlayerTrigger; import java.util.function.Supplier; public class AAMisc { /* DATA COMPONENTS */ - + public static final Supplier> GLINT_COLOR_COMPONENT = AARegistries.DATA_COMPONENT_TYPES.register( Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "glint_color"), () -> DataComponentType.builder().persistent(GlintColor.CODEC).networkSynchronized(GlintColor.STREAM_CODEC).build() diff --git a/common/src/main/java/one/dqu/additionaladditions/util/LootAdder.java b/common/src/main/java/one/dqu/additionaladditions/util/LootAdder.java index eb964d1b..999fedf1 100644 --- a/common/src/main/java/one/dqu/additionaladditions/util/LootAdder.java +++ b/common/src/main/java/one/dqu/additionaladditions/util/LootAdder.java @@ -13,6 +13,7 @@ import net.minecraft.server.packs.resources.Resource; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.world.level.storage.loot.LootPool; +import net.minecraft.world.level.storage.loot.entries.LootPoolEntries; import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator; @@ -50,11 +51,7 @@ public class LootAdder { public static final LootAdder INSTANCE = new LootAdder(); - public static final Codec ENTRY_CODEC = BuiltInRegistries.LOOT_POOL_ENTRY_TYPE.byNameCodec().dispatch( - "type", - LootPoolEntryContainer::getType, - LootPoolEntryType::codec - ); + public static final Codec ENTRY_CODEC = LootPoolEntries.CODEC; public record LootInjection(Identifier target, boolean replaceOtherPools, List entries) { public static final Codec CODEC = RecordCodecBuilder.create(instance -> diff --git a/common/src/main/resources/additionaladditions.accesswidener b/common/src/main/resources/additionaladditions.accesswidener index 1ed6187a..8f295033 100644 --- a/common/src/main/resources/additionaladditions.accesswidener +++ b/common/src/main/resources/additionaladditions.accesswidener @@ -23,6 +23,8 @@ accessible field net/minecraft/client/renderer/item/properties/numeric/RangeSele accessible method net/minecraft/world/item/crafting/RecipePropertySet create (Ljava/util/Collection;)Lnet/minecraft/world/item/crafting/RecipePropertySet; +accessible method net/minecraft/world/level/block/LilyPadBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V + accessible field net/minecraft/core/MappedRegistry frozen Z accessible field net/minecraft/world/level/Level random Lnet/minecraft/util/RandomSource; diff --git a/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsClientFabric.java b/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsClientFabric.java index 546cb826..c46229ea 100644 --- a/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsClientFabric.java +++ b/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsClientFabric.java @@ -6,19 +6,19 @@ import net.fabricmc.fabric.api.client.networking.v1.ClientConfigurationNetworking; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; import net.fabricmc.fabric.api.client.recipe.v1.sync.ClientRecipeSynchronizedEvent; -import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap; -import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; +import net.fabricmc.fabric.api.client.rendering.v1.BlockColorRegistry; import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry; import net.fabricmc.fabric.api.resource.ResourceManagerHelper; import net.fabricmc.fabric.api.resource.SimpleSynchronousResourceReloadListener; -import net.minecraft.client.renderer.chunk.ChunkSectionLayer; +import net.minecraft.client.color.block.BlockTintSource; +import net.minecraft.client.color.block.BlockTintSources; import net.minecraft.client.renderer.entity.ThrownItemRenderer; +import net.minecraft.client.renderer.item.properties.conditional.ConditionalItemModelProperties; +import net.minecraft.client.renderer.item.properties.numeric.RangeSelectItemModelProperties; import net.minecraft.network.chat.Component; import net.minecraft.resources.Identifier; import net.minecraft.server.packs.PackType; import net.minecraft.server.packs.resources.ResourceManager; -import net.minecraft.client.renderer.item.properties.conditional.ConditionalItemModelProperties; -import net.minecraft.client.renderer.item.properties.numeric.RangeSelectItemModelProperties; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.RecipeType; import one.dqu.additionaladditions.AdditionalAdditions; @@ -28,8 +28,8 @@ import one.dqu.additionaladditions.config.io.ConfigLoader; import one.dqu.additionaladditions.config.network.ConfigSyncS2CPayload; import one.dqu.additionaladditions.entity.RopeArrowRenderer; -import one.dqu.additionaladditions.feature.glint.GlintResourceGenerator; import one.dqu.additionaladditions.feature.PocketJukeboxPlayer; +import one.dqu.additionaladditions.feature.glint.GlintResourceGenerator; import one.dqu.additionaladditions.recipe.ClientRecipeCache; import one.dqu.additionaladditions.registry.AABlocks; import one.dqu.additionaladditions.registry.AAEntities; @@ -45,12 +45,12 @@ public final class AdditionalAdditionsClientFabric implements ClientModInitializ public void onInitializeClient() { // item model properties ConditionalItemModelProperties.ID_MAPPER.put( - Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, "has_disc"), - HasDiscProperty.MAP_CODEC + Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, "has_disc"), + HasDiscProperty.MAP_CODEC ); RangeSelectItemModelProperties.ID_MAPPER.put( - Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, "barometer_angle"), - BarometerAngleProperty.MAP_CODEC + Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, "barometer_angle"), + BarometerAngleProperty.MAP_CODEC ); // pocket jukebox @@ -86,37 +86,9 @@ public void onInitializeClient() { ClientRecipeCache.set(map); }); - // block render layers - BlockRenderLayerMap.putBlock(AABlocks.COPPER_PATINA.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.ROPE_BLOCK.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.GLOW_STICK_BLOCK.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.COTTONSHIVER.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.COTTONSHIVER_CROP.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.MUDFLOWER.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.MUDFLOWER_CROP.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.CRIMSON_BLOSSOM.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.CRIMSON_BLOSSOM_CROP.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.AMBER_BLOSSOM.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.AMBER_BLOSSOM_CROP.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.BULBUS.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.BULBUS_CROP.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.SAWTOOTH_FERN.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.SAWTOOTH_FERN_CROP.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.FROSTLEAF.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.FROSTLEAF_CROP.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.WISTERIA.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.WISTERIA_CROP.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.SPIKEBLOSSOM.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.SPIKEBLOSSOM_CROP.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.SNAPDRAGON.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.SNAPDRAGON_CROP.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.LOTUS_LILY.get(), ChunkSectionLayer.CUTOUT); - BlockRenderLayerMap.putBlock(AABlocks.LOTUS_LILY_CROP.get(), ChunkSectionLayer.CUTOUT); - // color providers - ColorProviderRegistry.BLOCK.register((state, getter, pos, tintIndex) -> { - return getter != null && pos != null ? -14647248 : -9321636; - }, AABlocks.LOTUS_LILY.get(), AABlocks.LOTUS_LILY_CROP.get()); + BlockTintSource lotusTint = BlockTintSources.constant(-9321636, -14647248); + BlockColorRegistry.register(List.of(lotusTint), AABlocks.LOTUS_LILY.get(), AABlocks.LOTUS_LILY_CROP.get()); // entity renderers EntityRendererRegistry.register(AAEntities.GLOW_STICK.get(), ThrownItemRenderer::new); diff --git a/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsDatagenFabric.java b/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsDatagenFabric.java index 68dfaccd..4416a809 100644 --- a/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsDatagenFabric.java +++ b/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsDatagenFabric.java @@ -2,7 +2,7 @@ import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricDynamicRegistryProvider; import net.minecraft.core.HolderLookup; import net.minecraft.core.RegistrySetBuilder; @@ -25,7 +25,7 @@ public void buildRegistry(RegistrySetBuilder registryBuilder) { } private static class RegistryProvider extends FabricDynamicRegistryProvider { - RegistryProvider(FabricDataOutput output, CompletableFuture registriesFuture) { + RegistryProvider(FabricPackOutput output, CompletableFuture registriesFuture) { super(output, registriesFuture); } diff --git a/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsFabric.java b/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsFabric.java index c23eae6c..9a80d485 100644 --- a/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsFabric.java +++ b/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsFabric.java @@ -3,7 +3,7 @@ import com.google.gson.JsonElement; import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; +import net.fabricmc.fabric.api.creativetab.v1.CreativeModeTabEvents; import net.fabricmc.fabric.api.loot.v3.LootTableEvents; import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; import net.fabricmc.fabric.api.networking.v1.ServerConfigurationConnectionEvents; @@ -30,14 +30,14 @@ public void onInitialize() { RegistrarImpl.runDeferred(); // creative adder - ItemGroupEvents.MODIFY_ENTRIES_ALL.register((tab, entries) -> { + CreativeModeTabEvents.MODIFY_OUTPUT_ALL.register((tab, entries) -> { BuiltInRegistries.CREATIVE_MODE_TAB.getResourceKey(tab).ifPresentOrElse(key -> { CreativeAdder.getEntries(key).forEach(entry -> { if (!entry.condition().get()) return; if (entry.before()) { - entries.addBefore(entry.anchor(), entry.item().get()); + entries.insertBefore(entry.anchor(), entry.item().get()); } else { - entries.addAfter(entry.anchor(), entry.item().get()); + entries.insertAfter(entry.anchor(), entry.item().get()); } }); }, () -> AdditionalAdditions.LOGGER.warn("[{}] Unknown creative tab: {}", AdditionalAdditions.NAMESPACE, tab.getDisplayName())); @@ -49,7 +49,7 @@ public void onInitialize() { })); // config sync - PayloadTypeRegistry.configurationS2C().register(ConfigSyncS2CPayload.TYPE, ConfigSyncS2CPayload.STREAM_CODEC); + PayloadTypeRegistry.clientboundConfiguration().register(ConfigSyncS2CPayload.TYPE, ConfigSyncS2CPayload.STREAM_CODEC); ServerConfigurationConnectionEvents.CONFIGURE.register((listener, server) -> { Map map = ConfigProperty.getAll().stream() .collect(Collectors.toMap( diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 21a860f9..12aafdf4 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -59,7 +59,7 @@ "accessWidener": "additionaladditions.accesswidener", "depends": { "fabricloader": ">=0.18.0", - "minecraft": "1.21.11", + "minecraft": "26.1.2", "java": ">=21", "fabric-api": "*" }, diff --git a/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AdditionalAdditionsNeoForge.java b/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AdditionalAdditionsNeoForge.java index 39696f32..17e60131 100644 --- a/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AdditionalAdditionsNeoForge.java +++ b/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AdditionalAdditionsNeoForge.java @@ -1,7 +1,7 @@ package one.dqu.additionaladditions.neoforge; -import net.minecraft.client.renderer.ItemBlockRenderTypes; -import net.minecraft.client.renderer.chunk.ChunkSectionLayer; +import net.minecraft.client.color.block.BlockTintSource; +import net.minecraft.client.color.block.BlockTintSources; import net.minecraft.client.renderer.entity.ThrownItemRenderer; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; @@ -12,7 +12,6 @@ import net.minecraft.world.item.CreativeModeTab; import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.common.Mod; - import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; import net.neoforged.fml.loading.FMLEnvironment; @@ -31,8 +30,8 @@ import one.dqu.additionaladditions.config.network.ConfigSyncS2CPayload; import one.dqu.additionaladditions.config.network.neoforge.ConfigSyncTask; import one.dqu.additionaladditions.entity.RopeArrowRenderer; -import one.dqu.additionaladditions.feature.glint.GlintResourceGenerator; import one.dqu.additionaladditions.feature.PocketJukeboxPlayer; +import one.dqu.additionaladditions.feature.glint.GlintResourceGenerator; import one.dqu.additionaladditions.recipe.neoforge.JEIBrewingRecipeSync; import one.dqu.additionaladditions.registry.AABlocks; import one.dqu.additionaladditions.registry.AAEntities; @@ -59,7 +58,7 @@ public AdditionalAdditionsNeoForge(IEventBus modEventBus) { modEventBus.addListener(AddClientReloadListenersEvent.class, this::onRegisterClientReloadListeners); modEventBus.addListener(FMLClientSetupEvent.class, this::onClientSetup); modEventBus.addListener(EntityRenderersEvent.RegisterRenderers.class, this::onRegisterEntityRenderers); - modEventBus.addListener(RegisterColorHandlersEvent.Block.class, this::registerBlockColors); + modEventBus.addListener(RegisterColorHandlersEvent.BlockTintSources.class, this::registerBlockColors); modEventBus.addListener(RegisterConditionalItemModelPropertyEvent.class, this::onRegisterConditionalProperty); modEventBus.addListener(RegisterRangeSelectItemModelPropertyEvent.class, this::onRegisterRangeSelectProperty); } @@ -81,9 +80,9 @@ private void onSetupEvent(FMLCommonSetupEvent event) { private void onBuildCreativeTabContents(BuildCreativeModeTabContentsEvent event) { BuiltInRegistries.CREATIVE_MODE_TAB.getResourceKey(event.getTab()).ifPresentOrElse( - key -> CreativeAdder.getEntries(key).forEach(entry -> addCreativeTabEntry(event, entry)), - () -> AdditionalAdditions.LOGGER.warn("[{}] Unknown creative tab: {}", - AdditionalAdditions.NAMESPACE, event.getTab().getDisplayName()) + key -> CreativeAdder.getEntries(key).forEach(entry -> addCreativeTabEntry(event, entry)), + () -> AdditionalAdditions.LOGGER.warn("[{}] Unknown creative tab: {}", + AdditionalAdditions.NAMESPACE, event.getTab().getDisplayName()) ); } @@ -110,19 +109,19 @@ private void onLootTableLoad(LootTableLoadEvent event) { private void onRegisterPayloadHandlers(RegisterPayloadHandlersEvent event) { final PayloadRegistrar registrar = event.registrar("1"); registrar.configurationToClient( - ConfigSyncS2CPayload.TYPE, - ConfigSyncS2CPayload.STREAM_CODEC, - (payload, context) -> context.enqueueWork(() -> { - var config = payload.config(); - int version = ConfigLoader.readVersion(config).version(); - if (version != Config.VERSION.get().version()) { - AdditionalAdditions.LOGGER.warn("[{}] Received incompatible config version from server, disconnecting. (server: {}, client: {})", AdditionalAdditions.NAMESPACE, version, Config.VERSION.get().version()); - context.disconnect(Component.translatable("additionaladditions.gui.config.disconnect")); - return; - } - ConfigLoader.apply(config); - AdditionalAdditions.LOGGER.info("[{}] Loaded config from server", AdditionalAdditions.NAMESPACE); - }) + ConfigSyncS2CPayload.TYPE, + ConfigSyncS2CPayload.STREAM_CODEC, + (payload, context) -> context.enqueueWork(() -> { + var config = payload.config(); + int version = ConfigLoader.readVersion(config).version(); + if (version != Config.VERSION.get().version()) { + AdditionalAdditions.LOGGER.warn("[{}] Received incompatible config version from server, disconnecting. (server: {}, client: {})", AdditionalAdditions.NAMESPACE, version, Config.VERSION.get().version()); + context.disconnect(Component.translatable("additionaladditions.gui.config.disconnect")); + return; + } + ConfigLoader.apply(config); + AdditionalAdditions.LOGGER.info("[{}] Loaded config from server", AdditionalAdditions.NAMESPACE); + }) ); } @@ -151,65 +150,37 @@ protected void apply(Void unused, ResourceManager resourceManager, ProfilerFille private void onRegisterEntityRenderers(EntityRenderersEvent.RegisterRenderers event) { event.registerEntityRenderer( - AAEntities.GLOW_STICK.get(), - ThrownItemRenderer::new + AAEntities.GLOW_STICK.get(), + ThrownItemRenderer::new ); event.registerEntityRenderer( - AAEntities.ROPE_ARROW.get(), - RopeArrowRenderer::new + AAEntities.ROPE_ARROW.get(), + RopeArrowRenderer::new ); } private void onRegisterConditionalProperty(RegisterConditionalItemModelPropertyEvent event) { event.register( - Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, "has_disc"), - HasDiscProperty.MAP_CODEC + Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, "has_disc"), + HasDiscProperty.MAP_CODEC ); } private void onRegisterRangeSelectProperty(RegisterRangeSelectItemModelPropertyEvent event) { event.register( - Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, "barometer_angle"), - BarometerAngleProperty.MAP_CODEC + Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, "barometer_angle"), + BarometerAngleProperty.MAP_CODEC ); } private void onClientSetup(FMLClientSetupEvent event) { - // block render layers - ItemBlockRenderTypes.setRenderLayer(AABlocks.COPPER_PATINA.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.ROPE_BLOCK.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.GLOW_STICK_BLOCK.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.COTTONSHIVER.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.COTTONSHIVER_CROP.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.MUDFLOWER.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.MUDFLOWER_CROP.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.CRIMSON_BLOSSOM.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.CRIMSON_BLOSSOM_CROP.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.AMBER_BLOSSOM.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.AMBER_BLOSSOM_CROP.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.BULBUS.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.BULBUS_CROP.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.SAWTOOTH_FERN.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.SAWTOOTH_FERN_CROP.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.FROSTLEAF.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.FROSTLEAF_CROP.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.WISTERIA.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.WISTERIA_CROP.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.SPIKEBLOSSOM.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.SPIKEBLOSSOM_CROP.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.SNAPDRAGON.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.SNAPDRAGON_CROP.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.LOTUS_LILY.get(), ChunkSectionLayer.CUTOUT); - ItemBlockRenderTypes.setRenderLayer(AABlocks.LOTUS_LILY_CROP.get(), ChunkSectionLayer.CUTOUT); - // mod compatibility event.enqueueWork(ModCompatibilityImpl::showToasts); } - private void registerBlockColors(RegisterColorHandlersEvent.Block event) { - event.register((state, getter, pos, tintIndex) -> { - return getter != null && pos != null ? -14647248 : -9321636; - }, AABlocks.LOTUS_LILY.get(), AABlocks.LOTUS_LILY_CROP.get()); + private void registerBlockColors(RegisterColorHandlersEvent.BlockTintSources event) { + BlockTintSource lotusTint = BlockTintSources.constant(-9321636, -14647248); + event.register(java.util.List.of(lotusTint), AABlocks.LOTUS_LILY.get(), AABlocks.LOTUS_LILY_CROP.get()); } } diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 8f222bbb..aa55c5fe 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -41,14 +41,14 @@ logoFile = "assets/additionaladditions/icon.png" [[dependencies.additionaladditions]] modId = "neoforge" type = "required" -versionRange = "[21.4,)" +versionRange = "[26.1,)" ordering = "NONE" side = "BOTH" [[dependencies.additionaladditions]] modId = "minecraft" type = "required" -versionRange = "[1.21.11]" +versionRange = "[26.1.2]" ordering = "NONE" side = "BOTH" From 3fec24722c87ff54634db4ea8de9c18a994d79c8 Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Mon, 25 May 2026 12:39:09 +0100 Subject: [PATCH 03/27] 26.1: refactor items --- .../core/builder/AAItem.java | 125 ++++ .../additionaladditions/item/AAAxeItem.java | 25 +- .../additionaladditions/item/AAHoeItem.java | 25 +- .../item/AAShovelItem.java | 26 +- .../additionaladditions/item/ArmorItem.java | 16 - .../additionaladditions/item/FoodItem.java | 14 - .../additionaladditions/item/ToolItem.java | 11 - .../item/WateringCanItem.java | 6 +- .../additionaladditions/item/WrenchItem.java | 9 +- .../item/configurable/ConfigurableItem.java | 35 - .../material/AAMaterial.java | 171 ++--- .../additionaladditions/registry/AAItems.java | 691 ++++++++---------- .../additionaladditions.accesswidener | 2 - 13 files changed, 487 insertions(+), 669 deletions(-) create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/builder/AAItem.java delete mode 100644 common/src/main/java/one/dqu/additionaladditions/item/ArmorItem.java delete mode 100644 common/src/main/java/one/dqu/additionaladditions/item/FoodItem.java delete mode 100644 common/src/main/java/one/dqu/additionaladditions/item/ToolItem.java delete mode 100644 common/src/main/java/one/dqu/additionaladditions/item/configurable/ConfigurableItem.java diff --git a/common/src/main/java/one/dqu/additionaladditions/core/builder/AAItem.java b/common/src/main/java/one/dqu/additionaladditions/core/builder/AAItem.java new file mode 100644 index 00000000..d654d6dd --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/builder/AAItem.java @@ -0,0 +1,125 @@ +package one.dqu.additionaladditions.core.builder; + +import com.mojang.datafixers.util.Pair; +import net.minecraft.core.component.DataComponentInitializers; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.equipment.ArmorType; +import net.minecraft.world.level.ItemLike; +import one.dqu.additionaladditions.AdditionalAdditions; +import one.dqu.additionaladditions.config.ConfigProperty; +import one.dqu.additionaladditions.config.Toggleable; +import one.dqu.additionaladditions.material.AAMaterial; +import one.dqu.additionaladditions.material.AnimalArmorType; +import one.dqu.additionaladditions.material.ToolType; +import one.dqu.additionaladditions.registry.AARegistries; +import one.dqu.additionaladditions.util.CreativeAdder; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Supplier; + +public class AAItem { + private ConfigProperty config; + Function factory; + private Consumer props = p -> { + }; + private final Map, List>> creative = new HashMap<>(); + private DataComponentInitializers.Initializer initializer; // extra component initializer on top of vanilla's (in item properties) + + @SuppressWarnings("unchecked") + public AAItem() { + // default factory = Item::new + this.factory = (Function) (Function) Item::new; + } + + public AAItem(AAItem template) { + this.config = template.config; + this.factory = template.factory; + this.props = template.props; + this.initializer = template.initializer; + } + + public AAItem config(ConfigProperty config) { + this.config = config; + return this; + } + + public AAItem factory(Function factory) { + this.factory = factory; + return this; + } + + public AAItem properties(Consumer props) { + this.props = this.props.andThen(props); + return this; + } + + public AAItem creative(ItemLike anchor, ResourceKey category, boolean isBefore) { + creative.computeIfAbsent(category, _ -> new ArrayList<>()).add(Pair.of(anchor, isBefore)); + return this; + } + + public AAItem initializer(DataComponentInitializers.Initializer step) { + this.initializer = this.initializer == null ? step : this.initializer.andThen(step); + return this; + } + + public AAItem material(AAMaterial material, ToolType toolType) { + return properties(p -> p.repairable(material.repairIngredient())) + .initializer(material.initializerFor(toolType)); + } + + public AAItem material(AAMaterial material, ArmorType armorType) { + return properties(p -> p.repairable(material.repairIngredient())) + .initializer(material.initializerFor(armorType)); + } + + public AAItem material(AAMaterial material, AnimalArmorType armorType) { + return properties(p -> p.repairable(material.repairIngredient())) + .initializer(material.initializerFor(armorType)); + } + + public Supplier make(String id) { + Identifier location = Identifier.tryBuild(AdditionalAdditions.NAMESPACE, id); + ResourceKey itemKey = ResourceKey.create(Registries.ITEM, location); + + ConfigProperty capturedConfig = config; + Supplier enabled = capturedConfig != null ? () -> capturedConfig.get().enabled() : () -> true; + + Consumer deferredProperties = props; + DataComponentInitializers.Initializer deferredInitializer = initializer; + Supplier item = AARegistries.ITEMS.register(location, () -> { + Item.Properties props = new Item.Properties(); + props.setId(itemKey); + deferredProperties.accept(props); + T instance = factory.apply(props); + if (deferredInitializer != null) { + BuiltInRegistries.DATA_COMPONENT_INITIALIZERS.add(itemKey, deferredInitializer); + } + return instance; + }); + + creative.forEach((tab, items) -> { + items.forEach(pair -> { + ItemLike anchor = pair.getFirst(); + boolean isBefore = pair.getSecond(); + if (isBefore) { + CreativeAdder.addBefore(tab, enabled, anchor, item); + } else { + CreativeAdder.add(tab, enabled, anchor, item); + } + }); + }); + + return item; + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/item/AAAxeItem.java b/common/src/main/java/one/dqu/additionaladditions/item/AAAxeItem.java index 15660f75..79593f4a 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/AAAxeItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/item/AAAxeItem.java @@ -1,30 +1,11 @@ package one.dqu.additionaladditions.item; -import net.minecraft.core.component.DataComponentMap; import net.minecraft.world.item.AxeItem; import net.minecraft.world.item.ToolMaterial; -import one.dqu.additionaladditions.material.AAMaterial; -import one.dqu.additionaladditions.material.ToolType; - -import java.util.function.Consumer; public class AAAxeItem extends AxeItem { - Consumer configurer; - - public AAAxeItem(AAMaterial material, Properties properties) { - // dummy values. actual values are generated by AAMaterial - super(ToolMaterial.WOOD, 0, 0, properties.repairable(material.repairIngredient())); - - this.configurer = builder -> material.applyFor(builder, ToolType.AXE); - } - - /** - * @see one.dqu.additionaladditions.item.configurable.ConfigurableItem - */ - @Override - public DataComponentMap components() { - DataComponentMap.Builder builder = DataComponentMap.builder().addAll(super.components()); - configurer.accept(builder); - return builder.build(); + // dummy values. real values should be overriden in component initializer of AAItem builder + public AAAxeItem(Properties properties) { + super(ToolMaterial.WOOD, 0, 0, properties); } } diff --git a/common/src/main/java/one/dqu/additionaladditions/item/AAHoeItem.java b/common/src/main/java/one/dqu/additionaladditions/item/AAHoeItem.java index 9a2ec8f6..b556149f 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/AAHoeItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/item/AAHoeItem.java @@ -1,30 +1,11 @@ package one.dqu.additionaladditions.item; -import net.minecraft.core.component.DataComponentMap; import net.minecraft.world.item.HoeItem; import net.minecraft.world.item.ToolMaterial; -import one.dqu.additionaladditions.material.AAMaterial; -import one.dqu.additionaladditions.material.ToolType; - -import java.util.function.Consumer; public class AAHoeItem extends HoeItem { - Consumer configurer; - - public AAHoeItem(AAMaterial material, Properties properties) { - // dummy values. actual values are generated by AAMaterial - super(ToolMaterial.WOOD, 0, 0, properties.repairable(material.repairIngredient())); - - this.configurer = builder -> material.applyFor(builder, ToolType.HOE); - } - - /** - * @see one.dqu.additionaladditions.item.configurable.ConfigurableItem - */ - @Override - public DataComponentMap components() { - DataComponentMap.Builder builder = DataComponentMap.builder().addAll(super.components()); - configurer.accept(builder); - return builder.build(); + // dummy values. real values should be overriden in component initializer of AAItem builder + public AAHoeItem(Properties properties) { + super(ToolMaterial.WOOD, 0, 0, properties); } } diff --git a/common/src/main/java/one/dqu/additionaladditions/item/AAShovelItem.java b/common/src/main/java/one/dqu/additionaladditions/item/AAShovelItem.java index b53ecc8e..fcb3c4d3 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/AAShovelItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/item/AAShovelItem.java @@ -1,31 +1,11 @@ package one.dqu.additionaladditions.item; -import net.minecraft.core.component.DataComponentMap; -import net.minecraft.world.item.HoeItem; import net.minecraft.world.item.ShovelItem; import net.minecraft.world.item.ToolMaterial; -import one.dqu.additionaladditions.material.AAMaterial; -import one.dqu.additionaladditions.material.ToolType; - -import java.util.function.Consumer; public class AAShovelItem extends ShovelItem { - Consumer configurer; - - public AAShovelItem(AAMaterial material, Properties properties) { - // dummy values. actual values are generated by AAMaterial - super(ToolMaterial.WOOD, 0, 0, properties.repairable(material.repairIngredient())); - - this.configurer = builder -> material.applyFor(builder, ToolType.SHOVEL); - } - - /** - * @see one.dqu.additionaladditions.item.configurable.ConfigurableItem - */ - @Override - public DataComponentMap components() { - DataComponentMap.Builder builder = DataComponentMap.builder().addAll(super.components()); - configurer.accept(builder); - return builder.build(); + // dummy values. real values should be overriden in component initializer of AAItem builder + public AAShovelItem(Properties properties) { + super(ToolMaterial.WOOD, 0, 0, properties); } } diff --git a/common/src/main/java/one/dqu/additionaladditions/item/ArmorItem.java b/common/src/main/java/one/dqu/additionaladditions/item/ArmorItem.java deleted file mode 100644 index 56fed8f3..00000000 --- a/common/src/main/java/one/dqu/additionaladditions/item/ArmorItem.java +++ /dev/null @@ -1,16 +0,0 @@ -package one.dqu.additionaladditions.item; - -import net.minecraft.world.item.equipment.ArmorType; -import one.dqu.additionaladditions.item.configurable.ConfigurableItem; -import one.dqu.additionaladditions.material.AAMaterial; -import one.dqu.additionaladditions.material.AnimalArmorType; - -public class ArmorItem extends ConfigurableItem { - public ArmorItem(AAMaterial material, ArmorType armorType, Properties properties) { - super(properties.repairable(material.repairIngredient()), builder -> material.applyFor(builder, armorType)); - } - - public ArmorItem(AAMaterial material, AnimalArmorType animalArmorType, Properties properties) { - super(properties.repairable(material.repairIngredient()), builder -> material.applyFor(builder, animalArmorType)); - } -} diff --git a/common/src/main/java/one/dqu/additionaladditions/item/FoodItem.java b/common/src/main/java/one/dqu/additionaladditions/item/FoodItem.java deleted file mode 100644 index 73d7cf38..00000000 --- a/common/src/main/java/one/dqu/additionaladditions/item/FoodItem.java +++ /dev/null @@ -1,14 +0,0 @@ -package one.dqu.additionaladditions.item; - -import net.minecraft.core.component.DataComponents; -import one.dqu.additionaladditions.config.ConfigProperty; -import one.dqu.additionaladditions.config.type.FoodConfig; -import one.dqu.additionaladditions.item.configurable.ConfigurableItem; - -public class FoodItem extends ConfigurableItem { - public FoodItem(Properties properties, ConfigProperty config) { - super(properties, builder -> { - builder.set(DataComponents.FOOD, config.get().food()); - }); - } -} diff --git a/common/src/main/java/one/dqu/additionaladditions/item/ToolItem.java b/common/src/main/java/one/dqu/additionaladditions/item/ToolItem.java deleted file mode 100644 index d28c323e..00000000 --- a/common/src/main/java/one/dqu/additionaladditions/item/ToolItem.java +++ /dev/null @@ -1,11 +0,0 @@ -package one.dqu.additionaladditions.item; - -import one.dqu.additionaladditions.item.configurable.ConfigurableItem; -import one.dqu.additionaladditions.material.AAMaterial; -import one.dqu.additionaladditions.material.ToolType; - -public class ToolItem extends ConfigurableItem { - public ToolItem(AAMaterial material, ToolType toolType, Properties properties) { - super(properties.repairable(material.repairIngredient()), builder -> material.applyFor(builder, toolType)); - } -} diff --git a/common/src/main/java/one/dqu/additionaladditions/item/WateringCanItem.java b/common/src/main/java/one/dqu/additionaladditions/item/WateringCanItem.java index 2abdfda7..8e852c1e 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/WateringCanItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/item/WateringCanItem.java @@ -4,8 +4,8 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionResult; +import net.minecraft.world.item.Item; import one.dqu.additionaladditions.config.Config; -import one.dqu.additionaladditions.item.configurable.ConfigurableItem; import one.dqu.additionaladditions.util.FluidHelper; import one.dqu.additionaladditions.registry.AAMisc; import net.minecraft.core.BlockPos; @@ -25,9 +25,9 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; -public class WateringCanItem extends ConfigurableItem { +public class WateringCanItem extends Item { public WateringCanItem(Properties settings) { - super(settings, builder -> {}); + super(settings); } private int getWaterLevel(ItemStack stack) { diff --git a/common/src/main/java/one/dqu/additionaladditions/item/WrenchItem.java b/common/src/main/java/one/dqu/additionaladditions/item/WrenchItem.java index befde6cc..0697a029 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/WrenchItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/item/WrenchItem.java @@ -1,9 +1,8 @@ package one.dqu.additionaladditions.item; +import net.minecraft.world.item.Item; import one.dqu.additionaladditions.config.Config; -import one.dqu.additionaladditions.item.configurable.ConfigurableItem; import net.minecraft.core.BlockPos; -import net.minecraft.core.component.DataComponents; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -23,11 +22,9 @@ import java.util.Optional; -public class WrenchItem extends ConfigurableItem { +public class WrenchItem extends Item { public WrenchItem(Properties settings) { - super(settings, builder -> { - builder.set(DataComponents.MAX_DAMAGE, Config.WRENCH.get().durability()); - }); + super(settings); } private boolean tryPlacing(BlockPos pos, BlockState state, Level world, ItemStack stack, Optional player, Optional hand) { diff --git a/common/src/main/java/one/dqu/additionaladditions/item/configurable/ConfigurableItem.java b/common/src/main/java/one/dqu/additionaladditions/item/configurable/ConfigurableItem.java deleted file mode 100644 index 9b71900c..00000000 --- a/common/src/main/java/one/dqu/additionaladditions/item/configurable/ConfigurableItem.java +++ /dev/null @@ -1,35 +0,0 @@ -package one.dqu.additionaladditions.item.configurable; - -import net.minecraft.core.component.DataComponentMap; -import net.minecraft.world.item.Item; - -import java.util.function.Consumer; - -public class ConfigurableItem extends Item { - Consumer configurer = builder -> {}; - - public ConfigurableItem(Properties properties) { - super(properties); - } - - public ConfigurableItem(Properties properties, Consumer configurer) { - super(properties); - this.configurer = configurer; - } - - /** - * This determines the map of default item components of an Item. - *

- * We use this to make otherwise static data (like durability or attribute modifiers) dynamic, - * so the server-client config sync works properly. - *

- * This should have a negligible impact on performance as this method is only called once - * per initialization of an ItemStack instance. - */ - @Override - public DataComponentMap components() { - DataComponentMap.Builder builder = DataComponentMap.builder().addAll(super.components()); - configurer.accept(builder); - return builder.build(); - } -} diff --git a/common/src/main/java/one/dqu/additionaladditions/material/AAMaterial.java b/common/src/main/java/one/dqu/additionaladditions/material/AAMaterial.java index de0693a4..0ae545f1 100644 --- a/common/src/main/java/one/dqu/additionaladditions/material/AAMaterial.java +++ b/common/src/main/java/one/dqu/additionaladditions/material/AAMaterial.java @@ -1,16 +1,17 @@ package one.dqu.additionaladditions.material; import net.minecraft.core.HolderGetter; +import net.minecraft.core.HolderLookup; import net.minecraft.core.HolderSet; -import net.minecraft.core.MappedRegistry; -import net.minecraft.core.Registry; +import net.minecraft.core.component.DataComponentInitializers; import net.minecraft.core.component.DataComponentMap; import net.minecraft.core.component.DataComponents; -import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; import net.minecraft.resources.Identifier; import net.minecraft.resources.ResourceKey; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; +import net.minecraft.world.damagesource.DamageTypes; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlotGroup; @@ -43,48 +44,44 @@ public record AAMaterial( Map> toolConfigs, Map> armorConfigs ) { - public void applyFor(DataComponentMap.Builder builder, ToolType toolType) { - DataComponentMap patch; + public DataComponentInitializers.Initializer initializerFor(ToolType toolType) { + return (builder, registries, key) -> { + HolderGetter blocks = registries.lookupOrThrow(Registries.BLOCK); + MaterialConfig material = materialConfig.get(); + ToolLikeConfig toolLike = toolConfigs.get(toolType).get(); - if (toolType == ToolType.SPEAR) { - patch = spearProperties(name, materialConfig.get(), toolConfigs.get(toolType).get()); - } else { - patch = toolProperties(toolType, materialConfig.get(), toolConfigs.get(toolType).get()); - } + applyToolComponents(builder, toolType, material, toolLike, blocks); - builder.addAll(patch); + if (toolType == ToolType.SPEAR) { + applySpearComponents(builder, toolLike, registries); + } + }; } - public void applyFor(DataComponentMap.Builder builder, ArmorType armorType) { + public DataComponentInitializers.Initializer initializerFor(ArmorType armorType) { if (armorType == ArmorType.BODY) { throw new IllegalArgumentException("BODY armor type not supported by this method. Material: " + name); } - var patch = AAMaterial.humanoidArmorProperties( - name, - armorType, - materialConfig.get(), - armorConfigs.get(armorType).get() + return (builder, registries, key) -> applyHumanoidArmorComponents( + builder, armorType, materialConfig.get(), armorConfigs.get(armorType).get() ); - - builder.addAll(patch); } - public void applyFor(DataComponentMap.Builder builder, AnimalArmorType armorType) { - var patch = AAMaterial.animalArmorProperties( - name, - armorType, - materialConfig.get(), - armorConfigs.get(ArmorType.BODY).get() - ); - - builder.addAll(patch); + public DataComponentInitializers.Initializer initializerFor(AnimalArmorType armorType) { + return (builder, registries, key) -> { + HolderGetter> entityTypes = registries.lookupOrThrow(Registries.ENTITY_TYPE); + applyAnimalArmorComponents(builder, armorType, materialConfig.get(), armorConfigs.get(ArmorType.BODY).get(), entityTypes); + }; } - private static DataComponentMap toolProperties(ToolType type, MaterialConfig material, ToolLikeConfig toolLike) { - DataComponentMap.Builder builder = DataComponentMap.builder(); - HolderGetter registry = acquireRegistry(BuiltInRegistries.BLOCK); - + private void applyToolComponents( + DataComponentMap.Builder builder, + ToolType type, + MaterialConfig material, + ToolLikeConfig toolLike, + HolderGetter blocks + ) { builder.set(DataComponents.MAX_DAMAGE, toolLike.durability()); builder.set(DataComponents.DAMAGE, 0); builder.set(DataComponents.MAX_STACK_SIZE, 1); @@ -94,8 +91,8 @@ private static DataComponentMap toolProperties(ToolType type, MaterialConfig mat Tool toolComponent = new Tool( List.of( Tool.Rule.minesAndDrops(HolderSet.direct(Blocks.COBWEB.builtInRegistryHolder()), 15.0F), - Tool.Rule.overrideSpeed(registry.getOrThrow(BlockTags.SWORD_INSTANTLY_MINES), Float.MAX_VALUE), - Tool.Rule.overrideSpeed(registry.getOrThrow(BlockTags.SWORD_EFFICIENT), 1.5F) + Tool.Rule.overrideSpeed(blocks.getOrThrow(BlockTags.SWORD_INSTANTLY_MINES), Float.MAX_VALUE), + Tool.Rule.overrideSpeed(blocks.getOrThrow(BlockTags.SWORD_EFFICIENT), 1.5F) ), 1.0F, 2, false ); @@ -103,8 +100,8 @@ private static DataComponentMap toolProperties(ToolType type, MaterialConfig mat } else if (!type.isWeapon()) { Tool toolComponent = new Tool( List.of( - Tool.Rule.deniesDrops(registry.getOrThrow(material.incorrectBlocksForDrops())), - Tool.Rule.minesAndDrops(registry.getOrThrow(type.mineableTag()), toolLike.blockBreakSpeed()) + Tool.Rule.deniesDrops(blocks.getOrThrow(material.incorrectBlocksForDrops())), + Tool.Rule.minesAndDrops(blocks.getOrThrow(type.mineableTag()), toolLike.blockBreakSpeed()) ), 1.0F, 1, true ); @@ -122,38 +119,28 @@ private static DataComponentMap toolProperties(ToolType type, MaterialConfig mat ItemAttributeModifiers attributes = ItemAttributeModifiers.builder() .add( Attributes.ATTACK_DAMAGE, - new AttributeModifier( - Item.BASE_ATTACK_DAMAGE_ID, - toolLike.attackDamage() - 1, - AttributeModifier.Operation.ADD_VALUE - ), + new AttributeModifier(Item.BASE_ATTACK_DAMAGE_ID, toolLike.attackDamage() - 1, AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND ) .add( Attributes.ATTACK_SPEED, - new AttributeModifier( - Item.BASE_ATTACK_SPEED_ID, - toolLike.attackSpeed(), - AttributeModifier.Operation.ADD_VALUE - ), + new AttributeModifier(Item.BASE_ATTACK_SPEED_ID, toolLike.attackSpeed(), AttributeModifier.Operation.ADD_VALUE), EquipmentSlotGroup.MAINHAND ) .build(); builder.set(DataComponents.ATTRIBUTE_MODIFIERS, attributes); - - return builder.build(); } - private static DataComponentMap spearProperties(String name, MaterialConfig material, ToolLikeConfig toolLike) { + private void applySpearComponents( + DataComponentMap.Builder builder, + ToolLikeConfig toolLike, + HolderLookup.Provider registries + ) { if (!(toolLike instanceof SpearItemConfig spear)) { throw new IllegalArgumentException("ToolLike of tool type SPEAR of material " + name + " is not an instance of SpearItemConfig."); } - DataComponentMap.Builder builder = DataComponentMap.builder(); - - DataComponentMap tool = toolProperties(ToolType.SPEAR, material, toolLike); - builder.addAll(tool); - + builder.set(DataComponents.DAMAGE_TYPE, registries.lookupOrThrow(Registries.DAMAGE_TYPE).getOrThrow(DamageTypes.SPEAR)); builder.set(DataComponents.KINETIC_WEAPON, spear.kineticWeapon()); builder.set(DataComponents.PIERCING_WEAPON, spear.piercingWeapon()); builder.set(DataComponents.SWING_ANIMATION, new SwingAnimation(SwingAnimationType.STAB, spear.swingAnimationTicks())); @@ -162,8 +149,6 @@ private static DataComponentMap spearProperties(String name, MaterialConfig mate builder.set(DataComponents.ATTACK_RANGE, new AttackRange(2.0F, 4.5F, 2.0F, 6.5F, 0.125F, 0.5F)); builder.set(DataComponents.MINIMUM_ATTACK_CHARGE, 1.0F); builder.set(DataComponents.USE_EFFECTS, new UseEffects(true, false, 1.0F)); - - return builder.build(); } private static ItemAttributeModifiers createArmorAttributes(ArmorType armorType, MaterialConfig material, ArmorLikeConfig armorLike) { @@ -171,33 +156,13 @@ private static ItemAttributeModifiers createArmorAttributes(ArmorType armorType, Identifier identifier = Identifier.withDefaultNamespace("armor." + armorType.getName()); ItemAttributeModifiers.Builder attributes = ItemAttributeModifiers.builder() - .add( - Attributes.ARMOR, - new AttributeModifier( - identifier, - armorLike.protection(), - AttributeModifier.Operation.ADD_VALUE - ), - slotGroup - ) - .add( - Attributes.ARMOR_TOUGHNESS, - new AttributeModifier( - identifier, - material.toughness(), - AttributeModifier.Operation.ADD_VALUE - ), - slotGroup - ); + .add(Attributes.ARMOR, new AttributeModifier(identifier, armorLike.protection(), AttributeModifier.Operation.ADD_VALUE), slotGroup) + .add(Attributes.ARMOR_TOUGHNESS, new AttributeModifier(identifier, material.toughness(), AttributeModifier.Operation.ADD_VALUE), slotGroup); if (material.knockbackResistance() > 0) { attributes.add( Attributes.KNOCKBACK_RESISTANCE, - new AttributeModifier( - identifier, - material.knockbackResistance(), - AttributeModifier.Operation.ADD_VALUE - ), + new AttributeModifier(identifier, material.knockbackResistance(), AttributeModifier.Operation.ADD_VALUE), slotGroup ); } @@ -205,9 +170,12 @@ private static ItemAttributeModifiers createArmorAttributes(ArmorType armorType, return attributes.build(); } - private static DataComponentMap humanoidArmorProperties(String name, ArmorType type, MaterialConfig material, ArmorLikeConfig armorLike) { - DataComponentMap.Builder builder = DataComponentMap.builder(); - + private void applyHumanoidArmorComponents( + DataComponentMap.Builder builder, + ArmorType type, + MaterialConfig material, + ArmorLikeConfig armorLike + ) { if (armorLike instanceof ArmorItemConfig armorItemConfig) { builder.set(DataComponents.MAX_DAMAGE, armorItemConfig.durability()); builder.set(DataComponents.DAMAGE, 0); @@ -217,7 +185,6 @@ private static DataComponentMap humanoidArmorProperties(String name, ArmorType t builder.set(DataComponents.MAX_STACK_SIZE, 1); builder.set(DataComponents.ENCHANTABLE, new Enchantable(material.enchantability())); - builder.set(DataComponents.ATTRIBUTE_MODIFIERS, createArmorAttributes(type, material, armorLike)); ResourceKey assetId = ResourceKey.create( @@ -230,20 +197,19 @@ private static DataComponentMap humanoidArmorProperties(String name, ArmorType t .setAsset(assetId) .build(); builder.set(DataComponents.EQUIPPABLE, equippable); - - return builder.build(); } - private static DataComponentMap animalArmorProperties(String name, AnimalArmorType armorType, MaterialConfig material, ArmorLikeConfig armorLike) { - DataComponentMap.Builder builder = DataComponentMap.builder(); - + private void applyAnimalArmorComponents( + DataComponentMap.Builder builder, + AnimalArmorType armorType, + MaterialConfig material, + ArmorLikeConfig armorLike, + HolderGetter> entityTypes + ) { builder.set(DataComponents.MAX_STACK_SIZE, 1); builder.set(DataComponents.ENCHANTABLE, new Enchantable(material.enchantability())); - builder.set(DataComponents.ATTRIBUTE_MODIFIERS, createArmorAttributes(ArmorType.BODY, material, armorLike)); - HolderGetter> registry = acquireRegistry(BuiltInRegistries.ENTITY_TYPE); - ResourceKey assetId = ResourceKey.create( ResourceKey.createRegistryKey(Identifier.withDefaultNamespace("equipment_asset")), Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, name) @@ -252,33 +218,12 @@ private static DataComponentMap animalArmorProperties(String name, AnimalArmorTy Equippable equippable = Equippable.builder(EquipmentSlot.BODY) .setEquipSound(armorType.equipSound()) .setAsset(assetId) - .setAllowedEntities(registry.getOrThrow(armorType.canWearTag())) + .setAllowedEntities(entityTypes.getOrThrow(armorType.canWearTag())) .setDamageOnHurt(false) .setEquipOnInteract(true) .setCanBeSheared(true) .setShearingSound(armorType.unequipSound()) .build(); builder.set(DataComponents.EQUIPPABLE, equippable); - - return builder.build(); - } - - /** - * Some mods access {@link Item#components()} during bootstrap phase, for example using - * Fabric's DefaultItemComponentEvents. In that case, registries should be accessed using - * {@link BuiltInRegistries#acquireBootstrapRegistrationLookup(Registry)}. - *

- * TODO: On Minecraft 26.1, this should be done differently!!! - */ - private static HolderGetter acquireRegistry(Registry registry) { - if (registry instanceof MappedRegistry mappedRegistry) { - if (mappedRegistry.frozen) { - return registry; - } else { - return BuiltInRegistries.acquireBootstrapRegistrationLookup(registry); - } - } else { - throw new IllegalStateException("Registry " + registry.key() + " is not a MappedRegistry, cannot acquire HolderGetter."); - } } } diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AAItems.java b/common/src/main/java/one/dqu/additionaladditions/registry/AAItems.java index fcb0a2dc..8756627f 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AAItems.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AAItems.java @@ -2,9 +2,13 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.component.DataComponents; -import net.minecraft.world.damagesource.DamageTypes; import net.minecraft.core.dispenser.BlockSource; import net.minecraft.core.dispenser.DefaultDispenseItemBehavior; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.*; +import net.minecraft.world.item.component.Consumables; import net.minecraft.world.item.component.TooltipDisplay; import net.minecraft.world.item.equipment.ArmorType; import net.minecraft.world.level.block.DispenserBlock; @@ -13,25 +17,19 @@ import one.dqu.additionaladditions.AdditionalAdditions; import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.config.ConfigProperty; -import one.dqu.additionaladditions.config.Toggleable; +import one.dqu.additionaladditions.core.builder.AAItem; +import one.dqu.additionaladditions.feature.album.AlbumContents; import one.dqu.additionaladditions.feature.glint.GlintColor; import one.dqu.additionaladditions.item.*; -import one.dqu.additionaladditions.item.configurable.*; -import one.dqu.additionaladditions.feature.album.AlbumContents; import one.dqu.additionaladditions.material.AAMaterials; import one.dqu.additionaladditions.material.AnimalArmorType; import one.dqu.additionaladditions.material.ToolType; -import one.dqu.additionaladditions.util.CreativeAdder; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.Identifier; -import net.minecraft.world.item.*; -import net.minecraft.world.level.ItemLike; import one.dqu.additionaladditions.util.Registrar; -import java.util.*; -import java.util.function.Consumer; -import java.util.function.Function; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; import java.util.function.Supplier; @SuppressWarnings("unused") @@ -39,555 +37,444 @@ public class AAItems { private static final Map>> CONFIG_TO_ITEM = new HashMap<>(); public static Collection> fromConfigProperty(ConfigProperty configProperty) { - return CONFIG_TO_ITEM.get(configProperty.path()); + return CONFIG_TO_ITEM.getOrDefault(configProperty.path(), Set.of()); } // BLOCKS - public static final Supplier ROPE = new Builder("rope") + public static final Supplier ROPE = new AAItem<>() .config(Config.ROPE) - .creativeAfter(Items.LADDER, CreativeModeTabs.FUNCTIONAL_BLOCKS) - .creativeAfter(Items.SPYGLASS, CreativeModeTabs.TOOLS_AND_UTILITIES) - .build(p -> new BlockItem(AABlocks.ROPE_BLOCK.get(), p)); + .factory(p -> new BlockItem(AABlocks.ROPE_BLOCK.get(), p)) + .creative(Items.LADDER, CreativeModeTabs.FUNCTIONAL_BLOCKS, false) + .creative(Items.SPYGLASS, CreativeModeTabs.TOOLS_AND_UTILITIES, false) + .make("rope"); - public static final Supplier TINTED_REDSTONE_LAMP = new Builder("tinted_redstone_lamp") + public static final Supplier TINTED_REDSTONE_LAMP = new AAItem<>() .config(Config.TINTED_REDSTONE_LAMP) - .creativeAfter(Items.REDSTONE_LAMP, CreativeModeTabs.REDSTONE_BLOCKS) - .creativeAfter(Items.REDSTONE_LAMP, CreativeModeTabs.FUNCTIONAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.TINTED_REDSTONE_LAMP.get(), p)); + .factory(p -> new BlockItem(AABlocks.TINTED_REDSTONE_LAMP.get(), p)) + .creative(Items.REDSTONE_LAMP, CreativeModeTabs.REDSTONE_BLOCKS, false) + .creative(Items.REDSTONE_LAMP, CreativeModeTabs.FUNCTIONAL_BLOCKS, false) + .make("tinted_redstone_lamp"); - public static final Supplier COPPER_PATINA = new Builder("copper_patina") + public static final Supplier COPPER_PATINA = new AAItem() .config(Config.COPPER_PATINA) - .creativeAfter(Items.REDSTONE, CreativeModeTabs.REDSTONE_BLOCKS) - .build(p -> new CopperPatinaItem(AABlocks.COPPER_PATINA.get(), p)); + .factory(p -> new CopperPatinaItem(AABlocks.COPPER_PATINA.get(), p)) + .creative(Items.REDSTONE, CreativeModeTabs.REDSTONE_BLOCKS, false) + .make("copper_patina"); - public static final Supplier PATINA_BLOCK = new Builder("patina_block") + public static final Supplier PATINA_BLOCK = new AAItem<>() .config(Config.COPPER_PATINA) - .creativeBefore(Items.COPPER_BLOCK, CreativeModeTabs.BUILDING_BLOCKS) - .build(p -> new BlockItem(AABlocks.PATINA_BLOCK.get(), p)); + .factory(p -> new BlockItem(AABlocks.PATINA_BLOCK.get(), p)) + .creative(Items.COPPER_BLOCK, CreativeModeTabs.BUILDING_BLOCKS, true) + .make("patina_block"); - public static final Supplier ROSE_GOLD_BLOCK = new Builder("rose_gold_block") + public static final Supplier ROSE_GOLD_BLOCK = new AAItem<>() .config(Config.ROSE_GOLD) - .creativeAfter(Items.LIGHT_WEIGHTED_PRESSURE_PLATE, CreativeModeTabs.BUILDING_BLOCKS) - .build(p -> new BlockItem(AABlocks.ROSE_GOLD_BLOCK.get(), p)); + .factory(p -> new BlockItem(AABlocks.ROSE_GOLD_BLOCK.get(), p)) + .creative(Items.LIGHT_WEIGHTED_PRESSURE_PLATE, CreativeModeTabs.BUILDING_BLOCKS, false) + .make("rose_gold_block"); // SNIFFER PLANTS - public static final Supplier COTTONSHIVER = new Builder("cottonshiver") + public static final Supplier COTTONSHIVER = new AAItem<>() .config(Config.SNIFFER_PLANTS) - .creativeAfter(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.COTTONSHIVER.get(), p)); - public static final Supplier COTTONSHIVER_POD = new Builder("cottonshiver_pod") + .factory(p -> new BlockItem(AABlocks.COTTONSHIVER.get(), p)) + .creative(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("cottonshiver"); + public static final Supplier COTTONSHIVER_POD = new AAItem<>() .config(Config.SNIFFER_PLANTS) + .factory(p -> new BlockItem(AABlocks.COTTONSHIVER_CROP.get(), p)) .properties(p -> p.useItemDescriptionPrefix()) - .creativeAfter(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.COTTONSHIVER_CROP.get(), p)); + .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("cottonshiver_pod"); - public static final Supplier MUDFLOWER = new Builder("mudflower") + public static final Supplier MUDFLOWER = new AAItem<>() .config(Config.SNIFFER_PLANTS) - .creativeAfter(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.MUDFLOWER.get(), p)); - public static final Supplier MUDFLOWER_SEEDS = new Builder("mudflower_seeds") + .factory(p -> new BlockItem(AABlocks.MUDFLOWER.get(), p)) + .creative(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("mudflower"); + public static final Supplier MUDFLOWER_SEEDS = new AAItem<>() .config(Config.SNIFFER_PLANTS) + .factory(p -> new BlockItem(AABlocks.MUDFLOWER_CROP.get(), p)) .properties(p -> p.useItemDescriptionPrefix()) - .creativeAfter(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.MUDFLOWER_CROP.get(), p)); + .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("mudflower_seeds"); - public static final Supplier CRIMSON_BLOSSOM = new Builder("crimson_blossom") + public static final Supplier CRIMSON_BLOSSOM = new AAItem<>() .config(Config.SNIFFER_PLANTS) - .creativeAfter(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.CRIMSON_BLOSSOM.get(), p)); - public static final Supplier CRIMSON_BLOSSOM_SEEDS = new Builder("crimson_blossom_seeds") + .factory(p -> new BlockItem(AABlocks.CRIMSON_BLOSSOM.get(), p)) + .creative(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("crimson_blossom"); + public static final Supplier CRIMSON_BLOSSOM_SEEDS = new AAItem<>() .config(Config.SNIFFER_PLANTS) + .factory(p -> new BlockItem(AABlocks.CRIMSON_BLOSSOM_CROP.get(), p)) .properties(p -> p.useItemDescriptionPrefix()) - .creativeAfter(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.CRIMSON_BLOSSOM_CROP.get(), p)); + .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("crimson_blossom_seeds"); - public static final Supplier AMBER_BLOSSOM = new Builder("amber_blossom") + public static final Supplier AMBER_BLOSSOM = new AAItem<>() .config(Config.SNIFFER_PLANTS) - .creativeAfter(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.AMBER_BLOSSOM.get(), p)); - public static final Supplier AMBER_BLOSSOM_SEEDS = new Builder("amber_blossom_seeds") + .factory(p -> new BlockItem(AABlocks.AMBER_BLOSSOM.get(), p)) + .creative(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("amber_blossom"); + public static final Supplier AMBER_BLOSSOM_SEEDS = new AAItem<>() .config(Config.SNIFFER_PLANTS) + .factory(p -> new BlockItem(AABlocks.AMBER_BLOSSOM_CROP.get(), p)) .properties(p -> p.useItemDescriptionPrefix()) - .creativeAfter(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.AMBER_BLOSSOM_CROP.get(), p)); + .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("amber_blossom_seeds"); - public static final Supplier BULBUS = new Builder("bulbus") + public static final Supplier BULBUS = new AAItem<>() .config(Config.SNIFFER_PLANTS) - .creativeAfter(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.BULBUS.get(), p)); - public static final Supplier BULBUS_POD = new Builder("bulbus_pod") + .factory(p -> new BlockItem(AABlocks.BULBUS.get(), p)) + .creative(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("bulbus"); + public static final Supplier BULBUS_POD = new AAItem<>() .config(Config.SNIFFER_PLANTS) + .factory(p -> new BlockItem(AABlocks.BULBUS_CROP.get(), p)) .properties(p -> p.useItemDescriptionPrefix()) - .creativeAfter(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.BULBUS_CROP.get(), p)); + .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("bulbus_pod"); - public static final Supplier SAWTOOTH_FERN = new Builder("sawtooth_fern") + public static final Supplier SAWTOOTH_FERN = new AAItem<>() .config(Config.SNIFFER_PLANTS) - .creativeAfter(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.SAWTOOTH_FERN.get(), p)); - public static final Supplier SAWTOOTH_FERN_FIDDLEHEAD = new Builder("sawtooth_fern_fiddlehead") + .factory(p -> new BlockItem(AABlocks.SAWTOOTH_FERN.get(), p)) + .creative(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("sawtooth_fern"); + public static final Supplier SAWTOOTH_FERN_FIDDLEHEAD = new AAItem<>() .config(Config.SNIFFER_PLANTS) + .factory(p -> new BlockItem(AABlocks.SAWTOOTH_FERN_CROP.get(), p)) .properties(p -> p.useItemDescriptionPrefix()) - .creativeAfter(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.SAWTOOTH_FERN_CROP.get(), p)); + .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("sawtooth_fern_fiddlehead"); - public static final Supplier FROSTLEAF = new Builder("frostleaf") + public static final Supplier FROSTLEAF = new AAItem<>() .config(Config.SNIFFER_PLANTS) - .creativeAfter(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.FROSTLEAF.get(), p)); - public static final Supplier FROSTLEAF_POD = new Builder("frostleaf_pod") + .factory(p -> new BlockItem(AABlocks.FROSTLEAF.get(), p)) + .creative(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("frostleaf"); + public static final Supplier FROSTLEAF_POD = new AAItem<>() .config(Config.SNIFFER_PLANTS) + .factory(p -> new BlockItem(AABlocks.FROSTLEAF_CROP.get(), p)) .properties(p -> p.useItemDescriptionPrefix()) - .creativeAfter(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.FROSTLEAF_CROP.get(), p)); + .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("frostleaf_pod"); - public static final Supplier WISTERIA = new Builder("wisteria") + public static final Supplier WISTERIA = new AAItem<>() .config(Config.SNIFFER_PLANTS) - .creativeAfter(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.WISTERIA.get(), p)); - public static final Supplier WISTERIA_VINES = new Builder("wisteria_vines") + .factory(p -> new BlockItem(AABlocks.WISTERIA.get(), p)) + .creative(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("wisteria"); + public static final Supplier WISTERIA_VINES = new AAItem<>() .config(Config.SNIFFER_PLANTS) + .factory(p -> new BlockItem(AABlocks.WISTERIA_CROP.get(), p)) .properties(p -> p.useItemDescriptionPrefix()) - .creativeAfter(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.WISTERIA_CROP.get(), p)); + .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("wisteria_vines"); - public static final Supplier SPIKEBLOSSOM = new Builder("spikeblossom") + public static final Supplier SPIKEBLOSSOM = new AAItem<>() .config(Config.SNIFFER_PLANTS) - .creativeAfter(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.SPIKEBLOSSOM.get(), p)); - public static final Supplier SPIKEBLOSSOM_SEEDS = new Builder("spikeblossom_seeds") + .factory(p -> new BlockItem(AABlocks.SPIKEBLOSSOM.get(), p)) + .creative(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("spikeblossom"); + public static final Supplier SPIKEBLOSSOM_SEEDS = new AAItem<>() .config(Config.SNIFFER_PLANTS) + .factory(p -> new BlockItem(AABlocks.SPIKEBLOSSOM_CROP.get(), p)) .properties(p -> p.useItemDescriptionPrefix()) - .creativeAfter(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.SPIKEBLOSSOM_CROP.get(), p)); + .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("spikeblossom_seeds"); - public static final Supplier SNAPDRAGON = new Builder("snapdragon") + public static final Supplier SNAPDRAGON = new AAItem<>() .config(Config.SNIFFER_PLANTS) - .creativeAfter(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.SNAPDRAGON.get(), p)); - public static final Supplier SNAPDRAGON_POD = new Builder("snapdragon_pod") + .factory(p -> new BlockItem(AABlocks.SNAPDRAGON.get(), p)) + .creative(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("snapdragon"); + public static final Supplier SNAPDRAGON_POD = new AAItem<>() .config(Config.SNIFFER_PLANTS) + .factory(p -> new BlockItem(AABlocks.SNAPDRAGON_CROP.get(), p)) .properties(p -> p.useItemDescriptionPrefix()) - .creativeAfter(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.SNAPDRAGON_CROP.get(), p)); + .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("snapdragon_pod"); - public static final Supplier LOTUS_LILY = new Builder("lotus_lily") + public static final Supplier LOTUS_LILY = new AAItem<>() .config(Config.SNIFFER_PLANTS) - .creativeAfter(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new PlaceOnWaterBlockItem(AABlocks.LOTUS_LILY.get(), p)); - public static final Supplier LOTUS_LILY_POD = new Builder("lotus_lily_pod") + .factory(p -> new PlaceOnWaterBlockItem(AABlocks.LOTUS_LILY.get(), p)) + .creative(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("lotus_lily"); + public static final Supplier LOTUS_LILY_POD = new AAItem<>() .config(Config.SNIFFER_PLANTS) + .factory(p -> new BlockItem(AABlocks.LOTUS_LILY_CROP.get(), p)) .properties(p -> p.useItemDescriptionPrefix()) - .creativeAfter(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS) - .build(p -> new BlockItem(AABlocks.LOTUS_LILY_CROP.get(), p)); + .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) + .make("lotus_lily_pod"); // FOOD - public static final Supplier FRIED_EGG = new Builder("fried_egg") + public static final Supplier FRIED_EGG = new AAItem<>() .config(Config.FRIED_EGG) - .properties(p -> p.food(Config.FRIED_EGG.get().food())) - .creativeAfter(Items.COOKED_RABBIT, CreativeModeTabs.FOOD_AND_DRINKS) - .build(p -> new FoodItem(p, Config.FRIED_EGG)); + .properties(p -> p + .delayedComponent(DataComponents.FOOD, provider -> Config.FRIED_EGG.get().food()) + .component(DataComponents.CONSUMABLE, Consumables.DEFAULT_FOOD) + ) + .creative(Items.COOKED_RABBIT, CreativeModeTabs.FOOD_AND_DRINKS, false) + .make("fried_egg"); - public static final Supplier BERRY_PIE = new Builder("berry_pie") + public static final Supplier BERRY_PIE = new AAItem<>() .config(Config.BERRY_PIE) - .properties(p -> p.food(Config.BERRY_PIE.get().food())) - .creativeAfter(Items.PUMPKIN_PIE, CreativeModeTabs.FOOD_AND_DRINKS) - .build(p -> new FoodItem(p, Config.BERRY_PIE)); + .properties(p -> p + .delayedComponent(DataComponents.FOOD, provider -> Config.BERRY_PIE.get().food()) + .component(DataComponents.CONSUMABLE, Consumables.DEFAULT_FOOD) + ) + .creative(Items.PUMPKIN_PIE, CreativeModeTabs.FOOD_AND_DRINKS, false) + .make("berry_pie"); - public static final Supplier HONEYED_APPLE = new Builder("honeyed_apple") + public static final Supplier HONEYED_APPLE = new AAItem<>() .config(Config.HONEYED_APPLE) - .properties(p -> p.food(Config.HONEYED_APPLE.get().food())) - .creativeAfter(Items.APPLE, CreativeModeTabs.FOOD_AND_DRINKS) - .build(p -> new FoodItem(p, Config.HONEYED_APPLE)); + .properties(p -> p + .delayedComponent(DataComponents.FOOD, provider -> Config.HONEYED_APPLE.get().food()) + .component(DataComponents.CONSUMABLE, Consumables.DEFAULT_FOOD) + ) + .creative(Items.APPLE, CreativeModeTabs.FOOD_AND_DRINKS, false) + .make("honeyed_apple"); - public static final Supplier CHICKEN_NUGGET = new Builder("chicken_nugget") + public static final Supplier CHICKEN_NUGGET = new AAItem<>() .config(Config.CHICKEN_NUGGET) - .properties(p -> p.food(Config.CHICKEN_NUGGET.get().food())) - .creativeAfter(Items.ROTTEN_FLESH, CreativeModeTabs.FOOD_AND_DRINKS) - .build(p -> new FoodItem(p, Config.CHICKEN_NUGGET)); + .properties(p -> p + .delayedComponent(DataComponents.FOOD, provider -> Config.CHICKEN_NUGGET.get().food()) + .component(DataComponents.CONSUMABLE, Consumables.DEFAULT_FOOD) + ) + .creative(Items.ROTTEN_FLESH, CreativeModeTabs.FOOD_AND_DRINKS, false) + .make("chicken_nugget"); // OTHER - public static final Supplier WATERING_CAN = new Builder("watering_can") + public static final Supplier WATERING_CAN = new AAItem() .config(Config.WATERING_CAN) + .factory(WateringCanItem::new) .properties(p -> p .stacksTo(1) .component(AAMisc.WATER_LEVEL_COMPONENT.get(), 0) ) - .creativeAfter(Items.BONE_MEAL, CreativeModeTabs.TOOLS_AND_UTILITIES) - .build(WateringCanItem::new); + .creative(Items.BONE_MEAL, CreativeModeTabs.TOOLS_AND_UTILITIES, false) + .make("watering_can"); - public static final Supplier WRENCH_ITEM = new Builder("wrench") + public static final Supplier WRENCH_ITEM = new AAItem() .config(Config.WRENCH) + .factory(WrenchItem::new) .properties(p -> p .stacksTo(1) - .durability(Config.WRENCH.get().durability()) + .delayedComponent(DataComponents.MAX_DAMAGE, provider -> Config.WRENCH.get().durability()) + .component(DataComponents.DAMAGE, 0) ) - .creativeAfter(Items.BONE_MEAL, CreativeModeTabs.TOOLS_AND_UTILITIES) - .creativeAfter(Items.TARGET, CreativeModeTabs.REDSTONE_BLOCKS) - .build(WrenchItem::new); + .creative(Items.BONE_MEAL, CreativeModeTabs.TOOLS_AND_UTILITIES, false) + .creative(Items.TARGET, CreativeModeTabs.REDSTONE_BLOCKS, false) + .make("wrench"); - public static final Supplier TRIDENT_SHARD = new Builder("trident_shard") + public static final Supplier TRIDENT_SHARD = new AAItem<>() .config(Config.TRIDENT_SHARD) - .creativeAfter(Items.PRISMARINE_CRYSTALS, CreativeModeTabs.INGREDIENTS) - .build(); + .creative(Items.PRISMARINE_CRYSTALS, CreativeModeTabs.INGREDIENTS, false) + .make("trident_shard"); - public static final Supplier GLOW_STICK_ITEM = new Builder("glow_stick") + public static final Supplier GLOW_STICK_ITEM = new AAItem<>() .config(Config.GLOW_STICK) - .creativeAfter(Items.BONE_MEAL, CreativeModeTabs.TOOLS_AND_UTILITIES) - .build(p -> new GlowStickItem(AABlocks.GLOW_STICK_BLOCK.get(), p)); + .factory(p -> new GlowStickItem(AABlocks.GLOW_STICK_BLOCK.get(), p)) + .creative(Items.BONE_MEAL, CreativeModeTabs.TOOLS_AND_UTILITIES, false) + .make("glow_stick"); - public static final Supplier BAROMETER = new Builder("barometer") + public static final Supplier BAROMETER = new AAItem<>() .config(Config.BAROMETER) - .creativeAfter(Items.CLOCK, CreativeModeTabs.TOOLS_AND_UTILITIES) - .build(Item::new); + .creative(Items.CLOCK, CreativeModeTabs.TOOLS_AND_UTILITIES, false) + .make("barometer"); - public static final Supplier POCKET_JUKEBOX_ITEM = new Builder("pocket_jukebox") + public static final Supplier POCKET_JUKEBOX_ITEM = new AAItem() .config(Config.POCKET_JUKEBOX) + .factory(PocketJukeboxItem::new) .properties(p -> p .stacksTo(1) .component(DataComponents.TOOLTIP_DISPLAY, TooltipDisplay.DEFAULT.withHidden(DataComponents.CONTAINER, true)) ) - .creativeAfter(Items.SPYGLASS, CreativeModeTabs.TOOLS_AND_UTILITIES) - .build(PocketJukeboxItem::new); + .creative(Items.SPYGLASS, CreativeModeTabs.TOOLS_AND_UTILITIES, false) + .make("pocket_jukebox"); - public static final Supplier ROSE_GOLD_INGOT = new Builder("rose_gold_ingot") + public static final Supplier ROSE_GOLD_INGOT = new AAItem<>() .config(Config.ROSE_GOLD) - .creativeAfter(Items.GOLD_INGOT, CreativeModeTabs.INGREDIENTS) - .build(); + .creative(Items.GOLD_INGOT, CreativeModeTabs.INGREDIENTS, false) + .make("rose_gold_ingot"); - public static final Supplier MUSIC_DISC_0308 = new Builder("music_disc_0308") + public static final Supplier MUSIC_DISC_0308 = new AAItem<>() .config(Config.MUSIC_DISC_0308) .properties(p -> p .stacksTo(1) .rarity(Rarity.RARE) .jukeboxPlayable(ResourceKey.create(Registries.JUKEBOX_SONG, Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "0308"))) ) - .creativeAfter(Items.MUSIC_DISC_WARD, CreativeModeTabs.TOOLS_AND_UTILITIES) - .build(); + .creative(Items.MUSIC_DISC_WARD, CreativeModeTabs.TOOLS_AND_UTILITIES, false) + .make("music_disc_0308"); - public static final Supplier MUSIC_DISC_1007 = new Builder("music_disc_1007") + public static final Supplier MUSIC_DISC_1007 = new AAItem<>() .config(Config.MUSIC_DISC_1007) .properties(p -> p .stacksTo(1) .rarity(Rarity.RARE) .jukeboxPlayable(ResourceKey.create(Registries.JUKEBOX_SONG, Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "1007"))) ) - .creativeAfter(Items.MUSIC_DISC_WARD, CreativeModeTabs.TOOLS_AND_UTILITIES) - .build(); + .creative(Items.MUSIC_DISC_WARD, CreativeModeTabs.TOOLS_AND_UTILITIES, false) + .make("music_disc_1007"); - public static final Supplier MUSIC_DISC_1507 = new Builder("music_disc_1507") + public static final Supplier MUSIC_DISC_1507 = new AAItem<>() .config(Config.MUSIC_DISC_1507) .properties(p -> p .stacksTo(1) .rarity(Rarity.RARE) .jukeboxPlayable(ResourceKey.create(Registries.JUKEBOX_SONG, Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "1507"))) ) - .creativeAfter(Items.MUSIC_DISC_WARD, CreativeModeTabs.TOOLS_AND_UTILITIES) - .build(); + .creative(Items.MUSIC_DISC_WARD, CreativeModeTabs.TOOLS_AND_UTILITIES, false) + .make("music_disc_1507"); // ROSE GOLD - public static final Supplier ROSE_GOLD_HELMET = new Builder("rose_gold_helmet") + public static final Supplier ROSE_GOLD_HELMET = new AAItem<>() .config(Config.ROSE_GOLD) - .creativeAfter(Items.GOLDEN_BOOTS, CreativeModeTabs.COMBAT) - .build(p -> new ArmorItem(AAMaterials.ROSE_GOLD, ArmorType.HELMET, p)); + .material(AAMaterials.ROSE_GOLD, ArmorType.HELMET) + .creative(Items.GOLDEN_BOOTS, CreativeModeTabs.COMBAT, false) + .make("rose_gold_helmet"); - public static final Supplier ROSE_GOLD_CHESTPLATE = new Builder("rose_gold_chestplate") + public static final Supplier ROSE_GOLD_CHESTPLATE = new AAItem<>() .config(Config.ROSE_GOLD) - .creativeAfter(Items.GOLDEN_BOOTS, CreativeModeTabs.COMBAT) - .build(p -> new ArmorItem(AAMaterials.ROSE_GOLD, ArmorType.CHESTPLATE, p)); + .material(AAMaterials.ROSE_GOLD, ArmorType.CHESTPLATE) + .creative(Items.GOLDEN_BOOTS, CreativeModeTabs.COMBAT, false) + .make("rose_gold_chestplate"); - public static final Supplier ROSE_GOLD_LEGGINGS = new Builder("rose_gold_leggings") + public static final Supplier ROSE_GOLD_LEGGINGS = new AAItem<>() .config(Config.ROSE_GOLD) - .creativeAfter(Items.GOLDEN_BOOTS, CreativeModeTabs.COMBAT) - .build(p -> new ArmorItem(AAMaterials.ROSE_GOLD, ArmorType.LEGGINGS, p)); + .material(AAMaterials.ROSE_GOLD, ArmorType.LEGGINGS) + .creative(Items.GOLDEN_BOOTS, CreativeModeTabs.COMBAT, false) + .make("rose_gold_leggings"); - public static final Supplier ROSE_GOLD_BOOTS = new Builder("rose_gold_boots") + public static final Supplier ROSE_GOLD_BOOTS = new AAItem<>() .config(Config.ROSE_GOLD) - .creativeAfter(Items.GOLDEN_BOOTS, CreativeModeTabs.COMBAT) - .build(p -> new ArmorItem(AAMaterials.ROSE_GOLD, ArmorType.BOOTS, p)); + .material(AAMaterials.ROSE_GOLD, ArmorType.BOOTS) + .creative(Items.GOLDEN_BOOTS, CreativeModeTabs.COMBAT, false) + .make("rose_gold_boots"); - public static final Supplier ROSE_GOLD_HORSE_ARMOR = new Builder("rose_gold_horse_armor") + public static final Supplier ROSE_GOLD_HORSE_ARMOR = new AAItem<>() .config(Config.ROSE_GOLD) - .properties(p -> p - .stacksTo(1) - ) - .creativeAfter(Items.GOLDEN_HORSE_ARMOR, CreativeModeTabs.COMBAT) - .build(p -> new ArmorItem(AAMaterials.ROSE_GOLD, AnimalArmorType.HORSE, p)); + .material(AAMaterials.ROSE_GOLD, AnimalArmorType.HORSE) + .properties(p -> p.stacksTo(1)) + .creative(Items.GOLDEN_HORSE_ARMOR, CreativeModeTabs.COMBAT, false) + .make("rose_gold_horse_armor"); - public static final Supplier ROSE_GOLD_NAUTILUS_ARMOR = new Builder("rose_gold_nautilus_armor") + public static final Supplier ROSE_GOLD_NAUTILUS_ARMOR = new AAItem<>() .config(Config.ROSE_GOLD) - .properties(p -> p - .stacksTo(1) - ) - .creativeAfter(Items.GOLDEN_NAUTILUS_ARMOR, CreativeModeTabs.COMBAT) - .build(p -> new ArmorItem(AAMaterials.ROSE_GOLD, AnimalArmorType.NAUTILUS, p)); + .material(AAMaterials.ROSE_GOLD, AnimalArmorType.NAUTILUS) + .properties(p -> p.stacksTo(1)) + .creative(Items.GOLDEN_NAUTILUS_ARMOR, CreativeModeTabs.COMBAT, false) + .make("rose_gold_nautilus_armor"); - public static final Supplier ROSE_GOLD_SWORD = new Builder("rose_gold_sword") + public static final Supplier ROSE_GOLD_SWORD = new AAItem<>() .config(Config.ROSE_GOLD) - .creativeAfter(Items.GOLDEN_SWORD, CreativeModeTabs.COMBAT) - .build(p -> new ToolItem(AAMaterials.ROSE_GOLD, ToolType.SWORD, p)); + .material(AAMaterials.ROSE_GOLD, ToolType.SWORD) + .creative(Items.GOLDEN_SWORD, CreativeModeTabs.COMBAT, false) + .make("rose_gold_sword"); - public static final Supplier ROSE_GOLD_SPEAR = new Builder("rose_gold_spear") + public static final Supplier ROSE_GOLD_SPEAR = new AAItem<>() .config(Config.ROSE_GOLD) - .properties(p -> p.delayedHolderComponent(DataComponents.DAMAGE_TYPE, DamageTypes.SPEAR)) - .creativeAfter(Items.GOLDEN_SPEAR, CreativeModeTabs.COMBAT) - .build(p -> new ToolItem(AAMaterials.ROSE_GOLD, ToolType.SPEAR, p)); + .material(AAMaterials.ROSE_GOLD, ToolType.SPEAR) + .creative(Items.GOLDEN_SPEAR, CreativeModeTabs.COMBAT, false) + .make("rose_gold_spear"); - public static final Supplier ROSE_GOLD_SHOVEL = new Builder("rose_gold_shovel") + public static final Supplier ROSE_GOLD_SHOVEL = new AAItem<>() .config(Config.ROSE_GOLD) - .creativeAfter(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES) - .build(p -> new AAShovelItem(AAMaterials.ROSE_GOLD, p)); + .factory(AAShovelItem::new) + .material(AAMaterials.ROSE_GOLD, ToolType.SHOVEL) + .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, false) + .make("rose_gold_shovel"); - public static final Supplier ROSE_GOLD_PICKAXE = new Builder("rose_gold_pickaxe") + public static final Supplier ROSE_GOLD_PICKAXE = new AAItem<>() .config(Config.ROSE_GOLD) - .creativeAfter(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES) - .build(p -> new ToolItem(AAMaterials.ROSE_GOLD, ToolType.PICKAXE, p)); + .material(AAMaterials.ROSE_GOLD, ToolType.PICKAXE) + .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, false) + .make("rose_gold_pickaxe"); - public static final Supplier ROSE_GOLD_AXE = new Builder("rose_gold_axe") + public static final Supplier ROSE_GOLD_AXE = new AAItem<>() .config(Config.ROSE_GOLD) - .creativeAfter(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES) - .creativeAfter(Items.GOLDEN_AXE, CreativeModeTabs.COMBAT) - .build(p -> new AAAxeItem(AAMaterials.ROSE_GOLD, p)); + .factory(AAAxeItem::new) + .material(AAMaterials.ROSE_GOLD, ToolType.AXE) + .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, false) + .creative(Items.GOLDEN_AXE, CreativeModeTabs.COMBAT, false) + .make("rose_gold_axe"); - public static final Supplier ROSE_GOLD_HOE = new Builder("rose_gold_hoe") + public static final Supplier ROSE_GOLD_HOE = new AAItem<>() .config(Config.ROSE_GOLD) - .creativeAfter(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES) - .build(p -> new AAHoeItem(AAMaterials.ROSE_GOLD, p)); + .factory(AAHoeItem::new) + .material(AAMaterials.ROSE_GOLD, ToolType.HOE) + .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, false) + .make("rose_gold_hoe"); // SUSPICIOUS DYE - public static final Supplier WHITE_SUSPICIOUS_DYE = new Builder("white_suspicious_dye") - .config(Config.SUSPICIOUS_DYE) - .properties(p -> p - .stacksTo(1) - .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) - .component(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(DyeColor.WHITE)) - ) - .creativeBefore(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS) - .build(p -> new SuspiciousDyeItem(DyeColor.WHITE, p)); - - public static final Supplier BROWN_SUSPICIOUS_DYE = new Builder("brown_suspicious_dye") - .config(Config.SUSPICIOUS_DYE) - .properties(p -> p - .stacksTo(1) - .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) - .component(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(DyeColor.BROWN)) - ) - .creativeBefore(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS) - .build(p -> new SuspiciousDyeItem(DyeColor.BROWN, p)); - - public static final Supplier RED_SUSPICIOUS_DYE = new Builder("red_suspicious_dye") - .config(Config.SUSPICIOUS_DYE) - .properties(p -> p - .stacksTo(1) - .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) - .component(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(DyeColor.RED)) - ) - .creativeBefore(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS) - .build(p -> new SuspiciousDyeItem(DyeColor.RED, p)); - - public static final Supplier ORANGE_SUSPICIOUS_DYE = new Builder("orange_suspicious_dye") - .config(Config.SUSPICIOUS_DYE) - .properties(p -> p - .stacksTo(1) - .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) - .component(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(DyeColor.ORANGE)) - ) - .creativeBefore(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS) - .build(p -> new SuspiciousDyeItem(DyeColor.ORANGE, p)); - - public static final Supplier YELLOW_SUSPICIOUS_DYE = new Builder("yellow_suspicious_dye") - .config(Config.SUSPICIOUS_DYE) - .properties(p -> p - .stacksTo(1) - .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) - .component(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(DyeColor.YELLOW)) - ) - .creativeBefore(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS) - .build(p -> new SuspiciousDyeItem(DyeColor.YELLOW, p)); - - public static final Supplier LIME_SUSPICIOUS_DYE = new Builder("lime_suspicious_dye") - .config(Config.SUSPICIOUS_DYE) - .properties(p -> p - .stacksTo(1) - .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) - .component(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(DyeColor.LIME)) - ) - .creativeBefore(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS) - .build(p -> new SuspiciousDyeItem(DyeColor.LIME, p)); - - public static final Supplier GREEN_SUSPICIOUS_DYE = new Builder("green_suspicious_dye") - .config(Config.SUSPICIOUS_DYE) - .properties(p -> p - .stacksTo(1) - .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) - .component(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(DyeColor.GREEN)) - ) - .creativeBefore(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS) - .build(p -> new SuspiciousDyeItem(DyeColor.GREEN, p)); - - public static final Supplier CYAN_SUSPICIOUS_DYE = new Builder("cyan_suspicious_dye") - .config(Config.SUSPICIOUS_DYE) - .properties(p -> p - .stacksTo(1) - .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) - .component(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(DyeColor.CYAN)) - ) - .creativeBefore(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS) - .build(p -> new SuspiciousDyeItem(DyeColor.CYAN, p)); - - public static final Supplier LIGHT_BLUE_SUSPICIOUS_DYE = new Builder("light_blue_suspicious_dye") - .config(Config.SUSPICIOUS_DYE) - .properties(p -> p - .stacksTo(1) - .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) - .component(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(DyeColor.LIGHT_BLUE)) - ) - .creativeBefore(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS) - .build(p -> new SuspiciousDyeItem(DyeColor.LIGHT_BLUE, p)); - - public static final Supplier BLUE_SUSPICIOUS_DYE = new Builder("blue_suspicious_dye") - .config(Config.SUSPICIOUS_DYE) - .properties(p -> p - .stacksTo(1) - .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) - .component(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(DyeColor.BLUE)) - ) - .creativeBefore(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS) - .build(p -> new SuspiciousDyeItem(DyeColor.BLUE, p)); - - public static final Supplier PURPLE_SUSPICIOUS_DYE = new Builder("purple_suspicious_dye") - .config(Config.SUSPICIOUS_DYE) - .properties(p -> p - .stacksTo(1) - .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) - .component(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(DyeColor.PURPLE)) - ) - .creativeBefore(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS) - .build(p -> new SuspiciousDyeItem(DyeColor.PURPLE, p)); + private static AAItem suspiciousDye(DyeColor color) { + return new AAItem() + .config(Config.SUSPICIOUS_DYE) + .factory(p -> new SuspiciousDyeItem(color, p)) + .properties(p -> p + .stacksTo(1) + .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) + .component(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(color)) + ) + .creative(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS, true); + } - public static final Supplier MAGENTA_SUSPICIOUS_DYE = new Builder("magenta_suspicious_dye") - .config(Config.SUSPICIOUS_DYE) - .properties(p -> p - .stacksTo(1) - .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) - .component(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(DyeColor.MAGENTA)) - ) - .creativeBefore(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS) - .build(p -> new SuspiciousDyeItem(DyeColor.MAGENTA, p)); - - public static final Supplier PINK_SUSPICIOUS_DYE = new Builder("pink_suspicious_dye") - .config(Config.SUSPICIOUS_DYE) - .properties(p -> p - .stacksTo(1) - .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) - .component(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(DyeColor.PINK)) - ) - .creativeBefore(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS) - .build(p -> new SuspiciousDyeItem(DyeColor.PINK, p)); + public static final Supplier WHITE_SUSPICIOUS_DYE = suspiciousDye(DyeColor.WHITE).make("white_suspicious_dye"); + public static final Supplier BROWN_SUSPICIOUS_DYE = suspiciousDye(DyeColor.BROWN).make("brown_suspicious_dye"); + public static final Supplier RED_SUSPICIOUS_DYE = suspiciousDye(DyeColor.RED).make("red_suspicious_dye"); + public static final Supplier ORANGE_SUSPICIOUS_DYE = suspiciousDye(DyeColor.ORANGE).make("orange_suspicious_dye"); + public static final Supplier YELLOW_SUSPICIOUS_DYE = suspiciousDye(DyeColor.YELLOW).make("yellow_suspicious_dye"); + public static final Supplier LIME_SUSPICIOUS_DYE = suspiciousDye(DyeColor.LIME).make("lime_suspicious_dye"); + public static final Supplier GREEN_SUSPICIOUS_DYE = suspiciousDye(DyeColor.GREEN).make("green_suspicious_dye"); + public static final Supplier CYAN_SUSPICIOUS_DYE = suspiciousDye(DyeColor.CYAN).make("cyan_suspicious_dye"); + public static final Supplier LIGHT_BLUE_SUSPICIOUS_DYE = suspiciousDye(DyeColor.LIGHT_BLUE).make("light_blue_suspicious_dye"); + public static final Supplier BLUE_SUSPICIOUS_DYE = suspiciousDye(DyeColor.BLUE).make("blue_suspicious_dye"); + public static final Supplier PURPLE_SUSPICIOUS_DYE = suspiciousDye(DyeColor.PURPLE).make("purple_suspicious_dye"); + public static final Supplier MAGENTA_SUSPICIOUS_DYE = suspiciousDye(DyeColor.MAGENTA).make("magenta_suspicious_dye"); + public static final Supplier PINK_SUSPICIOUS_DYE = suspiciousDye(DyeColor.PINK).make("pink_suspicious_dye"); // OTHER - public static final Supplier ROPE_ARROW = new Builder("rope_arrow") + public static final Supplier ROPE_ARROW = new AAItem() .config(Config.ROPE) - .creativeAfter(Items.ARROW, CreativeModeTabs.COMBAT) - .build(RopeArrowItem::new); + .factory(RopeArrowItem::new) + .creative(Items.ARROW, CreativeModeTabs.COMBAT, false) + .make("rope_arrow"); // ALBUMS - public static final Supplier ALBUM = new Builder("album") + public static final AAItem ALBUM_TEMPLATE = new AAItem() .config(Config.ALBUM) - .creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES) + .factory(AlbumItem::new) + .creative(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES, true) .properties(p -> p .stacksTo(1) .component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY) - ) - .build(AlbumItem::new); - public static final Supplier WHITE_ALBUM = new Builder("white_album").config(Config.ALBUM).creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES).properties(p -> p.stacksTo(1).component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)).build(AlbumItem::new); - public static final Supplier LIGHT_GRAY_ALBUM = new Builder("light_gray_album").config(Config.ALBUM).creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES).properties(p -> p.stacksTo(1).component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)).build(AlbumItem::new); - public static final Supplier GRAY_ALBUM = new Builder("gray_album").config(Config.ALBUM).creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES).properties(p -> p.stacksTo(1).component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)).build(AlbumItem::new); - public static final Supplier BLACK_ALBUM = new Builder("black_album").config(Config.ALBUM).creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES).properties(p -> p.stacksTo(1).component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)).build(AlbumItem::new); - public static final Supplier BROWN_ALBUM = new Builder("brown_album").config(Config.ALBUM).creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES).properties(p -> p.stacksTo(1).component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)).build(AlbumItem::new); - public static final Supplier RED_ALBUM = new Builder("red_album").config(Config.ALBUM).creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES).properties(p -> p.stacksTo(1).component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)).build(AlbumItem::new); - public static final Supplier ORANGE_ALBUM = new Builder("orange_album").config(Config.ALBUM).creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES).properties(p -> p.stacksTo(1).component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)).build(AlbumItem::new); - public static final Supplier YELLOW_ALBUM = new Builder("yellow_album").config(Config.ALBUM).creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES).properties(p -> p.stacksTo(1).component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)).build(AlbumItem::new); - public static final Supplier LIME_ALBUM = new Builder("lime_album").config(Config.ALBUM).creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES).properties(p -> p.stacksTo(1).component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)).build(AlbumItem::new); - public static final Supplier GREEN_ALBUM = new Builder("green_album").config(Config.ALBUM).creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES).properties(p -> p.stacksTo(1).component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)).build(AlbumItem::new); - public static final Supplier CYAN_ALBUM = new Builder("cyan_album").config(Config.ALBUM).creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES).properties(p -> p.stacksTo(1).component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)).build(AlbumItem::new); - public static final Supplier LIGHT_BLUE_ALBUM = new Builder("light_blue_album").config(Config.ALBUM).creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES).properties(p -> p.stacksTo(1).component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)).build(AlbumItem::new); - public static final Supplier BLUE_ALBUM = new Builder("blue_album").config(Config.ALBUM).creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES).properties(p -> p.stacksTo(1).component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)).build(AlbumItem::new); - public static final Supplier PURPLE_ALBUM = new Builder("purple_album").config(Config.ALBUM).creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES).properties(p -> p.stacksTo(1).component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)).build(AlbumItem::new); - public static final Supplier MAGENTA_ALBUM = new Builder("magenta_album").config(Config.ALBUM).creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES).properties(p -> p.stacksTo(1).component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)).build(AlbumItem::new); - public static final Supplier PINK_ALBUM = new Builder("pink_album").config(Config.ALBUM).creativeBefore(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES).properties(p -> p.stacksTo(1).component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)).build(AlbumItem::new); - - private static class Builder { - private final String id; - private final Map, List> creativeAfter = new HashMap<>(); - private final Map, List> creativeBefore = new HashMap<>(); - private Consumer propertiesConfig = p -> {}; - private ConfigProperty config = null; - - public Builder(String id) { - this.id = id; - } - - public Builder properties(Consumer consumer) { - this.propertiesConfig = consumer; - return this; - } - - public > Builder config(T config) { - this.config = config; - return this; - } - - public Builder creativeAfter(ItemLike item, ResourceKey category) { - this.creativeAfter.computeIfAbsent(category, k -> new ArrayList<>()).add(item); - return this; - } - - public Builder creativeBefore(ItemLike item, ResourceKey category) { - this.creativeBefore.computeIfAbsent(category, k -> new ArrayList<>()).add(item); - return this; - } - - public Supplier build() { - return build(Item::new); - } - - public Supplier build(Function itemFactory) { - Identifier location = Identifier.tryBuild(AdditionalAdditions.NAMESPACE, id); - ConfigProperty capturedConfig = config; - Supplier enabled = capturedConfig != null ? () -> capturedConfig.get().enabled() : () -> true; - - Consumer deferredProperties = propertiesConfig; - Supplier item = AARegistries.ITEMS.register(location, () -> { - Item.Properties props = new Item.Properties(); - props.setId(ResourceKey.create(Registries.ITEM, location)); - deferredProperties.accept(props); - return itemFactory.apply(props); - }); - - creativeAfter.forEach((tab, items) -> - items.forEach(anchor -> CreativeAdder.add(tab, enabled, anchor, item)) ); + public static final Supplier ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("album"); + public static final Supplier WHITE_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("white_album"); + public static final Supplier LIGHT_GRAY_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("light_gray_album"); + public static final Supplier GRAY_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("gray_album"); + public static final Supplier BLACK_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("black_album"); + public static final Supplier BROWN_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("brown_album"); + public static final Supplier RED_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("red_album"); + public static final Supplier ORANGE_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("orange_album"); + public static final Supplier YELLOW_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("yellow_album"); + public static final Supplier LIME_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("lime_album"); + public static final Supplier GREEN_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("green_album"); + public static final Supplier CYAN_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("cyan_album"); + public static final Supplier LIGHT_BLUE_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("light_blue_album"); + public static final Supplier BLUE_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("blue_album"); + public static final Supplier PURPLE_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("purple_album"); + public static final Supplier MAGENTA_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("magenta_album"); + public static final Supplier PINK_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("pink_album"); - creativeBefore.forEach((tab, items) -> - items.forEach(anchor -> CreativeAdder.addBefore(tab, enabled, anchor, item)) - ); - - if (config != null) { - CONFIG_TO_ITEM.computeIfAbsent(config.path(), k -> new HashSet<>()).add(item); - } - - return item; - } - } public static void registerAll() { if (Config.WRENCH.get().enabled()) { diff --git a/common/src/main/resources/additionaladditions.accesswidener b/common/src/main/resources/additionaladditions.accesswidener index 8f295033..90c16736 100644 --- a/common/src/main/resources/additionaladditions.accesswidener +++ b/common/src/main/resources/additionaladditions.accesswidener @@ -25,7 +25,5 @@ accessible method net/minecraft/world/item/crafting/RecipePropertySet create (Lj accessible method net/minecraft/world/level/block/LilyPadBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V -accessible field net/minecraft/core/MappedRegistry frozen Z - accessible field net/minecraft/world/level/Level random Lnet/minecraft/util/RandomSource; accessible method net/minecraft/client/renderer/rendertype/RenderType create (Ljava/lang/String;Lnet/minecraft/client/renderer/rendertype/RenderSetup;)Lnet/minecraft/client/renderer/rendertype/RenderType; \ No newline at end of file From 3001b487caa19dd4650afe80da3ba75b2dc85886 Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Mon, 25 May 2026 13:20:26 +0100 Subject: [PATCH 04/27] 26.1: fix colored glint rendering --- .../mixin/glint/ItemFeatureRendererMixin.java | 30 +++++++++++++++++++ .../mixin/glint/ItemRendererMixin.java | 29 ------------------ .../mixin/glint/RenderBuffersMixin.java | 6 ++-- .../mixin/glint/RenderTypesMixin.java | 4 --- .../resources/additionaladditions.mixins.json | 2 +- 5 files changed, 35 insertions(+), 36 deletions(-) create mode 100644 common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemFeatureRendererMixin.java delete mode 100644 common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemRendererMixin.java diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemFeatureRendererMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemFeatureRendererMixin.java new file mode 100644 index 00000000..cedae046 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemFeatureRendererMixin.java @@ -0,0 +1,30 @@ +package one.dqu.additionaladditions.mixin.glint; + +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.OutlineBufferSource; +import net.minecraft.client.renderer.SubmitNodeStorage; +import net.minecraft.client.renderer.feature.ItemFeatureRenderer; +import net.minecraft.world.item.DyeColor; +import one.dqu.additionaladditions.feature.glint.GlintContext; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +/** + * Restores the glint color into GlintContext before each ItemSubmit is rendered. + * ItemFeatureRenderer.getFoilRenderType then returns the colored glint render type. + */ +@Mixin(ItemFeatureRenderer.class) +public class ItemFeatureRendererMixin { + @Inject(method = "renderItem", at = @At("HEAD")) + private void restoreGlintColor(MultiBufferSource.BufferSource bufferSource, OutlineBufferSource outlineBufferSource, SubmitNodeStorage.ItemSubmit submit, CallbackInfo ci) { + DyeColor color = GlintContext.getAndClearColorForQuads(submit.quads()); + GlintContext.setDyeColor(color); + } + + @Inject(method = "renderItem", at = @At("RETURN")) + private void clearGlintColor(MultiBufferSource.BufferSource bufferSource, OutlineBufferSource outlineBufferSource, SubmitNodeStorage.ItemSubmit submit, CallbackInfo ci) { + GlintContext.setDyeColor(null); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemRendererMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemRendererMixin.java deleted file mode 100644 index c9b51025..00000000 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemRendererMixin.java +++ /dev/null @@ -1,29 +0,0 @@ -package one.dqu.additionaladditions.mixin.glint; - -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.entity.ItemRenderer; -import net.minecraft.client.renderer.item.ItemStackRenderState; -import net.minecraft.client.renderer.rendertype.RenderType; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.item.ItemDisplayContext; -import one.dqu.additionaladditions.feature.glint.GlintContext; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import java.util.List; - -/** - * Restores the glint color into GlintContext before the RenderType is retrieved. - */ -@Mixin(ItemRenderer.class) -public class ItemRendererMixin { - @Inject(method = "renderItem", at = @At("HEAD")) - private static void restoreGlintColor(ItemDisplayContext itemDisplayContext, PoseStack poseStack, MultiBufferSource multiBufferSource, int i, int j, int[] is, List list, RenderType renderType, ItemStackRenderState.FoilType foilType, CallbackInfo ci) { - DyeColor color = GlintContext.getAndClearColorForQuads(list); - GlintContext.setDyeColor(color); - } -} diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/RenderBuffersMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/glint/RenderBuffersMixin.java index fdb13e07..0f546c8d 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/RenderBuffersMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/glint/RenderBuffersMixin.java @@ -4,6 +4,7 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; import net.minecraft.client.renderer.RenderBuffers; import net.minecraft.client.renderer.rendertype.RenderType; +import net.minecraft.client.renderer.rendertype.RenderTypes; import one.dqu.additionaladditions.feature.glint.GlintRenderTypes; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; @@ -24,9 +25,10 @@ public class RenderBuffersMixin { @Unique private static final Set additionaladditions$injectedMaps = Collections.newSetFromMap(new IdentityHashMap<>()); - @Inject(method = "put", at = @At("HEAD")) + // inject our render types after vanilla entityGlint + @Inject(method = "put", at = @At("RETURN")) private static void put(Object2ObjectLinkedOpenHashMap object2ObjectLinkedOpenHashMap, RenderType renderType, CallbackInfo ci) { - if (additionaladditions$injectedMaps.add(object2ObjectLinkedOpenHashMap)) { + if (renderType == RenderTypes.entityGlint() && additionaladditions$injectedMaps.add(object2ObjectLinkedOpenHashMap)) { for (RenderType type : GlintRenderTypes.getRenderTypes()) { object2ObjectLinkedOpenHashMap.put(type, new ByteBufferBuilder(type.bufferSize())); } diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/RenderTypesMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/glint/RenderTypesMixin.java index 45aa2bfc..c8da1fd8 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/RenderTypesMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/glint/RenderTypesMixin.java @@ -19,7 +19,6 @@ private static void getGlint(CallbackInfoReturnable cir) { RenderType renderType = GlintRenderTypes.getGlint(GlintContext.getDyeColor()); if (renderType != null) { cir.setReturnValue(renderType); - GlintContext.setDyeColor(null); } } @@ -28,7 +27,6 @@ private static void getArmorEntityGlint(CallbackInfoReturnable cir) RenderType renderType = GlintRenderTypes.getArmorEntityGlint(GlintContext.getDyeColor()); if (renderType != null) { cir.setReturnValue(renderType); - GlintContext.setDyeColor(null); } } @@ -37,7 +35,6 @@ private static void getEntityGlint(CallbackInfoReturnable cir) { RenderType renderType = GlintRenderTypes.getEntityGlint(GlintContext.getDyeColor()); if (renderType != null) { cir.setReturnValue(renderType); - GlintContext.setDyeColor(null); } } @@ -46,7 +43,6 @@ private static void getGlintTranslucent(CallbackInfoReturnable cir) RenderType renderType = GlintRenderTypes.getGlintTranslucent(GlintContext.getDyeColor()); if (renderType != null) { cir.setReturnValue(renderType); - GlintContext.setDyeColor(null); } } } diff --git a/common/src/main/resources/additionaladditions.mixins.json b/common/src/main/resources/additionaladditions.mixins.json index 9efe8f00..10c4f30e 100644 --- a/common/src/main/resources/additionaladditions.mixins.json +++ b/common/src/main/resources/additionaladditions.mixins.json @@ -7,7 +7,7 @@ "GuiMixin", "glint.HumanoidArmorLayerMixin", "glint.ItemModelResolverMixin", - "glint.ItemRendererMixin", + "glint.ItemFeatureRendererMixin", "glint.ItemStackRenderStateMixin", "glint.RenderBuffersMixin", "glint.RenderTypesMixin", From 425221b9c79de070da6ce94c1c40883edee7abbd Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Fri, 19 Jun 2026 11:54:35 +0100 Subject: [PATCH 05/27] 26.1: refactor: registration, datagen. (massive) --- .../AdditionalAdditions.java | 12 +- .../client/HasDiscProperty.java | 2 +- .../config/io/ConfigLoader.java | 6 +- .../core/builder/AABlock.java | 66 ++ .../builder}/AAGameTest.java | 8 +- .../core/builder/AAItem.java | 71 ++- .../core/builder/AAReg.java | 33 + .../core/builder/CreativePosition.java | 6 + .../core/datagen/AABlockDatagen.java | 63 ++ .../datagen/AABlockTagDatagenProvider.java | 25 + .../datagen/AAGameTestDatagen.java | 5 +- .../core/datagen/AAItemDatagen.java | 83 +++ .../datagen/AAItemTagDatagenProvider.java | 25 + .../core/datagen/AARecipeDatagenProvider.java | 48 ++ .../core/datagen/template/Models.java | 45 ++ .../core/datagen/template/Recipes.java | 88 +++ .../{ => core}/material/AAMaterial.java | 2 +- .../{ => core}/material/AnimalArmorType.java | 2 +- .../{ => core}/material/ToolType.java | 2 +- .../{ => core}/util/CreativeAdder.java | 6 +- .../{ => core}/util/FluidHelper.java | 8 +- .../{ => core}/util/LootAdder.java | 22 +- .../{ => core}/util/LootTableExtension.java | 2 +- .../{ => core}/util/ModCompatibility.java | 2 +- .../{ => core}/util/Registrar.java | 2 +- .../{ => core}/util/SimplePlayerTrigger.java | 2 +- .../feature/album/AlbumContent.java | 31 + .../{item => feature/album}/AlbumItem.java | 2 +- .../feature/barometer/BarometerContent.java | 23 + .../copper_patina}/CopperPatinaBlock.java | 2 +- .../copper_patina/CopperPatinaContent.java | 60 ++ .../copper_patina}/CopperPatinaItem.java | 2 +- .../copper_patina}/PatinaBlock.java | 2 +- .../dye}/SuspiciousDyeItem.java | 2 +- .../feature/dye/SuspiciousDyes.java | 30 + .../feature/food/FoodContent.java | 55 ++ .../glow_stick}/GlowStickBlock.java | 2 +- .../feature/glow_stick/GlowStickContent.java | 54 ++ .../glow_stick}/GlowStickEntity.java | 4 +- .../glow_stick}/GlowStickItem.java | 3 +- .../feature/music_disc/MusicDiscContent.java | 46 ++ .../pocket_jukebox/PocketJukeboxContent.java | 27 + .../pocket_jukebox}/PocketJukeboxItem.java | 13 +- .../PocketJukeboxPlayer.java | 5 +- .../redstone_lamp/RedstoneLampContent.java | 38 ++ .../TintedRedstoneLampBlock.java | 2 +- .../{entity => feature/rope}/RopeArrow.java | 2 +- .../{item => feature/rope}/RopeArrowItem.java | 3 +- .../rope}/RopeArrowRenderer.java | 2 +- .../{block => feature/rope}/RopeBlock.java | 2 +- .../feature/rope/RopeContent.java | 76 +++ .../rose_gold}/AAAxeItem.java | 2 +- .../rose_gold}/AAHoeItem.java | 2 +- .../rose_gold}/AAShovelItem.java | 2 +- .../feature/rose_gold/RoseGoldContent.java | 163 +++++ .../sniffer_plants}/FlowerCropBlock.java | 2 +- .../sniffer_plants}/LotusLilyCropBlock.java | 2 +- .../sniffer_plants/SnifferPlantsContent.java | 296 +++++++++ .../sniffer_plants}/WisteriaBlock.java | 2 +- .../sniffer_plants}/WisteriaCropBlock.java | 2 +- .../feature/trident/TridentShardContent.java | 21 + .../watering_can/WateringCanContent.java | 26 + .../watering_can}/WateringCanItem.java | 4 +- .../feature/wrench/WrenchContent.java | 30 + .../{item => feature/wrench}/WrenchItem.java | 13 +- .../{tests => }/CopperPatinaTests.java | 2 +- .../gametest/{tests => }/MiscTests.java | 2 +- .../gametest/{tests => }/RopeArrowTests.java | 4 +- .../gametest/{tests => }/WrenchTests.java | 2 +- .../mixin/BrewingStandMenuMixin.java | 2 +- .../mixin/InventoryChangeTriggerMixin.java | 3 +- .../mixin/ReloadableServerResourcesMixin.java | 2 +- .../mixin/ServerAdvancementManagerMixin.java | 22 +- .../mixin/album/JukeboxBlockEntityMixin.java | 4 +- .../mixin/album/JukeboxBlockMixin.java | 4 +- .../additionaladditions/recipe/JEICompat.java | 26 +- .../recipe/SuspiciousDyeRecipe.java | 25 +- .../registry/AABlocks.java | 197 ++---- .../registry/AAEntities.java | 34 +- .../registry/AAGameTests.java | 10 +- .../additionaladditions/registry/AAItems.java | 579 +++++------------- .../{material => registry}/AAMaterials.java | 7 +- .../additionaladditions/registry/AAMisc.java | 15 +- .../registry/AARegistries.java | 2 +- .../additionaladditions/registry/AATags.java | 71 +++ .../util/ConventionalTags.java | 14 - .../additionaladditions.accesswidener | 10 +- .../models/block/bulbus.json | 8 - .../recipes/tinted_redstone_lamp.json | 32 - .../recipe/glow_stick.json | 11 - .../recipe/honeyed_apple.json | 11 - .../additionaladditions/tags/item/albums.json | 22 - .../tags/item/repairs_rose_gold_armor.json | 6 - .../tags/item/suspicious_dyes.json | 18 - .../resources/data/c/tags/block/flowers.json | 7 - .../data/c/tags/block/flowers/small.json | 8 - .../data/c/tags/block/flowers/tall.json | 11 - .../resources/data/c/tags/block/ropes.json | 6 - .../data/c/tags/item/dyed/black.json | 10 - .../resources/data/c/tags/item/dyed/blue.json | 10 - .../data/c/tags/item/dyed/brown.json | 10 - .../resources/data/c/tags/item/dyed/cyan.json | 10 - .../resources/data/c/tags/item/dyed/gray.json | 10 - .../data/c/tags/item/dyed/green.json | 10 - .../data/c/tags/item/dyed/light_blue.json | 10 - .../data/c/tags/item/dyed/light_gray.json | 10 - .../resources/data/c/tags/item/dyed/lime.json | 10 - .../data/c/tags/item/dyed/magenta.json | 10 - .../data/c/tags/item/dyed/orange.json | 10 - .../resources/data/c/tags/item/dyed/pink.json | 10 - .../data/c/tags/item/dyed/purple.json | 10 - .../resources/data/c/tags/item/dyed/red.json | 10 - .../data/c/tags/item/dyed/white.json | 10 - .../data/c/tags/item/dyed/yellow.json | 10 - .../resources/data/c/tags/item/flowers.json | 7 - .../data/c/tags/item/flowers/small.json | 8 - .../data/c/tags/item/flowers/tall.json | 11 - .../resources/data/c/tags/item/foods.json | 7 - .../resources/data/c/tags/item/foods/pie.json | 6 - .../data/c/tags/item/ingots/rose_gold.json | 6 - .../data/c/tags/item/music_discs.json | 8 - .../resources/data/c/tags/item/ropes.json | 6 - .../resources/data/c/tags/item/seeds.json | 14 - .../c/tags/item/storage_blocks/rose_gold.json | 6 - .../data/c/tags/item/tools/wrench.json | 6 - .../tags/block/beacon_base_blocks.json | 6 - .../minecraft/tags/block/bee_attractive.json | 16 - .../data/minecraft/tags/block/climbable.json | 6 - .../data/minecraft/tags/block/crops.json | 16 - .../tags/block/incorrect_for_gold_tool.json | 6 - .../tags/block/incorrect_for_stone_tool.json | 6 - .../tags/block/incorrect_for_wooden_tool.json | 6 - .../tags/block/maintains_farmland.json | 28 - .../tags/block/mineable/pickaxe.json | 6 - .../minecraft/tags/block/mineable/shovel.json | 6 - .../minecraft/tags/block/needs_iron_tool.json | 6 - .../data/minecraft/tags/item/arrows.json | 6 - .../data/minecraft/tags/item/axes.json | 6 - .../data/minecraft/tags/item/bee_food.json | 16 - .../data/minecraft/tags/item/chest_armor.json | 6 - .../data/minecraft/tags/item/foot_armor.json | 6 - .../data/minecraft/tags/item/head_armor.json | 6 - .../data/minecraft/tags/item/hoes.json | 6 - .../data/minecraft/tags/item/leg_armor.json | 6 - .../data/minecraft/tags/item/pickaxes.json | 6 - .../data/minecraft/tags/item/shovels.json | 6 - .../data/minecraft/tags/item/spears.json | 6 - .../data/minecraft/tags/item/swords.json | 6 - .../minecraft/tags/item/trimmable_armor.json | 9 - .../blockstates/amber_blossom.json | 3 +- .../blockstates/bulbus.json | 3 +- .../blockstates/cottonshiver.json | 3 +- .../blockstates/crimson_blossom.json | 3 +- .../blockstates/frostleaf.json | 3 +- .../blockstates/mudflower.json | 3 +- .../blockstates/rose_gold_block.json | 0 .../blockstates/sawtooth_fern.json | 3 +- .../blockstates/snapdragon.json | 3 +- .../blockstates/spikeblossom.json | 3 +- .../items/amber_blossom.json | 2 +- .../additionaladditions/items/berry_pie.json | 2 +- .../items/blue_suspicious_dye.json | 2 +- .../items/brown_suspicious_dye.json | 2 +- .../additionaladditions/items/bulbus.json | 2 +- .../items/chicken_nugget.json | 2 +- .../items/copper_patina.json | 2 +- .../items/cottonshiver.json | 2 +- .../items/crimson_blossom.json | 2 +- .../items/cyan_suspicious_dye.json | 2 +- .../additionaladditions/items/fried_egg.json | 2 +- .../additionaladditions/items/frostleaf.json | 2 +- .../additionaladditions/items/glow_stick.json | 2 +- .../items/green_suspicious_dye.json | 2 +- .../items/honeyed_apple.json | 2 +- .../items/light_blue_suspicious_dye.json | 2 +- .../items/lime_suspicious_dye.json | 2 +- .../items/magenta_suspicious_dye.json | 2 +- .../additionaladditions/items/mudflower.json | 2 +- .../items/music_disc_0308.json | 2 +- .../items/music_disc_1007.json | 2 +- .../items/music_disc_1507.json | 2 +- .../items/orange_suspicious_dye.json | 2 +- .../items/pink_suspicious_dye.json | 2 +- .../items/purple_suspicious_dye.json | 2 +- .../items/red_suspicious_dye.json | 2 +- .../additionaladditions/items/rope.json | 2 +- .../additionaladditions/items/rope_arrow.json | 2 +- .../items/rose_gold_block.json | 2 +- .../items/rose_gold_horse_armor.json | 2 +- .../items/rose_gold_ingot.json | 2 +- .../items/rose_gold_nautilus_armor.json | 2 +- .../items/sawtooth_fern.json | 2 +- .../additionaladditions/items/snapdragon.json | 2 +- .../items/spikeblossom.json | 2 +- .../items/trident_shard.json | 2 +- .../items/white_suspicious_dye.json | 2 +- .../items/yellow_suspicious_dye.json | 2 +- .../models/block/amber_blossom_bottom.json | 3 +- .../models/block/amber_blossom_top.json | 3 +- .../models/block/bulbus.json | 6 + .../models/block/cottonshiver_bottom.json | 3 +- .../models/block/cottonshiver_top.json | 3 +- .../models/block/crimson_blossom.json | 3 +- .../models/block/frostleaf.json | 3 +- .../models/block/mudflower_bottom.json | 3 +- .../models/block/mudflower_top.json | 3 +- .../models/block/rose_gold_block.json | 2 +- .../models/block/sawtooth_fern_bottom.json | 3 +- .../models/block/sawtooth_fern_top.json | 3 +- .../models/block/snapdragon_bottom.json | 3 +- .../models/block/snapdragon_top.json | 3 +- .../models/block/spikeblossom_bottom.json | 3 +- .../models/block/spikeblossom_top.json | 3 +- .../models/item/berry_pie.json | 2 +- .../models/item/blue_suspicious_dye.json | 2 +- .../models/item/brown_suspicious_dye.json | 2 +- .../models/item/chicken_nugget.json | 2 +- .../models/item/copper_patina.json | 2 +- .../models/item/cyan_suspicious_dye.json | 2 +- .../models/item/fried_egg.json | 2 +- .../models/item/glow_stick.json | 2 +- .../models/item/green_suspicious_dye.json | 2 +- .../models/item/honeyed_apple.json | 2 +- .../item/light_blue_suspicious_dye.json | 2 +- .../models/item/lime_suspicious_dye.json | 2 +- .../models/item/magenta_suspicious_dye.json | 2 +- .../models/item/music_disc_0308.json | 2 +- .../models/item/music_disc_1007.json | 2 +- .../models/item/music_disc_1507.json | 2 +- .../models/item/orange_suspicious_dye.json | 2 +- .../models/item/pink_suspicious_dye.json | 2 +- .../models/item/purple_suspicious_dye.json | 2 +- .../models/item/red_suspicious_dye.json | 2 +- .../additionaladditions/models/item/rope.json | 2 +- .../models/item/rope_arrow.json | 2 +- .../models/item/rose_gold_horse_armor.json | 2 +- .../models/item/rose_gold_ingot.json | 2 +- .../models/item/rose_gold_nautilus_armor.json | 4 +- .../models/item/trident_shard.json | 2 +- .../models/item/white_suspicious_dye.json | 2 +- .../models/item/yellow_suspicious_dye.json | 2 +- .../copper_patina/patina_block.json | 14 +- .../recipes/food/berry_pie}/berry_pie.json | 16 +- .../food/honeyed_apple}/honeyed_apple.json | 16 +- .../recipes/misc/glow_stick}/glow_stick.json | 18 +- .../advancement/recipes/misc}/rope/rope.json | 12 +- .../recipes/misc}/rope/rope_arrow.json | 12 +- .../tinted_redstone_lamp.json | 32 + .../recipes/tools/barometer/barometer.json | 32 + .../tools/pocket_jukebox}/pocket_jukebox.json | 16 +- .../tools/watering_can/watering_can.json | 32 + .../recipes/tools/wrench}/wrench.json | 18 +- .../recipe/barometer}/barometer.json | 12 +- .../recipe/berry_pie}/berry_pie.json | 6 +- .../recipe/copper_patina/patina_block.json | 10 +- .../recipe/glow_stick/glow_stick.json | 12 + .../recipe/honeyed_apple/honeyed_apple.json | 11 + .../pocket_jukebox}/pocket_jukebox.json | 14 +- .../additionaladditions/recipe/rope/rope.json | 11 +- .../recipe/rope/rope_arrow.json | 6 +- .../tinted_redstone_lamp.json | 12 +- .../recipe/watering_can/watering_can.json | 16 + .../recipe/wrench}/wrench.json | 10 +- .../additionaladditions/tags/item/albums.json | 21 + .../tags/item/repairs_rose_gold_armor.json | 5 + .../tags/item/suspicious_dyes.json | 17 + .../generated/data/c/tags/block/flowers.json | 6 + .../data/c/tags/block/flowers/small.json | 7 + .../data/c/tags/block/flowers/tall.json | 10 + .../generated/data/c/tags/block/ropes.json | 5 + .../data/c/tags/item/dyed/black.json | 5 + .../generated/data/c/tags/item/dyed/blue.json | 5 + .../data/c/tags/item/dyed/brown.json | 5 + .../generated/data/c/tags/item/dyed/cyan.json | 5 + .../generated/data/c/tags/item/dyed/gray.json | 5 + .../data/c/tags/item/dyed/green.json | 5 + .../data/c/tags/item/dyed/light_blue.json | 5 + .../data/c/tags/item/dyed/light_gray.json | 5 + .../generated/data/c/tags/item/dyed/lime.json | 5 + .../data/c/tags/item/dyed/magenta.json | 5 + .../data/c/tags/item/dyed/orange.json | 5 + .../generated/data/c/tags/item/dyed/pink.json | 5 + .../data/c/tags/item/dyed/purple.json | 5 + .../generated/data/c/tags/item/dyed/red.json | 5 + .../data/c/tags/item/dyed/white.json | 5 + .../data/c/tags/item/dyed/yellow.json | 5 + .../generated/data/c/tags/item/flowers.json | 6 + .../data/c/tags/item/flowers/small.json | 7 + .../data/c/tags/item/flowers/tall.json | 10 + .../generated/data/c/tags/item/foods.json | 6 + .../generated/data/c/tags/item/foods/pie.json | 5 + .../data/c/tags/item/ingots/rose_gold.json | 5 + .../data/c/tags/item/music_discs.json | 7 + .../generated/data/c/tags/item/ropes.json | 5 + .../generated/data/c/tags/item/seeds.json | 13 + .../c/tags/item/storage_blocks/rose_gold.json | 5 + .../data/c/tags/item/tools/wrench.json | 5 + .../tags/block/beacon_base_blocks.json | 5 + .../minecraft/tags/block/bee_attractive.json | 15 + .../data/minecraft/tags/block/climbable.json | 5 + .../data/minecraft/tags/block/crops.json | 15 + .../tags/block/incorrect_for_gold_tool.json | 5 + .../tags/block/incorrect_for_stone_tool.json | 5 + .../tags/block/incorrect_for_wooden_tool.json | 5 + .../tags/block/maintains_farmland.json | 26 + .../tags/block/mineable/pickaxe.json | 5 + .../minecraft/tags/block/mineable/shovel.json | 5 + .../minecraft/tags/block/needs_iron_tool.json | 5 + .../data/minecraft/tags/item/arrows.json | 5 + .../data/minecraft/tags/item/axes.json | 5 + .../data/minecraft/tags/item/bee_food.json | 15 + .../data/minecraft/tags/item/chest_armor.json | 5 + .../data/minecraft/tags/item/foot_armor.json | 5 + .../data/minecraft/tags/item/head_armor.json | 5 + .../data/minecraft/tags/item/hoes.json | 5 + .../data/minecraft/tags/item/leg_armor.json | 5 + .../data/minecraft/tags/item/pickaxes.json | 5 + .../data/minecraft/tags/item/shovels.json | 5 + .../data/minecraft/tags/item/spears.json | 5 + .../data/minecraft/tags/item/swords.json | 5 + .../minecraft/tags/item/trimmable_armor.json | 8 + .../util/fabric/FluidHelperImpl.java | 9 +- .../util/fabric/ModCompatibilityImpl.java | 24 +- .../{ => core}/util/fabric/RegistrarImpl.java | 4 +- .../AdditionalAdditionsClientFabric.java | 6 +- .../AdditionalAdditionsDatagenFabric.java | 47 +- .../fabric/AdditionalAdditionsFabric.java | 8 +- .../mixin/fabric/LootTableBuilderMixin.java | 2 +- neoforge/build.gradle | 2 +- .../blockstates/amber_blossom.json | 10 + .../blockstates/bulbus.json | 7 + .../blockstates/cottonshiver.json | 10 + .../blockstates/crimson_blossom.json | 7 + .../blockstates/frostleaf.json | 7 + .../blockstates/mudflower.json | 10 + .../blockstates/rose_gold_block.json | 7 + .../blockstates/sawtooth_fern.json | 10 + .../blockstates/snapdragon.json | 10 + .../blockstates/spikeblossom.json | 10 + .../items/amber_blossom.json | 6 + .../additionaladditions/items/berry_pie.json | 6 + .../items/blue_suspicious_dye.json | 6 + .../items/brown_suspicious_dye.json | 6 + .../additionaladditions/items/bulbus.json | 6 + .../items/chicken_nugget.json | 6 + .../items/copper_patina.json | 6 + .../items/cottonshiver.json | 6 + .../items/crimson_blossom.json | 6 + .../items/cyan_suspicious_dye.json | 6 + .../additionaladditions/items/fried_egg.json | 6 + .../additionaladditions/items/frostleaf.json | 6 + .../additionaladditions/items/glow_stick.json | 6 + .../items/green_suspicious_dye.json | 6 + .../items/honeyed_apple.json | 6 + .../items/light_blue_suspicious_dye.json | 6 + .../items/lime_suspicious_dye.json | 6 + .../items/magenta_suspicious_dye.json | 6 + .../additionaladditions/items/mudflower.json | 6 + .../items/music_disc_0308.json | 6 + .../items/music_disc_1007.json | 6 + .../items/music_disc_1507.json | 6 + .../items/orange_suspicious_dye.json | 6 + .../items/pink_suspicious_dye.json | 6 + .../items/purple_suspicious_dye.json | 6 + .../items/red_suspicious_dye.json | 6 + .../additionaladditions/items/rope.json | 6 + .../additionaladditions/items/rope_arrow.json | 6 + .../items/rose_gold_block.json | 6 + .../items/rose_gold_horse_armor.json | 6 + .../items/rose_gold_ingot.json | 6 + .../items/rose_gold_nautilus_armor.json | 6 + .../items/sawtooth_fern.json | 6 + .../additionaladditions/items/snapdragon.json | 6 + .../items/spikeblossom.json | 6 + .../items/trident_shard.json | 6 + .../items/white_suspicious_dye.json | 6 + .../items/yellow_suspicious_dye.json | 6 + .../models/block/amber_blossom_bottom.json | 6 + .../models/block/amber_blossom_top.json | 6 + .../models/block/bulbus.json | 6 + .../models/block/cottonshiver_bottom.json | 6 + .../models/block/cottonshiver_top.json | 6 + .../models/block/crimson_blossom.json | 6 + .../models/block/frostleaf.json | 6 + .../models/block/mudflower_bottom.json | 6 + .../models/block/mudflower_top.json | 6 + .../models/block/rose_gold_block.json | 6 + .../models/block/sawtooth_fern_bottom.json | 6 + .../models/block/sawtooth_fern_top.json | 6 + .../models/block/snapdragon_bottom.json | 6 + .../models/block/snapdragon_top.json | 6 + .../models/block/spikeblossom_bottom.json | 6 + .../models/block/spikeblossom_top.json | 6 + .../models/item/berry_pie.json | 6 + .../models/item/blue_suspicious_dye.json | 6 + .../models/item/brown_suspicious_dye.json | 6 + .../models/item/chicken_nugget.json | 6 + .../models/item/copper_patina.json | 6 + .../models/item/cyan_suspicious_dye.json | 6 + .../models/item/fried_egg.json | 6 + .../models/item/glow_stick.json | 6 + .../models/item/green_suspicious_dye.json | 6 + .../models/item/honeyed_apple.json | 6 + .../item/light_blue_suspicious_dye.json | 6 + .../models/item/lime_suspicious_dye.json | 6 + .../models/item/magenta_suspicious_dye.json | 6 + .../models/item/music_disc_0308.json | 6 + .../models/item/music_disc_1007.json | 6 + .../models/item/music_disc_1507.json | 6 + .../models/item/orange_suspicious_dye.json | 6 + .../models/item/pink_suspicious_dye.json | 6 + .../models/item/purple_suspicious_dye.json | 6 + .../models/item/red_suspicious_dye.json | 6 + .../additionaladditions/models/item/rope.json | 6 + .../models/item/rope_arrow.json | 6 + .../models/item/rose_gold_horse_armor.json | 6 + .../models/item/rose_gold_ingot.json | 6 + .../models/item/rose_gold_nautilus_armor.json | 6 + .../models/item/trident_shard.json | 6 + .../models/item/white_suspicious_dye.json | 6 + .../models/item/yellow_suspicious_dye.json | 6 + .../copper_patina/patina_block.json | 32 + .../recipes/food/berry_pie/berry_pie.json | 32 + .../food/honeyed_apple/honeyed_apple.json | 32 + .../recipes/misc/glow_stick/glow_stick.json | 32 + .../advancement/recipes/misc/rope/rope.json | 32 + .../recipes/misc/rope/rope_arrow.json | 32 + .../tinted_redstone_lamp.json | 32 + .../recipes/tools/barometer/barometer.json | 32 + .../tools/pocket_jukebox/pocket_jukebox.json | 32 + .../tools/watering_can/watering_can.json | 32 + .../recipes/tools/wrench/wrench.json | 18 +- .../recipe/barometer/barometer.json | 16 +- .../recipe/berry_pie/berry_pie.json | 13 + .../recipe/copper_patina/patina_block.json | 14 + .../recipe/glow_stick/glow_stick.json | 12 + .../recipe/honeyed_apple/honeyed_apple.json | 11 + .../recipe/pocket_jukebox/pocket_jukebox.json | 17 + .../additionaladditions/recipe/rope/rope.json | 14 + .../recipe/rope/rope_arrow.json | 18 + .../tinted_redstone_lamp.json | 16 + .../recipe/watering_can/watering_can.json | 16 + .../recipe/wrench/wrench.json | 15 + .../additionaladditions/tags/item/albums.json | 21 + .../tags/item/repairs_rose_gold_armor.json | 5 + .../tags/item/suspicious_dyes.json | 17 + .../generated/data/c/tags/block/flowers.json | 6 + .../data/c/tags/block/flowers/small.json | 7 + .../data/c/tags/block/flowers/tall.json | 10 + .../generated/data/c/tags/block/ropes.json | 5 + .../data/c/tags/item/dyed/black.json | 5 + .../generated/data/c/tags/item/dyed/blue.json | 5 + .../data/c/tags/item/dyed/brown.json | 5 + .../generated/data/c/tags/item/dyed/cyan.json | 5 + .../generated/data/c/tags/item/dyed/gray.json | 5 + .../data/c/tags/item/dyed/green.json | 5 + .../data/c/tags/item/dyed/light_blue.json | 5 + .../data/c/tags/item/dyed/light_gray.json | 5 + .../generated/data/c/tags/item/dyed/lime.json | 5 + .../data/c/tags/item/dyed/magenta.json | 5 + .../data/c/tags/item/dyed/orange.json | 5 + .../generated/data/c/tags/item/dyed/pink.json | 5 + .../data/c/tags/item/dyed/purple.json | 5 + .../generated/data/c/tags/item/dyed/red.json | 5 + .../data/c/tags/item/dyed/white.json | 5 + .../data/c/tags/item/dyed/yellow.json | 5 + .../generated/data/c/tags/item/flowers.json | 6 + .../data/c/tags/item/flowers/small.json | 7 + .../data/c/tags/item/flowers/tall.json | 10 + .../generated/data/c/tags/item/foods.json | 6 + .../generated/data/c/tags/item/foods/pie.json | 5 + .../data/c/tags/item/ingots/rose_gold.json | 5 + .../data/c/tags/item/music_discs.json | 7 + .../generated/data/c/tags/item/ropes.json | 5 + .../generated/data/c/tags/item/seeds.json | 13 + .../c/tags/item/storage_blocks/rose_gold.json | 5 + .../data/c/tags/item/tools/wrench.json | 5 + .../tags/block/beacon_base_blocks.json | 5 + .../minecraft/tags/block/bee_attractive.json | 15 + .../data/minecraft/tags/block/climbable.json | 5 + .../data/minecraft/tags/block/crops.json | 15 + .../tags/block/incorrect_for_gold_tool.json | 5 + .../tags/block/incorrect_for_stone_tool.json | 5 + .../tags/block/incorrect_for_wooden_tool.json | 5 + .../tags/block/maintains_farmland.json | 26 + .../tags/block/mineable/pickaxe.json | 5 + .../minecraft/tags/block/mineable/shovel.json | 5 + .../minecraft/tags/block/needs_iron_tool.json | 5 + .../data/minecraft/tags/item/arrows.json | 5 + .../data/minecraft/tags/item/axes.json | 5 + .../data/minecraft/tags/item/bee_food.json | 15 + .../data/minecraft/tags/item/chest_armor.json | 5 + .../data/minecraft/tags/item/foot_armor.json | 5 + .../data/minecraft/tags/item/head_armor.json | 5 + .../data/minecraft/tags/item/hoes.json | 5 + .../data/minecraft/tags/item/leg_armor.json | 5 + .../data/minecraft/tags/item/pickaxes.json | 5 + .../data/minecraft/tags/item/shovels.json | 5 + .../data/minecraft/tags/item/spears.json | 5 + .../data/minecraft/tags/item/swords.json | 5 + .../minecraft/tags/item/trimmable_armor.json | 8 + .../util/neoforge/FluidHelperImpl.java | 7 +- .../util/neoforge/ModCompatibilityImpl.java | 24 +- .../util/neoforge/RegistrarImpl.java | 4 +- .../mixin/neoforge/LootTableMixin.java | 2 +- .../neoforge/AANeoForgeRecipeProvider.java | 26 + .../AdditionalAdditionsDatagenNeoForge.java | 41 +- .../neoforge/AdditionalAdditionsNeoForge.java | 14 +- .../recipe/neoforge/JEIBrewingRecipeSync.java | 7 +- 509 files changed, 4301 insertions(+), 1665 deletions(-) create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/builder/AABlock.java rename common/src/main/java/one/dqu/additionaladditions/{gametest => core/builder}/AAGameTest.java (94%) create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/builder/AAReg.java create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/builder/CreativePosition.java create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/datagen/AABlockDatagen.java create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/datagen/AABlockTagDatagenProvider.java rename common/src/main/java/one/dqu/additionaladditions/{gametest => core}/datagen/AAGameTestDatagen.java (97%) create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemDatagen.java create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemTagDatagenProvider.java create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/datagen/AARecipeDatagenProvider.java create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Recipes.java rename common/src/main/java/one/dqu/additionaladditions/{ => core}/material/AAMaterial.java (99%) rename common/src/main/java/one/dqu/additionaladditions/{ => core}/material/AnimalArmorType.java (94%) rename common/src/main/java/one/dqu/additionaladditions/{ => core}/material/ToolType.java (93%) rename common/src/main/java/one/dqu/additionaladditions/{ => core}/util/CreativeAdder.java (89%) rename common/src/main/java/one/dqu/additionaladditions/{ => core}/util/FluidHelper.java (97%) rename common/src/main/java/one/dqu/additionaladditions/{ => core}/util/LootAdder.java (95%) rename common/src/main/java/one/dqu/additionaladditions/{ => core}/util/LootTableExtension.java (75%) rename common/src/main/java/one/dqu/additionaladditions/{ => core}/util/ModCompatibility.java (94%) rename common/src/main/java/one/dqu/additionaladditions/{ => core}/util/Registrar.java (92%) rename common/src/main/java/one/dqu/additionaladditions/{ => core}/util/SimplePlayerTrigger.java (96%) create mode 100644 common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumContent.java rename common/src/main/java/one/dqu/additionaladditions/{item => feature/album}/AlbumItem.java (98%) create mode 100644 common/src/main/java/one/dqu/additionaladditions/feature/barometer/BarometerContent.java rename common/src/main/java/one/dqu/additionaladditions/{block => feature/copper_patina}/CopperPatinaBlock.java (77%) create mode 100644 common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaContent.java rename common/src/main/java/one/dqu/additionaladditions/{item => feature/copper_patina}/CopperPatinaItem.java (97%) rename common/src/main/java/one/dqu/additionaladditions/{block => feature/copper_patina}/PatinaBlock.java (92%) rename common/src/main/java/one/dqu/additionaladditions/{item => feature/dye}/SuspiciousDyeItem.java (88%) create mode 100644 common/src/main/java/one/dqu/additionaladditions/feature/dye/SuspiciousDyes.java create mode 100644 common/src/main/java/one/dqu/additionaladditions/feature/food/FoodContent.java rename common/src/main/java/one/dqu/additionaladditions/{block => feature/glow_stick}/GlowStickBlock.java (98%) create mode 100644 common/src/main/java/one/dqu/additionaladditions/feature/glow_stick/GlowStickContent.java rename common/src/main/java/one/dqu/additionaladditions/{entity => feature/glow_stick}/GlowStickEntity.java (94%) rename common/src/main/java/one/dqu/additionaladditions/{item => feature/glow_stick}/GlowStickItem.java (93%) create mode 100644 common/src/main/java/one/dqu/additionaladditions/feature/music_disc/MusicDiscContent.java create mode 100644 common/src/main/java/one/dqu/additionaladditions/feature/pocket_jukebox/PocketJukeboxContent.java rename common/src/main/java/one/dqu/additionaladditions/{item => feature/pocket_jukebox}/PocketJukeboxItem.java (93%) rename common/src/main/java/one/dqu/additionaladditions/feature/{ => pocket_jukebox}/PocketJukeboxPlayer.java (98%) create mode 100644 common/src/main/java/one/dqu/additionaladditions/feature/redstone_lamp/RedstoneLampContent.java rename common/src/main/java/one/dqu/additionaladditions/{block => feature/redstone_lamp}/TintedRedstoneLampBlock.java (96%) rename common/src/main/java/one/dqu/additionaladditions/{entity => feature/rope}/RopeArrow.java (99%) rename common/src/main/java/one/dqu/additionaladditions/{item => feature/rope}/RopeArrowItem.java (92%) rename common/src/main/java/one/dqu/additionaladditions/{entity => feature/rope}/RopeArrowRenderer.java (94%) rename common/src/main/java/one/dqu/additionaladditions/{block => feature/rope}/RopeBlock.java (99%) create mode 100644 common/src/main/java/one/dqu/additionaladditions/feature/rope/RopeContent.java rename common/src/main/java/one/dqu/additionaladditions/{item => feature/rose_gold}/AAAxeItem.java (85%) rename common/src/main/java/one/dqu/additionaladditions/{item => feature/rose_gold}/AAHoeItem.java (85%) rename common/src/main/java/one/dqu/additionaladditions/{item => feature/rose_gold}/AAShovelItem.java (86%) create mode 100644 common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/RoseGoldContent.java rename common/src/main/java/one/dqu/additionaladditions/{block => feature/sniffer_plants}/FlowerCropBlock.java (98%) rename common/src/main/java/one/dqu/additionaladditions/{block => feature/sniffer_plants}/LotusLilyCropBlock.java (97%) create mode 100644 common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java rename common/src/main/java/one/dqu/additionaladditions/{block => feature/sniffer_plants}/WisteriaBlock.java (95%) rename common/src/main/java/one/dqu/additionaladditions/{block => feature/sniffer_plants}/WisteriaCropBlock.java (98%) create mode 100644 common/src/main/java/one/dqu/additionaladditions/feature/trident/TridentShardContent.java create mode 100644 common/src/main/java/one/dqu/additionaladditions/feature/watering_can/WateringCanContent.java rename common/src/main/java/one/dqu/additionaladditions/{item => feature/watering_can}/WateringCanItem.java (98%) create mode 100644 common/src/main/java/one/dqu/additionaladditions/feature/wrench/WrenchContent.java rename common/src/main/java/one/dqu/additionaladditions/{item => feature/wrench}/WrenchItem.java (95%) rename common/src/main/java/one/dqu/additionaladditions/gametest/{tests => }/CopperPatinaTests.java (99%) rename common/src/main/java/one/dqu/additionaladditions/gametest/{tests => }/MiscTests.java (93%) rename common/src/main/java/one/dqu/additionaladditions/gametest/{tests => }/RopeArrowTests.java (98%) rename common/src/main/java/one/dqu/additionaladditions/gametest/{tests => }/WrenchTests.java (99%) rename common/src/main/java/one/dqu/additionaladditions/{material => registry}/AAMaterials.java (84%) create mode 100644 common/src/main/java/one/dqu/additionaladditions/registry/AATags.java delete mode 100644 common/src/main/java/one/dqu/additionaladditions/util/ConventionalTags.java delete mode 100644 common/src/main/resources/assets/additionaladditions/models/block/bulbus.json delete mode 100644 common/src/main/resources/data/additionaladditions/advancement/recipes/tinted_redstone_lamp.json delete mode 100644 common/src/main/resources/data/additionaladditions/recipe/glow_stick.json delete mode 100644 common/src/main/resources/data/additionaladditions/recipe/honeyed_apple.json delete mode 100644 common/src/main/resources/data/additionaladditions/tags/item/albums.json delete mode 100644 common/src/main/resources/data/additionaladditions/tags/item/repairs_rose_gold_armor.json delete mode 100644 common/src/main/resources/data/additionaladditions/tags/item/suspicious_dyes.json delete mode 100644 common/src/main/resources/data/c/tags/block/flowers.json delete mode 100644 common/src/main/resources/data/c/tags/block/flowers/small.json delete mode 100644 common/src/main/resources/data/c/tags/block/flowers/tall.json delete mode 100644 common/src/main/resources/data/c/tags/block/ropes.json delete mode 100644 common/src/main/resources/data/c/tags/item/dyed/black.json delete mode 100644 common/src/main/resources/data/c/tags/item/dyed/blue.json delete mode 100644 common/src/main/resources/data/c/tags/item/dyed/brown.json delete mode 100644 common/src/main/resources/data/c/tags/item/dyed/cyan.json delete mode 100644 common/src/main/resources/data/c/tags/item/dyed/gray.json delete mode 100644 common/src/main/resources/data/c/tags/item/dyed/green.json delete mode 100644 common/src/main/resources/data/c/tags/item/dyed/light_blue.json delete mode 100644 common/src/main/resources/data/c/tags/item/dyed/light_gray.json delete mode 100644 common/src/main/resources/data/c/tags/item/dyed/lime.json delete mode 100644 common/src/main/resources/data/c/tags/item/dyed/magenta.json delete mode 100644 common/src/main/resources/data/c/tags/item/dyed/orange.json delete mode 100644 common/src/main/resources/data/c/tags/item/dyed/pink.json delete mode 100644 common/src/main/resources/data/c/tags/item/dyed/purple.json delete mode 100644 common/src/main/resources/data/c/tags/item/dyed/red.json delete mode 100644 common/src/main/resources/data/c/tags/item/dyed/white.json delete mode 100644 common/src/main/resources/data/c/tags/item/dyed/yellow.json delete mode 100644 common/src/main/resources/data/c/tags/item/flowers.json delete mode 100644 common/src/main/resources/data/c/tags/item/flowers/small.json delete mode 100644 common/src/main/resources/data/c/tags/item/flowers/tall.json delete mode 100644 common/src/main/resources/data/c/tags/item/foods.json delete mode 100644 common/src/main/resources/data/c/tags/item/foods/pie.json delete mode 100644 common/src/main/resources/data/c/tags/item/ingots/rose_gold.json delete mode 100644 common/src/main/resources/data/c/tags/item/music_discs.json delete mode 100644 common/src/main/resources/data/c/tags/item/ropes.json delete mode 100644 common/src/main/resources/data/c/tags/item/seeds.json delete mode 100644 common/src/main/resources/data/c/tags/item/storage_blocks/rose_gold.json delete mode 100644 common/src/main/resources/data/c/tags/item/tools/wrench.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/beacon_base_blocks.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/bee_attractive.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/climbable.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/crops.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/incorrect_for_gold_tool.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/incorrect_for_stone_tool.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/incorrect_for_wooden_tool.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/maintains_farmland.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/mineable/shovel.json delete mode 100644 common/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/arrows.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/axes.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/bee_food.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/chest_armor.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/foot_armor.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/head_armor.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/hoes.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/leg_armor.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/pickaxes.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/shovels.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/spears.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/swords.json delete mode 100644 common/src/main/resources/data/minecraft/tags/item/trimmable_armor.json rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/blockstates/amber_blossom.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/blockstates/bulbus.json (96%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/blockstates/cottonshiver.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/blockstates/crimson_blossom.json (97%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/blockstates/frostleaf.json (96%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/blockstates/mudflower.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/blockstates/rose_gold_block.json (100%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/blockstates/sawtooth_fern.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/blockstates/snapdragon.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/blockstates/spikeblossom.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/amber_blossom.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/berry_pie.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/blue_suspicious_dye.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/brown_suspicious_dye.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/bulbus.json (97%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/chicken_nugget.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/copper_patina.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/cottonshiver.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/crimson_blossom.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/cyan_suspicious_dye.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/fried_egg.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/frostleaf.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/glow_stick.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/green_suspicious_dye.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/honeyed_apple.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/light_blue_suspicious_dye.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/lime_suspicious_dye.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/magenta_suspicious_dye.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/mudflower.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/music_disc_0308.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/music_disc_1007.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/music_disc_1507.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/orange_suspicious_dye.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/pink_suspicious_dye.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/purple_suspicious_dye.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/red_suspicious_dye.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/rope.json (97%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/rope_arrow.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/rose_gold_block.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/rose_gold_horse_armor.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/rose_gold_ingot.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/rose_gold_nautilus_armor.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/sawtooth_fern.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/snapdragon.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/spikeblossom.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/trident_shard.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/white_suspicious_dye.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/yellow_suspicious_dye.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/block/amber_blossom_bottom.json (97%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/block/amber_blossom_top.json (97%) create mode 100644 fabric/src/main/generated/assets/additionaladditions/models/block/bulbus.json rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/block/cottonshiver_bottom.json (97%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/block/cottonshiver_top.json (97%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/block/crimson_blossom.json (97%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/block/frostleaf.json (97%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/block/mudflower_bottom.json (97%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/block/mudflower_top.json (97%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/block/rose_gold_block.json (66%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/block/sawtooth_fern_bottom.json (97%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/block/sawtooth_fern_top.json (97%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/block/snapdragon_bottom.json (97%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/block/snapdragon_top.json (97%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/block/spikeblossom_bottom.json (97%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/block/spikeblossom_top.json (97%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/berry_pie.json (64%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/blue_suspicious_dye.json (67%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/brown_suspicious_dye.json (68%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/chicken_nugget.json (66%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/copper_patina.json (66%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/cyan_suspicious_dye.json (67%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/fried_egg.json (64%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/glow_stick.json (65%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/green_suspicious_dye.json (68%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/honeyed_apple.json (66%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/light_blue_suspicious_dye.json (69%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/lime_suspicious_dye.json (67%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/magenta_suspicious_dye.json (68%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/music_disc_0308.json (66%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/music_disc_1007.json (66%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/music_disc_1507.json (66%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/orange_suspicious_dye.json (68%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/pink_suspicious_dye.json (67%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/purple_suspicious_dye.json (68%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/red_suspicious_dye.json (67%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/rope.json (63%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/rope_arrow.json (65%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/rose_gold_horse_armor.json (68%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/rose_gold_ingot.json (66%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/rose_gold_nautilus_armor.json (68%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/trident_shard.json (66%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/white_suspicious_dye.json (68%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/yellow_suspicious_dye.json (68%) rename {common/src/main/resources/data/additionaladditions/advancement/recipes => fabric/src/main/generated/data/additionaladditions/advancement/recipes/building_blocks}/copper_patina/patina_block.json (70%) rename {common/src/main/resources/data/additionaladditions/advancement/recipes => fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/berry_pie}/berry_pie.json (56%) rename {common/src/main/resources/data/additionaladditions/advancement/recipes => fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/honeyed_apple}/honeyed_apple.json (55%) rename {common/src/main/resources/data/additionaladditions/advancement/recipes => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/glow_stick}/glow_stick.json (51%) rename {common/src/main/resources/data/additionaladditions/advancement/recipes => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc}/rope/rope.json (73%) rename {common/src/main/resources/data/additionaladditions/advancement/recipes => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc}/rope/rope_arrow.json (74%) create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/redstone/tinted_redstone_lamp/tinted_redstone_lamp.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/barometer/barometer.json rename {common/src/main/resources/data/additionaladditions/advancement/recipes => fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/pocket_jukebox}/pocket_jukebox.json (54%) create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/watering_can/watering_can.json rename {common/src/main/resources/data/additionaladditions/advancement/recipes => fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/wrench}/wrench.json (53%) rename {common/src/main/resources/data/additionaladditions/recipe => fabric/src/main/generated/data/additionaladditions/recipe/barometer}/barometer.json (73%) rename {common/src/main/resources/data/additionaladditions/recipe => fabric/src/main/generated/data/additionaladditions/recipe/berry_pie}/berry_pie.json (57%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/copper_patina/patina_block.json (69%) create mode 100644 fabric/src/main/generated/data/additionaladditions/recipe/glow_stick/glow_stick.json create mode 100644 fabric/src/main/generated/data/additionaladditions/recipe/honeyed_apple/honeyed_apple.json rename {common/src/main/resources/data/additionaladditions/recipe => fabric/src/main/generated/data/additionaladditions/recipe/pocket_jukebox}/pocket_jukebox.json (54%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/rope/rope.json (69%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/rope/rope_arrow.json (75%) rename {common/src/main/resources/data/additionaladditions/recipe => fabric/src/main/generated/data/additionaladditions/recipe/tinted_redstone_lamp}/tinted_redstone_lamp.json (71%) create mode 100644 fabric/src/main/generated/data/additionaladditions/recipe/watering_can/watering_can.json rename {common/src/main/resources/data/additionaladditions/recipe => fabric/src/main/generated/data/additionaladditions/recipe/wrench}/wrench.json (71%) create mode 100644 fabric/src/main/generated/data/additionaladditions/tags/item/albums.json create mode 100644 fabric/src/main/generated/data/additionaladditions/tags/item/repairs_rose_gold_armor.json create mode 100644 fabric/src/main/generated/data/additionaladditions/tags/item/suspicious_dyes.json create mode 100644 fabric/src/main/generated/data/c/tags/block/flowers.json create mode 100644 fabric/src/main/generated/data/c/tags/block/flowers/small.json create mode 100644 fabric/src/main/generated/data/c/tags/block/flowers/tall.json create mode 100644 fabric/src/main/generated/data/c/tags/block/ropes.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dyed/black.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dyed/blue.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dyed/brown.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dyed/cyan.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dyed/gray.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dyed/green.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dyed/light_blue.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dyed/light_gray.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dyed/lime.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dyed/magenta.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dyed/orange.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dyed/pink.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dyed/purple.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dyed/red.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dyed/white.json create mode 100644 fabric/src/main/generated/data/c/tags/item/dyed/yellow.json create mode 100644 fabric/src/main/generated/data/c/tags/item/flowers.json create mode 100644 fabric/src/main/generated/data/c/tags/item/flowers/small.json create mode 100644 fabric/src/main/generated/data/c/tags/item/flowers/tall.json create mode 100644 fabric/src/main/generated/data/c/tags/item/foods.json create mode 100644 fabric/src/main/generated/data/c/tags/item/foods/pie.json create mode 100644 fabric/src/main/generated/data/c/tags/item/ingots/rose_gold.json create mode 100644 fabric/src/main/generated/data/c/tags/item/music_discs.json create mode 100644 fabric/src/main/generated/data/c/tags/item/ropes.json create mode 100644 fabric/src/main/generated/data/c/tags/item/seeds.json create mode 100644 fabric/src/main/generated/data/c/tags/item/storage_blocks/rose_gold.json create mode 100644 fabric/src/main/generated/data/c/tags/item/tools/wrench.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/block/beacon_base_blocks.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/block/bee_attractive.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/block/climbable.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/block/crops.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/block/incorrect_for_gold_tool.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/block/incorrect_for_stone_tool.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/block/incorrect_for_wooden_tool.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/block/maintains_farmland.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/block/mineable/shovel.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/item/arrows.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/item/axes.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/item/bee_food.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/item/chest_armor.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/item/foot_armor.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/item/head_armor.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/item/hoes.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/item/leg_armor.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/item/pickaxes.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/item/shovels.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/item/spears.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/item/swords.json create mode 100644 fabric/src/main/generated/data/minecraft/tags/item/trimmable_armor.json rename fabric/src/main/java/one/dqu/additionaladditions/{ => core}/util/fabric/FluidHelperImpl.java (87%) rename fabric/src/main/java/one/dqu/additionaladditions/{ => core}/util/fabric/ModCompatibilityImpl.java (79%) rename fabric/src/main/java/one/dqu/additionaladditions/{ => core}/util/fabric/RegistrarImpl.java (91%) create mode 100644 neoforge/src/main/generated/assets/additionaladditions/blockstates/amber_blossom.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/blockstates/bulbus.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/blockstates/cottonshiver.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/blockstates/crimson_blossom.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/blockstates/frostleaf.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/blockstates/mudflower.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/blockstates/rose_gold_block.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/blockstates/sawtooth_fern.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/blockstates/snapdragon.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/blockstates/spikeblossom.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/amber_blossom.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/berry_pie.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/blue_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/brown_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/bulbus.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/chicken_nugget.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/copper_patina.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/cottonshiver.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/crimson_blossom.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/cyan_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/fried_egg.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/frostleaf.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/glow_stick.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/green_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/honeyed_apple.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/light_blue_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/lime_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/magenta_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/mudflower.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/music_disc_0308.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/music_disc_1007.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/music_disc_1507.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/orange_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/pink_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/purple_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/red_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/rope.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/rope_arrow.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_block.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_horse_armor.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_ingot.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_nautilus_armor.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/snapdragon.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/spikeblossom.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/trident_shard.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/white_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/yellow_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/amber_blossom_bottom.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/amber_blossom_top.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/bulbus.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/cottonshiver_bottom.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/cottonshiver_top.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/crimson_blossom.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/frostleaf.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/mudflower_bottom.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/mudflower_top.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/rose_gold_block.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/sawtooth_fern_bottom.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/sawtooth_fern_top.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/snapdragon_bottom.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/snapdragon_top.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/spikeblossom_bottom.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/spikeblossom_top.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/berry_pie.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/blue_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/brown_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/chicken_nugget.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/copper_patina.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/cyan_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/fried_egg.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/glow_stick.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/green_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/honeyed_apple.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/light_blue_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/lime_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/magenta_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/music_disc_0308.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/music_disc_1007.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/music_disc_1507.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/orange_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/pink_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/purple_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/red_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rope.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rope_arrow.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_horse_armor.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_ingot.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_nautilus_armor.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/trident_shard.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/white_suspicious_dye.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/yellow_suspicious_dye.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/building_blocks/copper_patina/patina_block.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/berry_pie/berry_pie.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/honeyed_apple/honeyed_apple.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/glow_stick/glow_stick.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/rope/rope.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/rope/rope_arrow.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/redstone/tinted_redstone_lamp/tinted_redstone_lamp.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/barometer/barometer.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/pocket_jukebox/pocket_jukebox.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/watering_can/watering_can.json rename common/src/main/resources/data/additionaladditions/advancement/recipes/watering_can.json => neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/wrench/wrench.json (53%) rename common/src/main/resources/data/additionaladditions/recipe/watering_can.json => neoforge/src/main/generated/data/additionaladditions/recipe/barometer/barometer.json (50%) create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/berry_pie/berry_pie.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/copper_patina/patina_block.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/glow_stick/glow_stick.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/honeyed_apple/honeyed_apple.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/pocket_jukebox/pocket_jukebox.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rope/rope.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rope/rope_arrow.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/tinted_redstone_lamp/tinted_redstone_lamp.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/watering_can/watering_can.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/wrench/wrench.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/tags/item/albums.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/tags/item/repairs_rose_gold_armor.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/tags/item/suspicious_dyes.json create mode 100644 neoforge/src/main/generated/data/c/tags/block/flowers.json create mode 100644 neoforge/src/main/generated/data/c/tags/block/flowers/small.json create mode 100644 neoforge/src/main/generated/data/c/tags/block/flowers/tall.json create mode 100644 neoforge/src/main/generated/data/c/tags/block/ropes.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/dyed/black.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/dyed/blue.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/dyed/brown.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/dyed/cyan.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/dyed/gray.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/dyed/green.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/dyed/light_blue.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/dyed/light_gray.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/dyed/lime.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/dyed/magenta.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/dyed/orange.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/dyed/pink.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/dyed/purple.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/dyed/red.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/dyed/white.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/dyed/yellow.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/flowers.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/flowers/small.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/flowers/tall.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/foods.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/foods/pie.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/ingots/rose_gold.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/music_discs.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/ropes.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/seeds.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/storage_blocks/rose_gold.json create mode 100644 neoforge/src/main/generated/data/c/tags/item/tools/wrench.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/block/beacon_base_blocks.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/block/bee_attractive.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/block/climbable.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/block/crops.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/block/incorrect_for_gold_tool.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/block/incorrect_for_stone_tool.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/block/incorrect_for_wooden_tool.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/block/maintains_farmland.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/block/mineable/shovel.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/item/arrows.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/item/axes.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/item/bee_food.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/item/chest_armor.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/item/foot_armor.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/item/head_armor.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/item/hoes.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/item/leg_armor.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/item/pickaxes.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/item/shovels.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/item/spears.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/item/swords.json create mode 100644 neoforge/src/main/generated/data/minecraft/tags/item/trimmable_armor.json rename neoforge/src/main/java/one/dqu/additionaladditions/{ => core}/util/neoforge/FluidHelperImpl.java (91%) rename neoforge/src/main/java/one/dqu/additionaladditions/{ => core}/util/neoforge/ModCompatibilityImpl.java (78%) rename neoforge/src/main/java/one/dqu/additionaladditions/{ => core}/util/neoforge/RegistrarImpl.java (93%) create mode 100644 neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AANeoForgeRecipeProvider.java diff --git a/common/src/main/java/one/dqu/additionaladditions/AdditionalAdditions.java b/common/src/main/java/one/dqu/additionaladditions/AdditionalAdditions.java index 8664b0d8..c7860976 100644 --- a/common/src/main/java/one/dqu/additionaladditions/AdditionalAdditions.java +++ b/common/src/main/java/one/dqu/additionaladditions/AdditionalAdditions.java @@ -2,11 +2,20 @@ import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.config.io.ConfigLoader; +import one.dqu.additionaladditions.core.util.ModCompatibility; import one.dqu.additionaladditions.registry.*; -import one.dqu.additionaladditions.util.ModCompatibility; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/* +TODOs: +- make sure datagen generates stuff properly +- make sure All old manual data that datagen handles is removed +- maybe loottable datagen +- maybe furnace/cooking recipes datagen + +- test for any remaining issues on 26.1 port + */ public final class AdditionalAdditions { public static final String NAMESPACE = "additionaladditions"; public static final Logger LOGGER = LoggerFactory.getLogger(NAMESPACE); @@ -16,6 +25,7 @@ public final class AdditionalAdditions { public static void init() { ConfigLoader.load(); + AATags.registerAll(); AAMisc.registerAll(); AAEntities.registerAll(); AAItems.registerAll(); diff --git a/common/src/main/java/one/dqu/additionaladditions/client/HasDiscProperty.java b/common/src/main/java/one/dqu/additionaladditions/client/HasDiscProperty.java index 35eee700..1cbea0eb 100644 --- a/common/src/main/java/one/dqu/additionaladditions/client/HasDiscProperty.java +++ b/common/src/main/java/one/dqu/additionaladditions/client/HasDiscProperty.java @@ -9,7 +9,7 @@ import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import one.dqu.additionaladditions.feature.album.AlbumContents; -import one.dqu.additionaladditions.item.PocketJukeboxItem; +import one.dqu.additionaladditions.feature.pocket_jukebox.PocketJukeboxItem; import one.dqu.additionaladditions.registry.AAMisc; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/one/dqu/additionaladditions/config/io/ConfigLoader.java b/common/src/main/java/one/dqu/additionaladditions/config/io/ConfigLoader.java index 999f8c53..da582daf 100644 --- a/common/src/main/java/one/dqu/additionaladditions/config/io/ConfigLoader.java +++ b/common/src/main/java/one/dqu/additionaladditions/config/io/ConfigLoader.java @@ -16,7 +16,7 @@ import one.dqu.additionaladditions.config.datafixer.ConfigFixerUpper; import one.dqu.additionaladditions.config.type.VersionConfig; import one.dqu.additionaladditions.config.type.unit.FoodUnitConfig; -import one.dqu.additionaladditions.util.Registrar; +import one.dqu.additionaladditions.core.util.Registrar; import java.io.IOException; import java.nio.file.Files; @@ -38,8 +38,8 @@ public static void onPostReload(Identifier id, Runnable observer) { /** * Handles config loading. * In order: init config -> create config directory -> load config version - * -> run relocator -> read or create config files - * -> datafix if version is outdated -> apply config values + * -> run relocator -> read or create config files + * -> datafix if version is outdated -> apply config values */ public static void load() { AdditionalAdditions.LOGGER.info("[{}] Loading config files...", AdditionalAdditions.NAMESPACE); diff --git a/common/src/main/java/one/dqu/additionaladditions/core/builder/AABlock.java b/common/src/main/java/one/dqu/additionaladditions/core/builder/AABlock.java new file mode 100644 index 00000000..29017994 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/builder/AABlock.java @@ -0,0 +1,66 @@ +package one.dqu.additionaladditions.core.builder; + +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; +import one.dqu.additionaladditions.AdditionalAdditions; +import one.dqu.additionaladditions.core.datagen.AABlockDatagen; +import one.dqu.additionaladditions.registry.AARegistries; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Supplier; + +public class AABlock { + private final Function factory; + private Consumer props = p -> { + }; + // datagen data + private final List> tags = new ArrayList<>(); + private Consumer model; + + public AABlock(Function factory) { + this.factory = factory; + } + + public AABlock props(Consumer props) { + this.props = this.props.andThen(props); + return this; + } + + @SafeVarargs + public final AABlock tags(TagKey... tags) { + this.tags.addAll(Arrays.asList(tags)); + return this; + } + + /** + * optional datagen block template, e.g. Models::cube + */ + public AABlock model(Consumer model) { + this.model = model; + return this; + } + + public Supplier make(String id) { + Identifier location = Identifier.tryBuild(AdditionalAdditions.NAMESPACE, id); + + BlockBehaviour.Properties properties = BlockBehaviour.Properties.of(); + properties.setId(ResourceKey.create(Registries.BLOCK, location)); + props.accept(properties); + + Supplier block = AARegistries.BLOCKS.register(location, () -> factory.apply(properties)); + + if (AdditionalAdditions.DATAGEN) { + AABlockDatagen.register(new AABlockDatagen.Entry(location, block, List.copyOf(tags), model)); + } + + return block; + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/gametest/AAGameTest.java b/common/src/main/java/one/dqu/additionaladditions/core/builder/AAGameTest.java similarity index 94% rename from common/src/main/java/one/dqu/additionaladditions/gametest/AAGameTest.java rename to common/src/main/java/one/dqu/additionaladditions/core/builder/AAGameTest.java index 268261f9..5eb2c59c 100644 --- a/common/src/main/java/one/dqu/additionaladditions/gametest/AAGameTest.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/builder/AAGameTest.java @@ -1,13 +1,13 @@ -package one.dqu.additionaladditions.gametest; +package one.dqu.additionaladditions.core.builder; import net.minecraft.core.registries.Registries; +import net.minecraft.gametest.framework.GameTestEnvironments; import net.minecraft.gametest.framework.GameTestHelper; +import net.minecraft.gametest.framework.TestEnvironmentDefinition; import net.minecraft.resources.Identifier; import net.minecraft.resources.ResourceKey; -import net.minecraft.gametest.framework.TestEnvironmentDefinition; -import net.minecraft.gametest.framework.GameTestEnvironments; import one.dqu.additionaladditions.AdditionalAdditions; -import one.dqu.additionaladditions.gametest.datagen.AAGameTestDatagen; +import one.dqu.additionaladditions.core.datagen.AAGameTestDatagen; import one.dqu.additionaladditions.registry.AARegistries; import java.util.function.Consumer; diff --git a/common/src/main/java/one/dqu/additionaladditions/core/builder/AAItem.java b/common/src/main/java/one/dqu/additionaladditions/core/builder/AAItem.java index d654d6dd..51fb3f13 100644 --- a/common/src/main/java/one/dqu/additionaladditions/core/builder/AAItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/builder/AAItem.java @@ -6,6 +6,7 @@ import net.minecraft.core.registries.Registries; import net.minecraft.resources.Identifier; import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.TagKey; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.item.equipment.ArmorType; @@ -13,16 +14,16 @@ import one.dqu.additionaladditions.AdditionalAdditions; import one.dqu.additionaladditions.config.ConfigProperty; import one.dqu.additionaladditions.config.Toggleable; -import one.dqu.additionaladditions.material.AAMaterial; -import one.dqu.additionaladditions.material.AnimalArmorType; -import one.dqu.additionaladditions.material.ToolType; +import one.dqu.additionaladditions.core.datagen.AAItemDatagen; +import one.dqu.additionaladditions.core.datagen.template.Recipes; +import one.dqu.additionaladditions.core.material.AAMaterial; +import one.dqu.additionaladditions.core.material.AnimalArmorType; +import one.dqu.additionaladditions.core.material.ToolType; +import one.dqu.additionaladditions.core.util.CreativeAdder; +import one.dqu.additionaladditions.registry.AAItems; import one.dqu.additionaladditions.registry.AARegistries; -import one.dqu.additionaladditions.util.CreativeAdder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; @@ -32,9 +33,14 @@ public class AAItem { Function factory; private Consumer props = p -> { }; - private final Map, List>> creative = new HashMap<>(); + private final Map, List>> creative = new HashMap<>(); private DataComponentInitializers.Initializer initializer; // extra component initializer on top of vanilla's (in item properties) + // datagen data + private final List> tags = new ArrayList<>(); + private Consumer model = null; + private Recipes.RecipeEntry recipe = null; + @SuppressWarnings("unchecked") public AAItem() { // default factory = Item::new @@ -46,6 +52,9 @@ public AAItem(AAItem template) { this.factory = template.factory; this.props = template.props; this.initializer = template.initializer; + this.tags.addAll(template.tags); + this.model = template.model; + this.recipe = template.recipe; } public AAItem config(ConfigProperty config) { @@ -58,33 +67,53 @@ public AAItem factory(Function factory) { return this; } - public AAItem properties(Consumer props) { + public AAItem props(Consumer props) { this.props = this.props.andThen(props); return this; } - public AAItem creative(ItemLike anchor, ResourceKey category, boolean isBefore) { - creative.computeIfAbsent(category, _ -> new ArrayList<>()).add(Pair.of(anchor, isBefore)); + public AAItem creative(ItemLike anchor, ResourceKey category, CreativePosition position) { + creative.computeIfAbsent(category, _ -> new ArrayList<>()).add(Pair.of(anchor, position)); + return this; + } + + // Datagen + + @SafeVarargs + public final AAItem tags(TagKey... tags) { + this.tags.addAll(Arrays.asList(tags)); + return this; + } + + public AAItem model(Consumer model) { + this.model = model; + return this; + } + + public AAItem recipe(Recipes.RecipeEntry recipe) { + this.recipe = recipe; return this; } + // + public AAItem initializer(DataComponentInitializers.Initializer step) { this.initializer = this.initializer == null ? step : this.initializer.andThen(step); return this; } public AAItem material(AAMaterial material, ToolType toolType) { - return properties(p -> p.repairable(material.repairIngredient())) + return props(p -> p.repairable(material.repairIngredient())) .initializer(material.initializerFor(toolType)); } public AAItem material(AAMaterial material, ArmorType armorType) { - return properties(p -> p.repairable(material.repairIngredient())) + return props(p -> p.repairable(material.repairIngredient())) .initializer(material.initializerFor(armorType)); } public AAItem material(AAMaterial material, AnimalArmorType armorType) { - return properties(p -> p.repairable(material.repairIngredient())) + return props(p -> p.repairable(material.repairIngredient())) .initializer(material.initializerFor(armorType)); } @@ -111,8 +140,8 @@ public Supplier make(String id) { creative.forEach((tab, items) -> { items.forEach(pair -> { ItemLike anchor = pair.getFirst(); - boolean isBefore = pair.getSecond(); - if (isBefore) { + CreativePosition position = pair.getSecond(); + if (position == CreativePosition.BEFORE) { CreativeAdder.addBefore(tab, enabled, anchor, item); } else { CreativeAdder.add(tab, enabled, anchor, item); @@ -120,6 +149,14 @@ public Supplier make(String id) { }); }); + if (config != null) { + AAItems.addConfigItem(config, item); + } + + if (AdditionalAdditions.DATAGEN) { + AAItemDatagen.register(new AAItemDatagen.Entry(location, item, model, recipe, List.copyOf(tags))); + } + return item; } } diff --git a/common/src/main/java/one/dqu/additionaladditions/core/builder/AAReg.java b/common/src/main/java/one/dqu/additionaladditions/core/builder/AAReg.java new file mode 100644 index 00000000..0414ea97 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/builder/AAReg.java @@ -0,0 +1,33 @@ +package one.dqu.additionaladditions.core.builder; + +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; + +import java.util.function.Function; +import java.util.function.Supplier; + +/** + * Helper class for creating builders. + */ +public final class AAReg { + private AAReg() { + } + + public static AAItem item(Function factory) { + return new AAItem().factory(factory); + } + + public static AAItem item() { + return new AAItem<>(); + } + + public static AABlock block(Function factory) { + return new AABlock<>(factory); + } + + public static AAItem blockItem(Supplier block) { + return new AAItem().factory(p -> new BlockItem(block.get(), p)); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/core/builder/CreativePosition.java b/common/src/main/java/one/dqu/additionaladditions/core/builder/CreativePosition.java new file mode 100644 index 00000000..08d7c3c9 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/builder/CreativePosition.java @@ -0,0 +1,6 @@ +package one.dqu.additionaladditions.core.builder; + +public enum CreativePosition { + BEFORE, + AFTER +} diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AABlockDatagen.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AABlockDatagen.java new file mode 100644 index 00000000..e9f7113d --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AABlockDatagen.java @@ -0,0 +1,63 @@ +package one.dqu.additionaladditions.core.datagen; + +import net.minecraft.client.data.models.BlockModelGenerators; +import net.minecraft.core.Holder; +import net.minecraft.resources.Identifier; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.block.Block; +import one.dqu.additionaladditions.AdditionalAdditions; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; +import java.util.function.Supplier; +import java.util.stream.Stream; + +public class AABlockDatagen { + private static final List entries = AdditionalAdditions.DATAGEN ? new ArrayList<>() : null; + private static BlockModelGenerators currentGen; + + public record Entry( + Identifier id, + Supplier block, + List> tags, + @Nullable Consumer model // template is null for blocks whose models/blockstates should be manual + ) { + } + + public static void register(Entry entry) { + if (entries == null) return; + entries.add(entry); + } + + public static List entries() { + return entries == null ? List.of() : entries; + } + + public static BlockModelGenerators currentGen() { + return currentGen; + } + + // for neoforge + public static Stream> knownBlocks() { + if (entries == null) return Stream.empty(); + return entries.stream() + .filter(e -> e.model() != null) + .map(e -> e.block().get().builtInRegistryHolder()); + } + + public static void generateBlockStateModels(BlockModelGenerators gen) { + if (entries == null) return; + currentGen = gen; + try { + for (Entry entry : entries) { + if (entry.model() != null) { + entry.model().accept(entry.block().get()); + } + } + } finally { + currentGen = null; + } + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AABlockTagDatagenProvider.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AABlockTagDatagenProvider.java new file mode 100644 index 00000000..ed34a167 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AABlockTagDatagenProvider.java @@ -0,0 +1,25 @@ +package one.dqu.additionaladditions.core.datagen; + +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.TagsProvider; +import net.minecraft.tags.TagKey; +import net.minecraft.world.level.block.Block; + +import java.util.concurrent.CompletableFuture; + +public class AABlockTagDatagenProvider extends TagsProvider { + public AABlockTagDatagenProvider(PackOutput output, CompletableFuture registries) { + super(output, Registries.BLOCK, registries); + } + + @Override + protected void addTags(HolderLookup.Provider provider) { + for (AABlockDatagen.Entry entry : AABlockDatagen.entries()) { + for (TagKey tag : entry.tags()) { + getOrCreateRawBuilder(tag).addElement(entry.id()); + } + } + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/gametest/datagen/AAGameTestDatagen.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAGameTestDatagen.java similarity index 97% rename from common/src/main/java/one/dqu/additionaladditions/gametest/datagen/AAGameTestDatagen.java rename to common/src/main/java/one/dqu/additionaladditions/core/datagen/AAGameTestDatagen.java index bda26d49..172a4ff2 100644 --- a/common/src/main/java/one/dqu/additionaladditions/gametest/datagen/AAGameTestDatagen.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAGameTestDatagen.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.gametest.datagen; +package one.dqu.additionaladditions.core.datagen; import net.minecraft.core.Holder; import net.minecraft.core.HolderGetter; @@ -23,7 +23,8 @@ public record Entry( Identifier structure, int maxTicks, ResourceKey> environment - ) {} + ) { + } public static void register(Entry entry) { if (entries == null) return; diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemDatagen.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemDatagen.java new file mode 100644 index 00000000..3f7c2f22 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemDatagen.java @@ -0,0 +1,83 @@ +package one.dqu.additionaladditions.core.datagen; + +import net.minecraft.client.data.models.ItemModelGenerators; +import net.minecraft.core.Holder; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.resources.Identifier; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import one.dqu.additionaladditions.AdditionalAdditions; +import one.dqu.additionaladditions.core.datagen.template.Recipes; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.function.Consumer; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +public class AAItemDatagen { + private static final List entries = AdditionalAdditions.DATAGEN ? new ArrayList<>() : null; + private static ItemModelGenerators currentGen; + + public record Entry( + Identifier id, + Supplier item, + + // template is null for items whose models/item template defs should be manual + @Nullable Consumer model, + + // recipes are associated with item entries. used by AARecipeDatagenProvider + @Nullable Recipes.RecipeEntry recipe, + + List> tags + ) { + } + + public static void register(Entry entry) { + if (entries == null) return; + entries.add(entry); + } + + public static List entries() { + return entries == null ? List.of() : entries; + } + + public static ItemModelGenerators currentGen() { + return currentGen; + } + + // for neoforge + public static Stream> knownItems() { + if (entries == null) return Stream.empty(); + Set generatedBlocks = generatedBlockIds(); + return entries.stream() + .filter(e -> e.model != null || generatedBlocks.contains(e.id())) + .map(e -> BuiltInRegistries.ITEM.getValue(e.id()).builtInRegistryHolder()); + } + + public static void generateItemModels(ItemModelGenerators gen) { + if (entries == null) return; + currentGen = gen; + + Set generatedBlocks = generatedBlockIds(); + for (Entry entry : entries) { + if (entry.model() != null) { + entry.model().accept(entry.item().get()); + } + // block models are generated in AABlockDatagen, but need an item template def to reference them + if (generatedBlocks.contains(entry.id())) { + gen.declareCustomModelItem(entry.item().get()); + } + } + } + + private static Set generatedBlockIds() { + return AABlockDatagen.entries().stream() + .filter(e -> e.model() != null) + .map(AABlockDatagen.Entry::id) + .collect(Collectors.toSet()); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemTagDatagenProvider.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemTagDatagenProvider.java new file mode 100644 index 00000000..6573a741 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemTagDatagenProvider.java @@ -0,0 +1,25 @@ +package one.dqu.additionaladditions.core.datagen; + +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.TagsProvider; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; + +import java.util.concurrent.CompletableFuture; + +public class AAItemTagDatagenProvider extends TagsProvider { + public AAItemTagDatagenProvider(PackOutput output, CompletableFuture registries) { + super(output, Registries.ITEM, registries); + } + + @Override + protected void addTags(HolderLookup.Provider provider) { + for (AAItemDatagen.Entry entry : AAItemDatagen.entries()) { + for (TagKey tag : entry.tags()) { + getOrCreateRawBuilder(tag).addElement(entry.id()); + } + } + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AARecipeDatagenProvider.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AARecipeDatagenProvider.java new file mode 100644 index 00000000..adaa749e --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AARecipeDatagenProvider.java @@ -0,0 +1,48 @@ +package one.dqu.additionaladditions.core.datagen; + +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.recipes.RecipeBuilder; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.level.ItemLike; +import one.dqu.additionaladditions.AdditionalAdditions; +import one.dqu.additionaladditions.core.datagen.template.Recipes; +import one.dqu.additionaladditions.registry.AAItems; + +public class AARecipeDatagenProvider extends RecipeProvider { + public AARecipeDatagenProvider(HolderLookup.Provider registries, RecipeOutput output) { + super(registries, output); + } + + @Override + protected void buildRecipes() { + for (AAItemDatagen.Entry entry : AAItemDatagen.entries()) { + Recipes.RecipeEntry recipe = entry.recipe(); + if (recipe == null) { + continue; + } + + Item result = BuiltInRegistries.ITEM.getValue(entry.id()); + RecipeBuilder builder = recipe.builder(this.items, result); + for (ItemLike unlock : recipe.unlocks()) { + builder.unlockedBy(getHasName(unlock), has(unlock)); + } + builder.save(this.output, recipeKey(entry.id(), result)); + } + } + + // need / path for RecipeManagerMixin, so that recipes can be disabled with config + private static ResourceKey> recipeKey(Identifier itemId, Item result) { + Identifier configPath = AAItems.configPathFor(result); + Identifier id = configPath != null + ? Identifier.tryBuild(AdditionalAdditions.NAMESPACE, configPath.getPath().split("/")[0] + "/" + itemId.getPath()) + : itemId; + return ResourceKey.create(Registries.RECIPE, id); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java new file mode 100644 index 00000000..e80213f4 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java @@ -0,0 +1,45 @@ +package one.dqu.additionaladditions.core.datagen.template; + +import net.minecraft.client.data.models.BlockModelGenerators; +import net.minecraft.client.data.models.model.ModelTemplates; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import one.dqu.additionaladditions.core.datagen.AABlockDatagen; +import one.dqu.additionaladditions.core.datagen.AAItemDatagen; + +/** + * Datagen template presets for blocks and items. + * To be used with with block/item builders. Generated in AABlockDatagen / AAItemDatagen. + */ +public final class Models { + private Models() { + } + + // Blocks + + public static void cube(Block block) { + AABlockDatagen.currentGen().createTrivialCube(block); + } + + public static void cross(Block block) { + AABlockDatagen.currentGen().createCrossBlock(block, BlockModelGenerators.PlantType.NOT_TINTED); + } + + public static void doublePlant(Block block) { + AABlockDatagen.currentGen().createDoublePlant(block, BlockModelGenerators.PlantType.NOT_TINTED); + } + + // Items + + public static void flat(Item item) { + AAItemDatagen.currentGen().generateFlatItem(item, ModelTemplates.FLAT_ITEM); + } + + public static void handheld(Item item) { + AAItemDatagen.currentGen().generateFlatItem(item, ModelTemplates.FLAT_HANDHELD_ITEM); + } + + public static void customModel(Item item) { + AAItemDatagen.currentGen().declareCustomModelItem(item); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Recipes.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Recipes.java new file mode 100644 index 00000000..c2baf3f1 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Recipes.java @@ -0,0 +1,88 @@ +package one.dqu.additionaladditions.core.datagen.template; + +import net.minecraft.core.HolderGetter; +import net.minecraft.data.recipes.RecipeBuilder; +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.data.recipes.ShapedRecipeBuilder; +import net.minecraft.data.recipes.ShapelessRecipeBuilder; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.ItemLike; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.function.BiFunction; + +public class Recipes { + private Recipes() { + } + + public static final class RecipeEntry { + private final BiFunction, ItemLike, RecipeBuilder> factory; + private final List unlocks = new ArrayList<>(); + + private RecipeEntry(BiFunction, ItemLike, RecipeBuilder> factory) { + this.factory = factory; + } + + // recipe book unlocks + public RecipeEntry unlockedBy(ItemLike... items) { + Collections.addAll(unlocks, items); + return this; + } + + public RecipeBuilder builder(HolderGetter registries, ItemLike result) { + return factory.apply(registries, result); + } + + public List unlocks() { + return unlocks; + } + } + + // Shapeless + + public static RecipeEntry shapeless(List ingredients, RecipeCategory category, int count) { + return new RecipeEntry((registries, result) -> { + ShapelessRecipeBuilder builder = ShapelessRecipeBuilder.shapeless(registries, category, result, count); + ingredients.forEach(builder::requires); + return builder; + }); + } + + public static RecipeEntry shapeless(RecipeCategory category, int count, ItemLike... ingredients) { + return shapeless(List.of(ingredients), category, count); + } + + public static RecipeEntry shapeless(RecipeCategory category, ItemLike... ingredients) { + return shapeless(List.of(ingredients), category, 1); + } + + // Shaped + + public static RecipeEntry shaped(List pattern, Map key, RecipeCategory category, int count) { + return new RecipeEntry((registries, result) -> { + ShapedRecipeBuilder builder = ShapedRecipeBuilder.shaped(registries, category, result, count); + pattern.forEach(builder::pattern); + key.forEach(builder::define); + return builder; + }); + } + + public static RecipeEntry shaped(String row1, String row2, String row3, Map key, RecipeCategory category, int count) { + return shaped(List.of(row1, row2, row3), key, category, count); + } + + public static RecipeEntry shaped(String row1, String row2, String row3, Map key, RecipeCategory category) { + return shaped(List.of(row1, row2, row3), key, category, 1); + } + + public static RecipeEntry shaped(String row1, String row2, Map key, RecipeCategory category, int count) { + return shaped(List.of(row1, row2), key, category, count); + } + + public static RecipeEntry shaped(String row1, String row2, Map key, RecipeCategory category) { + return shaped(List.of(row1, row2), key, category, 1); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/material/AAMaterial.java b/common/src/main/java/one/dqu/additionaladditions/core/material/AAMaterial.java similarity index 99% rename from common/src/main/java/one/dqu/additionaladditions/material/AAMaterial.java rename to common/src/main/java/one/dqu/additionaladditions/core/material/AAMaterial.java index 0ae545f1..6a699acb 100644 --- a/common/src/main/java/one/dqu/additionaladditions/material/AAMaterial.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/material/AAMaterial.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.material; +package one.dqu.additionaladditions.core.material; import net.minecraft.core.HolderGetter; import net.minecraft.core.HolderLookup; diff --git a/common/src/main/java/one/dqu/additionaladditions/material/AnimalArmorType.java b/common/src/main/java/one/dqu/additionaladditions/core/material/AnimalArmorType.java similarity index 94% rename from common/src/main/java/one/dqu/additionaladditions/material/AnimalArmorType.java rename to common/src/main/java/one/dqu/additionaladditions/core/material/AnimalArmorType.java index 7462f23b..c626967b 100644 --- a/common/src/main/java/one/dqu/additionaladditions/material/AnimalArmorType.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/material/AnimalArmorType.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.material; +package one.dqu.additionaladditions.core.material; import net.minecraft.core.Holder; import net.minecraft.sounds.SoundEvent; diff --git a/common/src/main/java/one/dqu/additionaladditions/material/ToolType.java b/common/src/main/java/one/dqu/additionaladditions/core/material/ToolType.java similarity index 93% rename from common/src/main/java/one/dqu/additionaladditions/material/ToolType.java rename to common/src/main/java/one/dqu/additionaladditions/core/material/ToolType.java index 38b8eb22..144888c1 100644 --- a/common/src/main/java/one/dqu/additionaladditions/material/ToolType.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/material/ToolType.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.material; +package one.dqu.additionaladditions.core.material; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; diff --git a/common/src/main/java/one/dqu/additionaladditions/util/CreativeAdder.java b/common/src/main/java/one/dqu/additionaladditions/core/util/CreativeAdder.java similarity index 89% rename from common/src/main/java/one/dqu/additionaladditions/util/CreativeAdder.java rename to common/src/main/java/one/dqu/additionaladditions/core/util/CreativeAdder.java index fef7aeca..7c45e56e 100644 --- a/common/src/main/java/one/dqu/additionaladditions/util/CreativeAdder.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/util/CreativeAdder.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.util; +package one.dqu.additionaladditions.core.util; import net.minecraft.resources.ResourceKey; import net.minecraft.world.item.CreativeModeTab; @@ -25,5 +25,7 @@ public static List getEntries(ResourceKey tab) { return Collections.unmodifiableList(entries.getOrDefault(tab, Collections.emptyList())); } - public record CreativeEntry(Supplier condition, boolean before, ItemLike anchor, Supplier item) {} + public record CreativeEntry(Supplier condition, boolean before, ItemLike anchor, + Supplier item) { + } } diff --git a/common/src/main/java/one/dqu/additionaladditions/util/FluidHelper.java b/common/src/main/java/one/dqu/additionaladditions/core/util/FluidHelper.java similarity index 97% rename from common/src/main/java/one/dqu/additionaladditions/util/FluidHelper.java rename to common/src/main/java/one/dqu/additionaladditions/core/util/FluidHelper.java index c336b667..37ac4472 100644 --- a/common/src/main/java/one/dqu/additionaladditions/util/FluidHelper.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/util/FluidHelper.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.util; +package one.dqu.additionaladditions.core.util; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.core.BlockPos; @@ -25,7 +25,8 @@ public static Transaction transaction(Player player, BlockPos pos, Direction sid if (state.getBlock() instanceof BucketPickup bucketPickup && state.getFluidState().is(fluid)) { boolean isSource = state.getFluidState().isSource(); - if (amount >= 1000 && !isSource) return new Transaction(0, (committed) -> {}); + if (amount >= 1000 && !isSource) return new Transaction(0, (committed) -> { + }); return new Transaction(Math.min(amount, 1000), (committed) -> { fluid.getPickupSound().ifPresent((sound) -> level.playSound(null, pos, sound, SoundSource.BLOCKS)); @@ -61,7 +62,8 @@ public static Transaction transaction(Player player, BlockPos pos, Direction sid } if (fluid == Fluids.LAVA && state.is(Blocks.LAVA_CAULDRON)) { - if (amount < 1000) return new Transaction(0, (committed) -> {}); + if (amount < 1000) return new Transaction(0, (committed) -> { + }); return new Transaction(1000, (committed) -> { if (committed < 1000) return; diff --git a/common/src/main/java/one/dqu/additionaladditions/util/LootAdder.java b/common/src/main/java/one/dqu/additionaladditions/core/util/LootAdder.java similarity index 95% rename from common/src/main/java/one/dqu/additionaladditions/util/LootAdder.java rename to common/src/main/java/one/dqu/additionaladditions/core/util/LootAdder.java index 999fedf1..787856fa 100644 --- a/common/src/main/java/one/dqu/additionaladditions/util/LootAdder.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/util/LootAdder.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.util; +package one.dqu.additionaladditions.core.util; import com.google.gson.JsonElement; import com.google.gson.JsonParser; @@ -7,9 +7,8 @@ import com.mojang.serialization.JsonOps; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.core.HolderLookup; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.RegistryOps; import net.minecraft.resources.Identifier; +import net.minecraft.resources.RegistryOps; import net.minecraft.server.packs.resources.Resource; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.world.level.storage.loot.LootPool; @@ -23,7 +22,10 @@ import java.io.IOException; import java.io.Reader; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.function.Consumer; /** @@ -37,10 +39,10 @@ * Format: * ``` * { - * "target": "namespace:path/to/loot_table", - * "entries": [ - * { vanilla loot entry format } - * ] + * "target": "namespace:path/to/loot_table", + * "entries": [ + * { vanilla loot entry format } + * ] * } * ``` *

@@ -131,9 +133,9 @@ public void prepare(ResourceManager resourceManager) { * Applies loaded injections for a given loot table. * This creates a new loot pool containing all injected entries and passes it to the consumer. * - * @param target the loot table to inject into + * @param target the loot table to inject into * @param registries holder lookup provider for registry access - * @param consumer receives the created loot pool + * @param consumer receives the created loot pool * @param cleanPools runnable to clear existing pools of the target loot table */ public void inject(Identifier target, HolderLookup.Provider registries, Consumer consumer, Runnable cleanPools) { diff --git a/common/src/main/java/one/dqu/additionaladditions/util/LootTableExtension.java b/common/src/main/java/one/dqu/additionaladditions/core/util/LootTableExtension.java similarity index 75% rename from common/src/main/java/one/dqu/additionaladditions/util/LootTableExtension.java rename to common/src/main/java/one/dqu/additionaladditions/core/util/LootTableExtension.java index 74327f0b..0011c011 100644 --- a/common/src/main/java/one/dqu/additionaladditions/util/LootTableExtension.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/util/LootTableExtension.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.util; +package one.dqu.additionaladditions.core.util; /** * Provides a method to clear the loot table pools diff --git a/common/src/main/java/one/dqu/additionaladditions/util/ModCompatibility.java b/common/src/main/java/one/dqu/additionaladditions/core/util/ModCompatibility.java similarity index 94% rename from common/src/main/java/one/dqu/additionaladditions/util/ModCompatibility.java rename to common/src/main/java/one/dqu/additionaladditions/core/util/ModCompatibility.java index 48ac8992..395f8755 100644 --- a/common/src/main/java/one/dqu/additionaladditions/util/ModCompatibility.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/util/ModCompatibility.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.util; +package one.dqu.additionaladditions.core.util; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.client.Minecraft; diff --git a/common/src/main/java/one/dqu/additionaladditions/util/Registrar.java b/common/src/main/java/one/dqu/additionaladditions/core/util/Registrar.java similarity index 92% rename from common/src/main/java/one/dqu/additionaladditions/util/Registrar.java rename to common/src/main/java/one/dqu/additionaladditions/core/util/Registrar.java index 2a765edb..bcbf58af 100644 --- a/common/src/main/java/one/dqu/additionaladditions/util/Registrar.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/util/Registrar.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.util; +package one.dqu.additionaladditions.core.util; import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.core.Registry; diff --git a/common/src/main/java/one/dqu/additionaladditions/util/SimplePlayerTrigger.java b/common/src/main/java/one/dqu/additionaladditions/core/util/SimplePlayerTrigger.java similarity index 96% rename from common/src/main/java/one/dqu/additionaladditions/util/SimplePlayerTrigger.java rename to common/src/main/java/one/dqu/additionaladditions/core/util/SimplePlayerTrigger.java index 79efd7f0..36dfdeb7 100644 --- a/common/src/main/java/one/dqu/additionaladditions/util/SimplePlayerTrigger.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/util/SimplePlayerTrigger.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.util; +package one.dqu.additionaladditions.core.util; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumContent.java new file mode 100644 index 00000000..3899beb5 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumContent.java @@ -0,0 +1,31 @@ +package one.dqu.additionaladditions.feature.album; + +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.item.Items; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.core.builder.AAItem; +import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.registry.AAMisc; +import one.dqu.additionaladditions.registry.AATags; + +import java.util.function.Supplier; + +public class AlbumContent { + public static final AAItem TEMPLATE = new AAItem() + .config(Config.ALBUM) + .factory(AlbumItem::new) + .creative(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.BEFORE) + .props(p -> p + .stacksTo(1) + .component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)) + .tags(AATags.ALBUMS); + + public static Supplier album(String id) { + return new AAItem<>(TEMPLATE).make(id); + } + + public static Supplier album(String id, DyeColor color) { + return new AAItem<>(TEMPLATE).tags(AATags.dyed(color)).make(id); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/item/AlbumItem.java b/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumItem.java similarity index 98% rename from common/src/main/java/one/dqu/additionaladditions/item/AlbumItem.java rename to common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumItem.java index 41019598..53cdb86f 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/AlbumItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumItem.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.item; +package one.dqu.additionaladditions.feature.album; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.SlotAccess; diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/barometer/BarometerContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/barometer/BarometerContent.java new file mode 100644 index 00000000..64b0e0ac --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/feature/barometer/BarometerContent.java @@ -0,0 +1,23 @@ +package one.dqu.additionaladditions.feature.barometer; + +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.core.builder.AAReg; +import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Recipes; + +import java.util.Map; +import java.util.function.Supplier; + +public class BarometerContent { + public static Supplier barometer() { + return AAReg.item() + .config(Config.BAROMETER) + .creative(Items.CLOCK, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) + .recipe(Recipes.shaped(" C ", "CRC", "CCC", Map.of('C', Items.COPPER_INGOT, 'R', Items.REDSTONE), RecipeCategory.TOOLS).unlockedBy(Items.REDSTONE)) + .make("barometer"); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/block/CopperPatinaBlock.java b/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaBlock.java similarity index 77% rename from common/src/main/java/one/dqu/additionaladditions/block/CopperPatinaBlock.java rename to common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaBlock.java index 18be3ad5..fd1acb2b 100644 --- a/common/src/main/java/one/dqu/additionaladditions/block/CopperPatinaBlock.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaBlock.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.block; +package one.dqu.additionaladditions.feature.copper_patina; import net.minecraft.world.level.block.RedStoneWireBlock; diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaContent.java new file mode 100644 index 00000000..97e03785 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaContent.java @@ -0,0 +1,60 @@ +package one.dqu.additionaladditions.feature.copper_patina; + +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.tags.BlockTags; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.material.MapColor; +import net.minecraft.world.level.material.PushReaction; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.core.builder.AAReg; +import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Models; +import one.dqu.additionaladditions.core.datagen.template.Recipes; +import one.dqu.additionaladditions.registry.AABlocks; +import one.dqu.additionaladditions.registry.AAItems; + +import java.util.Map; +import java.util.function.Supplier; + +public class CopperPatinaContent { + public static Supplier copperPatinaBlock() { + return AAReg.block(CopperPatinaBlock::new) + .props(p -> p + .mapColor(MapColor.COLOR_CYAN) + .pushReaction(PushReaction.DESTROY) + .noCollision() + .sound(SoundType.TUFF) + .instabreak()) + .make("copper_patina"); + } + + public static Supplier patinaBlock() { + return AAReg.block(PatinaBlock::new) + .props(p -> p + .mapColor(MapColor.COLOR_CYAN) + .pushReaction(PushReaction.NORMAL) + .sound(SoundType.ROOTED_DIRT) + .strength(0.5f)) + .tags(BlockTags.MINEABLE_WITH_SHOVEL) + .make("patina_block"); + } + + public static Supplier copperPatina() { + return AAReg.item(p -> new CopperPatinaItem(AABlocks.COPPER_PATINA.get(), p)) + .config(Config.COPPER_PATINA) + .creative(Items.REDSTONE, CreativeModeTabs.REDSTONE_BLOCKS, CreativePosition.AFTER) + .model(Models::flat) + .make("copper_patina"); + } + + public static Supplier patinaBlockItem() { + return AAReg.blockItem(AABlocks.PATINA_BLOCK) + .config(Config.COPPER_PATINA) + .creative(Items.COPPER_BLOCK, CreativeModeTabs.BUILDING_BLOCKS, CreativePosition.BEFORE) + .recipe(Recipes.shaped("PP", "PP", Map.of('P', AAItems.COPPER_PATINA::get), RecipeCategory.BUILDING_BLOCKS).unlockedBy(AAItems.COPPER_PATINA::get)) + .make("patina_block"); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/item/CopperPatinaItem.java b/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaItem.java similarity index 97% rename from common/src/main/java/one/dqu/additionaladditions/item/CopperPatinaItem.java rename to common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaItem.java index a7c733cd..5224e574 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/CopperPatinaItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaItem.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.item; +package one.dqu.additionaladditions.feature.copper_patina; import net.minecraft.world.level.block.LevelEvent; import one.dqu.additionaladditions.config.Config; diff --git a/common/src/main/java/one/dqu/additionaladditions/block/PatinaBlock.java b/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/PatinaBlock.java similarity index 92% rename from common/src/main/java/one/dqu/additionaladditions/block/PatinaBlock.java rename to common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/PatinaBlock.java index 78a51896..1a328b1b 100644 --- a/common/src/main/java/one/dqu/additionaladditions/block/PatinaBlock.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/PatinaBlock.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.block; +package one.dqu.additionaladditions.feature.copper_patina; import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; diff --git a/common/src/main/java/one/dqu/additionaladditions/item/SuspiciousDyeItem.java b/common/src/main/java/one/dqu/additionaladditions/feature/dye/SuspiciousDyeItem.java similarity index 88% rename from common/src/main/java/one/dqu/additionaladditions/item/SuspiciousDyeItem.java rename to common/src/main/java/one/dqu/additionaladditions/feature/dye/SuspiciousDyeItem.java index 841ed4c4..58e1ef3b 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/SuspiciousDyeItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/dye/SuspiciousDyeItem.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.item; +package one.dqu.additionaladditions.feature.dye; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/dye/SuspiciousDyes.java b/common/src/main/java/one/dqu/additionaladditions/feature/dye/SuspiciousDyes.java new file mode 100644 index 00000000..10217c20 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/feature/dye/SuspiciousDyes.java @@ -0,0 +1,30 @@ +package one.dqu.additionaladditions.feature.dye; + +import net.minecraft.core.component.DataComponents; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.item.Items; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.core.builder.AAReg; +import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Models; +import one.dqu.additionaladditions.feature.glint.GlintColor; +import one.dqu.additionaladditions.registry.AAMisc; +import one.dqu.additionaladditions.registry.AATags; + +import java.util.function.Supplier; + +public class SuspiciousDyes { + public static Supplier suspiciousDye(DyeColor color) { + return AAReg.item(p -> new SuspiciousDyeItem(color, p)) + .config(Config.SUSPICIOUS_DYE) + .props(p -> p + .stacksTo(1) + .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) + .component(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(color))) + .creative(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS, CreativePosition.BEFORE) + .model(Models::flat) + .tags(AATags.SUSPICIOUS_DYES) + .make(color.getName() + "_suspicious_dye"); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/food/FoodContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/food/FoodContent.java new file mode 100644 index 00000000..bbb2c64c --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/feature/food/FoodContent.java @@ -0,0 +1,55 @@ +package one.dqu.additionaladditions.feature.food; + +import net.minecraft.core.component.DataComponents; +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.component.Consumables; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.config.ConfigProperty; +import one.dqu.additionaladditions.config.type.FoodConfig; +import one.dqu.additionaladditions.core.builder.AAItem; +import one.dqu.additionaladditions.core.builder.AAReg; +import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Models; +import one.dqu.additionaladditions.core.datagen.template.Recipes; +import one.dqu.additionaladditions.registry.AATags; + +import java.util.function.Supplier; + +public class FoodContent { + private static AAItem food(ConfigProperty config, Item anchor) { + return AAReg.item() + .config(config) + .props(p -> p + .delayedComponent(DataComponents.FOOD, _ -> config.get().food()) + .component(DataComponents.CONSUMABLE, Consumables.DEFAULT_FOOD)) + .creative(anchor, CreativeModeTabs.FOOD_AND_DRINKS, CreativePosition.AFTER) + .model(Models::flat); + } + + public static Supplier friedEgg() { + return food(Config.FRIED_EGG, Items.COOKED_RABBIT).make("fried_egg"); + } + + public static Supplier berryPie() { + return food(Config.BERRY_PIE, Items.PUMPKIN_PIE) + .tags(AATags.C_FOODS_PIE) + .recipe(Recipes.shapeless(RecipeCategory.FOOD, Items.WHEAT, Items.SWEET_BERRIES, Items.SUGAR, Items.EGG).unlockedBy(Items.SWEET_BERRIES)) + .make("berry_pie"); + } + + public static Supplier honeyedApple() { + return food(Config.HONEYED_APPLE, Items.APPLE) + .tags(AATags.C_FOODS) + .recipe(Recipes.shapeless(RecipeCategory.FOOD, Items.HONEY_BOTTLE, Items.APPLE).unlockedBy(Items.HONEY_BOTTLE)) + .make("honeyed_apple"); + } + + public static Supplier chickenNugget() { + return food(Config.CHICKEN_NUGGET, Items.ROTTEN_FLESH) + .tags(AATags.C_FOODS) + .make("chicken_nugget"); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/block/GlowStickBlock.java b/common/src/main/java/one/dqu/additionaladditions/feature/glow_stick/GlowStickBlock.java similarity index 98% rename from common/src/main/java/one/dqu/additionaladditions/block/GlowStickBlock.java rename to common/src/main/java/one/dqu/additionaladditions/feature/glow_stick/GlowStickBlock.java index 3c10156a..9b46ce7b 100644 --- a/common/src/main/java/one/dqu/additionaladditions/block/GlowStickBlock.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/glow_stick/GlowStickBlock.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.block; +package one.dqu.additionaladditions.feature.glow_stick; import com.mojang.serialization.MapCodec; import net.minecraft.core.Direction; diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/glow_stick/GlowStickContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/glow_stick/GlowStickContent.java new file mode 100644 index 00000000..539b9b73 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/feature/glow_stick/GlowStickContent.java @@ -0,0 +1,54 @@ +package one.dqu.additionaladditions.feature.glow_stick; + +import net.minecraft.core.registries.Registries; +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.MobCategory; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.material.MapColor; +import net.minecraft.world.level.material.PushReaction; +import one.dqu.additionaladditions.AdditionalAdditions; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.core.builder.AAReg; +import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Models; +import one.dqu.additionaladditions.core.datagen.template.Recipes; +import one.dqu.additionaladditions.registry.AABlocks; +import one.dqu.additionaladditions.registry.AARegistries; + +import java.util.function.Supplier; + +public class GlowStickContent { + public static Supplier> glowStickEntity() { + Identifier id = Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "glow_stick"); + return AARegistries.ENTITY_TYPES.register(id, () -> EntityType.Builder + .of((EntityType type, Level level) -> new GlowStickEntity(type, level), MobCategory.MISC) + .sized(0.25f, 0.25f).updateInterval(20).clientTrackingRange(4) + .build(ResourceKey.create(Registries.ENTITY_TYPE, id))); + } + + public static Supplier glowStickBlock() { + return AAReg.block(GlowStickBlock::new) + .props(p -> p + .mapColor(MapColor.NONE) + .pushReaction(PushReaction.DESTROY) + .noCollision() + .lightLevel(state -> 12) + .instabreak()) + .make("glow_stick"); + } + + public static Supplier glowStick() { + return AAReg.item(p -> new GlowStickItem(AABlocks.GLOW_STICK_BLOCK.get(), p)) + .config(Config.GLOW_STICK) + .creative(Items.BONE_MEAL, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) + .model(Models::flat) + .recipe(Recipes.shapeless(RecipeCategory.MISC, 3, Items.STICK, Items.GLOW_INK_SAC).unlockedBy(Items.GLOW_INK_SAC)) + .make("glow_stick"); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/entity/GlowStickEntity.java b/common/src/main/java/one/dqu/additionaladditions/feature/glow_stick/GlowStickEntity.java similarity index 94% rename from common/src/main/java/one/dqu/additionaladditions/entity/GlowStickEntity.java rename to common/src/main/java/one/dqu/additionaladditions/feature/glow_stick/GlowStickEntity.java index b2e8635b..7abee347 100644 --- a/common/src/main/java/one/dqu/additionaladditions/entity/GlowStickEntity.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/glow_stick/GlowStickEntity.java @@ -1,10 +1,8 @@ -package one.dqu.additionaladditions.entity; +package one.dqu.additionaladditions.feature.glow_stick; import net.minecraft.tags.FluidTags; -import net.minecraft.world.entity.item.FallingBlockEntity; import net.minecraft.world.entity.projectile.throwableitemprojectile.ThrowableItemProjectile; import net.minecraft.world.level.block.state.BlockState; -import one.dqu.additionaladditions.block.GlowStickBlock; import one.dqu.additionaladditions.registry.AABlocks; import one.dqu.additionaladditions.registry.AAItems; import net.minecraft.core.BlockPos; diff --git a/common/src/main/java/one/dqu/additionaladditions/item/GlowStickItem.java b/common/src/main/java/one/dqu/additionaladditions/feature/glow_stick/GlowStickItem.java similarity index 93% rename from common/src/main/java/one/dqu/additionaladditions/item/GlowStickItem.java rename to common/src/main/java/one/dqu/additionaladditions/feature/glow_stick/GlowStickItem.java index ea84ab97..4baaf08a 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/GlowStickItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/glow_stick/GlowStickItem.java @@ -1,10 +1,9 @@ -package one.dqu.additionaladditions.item; +package one.dqu.additionaladditions.feature.glow_stick; import net.minecraft.world.InteractionResult; import net.minecraft.world.item.BlockItem; import net.minecraft.world.level.block.Block; import one.dqu.additionaladditions.config.Config; -import one.dqu.additionaladditions.entity.GlowStickEntity; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/music_disc/MusicDiscContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/music_disc/MusicDiscContent.java new file mode 100644 index 00000000..4e7fccab --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/feature/music_disc/MusicDiscContent.java @@ -0,0 +1,46 @@ +package one.dqu.additionaladditions.feature.music_disc; + +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.Rarity; +import one.dqu.additionaladditions.AdditionalAdditions; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.config.ConfigProperty; +import one.dqu.additionaladditions.config.Toggleable; +import one.dqu.additionaladditions.core.builder.AAReg; +import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Models; +import one.dqu.additionaladditions.registry.AATags; + +import java.util.function.Supplier; + +public class MusicDiscContent { + private static Supplier disc(String song, ConfigProperty config) { + return AAReg.item() + .config(config) + .props(p -> p + .stacksTo(1) + .rarity(Rarity.RARE) + .jukeboxPlayable(ResourceKey.create(Registries.JUKEBOX_SONG, Identifier.tryBuild(AdditionalAdditions.NAMESPACE, song)))) + .creative(Items.MUSIC_DISC_WARD, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) + .model(Models::flat) + .tags(AATags.C_MUSIC_DISCS) + .make("music_disc_" + song); + } + + public static Supplier disc0308() { + return disc("0308", Config.MUSIC_DISC_0308); + } + + public static Supplier disc1007() { + return disc("1007", Config.MUSIC_DISC_1007); + } + + public static Supplier disc1507() { + return disc("1507", Config.MUSIC_DISC_1507); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/pocket_jukebox/PocketJukeboxContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/pocket_jukebox/PocketJukeboxContent.java new file mode 100644 index 00000000..e8f1ebe1 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/feature/pocket_jukebox/PocketJukeboxContent.java @@ -0,0 +1,27 @@ +package one.dqu.additionaladditions.feature.pocket_jukebox; + +import net.minecraft.core.component.DataComponents; +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.component.TooltipDisplay; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.core.builder.AAReg; +import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Recipes; + +import java.util.Map; +import java.util.function.Supplier; + +public class PocketJukeboxContent { + public static Supplier pocketJukebox() { + return AAReg.item(PocketJukeboxItem::new) + .config(Config.POCKET_JUKEBOX) + .props(p -> p + .stacksTo(1) + .component(DataComponents.TOOLTIP_DISPLAY, TooltipDisplay.DEFAULT.withHidden(DataComponents.CONTAINER, true))) + .creative(Items.SPYGLASS, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) + .recipe(Recipes.shaped("CRC", "CJC", "CCC", Map.of('C', Items.COPPER_INGOT, 'R', Items.REDSTONE, 'J', Items.JUKEBOX), RecipeCategory.TOOLS).unlockedBy(Items.JUKEBOX)) + .make("pocket_jukebox"); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/item/PocketJukeboxItem.java b/common/src/main/java/one/dqu/additionaladditions/feature/pocket_jukebox/PocketJukeboxItem.java similarity index 93% rename from common/src/main/java/one/dqu/additionaladditions/item/PocketJukeboxItem.java rename to common/src/main/java/one/dqu/additionaladditions/feature/pocket_jukebox/PocketJukeboxItem.java index aac7a5e0..568808d0 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/PocketJukeboxItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/pocket_jukebox/PocketJukeboxItem.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.item; +package one.dqu.additionaladditions.feature.pocket_jukebox; import net.minecraft.core.component.DataComponents; import net.minecraft.network.chat.Component; @@ -6,13 +6,16 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ClickAction; import net.minecraft.world.inventory.Slot; -import net.minecraft.world.item.*; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.JukeboxPlayable; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.component.ItemContainerContents; import net.minecraft.world.item.component.TooltipDisplay; import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.feature.album.AlbumContents; -import one.dqu.additionaladditions.feature.PocketJukeboxPlayer; import one.dqu.additionaladditions.registry.AAMisc; +import one.dqu.additionaladditions.registry.AATags; import java.util.List; import java.util.function.Consumer; @@ -48,7 +51,7 @@ public static boolean hasDisc(ItemStack stack) { private boolean insertDisc(ItemStack stack, ItemStack discStack, Player player) { AlbumContents contents = null; - if (discStack.is(AAMisc.ALBUMS_TAG)) { + if (discStack.is(AATags.ALBUMS)) { contents = discStack.getOrDefault(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY); } else if (AlbumContents.isValidItem(discStack)) { contents = new AlbumContents(List.of(discStack)); @@ -111,7 +114,7 @@ public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisp ItemStack storedDisc = getStoredDisc(stack); - if (storedDisc.is(AAMisc.ALBUMS_TAG)) { + if (storedDisc.is(AATags.ALBUMS)) { AlbumContents contents = storedDisc.getOrDefault(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY); int index = PocketJukeboxPlayer.INSTANCE.isPlayingFrom(stack) diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/PocketJukeboxPlayer.java b/common/src/main/java/one/dqu/additionaladditions/feature/pocket_jukebox/PocketJukeboxPlayer.java similarity index 98% rename from common/src/main/java/one/dqu/additionaladditions/feature/PocketJukeboxPlayer.java rename to common/src/main/java/one/dqu/additionaladditions/feature/pocket_jukebox/PocketJukeboxPlayer.java index 387ea1b8..4da6a604 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/PocketJukeboxPlayer.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/pocket_jukebox/PocketJukeboxPlayer.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.feature; +package one.dqu.additionaladditions.feature.pocket_jukebox; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -26,7 +26,8 @@ public class PocketJukeboxPlayer { private int currentTrack = -1; private PocketJukeboxPlayer.SoundInstance currentSong; - private PocketJukeboxPlayer() {} + private PocketJukeboxPlayer() { + } public void play(AlbumContents album, Player player, ItemStack jukeboxStack) { if (this.isPlaying) { diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/redstone_lamp/RedstoneLampContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/redstone_lamp/RedstoneLampContent.java new file mode 100644 index 00000000..e236a24a --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/feature/redstone_lamp/RedstoneLampContent.java @@ -0,0 +1,38 @@ +package one.dqu.additionaladditions.feature.redstone_lamp; + +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.material.MapColor; +import net.minecraft.world.level.material.PushReaction; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.core.builder.AAReg; +import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Recipes; +import one.dqu.additionaladditions.registry.AABlocks; + +import java.util.Map; +import java.util.function.Supplier; + +public class RedstoneLampContent { + public static Supplier tintedRedstoneLamp() { + return AAReg.block(TintedRedstoneLampBlock::new) + .props(p -> p + .mapColor(MapColor.TERRACOTTA_PURPLE) + .pushReaction(PushReaction.NORMAL) + .sound(SoundType.GLASS) + .strength(0.3f)) + .make("tinted_redstone_lamp"); + } + + public static Supplier tintedRedstoneLampItem() { + return AAReg.blockItem(AABlocks.TINTED_REDSTONE_LAMP) + .config(Config.TINTED_REDSTONE_LAMP) + .creative(Items.REDSTONE_LAMP, CreativeModeTabs.REDSTONE_BLOCKS, CreativePosition.AFTER) + .creative(Items.REDSTONE_LAMP, CreativeModeTabs.FUNCTIONAL_BLOCKS, CreativePosition.AFTER) + .recipe(Recipes.shaped(" A ", "ALA", " A ", Map.of('A', Items.AMETHYST_SHARD, 'L', Items.REDSTONE_LAMP), RecipeCategory.REDSTONE).unlockedBy(Items.AMETHYST_SHARD)) + .make("tinted_redstone_lamp"); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/block/TintedRedstoneLampBlock.java b/common/src/main/java/one/dqu/additionaladditions/feature/redstone_lamp/TintedRedstoneLampBlock.java similarity index 96% rename from common/src/main/java/one/dqu/additionaladditions/block/TintedRedstoneLampBlock.java rename to common/src/main/java/one/dqu/additionaladditions/feature/redstone_lamp/TintedRedstoneLampBlock.java index 4da6d099..db7c79e3 100644 --- a/common/src/main/java/one/dqu/additionaladditions/block/TintedRedstoneLampBlock.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/redstone_lamp/TintedRedstoneLampBlock.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.block; +package one.dqu.additionaladditions.feature.redstone_lamp; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerPlayer; diff --git a/common/src/main/java/one/dqu/additionaladditions/entity/RopeArrow.java b/common/src/main/java/one/dqu/additionaladditions/feature/rope/RopeArrow.java similarity index 99% rename from common/src/main/java/one/dqu/additionaladditions/entity/RopeArrow.java rename to common/src/main/java/one/dqu/additionaladditions/feature/rope/RopeArrow.java index dd53a588..715ae813 100644 --- a/common/src/main/java/one/dqu/additionaladditions/entity/RopeArrow.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/rope/RopeArrow.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.entity; +package one.dqu.additionaladditions.feature.rope; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundSource; diff --git a/common/src/main/java/one/dqu/additionaladditions/item/RopeArrowItem.java b/common/src/main/java/one/dqu/additionaladditions/feature/rope/RopeArrowItem.java similarity index 92% rename from common/src/main/java/one/dqu/additionaladditions/item/RopeArrowItem.java rename to common/src/main/java/one/dqu/additionaladditions/feature/rope/RopeArrowItem.java index 9fa682cb..528fa097 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/RopeArrowItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/rope/RopeArrowItem.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.item; +package one.dqu.additionaladditions.feature.rope; import net.minecraft.core.Direction; import net.minecraft.core.Position; @@ -8,7 +8,6 @@ import net.minecraft.world.item.ArrowItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import one.dqu.additionaladditions.entity.RopeArrow; import org.jetbrains.annotations.Nullable; public class RopeArrowItem extends ArrowItem { diff --git a/common/src/main/java/one/dqu/additionaladditions/entity/RopeArrowRenderer.java b/common/src/main/java/one/dqu/additionaladditions/feature/rope/RopeArrowRenderer.java similarity index 94% rename from common/src/main/java/one/dqu/additionaladditions/entity/RopeArrowRenderer.java rename to common/src/main/java/one/dqu/additionaladditions/feature/rope/RopeArrowRenderer.java index cc3532f9..6d379469 100644 --- a/common/src/main/java/one/dqu/additionaladditions/entity/RopeArrowRenderer.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/rope/RopeArrowRenderer.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.entity; +package one.dqu.additionaladditions.feature.rope; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/common/src/main/java/one/dqu/additionaladditions/block/RopeBlock.java b/common/src/main/java/one/dqu/additionaladditions/feature/rope/RopeBlock.java similarity index 99% rename from common/src/main/java/one/dqu/additionaladditions/block/RopeBlock.java rename to common/src/main/java/one/dqu/additionaladditions/feature/rope/RopeBlock.java index 988c710d..654f9877 100644 --- a/common/src/main/java/one/dqu/additionaladditions/block/RopeBlock.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/rope/RopeBlock.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.block; +package one.dqu.additionaladditions.feature.rope; import net.minecraft.server.level.ServerPlayer; import net.minecraft.tags.BlockTags; diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/rope/RopeContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/rope/RopeContent.java new file mode 100644 index 00000000..245a2315 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/feature/rope/RopeContent.java @@ -0,0 +1,76 @@ +package one.dqu.additionaladditions.feature.rope; + +import net.minecraft.core.registries.Registries; +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.MobCategory; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.material.MapColor; +import net.minecraft.world.level.material.PushReaction; +import one.dqu.additionaladditions.AdditionalAdditions; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.core.builder.AAReg; +import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Models; +import one.dqu.additionaladditions.core.datagen.template.Recipes; +import one.dqu.additionaladditions.registry.AABlocks; +import one.dqu.additionaladditions.registry.AAItems; +import one.dqu.additionaladditions.registry.AARegistries; +import one.dqu.additionaladditions.registry.AATags; + +import java.util.Map; +import java.util.function.Supplier; + +public class RopeContent { + public static Supplier ropeBlock() { + return AAReg.block(RopeBlock::new) + .props(p -> p + .mapColor(MapColor.COLOR_BROWN) + .pushReaction(PushReaction.DESTROY) + .noCollision() + .sound(SoundType.WOOL) + .explosionResistance(0f) + .destroyTime(0.2f)) + .tags(AATags.C_ROPES_BLOCK, BlockTags.CLIMBABLE) + .make("rope"); + } + + public static Supplier rope() { + return AAReg.blockItem(AABlocks.ROPE_BLOCK) + .config(Config.ROPE) + .creative(Items.LADDER, CreativeModeTabs.FUNCTIONAL_BLOCKS, CreativePosition.AFTER) + .creative(Items.SPYGLASS, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) + .model(Models::flat) + .tags(AATags.C_ROPES_ITEM) + .recipe(Recipes.shaped("S", "S", Map.of('S', Items.STRING), RecipeCategory.MISC).unlockedBy(Items.STRING)) + .make("rope"); + } + + public static Supplier ropeArrow() { + ItemLike rope = AAItems.ROPE::get; + return AAReg.item(RopeArrowItem::new) + .config(Config.ROPE) + .creative(Items.ARROW, CreativeModeTabs.COMBAT, CreativePosition.AFTER) + .model(Models::flat) + .tags(ItemTags.ARROWS) + .recipe(Recipes.shapeless(RecipeCategory.MISC, Items.ARROW, rope, rope, rope, rope, rope, rope, rope, rope).unlockedBy(rope)) + .make("rope_arrow"); + } + + public static Supplier> ropeArrowEntity() { + Identifier id = Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "rope_arrow"); + return AARegistries.ENTITY_TYPES.register(id, () -> EntityType.Builder + .of((EntityType type, Level level) -> new RopeArrow(type, level), MobCategory.MISC) + .sized(0.5f, 0.5f).eyeHeight(0.13f).updateInterval(20).clientTrackingRange(4) + .build(ResourceKey.create(Registries.ENTITY_TYPE, id))); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/item/AAAxeItem.java b/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/AAAxeItem.java similarity index 85% rename from common/src/main/java/one/dqu/additionaladditions/item/AAAxeItem.java rename to common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/AAAxeItem.java index 79593f4a..ba976cc0 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/AAAxeItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/AAAxeItem.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.item; +package one.dqu.additionaladditions.feature.rose_gold; import net.minecraft.world.item.AxeItem; import net.minecraft.world.item.ToolMaterial; diff --git a/common/src/main/java/one/dqu/additionaladditions/item/AAHoeItem.java b/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/AAHoeItem.java similarity index 85% rename from common/src/main/java/one/dqu/additionaladditions/item/AAHoeItem.java rename to common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/AAHoeItem.java index b556149f..52dc7e90 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/AAHoeItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/AAHoeItem.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.item; +package one.dqu.additionaladditions.feature.rose_gold; import net.minecraft.world.item.HoeItem; import net.minecraft.world.item.ToolMaterial; diff --git a/common/src/main/java/one/dqu/additionaladditions/item/AAShovelItem.java b/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/AAShovelItem.java similarity index 86% rename from common/src/main/java/one/dqu/additionaladditions/item/AAShovelItem.java rename to common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/AAShovelItem.java index fcb3c4d3..430af793 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/AAShovelItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/AAShovelItem.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.item; +package one.dqu.additionaladditions.feature.rose_gold; import net.minecraft.world.item.ShovelItem; import net.minecraft.world.item.ToolMaterial; diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/RoseGoldContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/RoseGoldContent.java new file mode 100644 index 00000000..2758a822 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/RoseGoldContent.java @@ -0,0 +1,163 @@ +package one.dqu.additionaladditions.feature.rose_gold; + +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.equipment.ArmorType; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.material.MapColor; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.core.builder.AAReg; +import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Models; +import one.dqu.additionaladditions.core.material.AnimalArmorType; +import one.dqu.additionaladditions.core.material.ToolType; +import one.dqu.additionaladditions.registry.AABlocks; +import one.dqu.additionaladditions.registry.AAMaterials; +import one.dqu.additionaladditions.registry.AATags; + +import java.util.function.Supplier; + +public class RoseGoldContent { + public static Supplier roseGoldBlock() { + return AAReg.block(Block::new) + .props(p -> p + .mapColor(MapColor.COLOR_PINK) + .requiresCorrectToolForDrops() + .strength(3.0f, 6.0f) + .sound(SoundType.METAL)) + .tags(BlockTags.BEACON_BASE_BLOCKS, BlockTags.MINEABLE_WITH_PICKAXE, BlockTags.NEEDS_IRON_TOOL, + BlockTags.INCORRECT_FOR_GOLD_TOOL, BlockTags.INCORRECT_FOR_STONE_TOOL, BlockTags.INCORRECT_FOR_WOODEN_TOOL) + .model(Models::cube) + .make("rose_gold_block"); + } + + public static Supplier roseGoldBlockItem() { + return AAReg.blockItem(AABlocks.ROSE_GOLD_BLOCK) + .config(Config.ROSE_GOLD) + .creative(Items.LIGHT_WEIGHTED_PRESSURE_PLATE, CreativeModeTabs.BUILDING_BLOCKS, CreativePosition.AFTER) + .tags(AATags.C_STORAGE_BLOCKS_ROSE_GOLD) + .make("rose_gold_block"); + } + + public static Supplier roseGoldIngot() { + return AAReg.item() + .config(Config.ROSE_GOLD) + .creative(Items.GOLD_INGOT, CreativeModeTabs.INGREDIENTS, CreativePosition.AFTER) + .model(Models::flat) + .tags(AATags.C_INGOTS_ROSE_GOLD, AATags.REPAIRS_ROSE_GOLD_ARMOR) + .make("rose_gold_ingot"); + } + + private static Supplier armor(String id, ArmorType armorType, Item anchor) { + TagKey slotTag = switch (armorType) { + case HELMET -> ItemTags.HEAD_ARMOR; + case CHESTPLATE -> ItemTags.CHEST_ARMOR; + case LEGGINGS -> ItemTags.LEG_ARMOR; + case BOOTS -> ItemTags.FOOT_ARMOR; + default -> throw new IllegalArgumentException("Invalid armor slot: " + armorType); + }; + return AAReg.item() + .config(Config.ROSE_GOLD) + .material(AAMaterials.ROSE_GOLD, armorType) + .creative(anchor, CreativeModeTabs.COMBAT, CreativePosition.AFTER) + .tags(slotTag, ItemTags.TRIMMABLE_ARMOR) + .make(id); + } + + public static Supplier helmet() { + return armor("rose_gold_helmet", ArmorType.HELMET, Items.GOLDEN_BOOTS); + } + + public static Supplier chestplate() { + return armor("rose_gold_chestplate", ArmorType.CHESTPLATE, Items.GOLDEN_BOOTS); + } + + public static Supplier leggings() { + return armor("rose_gold_leggings", ArmorType.LEGGINGS, Items.GOLDEN_BOOTS); + } + + public static Supplier boots() { + return armor("rose_gold_boots", ArmorType.BOOTS, Items.GOLDEN_BOOTS); + } + + public static Supplier horseArmor() { + return AAReg.item() + .config(Config.ROSE_GOLD) + .material(AAMaterials.ROSE_GOLD, AnimalArmorType.HORSE) + .props(p -> p.stacksTo(1)) + .creative(Items.GOLDEN_HORSE_ARMOR, CreativeModeTabs.COMBAT, CreativePosition.AFTER) + .model(Models::flat) + .make("rose_gold_horse_armor"); + } + + public static Supplier nautilusArmor() { + return AAReg.item() + .config(Config.ROSE_GOLD) + .material(AAMaterials.ROSE_GOLD, AnimalArmorType.NAUTILUS) + .props(p -> p.stacksTo(1)) + .creative(Items.GOLDEN_NAUTILUS_ARMOR, CreativeModeTabs.COMBAT, CreativePosition.AFTER) + .model(Models::flat) + .make("rose_gold_nautilus_armor"); + } + + public static Supplier sword() { + return AAReg.item() + .config(Config.ROSE_GOLD) + .material(AAMaterials.ROSE_GOLD, ToolType.SWORD) + .creative(Items.GOLDEN_SWORD, CreativeModeTabs.COMBAT, CreativePosition.AFTER) + .tags(ItemTags.SWORDS) + .make("rose_gold_sword"); + } + + public static Supplier spear() { + return AAReg.item() + .config(Config.ROSE_GOLD) + .material(AAMaterials.ROSE_GOLD, ToolType.SPEAR) + .creative(Items.GOLDEN_SPEAR, CreativeModeTabs.COMBAT, CreativePosition.AFTER) + .tags(ItemTags.SPEARS) + .make("rose_gold_spear"); + } + + public static Supplier shovel() { + return AAReg.item(AAShovelItem::new) + .config(Config.ROSE_GOLD) + .material(AAMaterials.ROSE_GOLD, ToolType.SHOVEL) + .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) + .tags(ItemTags.SHOVELS) + .make("rose_gold_shovel"); + } + + public static Supplier pickaxe() { + return AAReg.item() + .config(Config.ROSE_GOLD) + .material(AAMaterials.ROSE_GOLD, ToolType.PICKAXE) + .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) + .tags(ItemTags.PICKAXES) + .make("rose_gold_pickaxe"); + } + + public static Supplier axe() { + return AAReg.item(AAAxeItem::new) + .config(Config.ROSE_GOLD) + .material(AAMaterials.ROSE_GOLD, ToolType.AXE) + .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) + .creative(Items.GOLDEN_AXE, CreativeModeTabs.COMBAT, CreativePosition.AFTER) + .tags(ItemTags.AXES) + .make("rose_gold_axe"); + } + + public static Supplier hoe() { + return AAReg.item(AAHoeItem::new) + .config(Config.ROSE_GOLD) + .material(AAMaterials.ROSE_GOLD, ToolType.HOE) + .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) + .tags(ItemTags.HOES) + .make("rose_gold_hoe"); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/block/FlowerCropBlock.java b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/FlowerCropBlock.java similarity index 98% rename from common/src/main/java/one/dqu/additionaladditions/block/FlowerCropBlock.java rename to common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/FlowerCropBlock.java index 71d4e12f..64096111 100644 --- a/common/src/main/java/one/dqu/additionaladditions/block/FlowerCropBlock.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/FlowerCropBlock.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.block; +package one.dqu.additionaladditions.feature.sniffer_plants; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; diff --git a/common/src/main/java/one/dqu/additionaladditions/block/LotusLilyCropBlock.java b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/LotusLilyCropBlock.java similarity index 97% rename from common/src/main/java/one/dqu/additionaladditions/block/LotusLilyCropBlock.java rename to common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/LotusLilyCropBlock.java index fb5e75a7..54546a5d 100644 --- a/common/src/main/java/one/dqu/additionaladditions/block/LotusLilyCropBlock.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/LotusLilyCropBlock.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.block; +package one.dqu.additionaladditions.feature.sniffer_plants; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java new file mode 100644 index 00000000..20ceca54 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java @@ -0,0 +1,296 @@ +package one.dqu.additionaladditions.feature.sniffer_plants; + +import net.minecraft.core.Holder; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffects; +import net.minecraft.world.item.*; +import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.material.MapColor; +import net.minecraft.world.level.material.PushReaction; +import net.minecraft.world.phys.shapes.Shapes; +import net.minecraft.world.phys.shapes.VoxelShape; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.core.builder.AAItem; +import one.dqu.additionaladditions.core.builder.AAReg; +import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Models; +import one.dqu.additionaladditions.registry.AABlocks; +import one.dqu.additionaladditions.registry.AATags; + +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Supplier; + +public class SnifferPlantsContent { + private static final Consumer PLANT_PROPS = p -> p + .mapColor(MapColor.PLANT).noCollision().instabreak().sound(SoundType.GRASS) + .offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY); + private static final Consumer CROP_PROPS = p -> p + .mapColor(MapColor.PLANT).noCollision().randomTicks().instabreak().sound(SoundType.CROP) + .pushReaction(PushReaction.DESTROY); + + // Helpers + + private static Supplier doublePlant(String id) { + return AAReg.block(DoublePlantBlock::new).props(PLANT_PROPS) + .tags(AATags.C_FLOWERS_TALL_BLOCK, BlockTags.BEE_ATTRACTIVE, BlockTags.MAINTAINS_FARMLAND) + .model(Models::doublePlant) + .make(id); + } + + private static Supplier flower(String id, Holder effect) { + return AAReg.block(p -> new FlowerBlock(effect, 5f, p)).props(PLANT_PROPS) + .tags(AATags.C_FLOWERS_SMALL_BLOCK, BlockTags.BEE_ATTRACTIVE, BlockTags.MAINTAINS_FARMLAND) + .model(Models::cross) + .make(id); + } + + private static Supplier crop(String id, Supplier grown, int maxAge, VoxelShape[] shapes) { + return AAReg.block(p -> new FlowerCropBlock(grown, maxAge, shapes, p)).props(CROP_PROPS) + .tags(BlockTags.CROPS, BlockTags.MAINTAINS_FARMLAND) + .make(id); + } + + private static VoxelShape[] shapes(VoxelShape... s) { + return s; + } + + private static Supplier plantItem(String id, Supplier block, ItemLike anchor, TagKey flowerTag) { + return itemBuilder(p -> new BlockItem(block.get(), p), anchor, false) + .tags(flowerTag, ItemTags.BEE_FOOD) + .make(id); + } + + private static Supplier podItem(String id, Supplier block, ItemLike anchor) { + return itemBuilder(p -> new BlockItem(block.get(), p), anchor, true) + .tags(AATags.C_SEEDS) + .make(id); + } + + private static Supplier vineItem(String id, Supplier block, ItemLike anchor) { + return itemBuilder(p -> new BlockItem(block.get(), p), anchor, true).make(id); + } + + private static AAItem itemBuilder(Function factory, ItemLike anchor, boolean pod) { + var builder = AAReg.item(factory) + .config(Config.SNIFFER_PLANTS) + .creative(anchor, CreativeModeTabs.NATURAL_BLOCKS, CreativePosition.AFTER); + if (pod) builder.props(Item.Properties::useItemDescriptionPrefix); + return builder; + } + + + // Blocks + + public static Supplier cottonshiver() { + return doublePlant("cottonshiver"); + } + + public static Supplier cottonshiverCrop() { + return crop("cottonshiver_crop", AABlocks.COTTONSHIVER, 2, + shapes(Block.box(4, 0, 4, 12, 8, 12), Block.box(4, 0, 4, 12, 15, 12), Shapes.block())); + } + + public static Supplier mudflower() { + return doublePlant("mudflower"); + } + + public static Supplier mudflowerCrop() { + return crop("mudflower_crop", AABlocks.MUDFLOWER, 2, + shapes(Block.box(5, 0, 5, 11, 9, 11), Block.box(4, 0, 4, 12, 15, 12), Shapes.block())); + } + + public static Supplier crimsonBlossom() { + return flower("crimson_blossom", MobEffects.STRENGTH); + } + + public static Supplier crimsonBlossomCrop() { + return crop("crimson_blossom_crop", AABlocks.CRIMSON_BLOSSOM, 2, + shapes(Block.box(3, 0, 3, 13, 10, 13), Block.box(3, 0, 3, 13, 12, 13), Shapes.block())); + } + + public static Supplier amberBlossom() { + return doublePlant("amber_blossom"); + } + + public static Supplier amberBlossomCrop() { + return crop("amber_blossom_crop", AABlocks.AMBER_BLOSSOM, 2, + shapes(Block.box(5, 0, 5, 11, 7, 11), Block.box(4, 0, 4, 12, 12, 12), Shapes.block())); + } + + public static Supplier bulbus() { + return flower("bulbus", MobEffects.NIGHT_VISION); + } + + public static Supplier bulbusCrop() { + return crop("bulbus_crop", AABlocks.BULBUS, 2, + shapes(Block.box(5, 0, 5, 11, 10, 11), Block.box(4, 0, 4, 12, 15, 12), Shapes.block())); + } + + public static Supplier sawtoothFern() { + return doublePlant("sawtooth_fern"); + } + + public static Supplier sawtoothFernCrop() { + return crop("sawtooth_fern_crop", AABlocks.SAWTOOTH_FERN, 3, + shapes(Block.box(5, 0, 5, 11, 10, 11), Block.box(5, 0, 5, 11, 10, 11), Block.box(4, 0, 4, 12, 15, 12), Shapes.block())); + } + + public static Supplier frostleaf() { + return flower("frostleaf", MobEffects.SPEED); + } + + public static Supplier frostleafCrop() { + return crop("frostleaf_crop", AABlocks.FROSTLEAF, 2, + shapes(Block.box(1, 0, 1, 14, 6, 14), Block.box(1, 0, 1, 14, 6, 14), Shapes.block())); + } + + public static Supplier wisteria() { + return AAReg.block(WisteriaBlock::new) + .props(p -> p.mapColor(MapColor.PLANT).noCollision().instabreak().sound(SoundType.VINE) + .strength(0.2F).pushReaction(PushReaction.DESTROY)) + .tags(AATags.C_FLOWERS_BLOCK, BlockTags.BEE_ATTRACTIVE, BlockTags.MAINTAINS_FARMLAND) + .make("wisteria"); + } + + public static Supplier wisteriaCrop() { + return AAReg.block(WisteriaCropBlock::new) + .props(p -> p.mapColor(MapColor.PLANT).noCollision().randomTicks().instabreak().sound(SoundType.VINE) + .pushReaction(PushReaction.DESTROY)) + .tags(BlockTags.CROPS, BlockTags.MAINTAINS_FARMLAND) + .make("wisteria_crop"); + } + + public static Supplier spikeblossom() { + return doublePlant("spikeblossom"); + } + + public static Supplier spikeblossomCrop() { + return crop("spikeblossom_crop", AABlocks.SPIKEBLOSSOM, 2, + shapes(Block.box(5, 0, 5, 11, 7, 11), Block.box(4, 0, 4, 12, 11, 12), Shapes.block())); + } + + public static Supplier snapdragon() { + return doublePlant("snapdragon"); + } + + public static Supplier snapdragonCrop() { + return crop("snapdragon_crop", AABlocks.SNAPDRAGON, 2, + shapes(Block.box(5, 0, 5, 11, 8, 11), Block.box(4, 0, 4, 12, 15, 12), Shapes.block())); + } + + public static Supplier lotusLily() { + return AAReg.block(LilyPadBlock::new) + .props(p -> p.mapColor(MapColor.PLANT).instabreak().sound(SoundType.LILY_PAD).noOcclusion() + .pushReaction(PushReaction.DESTROY)) + .tags(AATags.C_FLOWERS_BLOCK, BlockTags.BEE_ATTRACTIVE, BlockTags.MAINTAINS_FARMLAND) + .make("lotus_lily"); + } + + public static Supplier lotusLilyCrop() { + return AAReg.block(LotusLilyCropBlock::new) + .props(p -> p.mapColor(MapColor.PLANT).randomTicks().instabreak().sound(SoundType.LILY_PAD).noOcclusion() + .pushReaction(PushReaction.DESTROY)) + .tags(BlockTags.CROPS, BlockTags.MAINTAINS_FARMLAND) + .make("lotus_lily_crop"); + } + + // Items + + public static Supplier cottonshiverItem() { + return plantItem("cottonshiver", AABlocks.COTTONSHIVER, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM); + } + + public static Supplier cottonshiverPod() { + return podItem("cottonshiver_pod", AABlocks.COTTONSHIVER_CROP, Items.PITCHER_POD); + } + + public static Supplier mudflowerItem() { + return plantItem("mudflower", AABlocks.MUDFLOWER, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM); + } + + public static Supplier mudflowerSeeds() { + return podItem("mudflower_seeds", AABlocks.MUDFLOWER_CROP, Items.PITCHER_POD); + } + + public static Supplier crimsonBlossomItem() { + return plantItem("crimson_blossom", AABlocks.CRIMSON_BLOSSOM, Items.TORCHFLOWER, AATags.C_FLOWERS_SMALL_ITEM); + } + + public static Supplier crimsonBlossomSeeds() { + return podItem("crimson_blossom_seeds", AABlocks.CRIMSON_BLOSSOM_CROP, Items.PITCHER_POD); + } + + public static Supplier amberBlossomItem() { + return plantItem("amber_blossom", AABlocks.AMBER_BLOSSOM, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM); + } + + public static Supplier amberBlossomSeeds() { + return podItem("amber_blossom_seeds", AABlocks.AMBER_BLOSSOM_CROP, Items.PITCHER_POD); + } + + public static Supplier bulbusItem() { + return plantItem("bulbus", AABlocks.BULBUS, Items.TORCHFLOWER, AATags.C_FLOWERS_SMALL_ITEM); + } + + public static Supplier bulbusPod() { + return podItem("bulbus_pod", AABlocks.BULBUS_CROP, Items.PITCHER_POD); + } + + public static Supplier sawtoothFernItem() { + return plantItem("sawtooth_fern", AABlocks.SAWTOOTH_FERN, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM); + } + + public static Supplier sawtoothFernFiddlehead() { + return podItem("sawtooth_fern_fiddlehead", AABlocks.SAWTOOTH_FERN_CROP, Items.PITCHER_POD); + } + + public static Supplier frostleafItem() { + return plantItem("frostleaf", AABlocks.FROSTLEAF, Items.TORCHFLOWER, AATags.C_FLOWERS_SMALL_ITEM); + } + + public static Supplier frostleafPod() { + return podItem("frostleaf_pod", AABlocks.FROSTLEAF_CROP, Items.PITCHER_POD); + } + + public static Supplier wisteriaItem() { + return plantItem("wisteria", AABlocks.WISTERIA, Items.TORCHFLOWER, AATags.C_FLOWERS_ITEM); + } + + public static Supplier wisteriaVines() { + return vineItem("wisteria_vines", AABlocks.WISTERIA_CROP, Items.PITCHER_POD); + } + + public static Supplier spikeblossomItem() { + return plantItem("spikeblossom", AABlocks.SPIKEBLOSSOM, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM); + } + + public static Supplier spikeblossomSeeds() { + return podItem("spikeblossom_seeds", AABlocks.SPIKEBLOSSOM_CROP, Items.PITCHER_POD); + } + + public static Supplier snapdragonItem() { + return plantItem("snapdragon", AABlocks.SNAPDRAGON, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM); + } + + public static Supplier snapdragonPod() { + return podItem("snapdragon_pod", AABlocks.SNAPDRAGON_CROP, Items.PITCHER_POD); + } + + public static Supplier lotusLilyItem() { + return AAReg.item(p -> new PlaceOnWaterBlockItem(AABlocks.LOTUS_LILY.get(), p)) + .config(Config.SNIFFER_PLANTS) + .creative(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS, CreativePosition.AFTER) + .tags(AATags.C_FLOWERS_ITEM, ItemTags.BEE_FOOD) + .make("lotus_lily"); + } + + public static Supplier lotusLilyPod() { + return vineItem("lotus_lily_pod", AABlocks.LOTUS_LILY_CROP, Items.PITCHER_POD); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/block/WisteriaBlock.java b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/WisteriaBlock.java similarity index 95% rename from common/src/main/java/one/dqu/additionaladditions/block/WisteriaBlock.java rename to common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/WisteriaBlock.java index 5a66f1c5..39209ebd 100644 --- a/common/src/main/java/one/dqu/additionaladditions/block/WisteriaBlock.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/WisteriaBlock.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.block; +package one.dqu.additionaladditions.feature.sniffer_plants; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; diff --git a/common/src/main/java/one/dqu/additionaladditions/block/WisteriaCropBlock.java b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/WisteriaCropBlock.java similarity index 98% rename from common/src/main/java/one/dqu/additionaladditions/block/WisteriaCropBlock.java rename to common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/WisteriaCropBlock.java index 3c5873cd..14ae8145 100644 --- a/common/src/main/java/one/dqu/additionaladditions/block/WisteriaCropBlock.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/WisteriaCropBlock.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.block; +package one.dqu.additionaladditions.feature.sniffer_plants; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/trident/TridentShardContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/trident/TridentShardContent.java new file mode 100644 index 00000000..b0e242af --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/feature/trident/TridentShardContent.java @@ -0,0 +1,21 @@ +package one.dqu.additionaladditions.feature.trident; + +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.core.builder.AAReg; +import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Models; + +import java.util.function.Supplier; + +public class TridentShardContent { + public static Supplier tridentShard() { + return AAReg.item() + .config(Config.TRIDENT_SHARD) + .creative(Items.PRISMARINE_CRYSTALS, CreativeModeTabs.INGREDIENTS, CreativePosition.AFTER) + .model(Models::flat) + .make("trident_shard"); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/watering_can/WateringCanContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/watering_can/WateringCanContent.java new file mode 100644 index 00000000..114a343e --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/feature/watering_can/WateringCanContent.java @@ -0,0 +1,26 @@ +package one.dqu.additionaladditions.feature.watering_can; + +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.Items; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.core.builder.AAReg; +import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Recipes; +import one.dqu.additionaladditions.registry.AAMisc; + +import java.util.Map; +import java.util.function.Supplier; + +public class WateringCanContent { + public static Supplier wateringCan() { + return AAReg.item(WateringCanItem::new) + .config(Config.WATERING_CAN) + .props(p -> p + .stacksTo(1) + .component(AAMisc.WATER_LEVEL_COMPONENT.get(), 0)) + .creative(Items.BONE_MEAL, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) + .recipe(Recipes.shaped("C ", "CBC", " C ", Map.of('C', Items.COPPER_INGOT, 'B', Items.BUCKET), RecipeCategory.TOOLS).unlockedBy(Items.COPPER_INGOT)) + .make("watering_can"); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/item/WateringCanItem.java b/common/src/main/java/one/dqu/additionaladditions/feature/watering_can/WateringCanItem.java similarity index 98% rename from common/src/main/java/one/dqu/additionaladditions/item/WateringCanItem.java rename to common/src/main/java/one/dqu/additionaladditions/feature/watering_can/WateringCanItem.java index 8e852c1e..4134e43b 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/WateringCanItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/watering_can/WateringCanItem.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.item; +package one.dqu.additionaladditions.feature.watering_can; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.server.level.ServerPlayer; @@ -6,7 +6,7 @@ import net.minecraft.world.InteractionResult; import net.minecraft.world.item.Item; import one.dqu.additionaladditions.config.Config; -import one.dqu.additionaladditions.util.FluidHelper; +import one.dqu.additionaladditions.core.util.FluidHelper; import one.dqu.additionaladditions.registry.AAMisc; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/wrench/WrenchContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/wrench/WrenchContent.java new file mode 100644 index 00000000..75821917 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/feature/wrench/WrenchContent.java @@ -0,0 +1,30 @@ +package one.dqu.additionaladditions.feature.wrench; + +import net.minecraft.core.component.DataComponents; +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.Items; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.core.builder.AAReg; +import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Recipes; +import one.dqu.additionaladditions.registry.AATags; + +import java.util.Map; +import java.util.function.Supplier; + +public class WrenchContent { + public static Supplier wrench() { + return AAReg.item(WrenchItem::new) + .config(Config.WRENCH) + .props(p -> p + .stacksTo(1) + .delayedComponent(DataComponents.MAX_DAMAGE, _ -> Config.WRENCH.get().durability()) + .component(DataComponents.DAMAGE, 0)) + .creative(Items.BONE_MEAL, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) + .creative(Items.TARGET, CreativeModeTabs.REDSTONE_BLOCKS, CreativePosition.AFTER) + .tags(AATags.C_TOOLS_WRENCH) + .recipe(Recipes.shaped("C C", " C ", " C ", Map.of('C', Items.COPPER_INGOT), RecipeCategory.TOOLS).unlockedBy(Items.COPPER_INGOT)) + .make("wrench"); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/item/WrenchItem.java b/common/src/main/java/one/dqu/additionaladditions/feature/wrench/WrenchItem.java similarity index 95% rename from common/src/main/java/one/dqu/additionaladditions/item/WrenchItem.java rename to common/src/main/java/one/dqu/additionaladditions/feature/wrench/WrenchItem.java index 0697a029..d6434d04 100644 --- a/common/src/main/java/one/dqu/additionaladditions/item/WrenchItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/wrench/WrenchItem.java @@ -1,7 +1,5 @@ -package one.dqu.additionaladditions.item; +package one.dqu.additionaladditions.feature.wrench; -import net.minecraft.world.item.Item; -import one.dqu.additionaladditions.config.Config; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundEvents; @@ -10,6 +8,7 @@ import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; @@ -17,7 +16,8 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.SlabType; -import one.dqu.additionaladditions.registry.AAMisc; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.registry.AATags; import org.jetbrains.annotations.NotNull; import java.util.Optional; @@ -43,7 +43,8 @@ private boolean tryPlacing(BlockPos pos, BlockState state, Level world, ItemStac } }, () -> { if (world instanceof ServerLevel serverLevel) { - stack.hurtAndBreak(1, serverLevel, null, item -> {}); + stack.hurtAndBreak(1, serverLevel, null, item -> { + }); } }); @@ -57,7 +58,7 @@ private boolean tryPlacing(BlockPos pos, BlockState state, Level world, ItemStac private InteractionResult rotate(BlockPos pos, BlockState state, Level world, ItemStack stack, Optional player, Optional hand) { if (!Config.WRENCH.get().enabled()) return InteractionResult.FAIL; - if (state.is(AAMisc.WRENCH_BLACKLIST_TAG)) return InteractionResult.PASS; + if (state.is(AATags.WRENCH_BLACKLIST)) return InteractionResult.PASS; if (state.hasProperty(BlockStateProperties.FACING)) { if (tryPlacing(pos, state.cycle(BlockStateProperties.FACING), world, stack, player, hand)) { diff --git a/common/src/main/java/one/dqu/additionaladditions/gametest/tests/CopperPatinaTests.java b/common/src/main/java/one/dqu/additionaladditions/gametest/CopperPatinaTests.java similarity index 99% rename from common/src/main/java/one/dqu/additionaladditions/gametest/tests/CopperPatinaTests.java rename to common/src/main/java/one/dqu/additionaladditions/gametest/CopperPatinaTests.java index 208d6772..0c3af935 100644 --- a/common/src/main/java/one/dqu/additionaladditions/gametest/tests/CopperPatinaTests.java +++ b/common/src/main/java/one/dqu/additionaladditions/gametest/CopperPatinaTests.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.gametest.tests; +package one.dqu.additionaladditions.gametest; import net.minecraft.core.BlockPos; import net.minecraft.gametest.framework.GameTestHelper; diff --git a/common/src/main/java/one/dqu/additionaladditions/gametest/tests/MiscTests.java b/common/src/main/java/one/dqu/additionaladditions/gametest/MiscTests.java similarity index 93% rename from common/src/main/java/one/dqu/additionaladditions/gametest/tests/MiscTests.java rename to common/src/main/java/one/dqu/additionaladditions/gametest/MiscTests.java index 40f1fcd1..d096a6d6 100644 --- a/common/src/main/java/one/dqu/additionaladditions/gametest/tests/MiscTests.java +++ b/common/src/main/java/one/dqu/additionaladditions/gametest/MiscTests.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.gametest.tests; +package one.dqu.additionaladditions.gametest; import net.minecraft.gametest.framework.GameTestHelper; import net.minecraft.network.chat.Component; diff --git a/common/src/main/java/one/dqu/additionaladditions/gametest/tests/RopeArrowTests.java b/common/src/main/java/one/dqu/additionaladditions/gametest/RopeArrowTests.java similarity index 98% rename from common/src/main/java/one/dqu/additionaladditions/gametest/tests/RopeArrowTests.java rename to common/src/main/java/one/dqu/additionaladditions/gametest/RopeArrowTests.java index 1b3fa7d7..affa6242 100644 --- a/common/src/main/java/one/dqu/additionaladditions/gametest/tests/RopeArrowTests.java +++ b/common/src/main/java/one/dqu/additionaladditions/gametest/RopeArrowTests.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.gametest.tests; +package one.dqu.additionaladditions.gametest; import net.minecraft.core.BlockPos; import net.minecraft.gametest.framework.GameTestHelper; @@ -7,7 +7,7 @@ import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.projectile.arrow.AbstractArrow; import net.minecraft.world.level.block.Blocks; -import one.dqu.additionaladditions.entity.RopeArrow; +import one.dqu.additionaladditions.feature.rope.RopeArrow; import one.dqu.additionaladditions.registry.AABlocks; import one.dqu.additionaladditions.registry.AAEntities; import one.dqu.additionaladditions.registry.AAItems; diff --git a/common/src/main/java/one/dqu/additionaladditions/gametest/tests/WrenchTests.java b/common/src/main/java/one/dqu/additionaladditions/gametest/WrenchTests.java similarity index 99% rename from common/src/main/java/one/dqu/additionaladditions/gametest/tests/WrenchTests.java rename to common/src/main/java/one/dqu/additionaladditions/gametest/WrenchTests.java index 728af31b..b7a4869b 100644 --- a/common/src/main/java/one/dqu/additionaladditions/gametest/tests/WrenchTests.java +++ b/common/src/main/java/one/dqu/additionaladditions/gametest/WrenchTests.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.gametest.tests; +package one.dqu.additionaladditions.gametest; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/BrewingStandMenuMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/BrewingStandMenuMixin.java index f4a513fd..6476e01f 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/BrewingStandMenuMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/BrewingStandMenuMixin.java @@ -7,7 +7,7 @@ import net.minecraft.world.level.block.entity.BrewingStandBlockEntity; import one.dqu.additionaladditions.recipe.BrewingRecipe; import one.dqu.additionaladditions.registry.AAMisc; -import one.dqu.additionaladditions.util.ModCompatibility; +import one.dqu.additionaladditions.core.util.ModCompatibility; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/InventoryChangeTriggerMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/InventoryChangeTriggerMixin.java index 7411fb9f..baf5b61c 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/InventoryChangeTriggerMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/InventoryChangeTriggerMixin.java @@ -7,6 +7,7 @@ import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.feature.album.AlbumContents; import one.dqu.additionaladditions.registry.AAMisc; +import one.dqu.additionaladditions.registry.AATags; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -20,7 +21,7 @@ public class InventoryChangeTriggerMixin { @Inject(method = "trigger(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/entity/player/Inventory;Lnet/minecraft/world/item/ItemStack;)V", at = @At("TAIL")) private void additionaladditions$onTrigger(ServerPlayer player, Inventory inventory, ItemStack stack, CallbackInfo ci) { if (!Config.ALBUM.get().enabled()) return; - if (!stack.is(AAMisc.ALBUMS_TAG)) return; + if (!stack.is(AATags.ALBUMS)) return; AlbumContents contents = stack.getOrDefault(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY); int capacity = Config.ALBUM.get().capacity(); diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/ReloadableServerResourcesMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/ReloadableServerResourcesMixin.java index d38a35b0..d12d420b 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/ReloadableServerResourcesMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/ReloadableServerResourcesMixin.java @@ -8,7 +8,7 @@ import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.server.permissions.PermissionSet; import net.minecraft.world.flag.FeatureFlagSet; -import one.dqu.additionaladditions.util.LootAdder; +import one.dqu.additionaladditions.core.util.LootAdder; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/ServerAdvancementManagerMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/ServerAdvancementManagerMixin.java index 2a981395..20c0e5aa 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/ServerAdvancementManagerMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/ServerAdvancementManagerMixin.java @@ -1,6 +1,10 @@ package one.dqu.additionaladditions.mixin; import com.google.gson.JsonElement; +import net.minecraft.resources.Identifier; +import net.minecraft.server.ServerAdvancementManager; +import net.minecraft.server.packs.resources.ResourceManager; +import net.minecraft.util.profiling.ProfilerFiller; import one.dqu.additionaladditions.AdditionalAdditions; import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.config.ConfigProperty; @@ -11,10 +15,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import java.util.Map; -import net.minecraft.resources.Identifier; -import net.minecraft.server.ServerAdvancementManager; -import net.minecraft.server.packs.resources.ResourceManager; -import net.minecraft.util.profiling.ProfilerFiller; /** * Removes advancements when their corresponding features are disabled in the config. @@ -41,11 +41,15 @@ private void removeAdvancements(Map map, ResourceManage case "use_tinted_redstone_lamp" -> Config.TINTED_REDSTONE_LAMP.get().enabled(); case "use_watering_can" -> Config.WATERING_CAN.get().enabled(); case "recipes" -> { - String feature = identifier.getPath().split("/")[1]; - - ConfigProperty property = ConfigProperty.getAll().stream() - .filter((p) -> p.path().getPath().split("/")[0].equals(feature)) - .findFirst().orElse(null); + // datagenned recipe advancements are recipes///, the ones i wrote manually aren't (recipes//) + String[] parts = identifier.getPath().split("/"); + ConfigProperty property = null; + for (int i = 1; i < parts.length && property == null; i++) { + String part = parts[i]; + property = ConfigProperty.getAll().stream() + .filter((p) -> p.path().getPath().split("/")[0].equals(part)) + .findFirst().orElse(null); + } if (property == null) { AdditionalAdditions.LOGGER.warn("[{}] Could not find a matching config property for advancement '{}'!", AdditionalAdditions.NAMESPACE, identifier); diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/album/JukeboxBlockEntityMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/album/JukeboxBlockEntityMixin.java index 65f570a8..b6fa9f0d 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/album/JukeboxBlockEntityMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/album/JukeboxBlockEntityMixin.java @@ -9,6 +9,7 @@ import one.dqu.additionaladditions.feature.album.AlbumContents; import one.dqu.additionaladditions.feature.album.AlbumJukeboxExtension; import one.dqu.additionaladditions.registry.AAMisc; +import one.dqu.additionaladditions.registry.AATags; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @@ -25,7 +26,7 @@ public class JukeboxBlockEntityMixin implements AlbumJukeboxExtension { @Inject(method = "setTheItem", at = @At("TAIL")) private void setTheItem(ItemStack stack, CallbackInfo ci) { additionaladditions$track = -1; - if (!stack.is(AAMisc.ALBUMS_TAG)) { + if (!stack.is(AATags.ALBUMS)) { return; } additionaladditions$playing = true; @@ -46,7 +47,6 @@ private static void tick(Level level, BlockPos blockPos, BlockState blockState, int nextTrack = albumJukebox.additionaladditions$getTrack() + 1; if (nextTrack >= album.items().size()) { albumJukebox.additionaladditions$setPlaying(false); - return; } else { ItemStack nextRecord = album.items().get(nextTrack); jukebox.getSongPlayer().play( diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/album/JukeboxBlockMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/album/JukeboxBlockMixin.java index 56a283ad..3d643209 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/album/JukeboxBlockMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/album/JukeboxBlockMixin.java @@ -14,7 +14,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.phys.BlockHitResult; -import one.dqu.additionaladditions.registry.AAMisc; +import one.dqu.additionaladditions.registry.AATags; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -28,7 +28,7 @@ private void useItemOn(ItemStack itemStack, BlockState blockState, Level level, return; } - if (!itemStack.is(AAMisc.ALBUMS_TAG)) { + if (!itemStack.is(AATags.ALBUMS)) { return; } diff --git a/common/src/main/java/one/dqu/additionaladditions/recipe/JEICompat.java b/common/src/main/java/one/dqu/additionaladditions/recipe/JEICompat.java index f2572308..4076e691 100644 --- a/common/src/main/java/one/dqu/additionaladditions/recipe/JEICompat.java +++ b/common/src/main/java/one/dqu/additionaladditions/recipe/JEICompat.java @@ -18,11 +18,7 @@ import net.minecraft.core.component.DataComponents; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.Identifier; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStackTemplate; -import net.minecraft.world.item.Items; -import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.*; import net.minecraft.world.item.alchemy.PotionContents; import net.minecraft.world.item.crafting.RecipeHolder; import net.minecraft.world.item.crafting.display.SlotDisplay; @@ -30,15 +26,17 @@ import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.config.ConfigProperty; import one.dqu.additionaladditions.config.Toggleable; +import one.dqu.additionaladditions.core.util.ModCompatibility; +import one.dqu.additionaladditions.feature.dye.SuspiciousDyeItem; import one.dqu.additionaladditions.feature.glint.GlintColor; -import one.dqu.additionaladditions.item.SuspiciousDyeItem; import one.dqu.additionaladditions.registry.AAItems; import one.dqu.additionaladditions.registry.AAMisc; -import one.dqu.additionaladditions.util.ConventionalTags; -import one.dqu.additionaladditions.util.ModCompatibility; +import one.dqu.additionaladditions.registry.AATags; import org.jetbrains.annotations.NotNull; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import java.util.function.Supplier; @JeiPlugin @@ -80,7 +78,7 @@ public void onRuntimeAvailable(IJeiRuntime jeiRuntime) { } } - // BrewingRecipe + // BrewingRecipe private void brewingRecipes(IRecipeRegistration event) { if (!ModCompatibility.isClientSide()) return; @@ -112,16 +110,16 @@ private static class SuspiciousDyeExtension implements ICraftingCategoryExtensio @Override public List getIngredients(RecipeHolder recipeHolder) { List foilStacks = new ArrayList<>(); - for (Holder item : BuiltInRegistries.ITEM.getTagOrEmpty(ConventionalTags.ENCHANTABLE)) { + for (Holder item : BuiltInRegistries.ITEM.getTagOrEmpty(AATags.C_ENCHANTABLE)) { ItemStack stack = new ItemStack(item); - if (stack.is(AAMisc.SUSPICIOUS_DYES_TAG)) continue; + if (stack.is(AATags.SUSPICIOUS_DYES)) continue; stack.set(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true); foilStacks.add(new SlotDisplay.ItemStackSlotDisplay(ItemStackTemplate.fromNonEmptyStack(stack))); } return List.of( new SlotDisplay.Composite(foilStacks), - new SlotDisplay.TagSlotDisplay(AAMisc.SUSPICIOUS_DYES_TAG) + new SlotDisplay.TagSlotDisplay(AATags.SUSPICIOUS_DYES) ); } @@ -138,7 +136,7 @@ public void onDisplayedIngredientsUpdate( if (slot.getRole() != RecipeIngredientRole.INPUT) continue; ItemStack stack = slot.getDisplayedIngredient(VanillaTypes.ITEM_STACK).orElse(ItemStack.EMPTY); if (stack.isEmpty()) continue; - if (stack.is(AAMisc.SUSPICIOUS_DYES_TAG)) { + if (stack.is(AATags.SUSPICIOUS_DYES)) { dye = stack; } else { foil = stack; diff --git a/common/src/main/java/one/dqu/additionaladditions/recipe/SuspiciousDyeRecipe.java b/common/src/main/java/one/dqu/additionaladditions/recipe/SuspiciousDyeRecipe.java index 3cfe51cb..f580454b 100644 --- a/common/src/main/java/one/dqu/additionaladditions/recipe/SuspiciousDyeRecipe.java +++ b/common/src/main/java/one/dqu/additionaladditions/recipe/SuspiciousDyeRecipe.java @@ -1,20 +1,21 @@ package one.dqu.additionaladditions.recipe; import com.mojang.serialization.MapCodec; -import net.minecraft.network.RegistryFriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; -import one.dqu.additionaladditions.feature.glint.GlintColor; -import one.dqu.additionaladditions.item.SuspiciousDyeItem; import net.minecraft.world.item.DyeColor; -import net.minecraft.world.item.Items; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.*; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.CraftingInput; +import net.minecraft.world.item.crafting.CustomRecipe; +import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.display.RecipeDisplay; import net.minecraft.world.item.crafting.display.ShapelessCraftingRecipeDisplay; import net.minecraft.world.item.crafting.display.SlotDisplay; import net.minecraft.world.level.Level; +import one.dqu.additionaladditions.feature.dye.SuspiciousDyeItem; +import one.dqu.additionaladditions.feature.glint.GlintColor; import one.dqu.additionaladditions.registry.AAMisc; -import one.dqu.additionaladditions.util.ConventionalTags; +import one.dqu.additionaladditions.registry.AATags; import java.util.List; @@ -36,11 +37,11 @@ public boolean matches(CraftingInput recipeInput, Level level) { for (int i = 0; i < recipeInput.size(); i++) { ItemStack stack = recipeInput.getItem(i); if (!stack.isEmpty()) { - if (stack.is(AAMisc.SUSPICIOUS_DYES_TAG)) { + if (stack.is(AATags.SUSPICIOUS_DYES)) { dye++; continue; } - if (stack.hasFoil() && stack.is(ConventionalTags.ENCHANTABLE)) { + if (stack.hasFoil() && stack.is(AATags.C_ENCHANTABLE)) { glint++; continue; } @@ -54,8 +55,8 @@ public boolean matches(CraftingInput recipeInput, Level level) { @Override public ItemStack assemble(CraftingInput recipeInput) { - ItemStack itemStack = recipeInput.items().stream().filter(item -> !item.isEmpty() && !item.is(AAMisc.SUSPICIOUS_DYES_TAG)).findFirst().orElse(ItemStack.EMPTY); - ItemStack dye = recipeInput.items().stream().filter(item -> !item.isEmpty() && item.is(AAMisc.SUSPICIOUS_DYES_TAG)).findFirst().orElse(ItemStack.EMPTY); + ItemStack itemStack = recipeInput.items().stream().filter(item -> !item.isEmpty() && !item.is(AATags.SUSPICIOUS_DYES)).findFirst().orElse(ItemStack.EMPTY); + ItemStack dye = recipeInput.items().stream().filter(item -> !item.isEmpty() && item.is(AATags.SUSPICIOUS_DYES)).findFirst().orElse(ItemStack.EMPTY); if (itemStack.isEmpty() || dye.isEmpty()) { return ItemStack.EMPTY; @@ -80,8 +81,8 @@ public RecipeSerializer getSerializer() { public List display() { return List.of(new ShapelessCraftingRecipeDisplay( List.of( - new SlotDisplay.TagSlotDisplay(ConventionalTags.ENCHANTABLE), - new SlotDisplay.TagSlotDisplay(AAMisc.SUSPICIOUS_DYES_TAG) + new SlotDisplay.TagSlotDisplay(AATags.C_ENCHANTABLE), + new SlotDisplay.TagSlotDisplay(AATags.SUSPICIOUS_DYES) ), SlotDisplay.Empty.INSTANCE, new SlotDisplay.ItemSlotDisplay(Items.CRAFTING_TABLE) diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AABlocks.java b/common/src/main/java/one/dqu/additionaladditions/registry/AABlocks.java index 2a98ad49..002a1663 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AABlocks.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AABlocks.java @@ -6,182 +6,77 @@ import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; -import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.ai.village.poi.PoiTypes; import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.phys.shapes.Shapes; -import net.minecraft.world.phys.shapes.VoxelShape; import one.dqu.additionaladditions.AdditionalAdditions; -import one.dqu.additionaladditions.block.*; +import one.dqu.additionaladditions.feature.copper_patina.CopperPatinaBlock; +import one.dqu.additionaladditions.feature.copper_patina.CopperPatinaContent; +import one.dqu.additionaladditions.feature.copper_patina.PatinaBlock; +import one.dqu.additionaladditions.feature.glow_stick.GlowStickBlock; +import one.dqu.additionaladditions.feature.glow_stick.GlowStickContent; +import one.dqu.additionaladditions.feature.redstone_lamp.RedstoneLampContent; +import one.dqu.additionaladditions.feature.redstone_lamp.TintedRedstoneLampBlock; +import one.dqu.additionaladditions.feature.rope.RopeBlock; +import one.dqu.additionaladditions.feature.rope.RopeContent; +import one.dqu.additionaladditions.feature.rose_gold.RoseGoldContent; +import one.dqu.additionaladditions.feature.sniffer_plants.SnifferPlantsContent; import net.minecraft.resources.Identifier; import net.minecraft.world.entity.ai.village.poi.PoiType; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.material.MapColor; -import net.minecraft.world.level.material.PushReaction; -import one.dqu.additionaladditions.util.Registrar; +import one.dqu.additionaladditions.core.util.Registrar; import java.util.Set; -import java.util.function.Consumer; -import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; @SuppressWarnings("unused") public class AABlocks { - public static final Supplier ROPE_BLOCK = register( - "rope", RopeBlock::new, - (p) -> p.mapColor(MapColor.COLOR_BROWN).pushReaction(PushReaction.DESTROY).noCollision().sound(SoundType.WOOL).explosionResistance(0f).destroyTime(0.2f) - ); - - public static final Supplier TINTED_REDSTONE_LAMP = register( - "tinted_redstone_lamp", TintedRedstoneLampBlock::new, - (p) -> p.mapColor(MapColor.TERRACOTTA_PURPLE).pushReaction(PushReaction.NORMAL).sound(SoundType.GLASS).strength(0.3f) - ); - - public static final Supplier COPPER_PATINA = register( - "copper_patina", CopperPatinaBlock::new, - (p) -> p.mapColor(MapColor.COLOR_CYAN).pushReaction(PushReaction.DESTROY).noCollision().sound(SoundType.TUFF).instabreak() - ); - - public static final Supplier GLOW_STICK_BLOCK = register( - "glow_stick", GlowStickBlock::new, - (p) -> p.mapColor(MapColor.NONE).pushReaction(PushReaction.DESTROY).noCollision().lightLevel((state) -> 12).instabreak() - ); - - public static final Supplier PATINA_BLOCK = register( - "patina_block", PatinaBlock::new, - (p) -> p.mapColor(MapColor.COLOR_CYAN).pushReaction(PushReaction.NORMAL).sound(SoundType.ROOTED_DIRT).strength(0.5f) - ); - - public static final Supplier ROSE_GOLD_BLOCK = register( - "rose_gold_block", Block::new, - (p) -> p.mapColor(MapColor.COLOR_PINK).requiresCorrectToolForDrops().strength(3.0f, 6.0f).sound(SoundType.METAL) - ); - - // sniffer plantws - - public static final Supplier COTTONSHIVER = register( - "cottonshiver", DoublePlantBlock::new, - (p) -> p.mapColor(MapColor.PLANT).noCollision().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY) - ); - - public static final Supplier COTTONSHIVER_CROP = register( - "cottonshiver_crop", - (p) -> new FlowerCropBlock(COTTONSHIVER, 2, new VoxelShape[]{Block.box(4d, 0d, 4d, 12d, 8d, 12d), Block.box(4d, 0d, 4d, 12d, 15d, 12d), Shapes.block()}, p), - (p) -> p.mapColor(MapColor.PLANT).noCollision().randomTicks().instabreak().sound(SoundType.CROP).pushReaction(PushReaction.DESTROY) - ); - - public static final Supplier MUDFLOWER = register( - "mudflower", DoublePlantBlock::new, - (p) -> p.mapColor(MapColor.PLANT).noCollision().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY) - ); - - public static final Supplier MUDFLOWER_CROP = register( - "mudflower_crop", - (p) -> new FlowerCropBlock(MUDFLOWER, 2, new VoxelShape[]{Block.box(5d, 0d, 5d, 11d, 9d, 11d), Block.box(4d, 0d, 4d, 12d, 15d, 12d), Shapes.block()}, p), - (p) -> p.mapColor(MapColor.PLANT).noCollision().randomTicks().instabreak().sound(SoundType.CROP).pushReaction(PushReaction.DESTROY) - ); - - public static final Supplier CRIMSON_BLOSSOM = register( - "crimson_blossom", - (p) -> new FlowerBlock(MobEffects.STRENGTH, 5f, p), - (p) -> p.mapColor(MapColor.PLANT).noCollision().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY) - ); + public static final Supplier ROPE_BLOCK = RopeContent.ropeBlock(); - public static final Supplier CRIMSON_BLOSSOM_CROP = register( - "crimson_blossom_crop", - (p) -> new FlowerCropBlock(CRIMSON_BLOSSOM, 2, new VoxelShape[]{Block.box(3d, 0d, 3d, 13d, 10d, 13d), Block.box(3d, 0d, 3d, 13d, 12d, 13d), Shapes.block()}, p), - (p) -> p.mapColor(MapColor.PLANT).noCollision().randomTicks().instabreak().sound(SoundType.CROP).pushReaction(PushReaction.DESTROY) - ); + public static final Supplier TINTED_REDSTONE_LAMP = RedstoneLampContent.tintedRedstoneLamp(); - public static final Supplier AMBER_BLOSSOM = register( - "amber_blossom", DoublePlantBlock::new, - (p) -> p.mapColor(MapColor.PLANT).noCollision().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY) - ); + public static final Supplier COPPER_PATINA = CopperPatinaContent.copperPatinaBlock(); - public static final Supplier AMBER_BLOSSOM_CROP = register( - "amber_blossom_crop", - (p) -> new FlowerCropBlock(AMBER_BLOSSOM, 2, new VoxelShape[]{Block.box(5d, 0d, 5d, 11d, 7d, 11d), Block.box(4d, 0d, 4d, 12d, 12d, 12d), Shapes.block()}, p), - (p) -> p.mapColor(MapColor.PLANT).noCollision().randomTicks().instabreak().sound(SoundType.CROP).pushReaction(PushReaction.DESTROY) - ); + public static final Supplier GLOW_STICK_BLOCK = GlowStickContent.glowStickBlock(); - public static final Supplier BULBUS = register( - "bulbus", - (p) -> new FlowerBlock(MobEffects.NIGHT_VISION, 5f, p), - (p) -> p.mapColor(MapColor.PLANT).noCollision().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY) - ); + public static final Supplier PATINA_BLOCK = CopperPatinaContent.patinaBlock(); - public static final Supplier BULBUS_CROP = register( - "bulbus_crop", - (p) -> new FlowerCropBlock(BULBUS, 2, new VoxelShape[]{Block.box(5d, 0d, 5d, 11d, 10d, 11d), Block.box(4d, 0d, 4d, 12d, 15d, 12d), Shapes.block()}, p), - (p) -> p.mapColor(MapColor.PLANT).noCollision().randomTicks().instabreak().sound(SoundType.CROP).pushReaction(PushReaction.DESTROY) - ); + public static final Supplier ROSE_GOLD_BLOCK = RoseGoldContent.roseGoldBlock(); - public static final Supplier SAWTOOTH_FERN = register( - "sawtooth_fern", DoublePlantBlock::new, - (p) -> p.mapColor(MapColor.PLANT).noCollision().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY) - ); + // sniffer plants - public static final Supplier SAWTOOTH_FERN_CROP = register( - "sawtooth_fern_crop", - (p) -> new FlowerCropBlock(SAWTOOTH_FERN, 3, new VoxelShape[]{Block.box(5d, 0d, 5d, 11d, 10d, 11d), Block.box(5d, 0d, 5d, 11d, 10d, 11d), Block.box(4d, 0d, 4d, 12d, 15d, 12d), Shapes.block()}, p), - (p) -> p.mapColor(MapColor.PLANT).noCollision().randomTicks().instabreak().sound(SoundType.CROP).pushReaction(PushReaction.DESTROY) - ); + public static final Supplier COTTONSHIVER = SnifferPlantsContent.cottonshiver(); + public static final Supplier COTTONSHIVER_CROP = SnifferPlantsContent.cottonshiverCrop(); - public static final Supplier FROSTLEAF = register( - "frostleaf", - (p) -> new FlowerBlock(MobEffects.SPEED, 5f, p), - (p) -> p.mapColor(MapColor.PLANT).noCollision().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY) - ); + public static final Supplier MUDFLOWER = SnifferPlantsContent.mudflower(); + public static final Supplier MUDFLOWER_CROP = SnifferPlantsContent.mudflowerCrop(); - public static final Supplier FROSTLEAF_CROP = register( - "frostleaf_crop", - (p) -> new FlowerCropBlock(FROSTLEAF, 2, new VoxelShape[]{Block.box(1d, 0d, 1d, 14d, 6d, 14d), Block.box(1d, 0d, 1d, 14d, 6d, 14d), Shapes.block()}, p), - (p) -> p.mapColor(MapColor.PLANT).noCollision().randomTicks().instabreak().sound(SoundType.CROP).pushReaction(PushReaction.DESTROY) - ); + public static final Supplier CRIMSON_BLOSSOM = SnifferPlantsContent.crimsonBlossom(); + public static final Supplier CRIMSON_BLOSSOM_CROP = SnifferPlantsContent.crimsonBlossomCrop(); - public static final Supplier WISTERIA = register( - "wisteria", WisteriaBlock::new, - (p) -> p.mapColor(MapColor.PLANT).noCollision().instabreak().sound(SoundType.VINE).strength(0.2F).pushReaction(PushReaction.DESTROY) - ); + public static final Supplier AMBER_BLOSSOM = SnifferPlantsContent.amberBlossom(); + public static final Supplier AMBER_BLOSSOM_CROP = SnifferPlantsContent.amberBlossomCrop(); - public static final Supplier WISTERIA_CROP = register( - "wisteria_crop", WisteriaCropBlock::new, - (p) -> p.mapColor(MapColor.PLANT).noCollision().randomTicks().instabreak().sound(SoundType.VINE).pushReaction(PushReaction.DESTROY) - ); + public static final Supplier BULBUS = SnifferPlantsContent.bulbus(); + public static final Supplier BULBUS_CROP = SnifferPlantsContent.bulbusCrop(); - public static final Supplier SPIKEBLOSSOM = register( - "spikeblossom", DoublePlantBlock::new, - (p) -> p.mapColor(MapColor.PLANT).noCollision().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY) - ); + public static final Supplier SAWTOOTH_FERN = SnifferPlantsContent.sawtoothFern(); + public static final Supplier SAWTOOTH_FERN_CROP = SnifferPlantsContent.sawtoothFernCrop(); - public static final Supplier SPIKEBLOSSOM_CROP = register( - "spikeblossom_crop", - (p) -> new FlowerCropBlock(SPIKEBLOSSOM, 2, new VoxelShape[]{Block.box(5d, 0d, 5d, 11d, 7d, 11d), Block.box(4d, 0d, 4d, 12d, 11d, 12d), Shapes.block()}, p), - (p) -> p.mapColor(MapColor.PLANT).noCollision().randomTicks().instabreak().sound(SoundType.CROP).pushReaction(PushReaction.DESTROY) - ); + public static final Supplier FROSTLEAF = SnifferPlantsContent.frostleaf(); + public static final Supplier FROSTLEAF_CROP = SnifferPlantsContent.frostleafCrop(); - public static final Supplier SNAPDRAGON = register( - "snapdragon", DoublePlantBlock::new, - (p) -> p.mapColor(MapColor.PLANT).noCollision().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY) - ); + public static final Supplier WISTERIA = SnifferPlantsContent.wisteria(); + public static final Supplier WISTERIA_CROP = SnifferPlantsContent.wisteriaCrop(); - public static final Supplier SNAPDRAGON_CROP = register( - "snapdragon_crop", - (p) -> new FlowerCropBlock(SNAPDRAGON, 2, new VoxelShape[]{Block.box(5d, 0d, 5d, 11d, 8d, 11d), Block.box(4d, 0d, 4d, 12d, 15d, 12d), Shapes.block()}, p), - (p) -> p.mapColor(MapColor.PLANT).noCollision().randomTicks().instabreak().sound(SoundType.CROP).pushReaction(PushReaction.DESTROY) - ); + public static final Supplier SPIKEBLOSSOM = SnifferPlantsContent.spikeblossom(); + public static final Supplier SPIKEBLOSSOM_CROP = SnifferPlantsContent.spikeblossomCrop(); - public static final Supplier LOTUS_LILY = register( - "lotus_lily", LilyPadBlock::new, - (p) -> p.mapColor(MapColor.PLANT).instabreak().sound(SoundType.LILY_PAD).noOcclusion().pushReaction(PushReaction.DESTROY) - ); + public static final Supplier SNAPDRAGON = SnifferPlantsContent.snapdragon(); + public static final Supplier SNAPDRAGON_CROP = SnifferPlantsContent.snapdragonCrop(); - public static final Supplier LOTUS_LILY_CROP = register( - "lotus_lily_crop", LotusLilyCropBlock::new, - (p) -> p.mapColor(MapColor.PLANT).randomTicks().instabreak().sound(SoundType.LILY_PAD).noOcclusion().pushReaction(PushReaction.DESTROY) - ); + public static final Supplier LOTUS_LILY = SnifferPlantsContent.lotusLily(); + public static final Supplier LOTUS_LILY_CROP = SnifferPlantsContent.lotusLilyCrop(); // amethyst lamp poi @@ -194,16 +89,6 @@ public class AABlocks { () -> new PoiType(AMETHYST_LAMP_POI_STATES.get(), 0, 0) ); - // register helper method - - private static Supplier register(String id, Function blockFactory, Consumer props) { - Identifier location = Identifier.tryBuild(AdditionalAdditions.NAMESPACE, id); - BlockBehaviour.Properties properties = BlockBehaviour.Properties.of(); - properties.setId(ResourceKey.create(Registries.BLOCK, location)); - props.accept(properties); - return AARegistries.BLOCKS.register(location, () -> blockFactory.apply(properties)); - } - public static void registerAll() { // amethyst lamp poi Registrar.defer(() -> { diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AAEntities.java b/common/src/main/java/one/dqu/additionaladditions/registry/AAEntities.java index e88495d7..412f326c 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AAEntities.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AAEntities.java @@ -1,39 +1,17 @@ package one.dqu.additionaladditions.registry; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.world.level.Level; -import one.dqu.additionaladditions.AdditionalAdditions; -import one.dqu.additionaladditions.entity.GlowStickEntity; -import net.minecraft.resources.Identifier; import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.MobCategory; -import one.dqu.additionaladditions.entity.RopeArrow; +import one.dqu.additionaladditions.feature.glow_stick.GlowStickContent; +import one.dqu.additionaladditions.feature.glow_stick.GlowStickEntity; +import one.dqu.additionaladditions.feature.rope.RopeArrow; +import one.dqu.additionaladditions.feature.rope.RopeContent; import java.util.function.Supplier; public class AAEntities { - public static final Supplier> GLOW_STICK = - AARegistries.ENTITY_TYPES.register( - Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "glow_stick"), - () -> EntityType.Builder.of( - (EntityType type, Level level) -> new GlowStickEntity(type, level), - MobCategory.MISC - ) - .sized(0.25f, 0.25f).updateInterval(20) - .clientTrackingRange(4).build(ResourceKey.create(Registries.ENTITY_TYPE, Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "glow_stick"))) - ); + public static final Supplier> GLOW_STICK = GlowStickContent.glowStickEntity(); - public static final Supplier> ROPE_ARROW = - AARegistries.ENTITY_TYPES.register( - Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "rope_arrow"), - () -> EntityType.Builder.of( - (EntityType type, Level level) -> new RopeArrow(type, level), - MobCategory.MISC - ) - .sized(0.5f, 0.5f).eyeHeight(0.13f).updateInterval(20) - .clientTrackingRange(4).build(ResourceKey.create(Registries.ENTITY_TYPE, Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "rope_arrow"))) - ); + public static final Supplier> ROPE_ARROW = RopeContent.ropeArrowEntity(); public static void registerAll() { diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java b/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java index 0cdf3d96..97c52d7e 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java @@ -1,10 +1,10 @@ package one.dqu.additionaladditions.registry; -import one.dqu.additionaladditions.gametest.tests.CopperPatinaTests; -import one.dqu.additionaladditions.gametest.tests.MiscTests; -import one.dqu.additionaladditions.gametest.tests.RopeArrowTests; -import one.dqu.additionaladditions.gametest.tests.WrenchTests; -import one.dqu.additionaladditions.gametest.AAGameTest; +import one.dqu.additionaladditions.core.builder.AAGameTest; +import one.dqu.additionaladditions.gametest.CopperPatinaTests; +import one.dqu.additionaladditions.gametest.MiscTests; +import one.dqu.additionaladditions.gametest.RopeArrowTests; +import one.dqu.additionaladditions.gametest.WrenchTests; public class AAGameTests { public static void registerAll() { diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AAItems.java b/common/src/main/java/one/dqu/additionaladditions/registry/AAItems.java index 8756627f..ce47c877 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AAItems.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AAItems.java @@ -1,35 +1,43 @@ package one.dqu.additionaladditions.registry; import net.minecraft.core.BlockPos; -import net.minecraft.core.component.DataComponents; import net.minecraft.core.dispenser.BlockSource; import net.minecraft.core.dispenser.DefaultDispenseItemBehavior; -import net.minecraft.core.registries.Registries; import net.minecraft.resources.Identifier; -import net.minecraft.resources.ResourceKey; -import net.minecraft.world.item.*; -import net.minecraft.world.item.component.Consumables; -import net.minecraft.world.item.component.TooltipDisplay; -import net.minecraft.world.item.equipment.ArmorType; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.DispenserBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import one.dqu.additionaladditions.AdditionalAdditions; import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.config.ConfigProperty; -import one.dqu.additionaladditions.core.builder.AAItem; -import one.dqu.additionaladditions.feature.album.AlbumContents; -import one.dqu.additionaladditions.feature.glint.GlintColor; -import one.dqu.additionaladditions.item.*; -import one.dqu.additionaladditions.material.AAMaterials; -import one.dqu.additionaladditions.material.AnimalArmorType; -import one.dqu.additionaladditions.material.ToolType; -import one.dqu.additionaladditions.util.Registrar; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; +import one.dqu.additionaladditions.core.util.Registrar; +import one.dqu.additionaladditions.feature.album.AlbumContent; +import one.dqu.additionaladditions.feature.album.AlbumItem; +import one.dqu.additionaladditions.feature.barometer.BarometerContent; +import one.dqu.additionaladditions.feature.copper_patina.CopperPatinaContent; +import one.dqu.additionaladditions.feature.copper_patina.CopperPatinaItem; +import one.dqu.additionaladditions.feature.dye.SuspiciousDyeItem; +import one.dqu.additionaladditions.feature.dye.SuspiciousDyes; +import one.dqu.additionaladditions.feature.food.FoodContent; +import one.dqu.additionaladditions.feature.glow_stick.GlowStickContent; +import one.dqu.additionaladditions.feature.music_disc.MusicDiscContent; +import one.dqu.additionaladditions.feature.pocket_jukebox.PocketJukeboxContent; +import one.dqu.additionaladditions.feature.pocket_jukebox.PocketJukeboxItem; +import one.dqu.additionaladditions.feature.redstone_lamp.RedstoneLampContent; +import one.dqu.additionaladditions.feature.rope.RopeArrowItem; +import one.dqu.additionaladditions.feature.rope.RopeContent; +import one.dqu.additionaladditions.feature.rose_gold.RoseGoldContent; +import one.dqu.additionaladditions.feature.sniffer_plants.SnifferPlantsContent; +import one.dqu.additionaladditions.feature.trident.TridentShardContent; +import one.dqu.additionaladditions.feature.watering_can.WateringCanContent; +import one.dqu.additionaladditions.feature.watering_can.WateringCanItem; +import one.dqu.additionaladditions.feature.wrench.WrenchContent; +import one.dqu.additionaladditions.feature.wrench.WrenchItem; + +import java.util.*; import java.util.function.Supplier; @SuppressWarnings("unused") @@ -40,440 +48,147 @@ public static Collection> fromConfigProperty(ConfigProp return CONFIG_TO_ITEM.getOrDefault(configProperty.path(), Set.of()); } + public static void addConfigItem(ConfigProperty config, Supplier item) { + CONFIG_TO_ITEM.computeIfAbsent(config.path(), k -> new HashSet<>()).add(item); + } + + public static Identifier configPathFor(Item item) { + for (Map.Entry>> e : CONFIG_TO_ITEM.entrySet()) { + for (Supplier supplier : e.getValue()) { + if (supplier.get() == item) return e.getKey(); + } + } + return null; + } + // BLOCKS - public static final Supplier ROPE = new AAItem<>() - .config(Config.ROPE) - .factory(p -> new BlockItem(AABlocks.ROPE_BLOCK.get(), p)) - .creative(Items.LADDER, CreativeModeTabs.FUNCTIONAL_BLOCKS, false) - .creative(Items.SPYGLASS, CreativeModeTabs.TOOLS_AND_UTILITIES, false) - .make("rope"); - - public static final Supplier TINTED_REDSTONE_LAMP = new AAItem<>() - .config(Config.TINTED_REDSTONE_LAMP) - .factory(p -> new BlockItem(AABlocks.TINTED_REDSTONE_LAMP.get(), p)) - .creative(Items.REDSTONE_LAMP, CreativeModeTabs.REDSTONE_BLOCKS, false) - .creative(Items.REDSTONE_LAMP, CreativeModeTabs.FUNCTIONAL_BLOCKS, false) - .make("tinted_redstone_lamp"); - - public static final Supplier COPPER_PATINA = new AAItem() - .config(Config.COPPER_PATINA) - .factory(p -> new CopperPatinaItem(AABlocks.COPPER_PATINA.get(), p)) - .creative(Items.REDSTONE, CreativeModeTabs.REDSTONE_BLOCKS, false) - .make("copper_patina"); - - public static final Supplier PATINA_BLOCK = new AAItem<>() - .config(Config.COPPER_PATINA) - .factory(p -> new BlockItem(AABlocks.PATINA_BLOCK.get(), p)) - .creative(Items.COPPER_BLOCK, CreativeModeTabs.BUILDING_BLOCKS, true) - .make("patina_block"); - - public static final Supplier ROSE_GOLD_BLOCK = new AAItem<>() - .config(Config.ROSE_GOLD) - .factory(p -> new BlockItem(AABlocks.ROSE_GOLD_BLOCK.get(), p)) - .creative(Items.LIGHT_WEIGHTED_PRESSURE_PLATE, CreativeModeTabs.BUILDING_BLOCKS, false) - .make("rose_gold_block"); + public static final Supplier ROPE = RopeContent.rope(); + + public static final Supplier TINTED_REDSTONE_LAMP = RedstoneLampContent.tintedRedstoneLampItem(); + + public static final Supplier COPPER_PATINA = CopperPatinaContent.copperPatina(); + + public static final Supplier PATINA_BLOCK = CopperPatinaContent.patinaBlockItem(); + + public static final Supplier ROSE_GOLD_BLOCK = RoseGoldContent.roseGoldBlockItem(); // SNIFFER PLANTS - public static final Supplier COTTONSHIVER = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.COTTONSHIVER.get(), p)) - .creative(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("cottonshiver"); - public static final Supplier COTTONSHIVER_POD = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.COTTONSHIVER_CROP.get(), p)) - .properties(p -> p.useItemDescriptionPrefix()) - .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("cottonshiver_pod"); - - public static final Supplier MUDFLOWER = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.MUDFLOWER.get(), p)) - .creative(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("mudflower"); - public static final Supplier MUDFLOWER_SEEDS = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.MUDFLOWER_CROP.get(), p)) - .properties(p -> p.useItemDescriptionPrefix()) - .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("mudflower_seeds"); - - public static final Supplier CRIMSON_BLOSSOM = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.CRIMSON_BLOSSOM.get(), p)) - .creative(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("crimson_blossom"); - public static final Supplier CRIMSON_BLOSSOM_SEEDS = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.CRIMSON_BLOSSOM_CROP.get(), p)) - .properties(p -> p.useItemDescriptionPrefix()) - .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("crimson_blossom_seeds"); - - public static final Supplier AMBER_BLOSSOM = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.AMBER_BLOSSOM.get(), p)) - .creative(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("amber_blossom"); - public static final Supplier AMBER_BLOSSOM_SEEDS = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.AMBER_BLOSSOM_CROP.get(), p)) - .properties(p -> p.useItemDescriptionPrefix()) - .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("amber_blossom_seeds"); - - public static final Supplier BULBUS = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.BULBUS.get(), p)) - .creative(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("bulbus"); - public static final Supplier BULBUS_POD = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.BULBUS_CROP.get(), p)) - .properties(p -> p.useItemDescriptionPrefix()) - .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("bulbus_pod"); - - public static final Supplier SAWTOOTH_FERN = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.SAWTOOTH_FERN.get(), p)) - .creative(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("sawtooth_fern"); - public static final Supplier SAWTOOTH_FERN_FIDDLEHEAD = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.SAWTOOTH_FERN_CROP.get(), p)) - .properties(p -> p.useItemDescriptionPrefix()) - .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("sawtooth_fern_fiddlehead"); - - public static final Supplier FROSTLEAF = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.FROSTLEAF.get(), p)) - .creative(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("frostleaf"); - public static final Supplier FROSTLEAF_POD = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.FROSTLEAF_CROP.get(), p)) - .properties(p -> p.useItemDescriptionPrefix()) - .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("frostleaf_pod"); - - public static final Supplier WISTERIA = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.WISTERIA.get(), p)) - .creative(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("wisteria"); - public static final Supplier WISTERIA_VINES = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.WISTERIA_CROP.get(), p)) - .properties(p -> p.useItemDescriptionPrefix()) - .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("wisteria_vines"); - - public static final Supplier SPIKEBLOSSOM = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.SPIKEBLOSSOM.get(), p)) - .creative(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("spikeblossom"); - public static final Supplier SPIKEBLOSSOM_SEEDS = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.SPIKEBLOSSOM_CROP.get(), p)) - .properties(p -> p.useItemDescriptionPrefix()) - .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("spikeblossom_seeds"); - - public static final Supplier SNAPDRAGON = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.SNAPDRAGON.get(), p)) - .creative(Items.PITCHER_PLANT, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("snapdragon"); - public static final Supplier SNAPDRAGON_POD = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.SNAPDRAGON_CROP.get(), p)) - .properties(p -> p.useItemDescriptionPrefix()) - .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("snapdragon_pod"); - - public static final Supplier LOTUS_LILY = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new PlaceOnWaterBlockItem(AABlocks.LOTUS_LILY.get(), p)) - .creative(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("lotus_lily"); - public static final Supplier LOTUS_LILY_POD = new AAItem<>() - .config(Config.SNIFFER_PLANTS) - .factory(p -> new BlockItem(AABlocks.LOTUS_LILY_CROP.get(), p)) - .properties(p -> p.useItemDescriptionPrefix()) - .creative(Items.PITCHER_POD, CreativeModeTabs.NATURAL_BLOCKS, false) - .make("lotus_lily_pod"); + public static final Supplier COTTONSHIVER = SnifferPlantsContent.cottonshiverItem(); + public static final Supplier COTTONSHIVER_POD = SnifferPlantsContent.cottonshiverPod(); + + public static final Supplier MUDFLOWER = SnifferPlantsContent.mudflowerItem(); + public static final Supplier MUDFLOWER_SEEDS = SnifferPlantsContent.mudflowerSeeds(); + + public static final Supplier CRIMSON_BLOSSOM = SnifferPlantsContent.crimsonBlossomItem(); + public static final Supplier CRIMSON_BLOSSOM_SEEDS = SnifferPlantsContent.crimsonBlossomSeeds(); + + public static final Supplier AMBER_BLOSSOM = SnifferPlantsContent.amberBlossomItem(); + public static final Supplier AMBER_BLOSSOM_SEEDS = SnifferPlantsContent.amberBlossomSeeds(); + + public static final Supplier BULBUS = SnifferPlantsContent.bulbusItem(); + public static final Supplier BULBUS_POD = SnifferPlantsContent.bulbusPod(); + + public static final Supplier SAWTOOTH_FERN = SnifferPlantsContent.sawtoothFernItem(); + public static final Supplier SAWTOOTH_FERN_FIDDLEHEAD = SnifferPlantsContent.sawtoothFernFiddlehead(); + + public static final Supplier FROSTLEAF = SnifferPlantsContent.frostleafItem(); + public static final Supplier FROSTLEAF_POD = SnifferPlantsContent.frostleafPod(); + + public static final Supplier WISTERIA = SnifferPlantsContent.wisteriaItem(); + public static final Supplier WISTERIA_VINES = SnifferPlantsContent.wisteriaVines(); + + public static final Supplier SPIKEBLOSSOM = SnifferPlantsContent.spikeblossomItem(); + public static final Supplier SPIKEBLOSSOM_SEEDS = SnifferPlantsContent.spikeblossomSeeds(); + + public static final Supplier SNAPDRAGON = SnifferPlantsContent.snapdragonItem(); + public static final Supplier SNAPDRAGON_POD = SnifferPlantsContent.snapdragonPod(); + + public static final Supplier LOTUS_LILY = SnifferPlantsContent.lotusLilyItem(); + public static final Supplier LOTUS_LILY_POD = SnifferPlantsContent.lotusLilyPod(); // FOOD - public static final Supplier FRIED_EGG = new AAItem<>() - .config(Config.FRIED_EGG) - .properties(p -> p - .delayedComponent(DataComponents.FOOD, provider -> Config.FRIED_EGG.get().food()) - .component(DataComponents.CONSUMABLE, Consumables.DEFAULT_FOOD) - ) - .creative(Items.COOKED_RABBIT, CreativeModeTabs.FOOD_AND_DRINKS, false) - .make("fried_egg"); - - public static final Supplier BERRY_PIE = new AAItem<>() - .config(Config.BERRY_PIE) - .properties(p -> p - .delayedComponent(DataComponents.FOOD, provider -> Config.BERRY_PIE.get().food()) - .component(DataComponents.CONSUMABLE, Consumables.DEFAULT_FOOD) - ) - .creative(Items.PUMPKIN_PIE, CreativeModeTabs.FOOD_AND_DRINKS, false) - .make("berry_pie"); - - public static final Supplier HONEYED_APPLE = new AAItem<>() - .config(Config.HONEYED_APPLE) - .properties(p -> p - .delayedComponent(DataComponents.FOOD, provider -> Config.HONEYED_APPLE.get().food()) - .component(DataComponents.CONSUMABLE, Consumables.DEFAULT_FOOD) - ) - .creative(Items.APPLE, CreativeModeTabs.FOOD_AND_DRINKS, false) - .make("honeyed_apple"); - - public static final Supplier CHICKEN_NUGGET = new AAItem<>() - .config(Config.CHICKEN_NUGGET) - .properties(p -> p - .delayedComponent(DataComponents.FOOD, provider -> Config.CHICKEN_NUGGET.get().food()) - .component(DataComponents.CONSUMABLE, Consumables.DEFAULT_FOOD) - ) - .creative(Items.ROTTEN_FLESH, CreativeModeTabs.FOOD_AND_DRINKS, false) - .make("chicken_nugget"); + public static final Supplier FRIED_EGG = FoodContent.friedEgg(); + public static final Supplier BERRY_PIE = FoodContent.berryPie(); + public static final Supplier HONEYED_APPLE = FoodContent.honeyedApple(); + public static final Supplier CHICKEN_NUGGET = FoodContent.chickenNugget(); // OTHER - public static final Supplier WATERING_CAN = new AAItem() - .config(Config.WATERING_CAN) - .factory(WateringCanItem::new) - .properties(p -> p - .stacksTo(1) - .component(AAMisc.WATER_LEVEL_COMPONENT.get(), 0) - ) - .creative(Items.BONE_MEAL, CreativeModeTabs.TOOLS_AND_UTILITIES, false) - .make("watering_can"); - - public static final Supplier WRENCH_ITEM = new AAItem() - .config(Config.WRENCH) - .factory(WrenchItem::new) - .properties(p -> p - .stacksTo(1) - .delayedComponent(DataComponents.MAX_DAMAGE, provider -> Config.WRENCH.get().durability()) - .component(DataComponents.DAMAGE, 0) - ) - .creative(Items.BONE_MEAL, CreativeModeTabs.TOOLS_AND_UTILITIES, false) - .creative(Items.TARGET, CreativeModeTabs.REDSTONE_BLOCKS, false) - .make("wrench"); - - public static final Supplier TRIDENT_SHARD = new AAItem<>() - .config(Config.TRIDENT_SHARD) - .creative(Items.PRISMARINE_CRYSTALS, CreativeModeTabs.INGREDIENTS, false) - .make("trident_shard"); - - public static final Supplier GLOW_STICK_ITEM = new AAItem<>() - .config(Config.GLOW_STICK) - .factory(p -> new GlowStickItem(AABlocks.GLOW_STICK_BLOCK.get(), p)) - .creative(Items.BONE_MEAL, CreativeModeTabs.TOOLS_AND_UTILITIES, false) - .make("glow_stick"); - - public static final Supplier BAROMETER = new AAItem<>() - .config(Config.BAROMETER) - .creative(Items.CLOCK, CreativeModeTabs.TOOLS_AND_UTILITIES, false) - .make("barometer"); - - public static final Supplier POCKET_JUKEBOX_ITEM = new AAItem() - .config(Config.POCKET_JUKEBOX) - .factory(PocketJukeboxItem::new) - .properties(p -> p - .stacksTo(1) - .component(DataComponents.TOOLTIP_DISPLAY, TooltipDisplay.DEFAULT.withHidden(DataComponents.CONTAINER, true)) - ) - .creative(Items.SPYGLASS, CreativeModeTabs.TOOLS_AND_UTILITIES, false) - .make("pocket_jukebox"); - - public static final Supplier ROSE_GOLD_INGOT = new AAItem<>() - .config(Config.ROSE_GOLD) - .creative(Items.GOLD_INGOT, CreativeModeTabs.INGREDIENTS, false) - .make("rose_gold_ingot"); - - public static final Supplier MUSIC_DISC_0308 = new AAItem<>() - .config(Config.MUSIC_DISC_0308) - .properties(p -> p - .stacksTo(1) - .rarity(Rarity.RARE) - .jukeboxPlayable(ResourceKey.create(Registries.JUKEBOX_SONG, Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "0308"))) - ) - .creative(Items.MUSIC_DISC_WARD, CreativeModeTabs.TOOLS_AND_UTILITIES, false) - .make("music_disc_0308"); - - public static final Supplier MUSIC_DISC_1007 = new AAItem<>() - .config(Config.MUSIC_DISC_1007) - .properties(p -> p - .stacksTo(1) - .rarity(Rarity.RARE) - .jukeboxPlayable(ResourceKey.create(Registries.JUKEBOX_SONG, Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "1007"))) - ) - .creative(Items.MUSIC_DISC_WARD, CreativeModeTabs.TOOLS_AND_UTILITIES, false) - .make("music_disc_1007"); - - public static final Supplier MUSIC_DISC_1507 = new AAItem<>() - .config(Config.MUSIC_DISC_1507) - .properties(p -> p - .stacksTo(1) - .rarity(Rarity.RARE) - .jukeboxPlayable(ResourceKey.create(Registries.JUKEBOX_SONG, Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "1507"))) - ) - .creative(Items.MUSIC_DISC_WARD, CreativeModeTabs.TOOLS_AND_UTILITIES, false) - .make("music_disc_1507"); + public static final Supplier WATERING_CAN = WateringCanContent.wateringCan(); + + public static final Supplier WRENCH_ITEM = WrenchContent.wrench(); + + public static final Supplier TRIDENT_SHARD = TridentShardContent.tridentShard(); + + public static final Supplier GLOW_STICK_ITEM = GlowStickContent.glowStick(); + + public static final Supplier BAROMETER = BarometerContent.barometer(); + + public static final Supplier POCKET_JUKEBOX_ITEM = PocketJukeboxContent.pocketJukebox(); + + public static final Supplier ROSE_GOLD_INGOT = RoseGoldContent.roseGoldIngot(); + + public static final Supplier MUSIC_DISC_0308 = MusicDiscContent.disc0308(); + public static final Supplier MUSIC_DISC_1007 = MusicDiscContent.disc1007(); + public static final Supplier MUSIC_DISC_1507 = MusicDiscContent.disc1507(); // ROSE GOLD - public static final Supplier ROSE_GOLD_HELMET = new AAItem<>() - .config(Config.ROSE_GOLD) - .material(AAMaterials.ROSE_GOLD, ArmorType.HELMET) - .creative(Items.GOLDEN_BOOTS, CreativeModeTabs.COMBAT, false) - .make("rose_gold_helmet"); - - public static final Supplier ROSE_GOLD_CHESTPLATE = new AAItem<>() - .config(Config.ROSE_GOLD) - .material(AAMaterials.ROSE_GOLD, ArmorType.CHESTPLATE) - .creative(Items.GOLDEN_BOOTS, CreativeModeTabs.COMBAT, false) - .make("rose_gold_chestplate"); - - public static final Supplier ROSE_GOLD_LEGGINGS = new AAItem<>() - .config(Config.ROSE_GOLD) - .material(AAMaterials.ROSE_GOLD, ArmorType.LEGGINGS) - .creative(Items.GOLDEN_BOOTS, CreativeModeTabs.COMBAT, false) - .make("rose_gold_leggings"); - - public static final Supplier ROSE_GOLD_BOOTS = new AAItem<>() - .config(Config.ROSE_GOLD) - .material(AAMaterials.ROSE_GOLD, ArmorType.BOOTS) - .creative(Items.GOLDEN_BOOTS, CreativeModeTabs.COMBAT, false) - .make("rose_gold_boots"); - - public static final Supplier ROSE_GOLD_HORSE_ARMOR = new AAItem<>() - .config(Config.ROSE_GOLD) - .material(AAMaterials.ROSE_GOLD, AnimalArmorType.HORSE) - .properties(p -> p.stacksTo(1)) - .creative(Items.GOLDEN_HORSE_ARMOR, CreativeModeTabs.COMBAT, false) - .make("rose_gold_horse_armor"); - - public static final Supplier ROSE_GOLD_NAUTILUS_ARMOR = new AAItem<>() - .config(Config.ROSE_GOLD) - .material(AAMaterials.ROSE_GOLD, AnimalArmorType.NAUTILUS) - .properties(p -> p.stacksTo(1)) - .creative(Items.GOLDEN_NAUTILUS_ARMOR, CreativeModeTabs.COMBAT, false) - .make("rose_gold_nautilus_armor"); - - public static final Supplier ROSE_GOLD_SWORD = new AAItem<>() - .config(Config.ROSE_GOLD) - .material(AAMaterials.ROSE_GOLD, ToolType.SWORD) - .creative(Items.GOLDEN_SWORD, CreativeModeTabs.COMBAT, false) - .make("rose_gold_sword"); - - public static final Supplier ROSE_GOLD_SPEAR = new AAItem<>() - .config(Config.ROSE_GOLD) - .material(AAMaterials.ROSE_GOLD, ToolType.SPEAR) - .creative(Items.GOLDEN_SPEAR, CreativeModeTabs.COMBAT, false) - .make("rose_gold_spear"); - - public static final Supplier ROSE_GOLD_SHOVEL = new AAItem<>() - .config(Config.ROSE_GOLD) - .factory(AAShovelItem::new) - .material(AAMaterials.ROSE_GOLD, ToolType.SHOVEL) - .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, false) - .make("rose_gold_shovel"); - - public static final Supplier ROSE_GOLD_PICKAXE = new AAItem<>() - .config(Config.ROSE_GOLD) - .material(AAMaterials.ROSE_GOLD, ToolType.PICKAXE) - .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, false) - .make("rose_gold_pickaxe"); - - public static final Supplier ROSE_GOLD_AXE = new AAItem<>() - .config(Config.ROSE_GOLD) - .factory(AAAxeItem::new) - .material(AAMaterials.ROSE_GOLD, ToolType.AXE) - .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, false) - .creative(Items.GOLDEN_AXE, CreativeModeTabs.COMBAT, false) - .make("rose_gold_axe"); - - public static final Supplier ROSE_GOLD_HOE = new AAItem<>() - .config(Config.ROSE_GOLD) - .factory(AAHoeItem::new) - .material(AAMaterials.ROSE_GOLD, ToolType.HOE) - .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, false) - .make("rose_gold_hoe"); + public static final Supplier ROSE_GOLD_HELMET = RoseGoldContent.helmet(); + public static final Supplier ROSE_GOLD_CHESTPLATE = RoseGoldContent.chestplate(); + public static final Supplier ROSE_GOLD_LEGGINGS = RoseGoldContent.leggings(); + public static final Supplier ROSE_GOLD_BOOTS = RoseGoldContent.boots(); + public static final Supplier ROSE_GOLD_HORSE_ARMOR = RoseGoldContent.horseArmor(); + public static final Supplier ROSE_GOLD_NAUTILUS_ARMOR = RoseGoldContent.nautilusArmor(); + public static final Supplier ROSE_GOLD_SWORD = RoseGoldContent.sword(); + public static final Supplier ROSE_GOLD_SPEAR = RoseGoldContent.spear(); + public static final Supplier ROSE_GOLD_SHOVEL = RoseGoldContent.shovel(); + public static final Supplier ROSE_GOLD_PICKAXE = RoseGoldContent.pickaxe(); + public static final Supplier ROSE_GOLD_AXE = RoseGoldContent.axe(); + public static final Supplier ROSE_GOLD_HOE = RoseGoldContent.hoe(); // SUSPICIOUS DYE - private static AAItem suspiciousDye(DyeColor color) { - return new AAItem() - .config(Config.SUSPICIOUS_DYE) - .factory(p -> new SuspiciousDyeItem(color, p)) - .properties(p -> p - .stacksTo(1) - .component(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true) - .component(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(color)) - ) - .creative(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS, true); - } - - public static final Supplier WHITE_SUSPICIOUS_DYE = suspiciousDye(DyeColor.WHITE).make("white_suspicious_dye"); - public static final Supplier BROWN_SUSPICIOUS_DYE = suspiciousDye(DyeColor.BROWN).make("brown_suspicious_dye"); - public static final Supplier RED_SUSPICIOUS_DYE = suspiciousDye(DyeColor.RED).make("red_suspicious_dye"); - public static final Supplier ORANGE_SUSPICIOUS_DYE = suspiciousDye(DyeColor.ORANGE).make("orange_suspicious_dye"); - public static final Supplier YELLOW_SUSPICIOUS_DYE = suspiciousDye(DyeColor.YELLOW).make("yellow_suspicious_dye"); - public static final Supplier LIME_SUSPICIOUS_DYE = suspiciousDye(DyeColor.LIME).make("lime_suspicious_dye"); - public static final Supplier GREEN_SUSPICIOUS_DYE = suspiciousDye(DyeColor.GREEN).make("green_suspicious_dye"); - public static final Supplier CYAN_SUSPICIOUS_DYE = suspiciousDye(DyeColor.CYAN).make("cyan_suspicious_dye"); - public static final Supplier LIGHT_BLUE_SUSPICIOUS_DYE = suspiciousDye(DyeColor.LIGHT_BLUE).make("light_blue_suspicious_dye"); - public static final Supplier BLUE_SUSPICIOUS_DYE = suspiciousDye(DyeColor.BLUE).make("blue_suspicious_dye"); - public static final Supplier PURPLE_SUSPICIOUS_DYE = suspiciousDye(DyeColor.PURPLE).make("purple_suspicious_dye"); - public static final Supplier MAGENTA_SUSPICIOUS_DYE = suspiciousDye(DyeColor.MAGENTA).make("magenta_suspicious_dye"); - public static final Supplier PINK_SUSPICIOUS_DYE = suspiciousDye(DyeColor.PINK).make("pink_suspicious_dye"); + public static final Supplier WHITE_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.WHITE); + public static final Supplier BROWN_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.BROWN); + public static final Supplier RED_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.RED); + public static final Supplier ORANGE_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.ORANGE); + public static final Supplier YELLOW_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.YELLOW); + public static final Supplier LIME_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.LIME); + public static final Supplier GREEN_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.GREEN); + public static final Supplier CYAN_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.CYAN); + public static final Supplier LIGHT_BLUE_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.LIGHT_BLUE); + public static final Supplier BLUE_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.BLUE); + public static final Supplier PURPLE_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.PURPLE); + public static final Supplier MAGENTA_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.MAGENTA); + public static final Supplier PINK_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.PINK); // OTHER - public static final Supplier ROPE_ARROW = new AAItem() - .config(Config.ROPE) - .factory(RopeArrowItem::new) - .creative(Items.ARROW, CreativeModeTabs.COMBAT, false) - .make("rope_arrow"); + public static final Supplier ROPE_ARROW = RopeContent.ropeArrow(); // ALBUMS - public static final AAItem ALBUM_TEMPLATE = new AAItem() - .config(Config.ALBUM) - .factory(AlbumItem::new) - .creative(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES, true) - .properties(p -> p - .stacksTo(1) - .component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY) - ); - public static final Supplier ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("album"); - public static final Supplier WHITE_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("white_album"); - public static final Supplier LIGHT_GRAY_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("light_gray_album"); - public static final Supplier GRAY_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("gray_album"); - public static final Supplier BLACK_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("black_album"); - public static final Supplier BROWN_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("brown_album"); - public static final Supplier RED_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("red_album"); - public static final Supplier ORANGE_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("orange_album"); - public static final Supplier YELLOW_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("yellow_album"); - public static final Supplier LIME_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("lime_album"); - public static final Supplier GREEN_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("green_album"); - public static final Supplier CYAN_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("cyan_album"); - public static final Supplier LIGHT_BLUE_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("light_blue_album"); - public static final Supplier BLUE_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("blue_album"); - public static final Supplier PURPLE_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("purple_album"); - public static final Supplier MAGENTA_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("magenta_album"); - public static final Supplier PINK_ALBUM = new AAItem<>(ALBUM_TEMPLATE).make("pink_album"); + public static final Supplier ALBUM = AlbumContent.album("album"); + public static final Supplier WHITE_ALBUM = AlbumContent.album("white_album", DyeColor.WHITE); + public static final Supplier LIGHT_GRAY_ALBUM = AlbumContent.album("light_gray_album", DyeColor.LIGHT_GRAY); + public static final Supplier GRAY_ALBUM = AlbumContent.album("gray_album", DyeColor.GRAY); + public static final Supplier BLACK_ALBUM = AlbumContent.album("black_album", DyeColor.BLACK); + public static final Supplier BROWN_ALBUM = AlbumContent.album("brown_album", DyeColor.BROWN); + public static final Supplier RED_ALBUM = AlbumContent.album("red_album", DyeColor.RED); + public static final Supplier ORANGE_ALBUM = AlbumContent.album("orange_album", DyeColor.ORANGE); + public static final Supplier YELLOW_ALBUM = AlbumContent.album("yellow_album", DyeColor.YELLOW); + public static final Supplier LIME_ALBUM = AlbumContent.album("lime_album", DyeColor.LIME); + public static final Supplier GREEN_ALBUM = AlbumContent.album("green_album", DyeColor.GREEN); + public static final Supplier CYAN_ALBUM = AlbumContent.album("cyan_album", DyeColor.CYAN); + public static final Supplier LIGHT_BLUE_ALBUM = AlbumContent.album("light_blue_album", DyeColor.LIGHT_BLUE); + public static final Supplier BLUE_ALBUM = AlbumContent.album("blue_album", DyeColor.BLUE); + public static final Supplier PURPLE_ALBUM = AlbumContent.album("purple_album", DyeColor.PURPLE); + public static final Supplier MAGENTA_ALBUM = AlbumContent.album("magenta_album", DyeColor.MAGENTA); + public static final Supplier PINK_ALBUM = AlbumContent.album("pink_album", DyeColor.PINK); public static void registerAll() { diff --git a/common/src/main/java/one/dqu/additionaladditions/material/AAMaterials.java b/common/src/main/java/one/dqu/additionaladditions/registry/AAMaterials.java similarity index 84% rename from common/src/main/java/one/dqu/additionaladditions/material/AAMaterials.java rename to common/src/main/java/one/dqu/additionaladditions/registry/AAMaterials.java index 2b9c66aa..e22f991c 100644 --- a/common/src/main/java/one/dqu/additionaladditions/material/AAMaterials.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AAMaterials.java @@ -1,8 +1,9 @@ -package one.dqu.additionaladditions.material; +package one.dqu.additionaladditions.registry; import net.minecraft.world.item.equipment.ArmorType; import one.dqu.additionaladditions.config.Config; -import one.dqu.additionaladditions.registry.AAMisc; +import one.dqu.additionaladditions.core.material.AAMaterial; +import one.dqu.additionaladditions.core.material.ToolType; import java.util.Map; @@ -10,7 +11,7 @@ public class AAMaterials { public static final AAMaterial ROSE_GOLD = new AAMaterial( "rose_gold", Config.ROSE_GOLD_MATERIAL::get, - AAMisc.REPAIRS_ROSE_GOLD_ARMOR_TAG, + AATags.REPAIRS_ROSE_GOLD_ARMOR, Map.of( ToolType.SWORD, Config.ROSE_GOLD_SWORD::get, ToolType.SPEAR, Config.ROSE_GOLD_SPEAR::get, diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AAMisc.java b/common/src/main/java/one/dqu/additionaladditions/registry/AAMisc.java index 83452ae1..8eac3d0e 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AAMisc.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AAMisc.java @@ -2,28 +2,24 @@ import com.mojang.serialization.Codec; import net.minecraft.core.component.DataComponentType; -import net.minecraft.core.registries.Registries; import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.resources.Identifier; import net.minecraft.resources.ResourceKey; -import net.minecraft.tags.TagKey; -import net.minecraft.world.item.Item; import net.minecraft.world.item.crafting.RecipePropertySet; import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.RecipeType; -import net.minecraft.world.level.block.Block; import one.dqu.additionaladditions.AdditionalAdditions; +import one.dqu.additionaladditions.core.util.SimplePlayerTrigger; import one.dqu.additionaladditions.feature.album.AlbumContents; import one.dqu.additionaladditions.feature.glint.GlintColor; import one.dqu.additionaladditions.recipe.BrewingRecipe; import one.dqu.additionaladditions.recipe.SuspiciousDyeRecipe; -import one.dqu.additionaladditions.util.SimplePlayerTrigger; import java.util.function.Supplier; public class AAMisc { /* DATA COMPONENTS */ - + public static final Supplier> GLINT_COLOR_COMPONENT = AARegistries.DATA_COMPONENT_TYPES.register( Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "glint_color"), () -> DataComponentType.builder().persistent(GlintColor.CODEC).networkSynchronized(GlintColor.STREAM_CODEC).build() @@ -39,13 +35,6 @@ public class AAMisc { () -> DataComponentType.builder().persistent(Codec.INT).networkSynchronized(ByteBufCodecs.INT).build() ); - /* TAGS */ - - public static final TagKey SUSPICIOUS_DYES_TAG = TagKey.create(Registries.ITEM, Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "suspicious_dyes")); - public static final TagKey WRENCH_BLACKLIST_TAG = TagKey.create(Registries.BLOCK, Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "wrench_blacklisted")); - public static final TagKey ALBUMS_TAG = TagKey.create(Registries.ITEM, Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "albums")); - public static final TagKey REPAIRS_ROSE_GOLD_ARMOR_TAG = TagKey.create(Registries.ITEM, Identifier.tryBuild(AdditionalAdditions.NAMESPACE, "repairs_rose_gold_armor")); - /* RECIPE SERIALIZERS AND TYPES */ public static final Supplier> SUSPICIOUS_DYE_RECIPE_SERIALIZER = AARegistries.RECIPE_SERIALIZERS.register( diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AARegistries.java b/common/src/main/java/one/dqu/additionaladditions/registry/AARegistries.java index 0ec4e6ac..1bd67e0f 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AARegistries.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AARegistries.java @@ -10,7 +10,7 @@ import net.minecraft.world.item.crafting.RecipeSerializer; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.block.Block; -import one.dqu.additionaladditions.util.Registrar; +import one.dqu.additionaladditions.core.util.Registrar; import java.util.function.Consumer; diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AATags.java b/common/src/main/java/one/dqu/additionaladditions/registry/AATags.java new file mode 100644 index 00000000..83a2474a --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AATags.java @@ -0,0 +1,71 @@ +package one.dqu.additionaladditions.registry; + +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.Identifier; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import one.dqu.additionaladditions.AdditionalAdditions; + + +public class AATags { + // AddAdd Tags + + public static final TagKey SUSPICIOUS_DYES = aitem("suspicious_dyes"); + + public static final TagKey WRENCH_BLACKLIST = ablock("wrench_blacklisted"); + + public static final TagKey ALBUMS = aitem("albums"); + + public static final TagKey REPAIRS_ROSE_GOLD_ARMOR = aitem("repairs_rose_gold_armor"); + + // Conventional Tags + + public static final TagKey C_ENCHANTABLE = citem("enchantables"); + + public static final TagKey C_ROPES_ITEM = citem("ropes"); + public static final TagKey C_ROPES_BLOCK = cblock("ropes"); + + public static final TagKey C_FLOWERS_ITEM = citem("flowers"); + public static final TagKey C_FLOWERS_BLOCK = cblock("flowers"); + public static final TagKey C_FLOWERS_SMALL_ITEM = citem("flowers/small"); + public static final TagKey C_FLOWERS_SMALL_BLOCK = cblock("flowers/small"); + public static final TagKey C_FLOWERS_TALL_ITEM = citem("flowers/tall"); + public static final TagKey C_FLOWERS_TALL_BLOCK = cblock("flowers/tall"); + + public static final TagKey C_SEEDS = citem("seeds"); + public static final TagKey C_FOODS = citem("foods"); + public static final TagKey C_FOODS_PIE = citem("foods/pie"); + public static final TagKey C_MUSIC_DISCS = citem("music_discs"); + public static final TagKey C_TOOLS_WRENCH = citem("tools/wrench"); + public static final TagKey C_INGOTS_ROSE_GOLD = citem("ingots/rose_gold"); + public static final TagKey C_STORAGE_BLOCKS_ROSE_GOLD = citem("storage_blocks/rose_gold"); + + // i don't know if this is right. (used in AlbumContent) + public static TagKey dyed(DyeColor color) { + return citem("dyed/" + color.getName()); + } + + // helper methods + + private static TagKey aitem(String tag) { + return TagKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, tag)); + } + + private static TagKey ablock(String tag) { + return TagKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, tag)); + } + + private static TagKey citem(String tag) { + return TagKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath("c", tag)); + } + + private static TagKey cblock(String tag) { + return TagKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath("c", tag)); + } + + public static void registerAll() { + + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/util/ConventionalTags.java b/common/src/main/java/one/dqu/additionaladditions/util/ConventionalTags.java deleted file mode 100644 index 08e7d9af..00000000 --- a/common/src/main/java/one/dqu/additionaladditions/util/ConventionalTags.java +++ /dev/null @@ -1,14 +0,0 @@ -package one.dqu.additionaladditions.util; - -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.Identifier; -import net.minecraft.tags.TagKey; -import net.minecraft.world.item.Item; - -public class ConventionalTags { - public static final TagKey ENCHANTABLE = item("enchantables"); - - private static TagKey item(String tag) { - return TagKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath("c", tag)); - } -} diff --git a/common/src/main/resources/additionaladditions.accesswidener b/common/src/main/resources/additionaladditions.accesswidener index 90c16736..fb9e0203 100644 --- a/common/src/main/resources/additionaladditions.accesswidener +++ b/common/src/main/resources/additionaladditions.accesswidener @@ -26,4 +26,12 @@ accessible method net/minecraft/world/item/crafting/RecipePropertySet create (Lj accessible method net/minecraft/world/level/block/LilyPadBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V accessible field net/minecraft/world/level/Level random Lnet/minecraft/util/RandomSource; -accessible method net/minecraft/client/renderer/rendertype/RenderType create (Ljava/lang/String;Lnet/minecraft/client/renderer/rendertype/RenderSetup;)Lnet/minecraft/client/renderer/rendertype/RenderType; \ No newline at end of file +accessible method net/minecraft/client/renderer/rendertype/RenderType create (Ljava/lang/String;Lnet/minecraft/client/renderer/rendertype/RenderSetup;)Lnet/minecraft/client/renderer/rendertype/RenderType; + +accessible class net/minecraft/client/data/models/BlockModelGenerators$PlantType +accessible method net/minecraft/client/data/models/BlockModelGenerators createTrivialCube (Lnet/minecraft/world/level/block/Block;)V +accessible method net/minecraft/client/data/models/BlockModelGenerators createCrossBlock (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/client/data/models/BlockModelGenerators$PlantType;)V +accessible method net/minecraft/client/data/models/BlockModelGenerators createDoublePlant (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/client/data/models/BlockModelGenerators$PlantType;)V +accessible method net/minecraft/client/data/models/ItemModelGenerators generateFlatItem (Lnet/minecraft/world/item/Item;Lnet/minecraft/client/data/models/model/ModelTemplate;)V +accessible method net/minecraft/client/data/models/ItemModelGenerators declareCustomModelItem (Lnet/minecraft/world/item/Item;)V +accessible field net/minecraft/data/recipes/RecipeProvider items Lnet/minecraft/core/HolderGetter; \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/block/bulbus.json b/common/src/main/resources/assets/additionaladditions/models/block/bulbus.json deleted file mode 100644 index 51802366..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/block/bulbus.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "additionaladditions:block/tall_cross", - "textures": { - "0": "additionaladditions:block/bulbus_bottom", - "1": "additionaladditions:block/bulbus_top" - } -} - diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/tinted_redstone_lamp.json b/common/src/main/resources/data/additionaladditions/advancement/recipes/tinted_redstone_lamp.json deleted file mode 100644 index 93fa8b83..00000000 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/tinted_redstone_lamp.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_amethyst": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "minecraft:amethyst_shard" - } - ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "additionaladditions:tinted_redstone_lamp" - } - } - }, - "requirements": [ - [ - "has_amethyst", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "additionaladditions:tinted_redstone_lamp" - ] - } -} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/glow_stick.json b/common/src/main/resources/data/additionaladditions/recipe/glow_stick.json deleted file mode 100644 index d1c42dd3..00000000 --- a/common/src/main/resources/data/additionaladditions/recipe/glow_stick.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "crafting_shapeless", - "ingredients": [ - "minecraft:stick", - "minecraft:glow_ink_sac" - ], - "result": { - "id": "additionaladditions:glow_stick", - "count": 3 - } -} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/honeyed_apple.json b/common/src/main/resources/data/additionaladditions/recipe/honeyed_apple.json deleted file mode 100644 index 0d421ee8..00000000 --- a/common/src/main/resources/data/additionaladditions/recipe/honeyed_apple.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "crafting_shapeless", - "ingredients": [ - "minecraft:honey_bottle", - "minecraft:apple" - ], - "result": { - "id": "additionaladditions:honeyed_apple", - "count": 1 - } -} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/tags/item/albums.json b/common/src/main/resources/data/additionaladditions/tags/item/albums.json deleted file mode 100644 index 8c99269a..00000000 --- a/common/src/main/resources/data/additionaladditions/tags/item/albums.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:album", "required": false}, - {"id": "additionaladditions:white_album", "required": false}, - {"id": "additionaladditions:light_gray_album", "required": false}, - {"id": "additionaladditions:gray_album", "required": false}, - {"id": "additionaladditions:black_album", "required": false}, - {"id": "additionaladditions:brown_album", "required": false}, - {"id": "additionaladditions:red_album", "required": false}, - {"id": "additionaladditions:orange_album", "required": false}, - {"id": "additionaladditions:yellow_album", "required": false}, - {"id": "additionaladditions:lime_album", "required": false}, - {"id": "additionaladditions:green_album", "required": false}, - {"id": "additionaladditions:cyan_album", "required": false}, - {"id": "additionaladditions:light_blue_album", "required": false}, - {"id": "additionaladditions:blue_album", "required": false}, - {"id": "additionaladditions:purple_album", "required": false}, - {"id": "additionaladditions:magenta_album", "required": false}, - {"id": "additionaladditions:pink_album", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/tags/item/repairs_rose_gold_armor.json b/common/src/main/resources/data/additionaladditions/tags/item/repairs_rose_gold_armor.json deleted file mode 100644 index 7781884c..00000000 --- a/common/src/main/resources/data/additionaladditions/tags/item/repairs_rose_gold_armor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_ingot", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/tags/item/suspicious_dyes.json b/common/src/main/resources/data/additionaladditions/tags/item/suspicious_dyes.json deleted file mode 100644 index ac63e1e1..00000000 --- a/common/src/main/resources/data/additionaladditions/tags/item/suspicious_dyes.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:white_suspicious_dye", "required": false}, - {"id": "additionaladditions:brown_suspicious_dye", "required": false}, - {"id": "additionaladditions:red_suspicious_dye", "required": false}, - {"id": "additionaladditions:orange_suspicious_dye", "required": false}, - {"id": "additionaladditions:yellow_suspicious_dye", "required": false}, - {"id": "additionaladditions:lime_suspicious_dye", "required": false}, - {"id": "additionaladditions:green_suspicious_dye", "required": false}, - {"id": "additionaladditions:cyan_suspicious_dye", "required": false}, - {"id": "additionaladditions:light_blue_suspicious_dye", "required": false}, - {"id": "additionaladditions:blue_suspicious_dye", "required": false}, - {"id": "additionaladditions:purple_suspicious_dye", "required": false}, - {"id": "additionaladditions:magenta_suspicious_dye", "required": false}, - {"id": "additionaladditions:pink_suspicious_dye", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/c/tags/block/flowers.json b/common/src/main/resources/data/c/tags/block/flowers.json deleted file mode 100644 index 166d83bf..00000000 --- a/common/src/main/resources/data/c/tags/block/flowers.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:lotus_lily", "required": false}, - {"id": "additionaladditions:wisteria", "required": false} - ] -} diff --git a/common/src/main/resources/data/c/tags/block/flowers/small.json b/common/src/main/resources/data/c/tags/block/flowers/small.json deleted file mode 100644 index 6db0a37b..00000000 --- a/common/src/main/resources/data/c/tags/block/flowers/small.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:crimson_blossom", "required": false}, - {"id": "additionaladditions:bulbus", "required": false}, - {"id": "additionaladditions:frostleaf", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/c/tags/block/flowers/tall.json b/common/src/main/resources/data/c/tags/block/flowers/tall.json deleted file mode 100644 index f78e41a5..00000000 --- a/common/src/main/resources/data/c/tags/block/flowers/tall.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:cottonshiver", "required": false}, - {"id": "additionaladditions:mudflower", "required": false}, - {"id": "additionaladditions:sawtooth_fern", "required": false}, - {"id": "additionaladditions:amber_blossom", "required": false}, - {"id": "additionaladditions:spikeblossom", "required": false}, - {"id": "additionaladditions:snapdragon", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/c/tags/block/ropes.json b/common/src/main/resources/data/c/tags/block/ropes.json deleted file mode 100644 index 250146bb..00000000 --- a/common/src/main/resources/data/c/tags/block/ropes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rope", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/c/tags/item/dyed/black.json b/common/src/main/resources/data/c/tags/item/dyed/black.json deleted file mode 100644 index f3f6b63f..00000000 --- a/common/src/main/resources/data/c/tags/item/dyed/black.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "additionaladditions:black_album", - "required": false - } - ] -} - diff --git a/common/src/main/resources/data/c/tags/item/dyed/blue.json b/common/src/main/resources/data/c/tags/item/dyed/blue.json deleted file mode 100644 index 22d73b98..00000000 --- a/common/src/main/resources/data/c/tags/item/dyed/blue.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "additionaladditions:blue_album", - "required": false - } - ] -} - diff --git a/common/src/main/resources/data/c/tags/item/dyed/brown.json b/common/src/main/resources/data/c/tags/item/dyed/brown.json deleted file mode 100644 index fde499f1..00000000 --- a/common/src/main/resources/data/c/tags/item/dyed/brown.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "additionaladditions:brown_album", - "required": false - } - ] -} - diff --git a/common/src/main/resources/data/c/tags/item/dyed/cyan.json b/common/src/main/resources/data/c/tags/item/dyed/cyan.json deleted file mode 100644 index 3bf3e91b..00000000 --- a/common/src/main/resources/data/c/tags/item/dyed/cyan.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "additionaladditions:cyan_album", - "required": false - } - ] -} - diff --git a/common/src/main/resources/data/c/tags/item/dyed/gray.json b/common/src/main/resources/data/c/tags/item/dyed/gray.json deleted file mode 100644 index 84597ae6..00000000 --- a/common/src/main/resources/data/c/tags/item/dyed/gray.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "additionaladditions:gray_album", - "required": false - } - ] -} - diff --git a/common/src/main/resources/data/c/tags/item/dyed/green.json b/common/src/main/resources/data/c/tags/item/dyed/green.json deleted file mode 100644 index 01fcd865..00000000 --- a/common/src/main/resources/data/c/tags/item/dyed/green.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "additionaladditions:green_album", - "required": false - } - ] -} - diff --git a/common/src/main/resources/data/c/tags/item/dyed/light_blue.json b/common/src/main/resources/data/c/tags/item/dyed/light_blue.json deleted file mode 100644 index 6238d73a..00000000 --- a/common/src/main/resources/data/c/tags/item/dyed/light_blue.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "additionaladditions:light_blue_album", - "required": false - } - ] -} - diff --git a/common/src/main/resources/data/c/tags/item/dyed/light_gray.json b/common/src/main/resources/data/c/tags/item/dyed/light_gray.json deleted file mode 100644 index af923ca1..00000000 --- a/common/src/main/resources/data/c/tags/item/dyed/light_gray.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "additionaladditions:light_gray_album", - "required": false - } - ] -} - diff --git a/common/src/main/resources/data/c/tags/item/dyed/lime.json b/common/src/main/resources/data/c/tags/item/dyed/lime.json deleted file mode 100644 index 6ab5e3f2..00000000 --- a/common/src/main/resources/data/c/tags/item/dyed/lime.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "additionaladditions:lime_album", - "required": false - } - ] -} - diff --git a/common/src/main/resources/data/c/tags/item/dyed/magenta.json b/common/src/main/resources/data/c/tags/item/dyed/magenta.json deleted file mode 100644 index 1a42cad9..00000000 --- a/common/src/main/resources/data/c/tags/item/dyed/magenta.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "additionaladditions:magenta_album", - "required": false - } - ] -} - diff --git a/common/src/main/resources/data/c/tags/item/dyed/orange.json b/common/src/main/resources/data/c/tags/item/dyed/orange.json deleted file mode 100644 index bb07aac3..00000000 --- a/common/src/main/resources/data/c/tags/item/dyed/orange.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "additionaladditions:orange_album", - "required": false - } - ] -} - diff --git a/common/src/main/resources/data/c/tags/item/dyed/pink.json b/common/src/main/resources/data/c/tags/item/dyed/pink.json deleted file mode 100644 index 75471edb..00000000 --- a/common/src/main/resources/data/c/tags/item/dyed/pink.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "additionaladditions:pink_album", - "required": false - } - ] -} - diff --git a/common/src/main/resources/data/c/tags/item/dyed/purple.json b/common/src/main/resources/data/c/tags/item/dyed/purple.json deleted file mode 100644 index 4e8468d1..00000000 --- a/common/src/main/resources/data/c/tags/item/dyed/purple.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "additionaladditions:purple_album", - "required": false - } - ] -} - diff --git a/common/src/main/resources/data/c/tags/item/dyed/red.json b/common/src/main/resources/data/c/tags/item/dyed/red.json deleted file mode 100644 index c23a3542..00000000 --- a/common/src/main/resources/data/c/tags/item/dyed/red.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "additionaladditions:red_album", - "required": false - } - ] -} - diff --git a/common/src/main/resources/data/c/tags/item/dyed/white.json b/common/src/main/resources/data/c/tags/item/dyed/white.json deleted file mode 100644 index 20efb44c..00000000 --- a/common/src/main/resources/data/c/tags/item/dyed/white.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "additionaladditions:white_album", - "required": false - } - ] -} - diff --git a/common/src/main/resources/data/c/tags/item/dyed/yellow.json b/common/src/main/resources/data/c/tags/item/dyed/yellow.json deleted file mode 100644 index d535b31e..00000000 --- a/common/src/main/resources/data/c/tags/item/dyed/yellow.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - { - "id": "additionaladditions:yellow_album", - "required": false - } - ] -} - diff --git a/common/src/main/resources/data/c/tags/item/flowers.json b/common/src/main/resources/data/c/tags/item/flowers.json deleted file mode 100644 index 166d83bf..00000000 --- a/common/src/main/resources/data/c/tags/item/flowers.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:lotus_lily", "required": false}, - {"id": "additionaladditions:wisteria", "required": false} - ] -} diff --git a/common/src/main/resources/data/c/tags/item/flowers/small.json b/common/src/main/resources/data/c/tags/item/flowers/small.json deleted file mode 100644 index 6db0a37b..00000000 --- a/common/src/main/resources/data/c/tags/item/flowers/small.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:crimson_blossom", "required": false}, - {"id": "additionaladditions:bulbus", "required": false}, - {"id": "additionaladditions:frostleaf", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/c/tags/item/flowers/tall.json b/common/src/main/resources/data/c/tags/item/flowers/tall.json deleted file mode 100644 index f78e41a5..00000000 --- a/common/src/main/resources/data/c/tags/item/flowers/tall.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:cottonshiver", "required": false}, - {"id": "additionaladditions:mudflower", "required": false}, - {"id": "additionaladditions:sawtooth_fern", "required": false}, - {"id": "additionaladditions:amber_blossom", "required": false}, - {"id": "additionaladditions:spikeblossom", "required": false}, - {"id": "additionaladditions:snapdragon", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/c/tags/item/foods.json b/common/src/main/resources/data/c/tags/item/foods.json deleted file mode 100644 index cfa0894c..00000000 --- a/common/src/main/resources/data/c/tags/item/foods.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:honeyed_apple", "required": false}, - {"id": "additionaladditions:chicken_nugget", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/c/tags/item/foods/pie.json b/common/src/main/resources/data/c/tags/item/foods/pie.json deleted file mode 100644 index 0968e652..00000000 --- a/common/src/main/resources/data/c/tags/item/foods/pie.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:berry_pie", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/c/tags/item/ingots/rose_gold.json b/common/src/main/resources/data/c/tags/item/ingots/rose_gold.json deleted file mode 100644 index 7781884c..00000000 --- a/common/src/main/resources/data/c/tags/item/ingots/rose_gold.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_ingot", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/c/tags/item/music_discs.json b/common/src/main/resources/data/c/tags/item/music_discs.json deleted file mode 100644 index a034ad1a..00000000 --- a/common/src/main/resources/data/c/tags/item/music_discs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:music_disc_0308", "required": false}, - {"id": "additionaladditions:music_disc_1007", "required": false}, - {"id": "additionaladditions:music_disc_1507", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/c/tags/item/ropes.json b/common/src/main/resources/data/c/tags/item/ropes.json deleted file mode 100644 index 250146bb..00000000 --- a/common/src/main/resources/data/c/tags/item/ropes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rope", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/c/tags/item/seeds.json b/common/src/main/resources/data/c/tags/item/seeds.json deleted file mode 100644 index 2539201f..00000000 --- a/common/src/main/resources/data/c/tags/item/seeds.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:cottonshiver_pod", "required": false}, - {"id": "additionaladditions:mudflower_seeds", "required": false}, - {"id": "additionaladditions:crimson_blossom_seeds", "required": false}, - {"id": "additionaladditions:amber_blossom_seeds", "required": false}, - {"id": "additionaladditions:bulbus_pod", "required": false}, - {"id": "additionaladditions:sawtooth_fern_fiddlehead", "required": false}, - {"id": "additionaladditions:frostleaf_pod", "required": false}, - {"id": "additionaladditions:spikeblossom_seeds", "required": false}, - {"id": "additionaladditions:snapdragon_pod", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/c/tags/item/storage_blocks/rose_gold.json b/common/src/main/resources/data/c/tags/item/storage_blocks/rose_gold.json deleted file mode 100644 index 1895f9ce..00000000 --- a/common/src/main/resources/data/c/tags/item/storage_blocks/rose_gold.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_block", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/c/tags/item/tools/wrench.json b/common/src/main/resources/data/c/tags/item/tools/wrench.json deleted file mode 100644 index 48ae9d5c..00000000 --- a/common/src/main/resources/data/c/tags/item/tools/wrench.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:wrench", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/beacon_base_blocks.json b/common/src/main/resources/data/minecraft/tags/block/beacon_base_blocks.json deleted file mode 100644 index 1895f9ce..00000000 --- a/common/src/main/resources/data/minecraft/tags/block/beacon_base_blocks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_block", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/bee_attractive.json b/common/src/main/resources/data/minecraft/tags/block/bee_attractive.json deleted file mode 100644 index ff03ee34..00000000 --- a/common/src/main/resources/data/minecraft/tags/block/bee_attractive.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:cottonshiver", "required": false}, - {"id": "additionaladditions:mudflower", "required": false}, - {"id": "additionaladditions:sawtooth_fern", "required": false}, - {"id": "additionaladditions:amber_blossom", "required": false}, - {"id": "additionaladditions:spikeblossom", "required": false}, - {"id": "additionaladditions:snapdragon", "required": false}, - {"id": "additionaladditions:crimson_blossom", "required": false}, - {"id": "additionaladditions:bulbus", "required": false}, - {"id": "additionaladditions:frostleaf", "required": false}, - {"id": "additionaladditions:lotus_lily", "required": false}, - {"id": "additionaladditions:wisteria", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/climbable.json b/common/src/main/resources/data/minecraft/tags/block/climbable.json deleted file mode 100644 index 250146bb..00000000 --- a/common/src/main/resources/data/minecraft/tags/block/climbable.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rope", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/crops.json b/common/src/main/resources/data/minecraft/tags/block/crops.json deleted file mode 100644 index af03dd6e..00000000 --- a/common/src/main/resources/data/minecraft/tags/block/crops.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:cottonshiver_crop", "required": false}, - {"id": "additionaladditions:mudflower_crop", "required": false}, - {"id": "additionaladditions:crimson_blossom_crop", "required": false}, - {"id": "additionaladditions:amber_blossom_crop", "required": false}, - {"id": "additionaladditions:bulbus_crop", "required": false}, - {"id": "additionaladditions:sawtooth_fern_crop", "required": false}, - {"id": "additionaladditions:frostleaf_crop", "required": false}, - {"id": "additionaladditions:wisteria_crop", "required": false}, - {"id": "additionaladditions:spikeblossom_crop", "required": false}, - {"id": "additionaladditions:snapdragon_crop", "required": false}, - {"id": "additionaladditions:lotus_lily_crop", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/incorrect_for_gold_tool.json b/common/src/main/resources/data/minecraft/tags/block/incorrect_for_gold_tool.json deleted file mode 100644 index 1895f9ce..00000000 --- a/common/src/main/resources/data/minecraft/tags/block/incorrect_for_gold_tool.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_block", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/incorrect_for_stone_tool.json b/common/src/main/resources/data/minecraft/tags/block/incorrect_for_stone_tool.json deleted file mode 100644 index 1895f9ce..00000000 --- a/common/src/main/resources/data/minecraft/tags/block/incorrect_for_stone_tool.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_block", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/incorrect_for_wooden_tool.json b/common/src/main/resources/data/minecraft/tags/block/incorrect_for_wooden_tool.json deleted file mode 100644 index 1895f9ce..00000000 --- a/common/src/main/resources/data/minecraft/tags/block/incorrect_for_wooden_tool.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_block", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/maintains_farmland.json b/common/src/main/resources/data/minecraft/tags/block/maintains_farmland.json deleted file mode 100644 index 017dcd6f..00000000 --- a/common/src/main/resources/data/minecraft/tags/block/maintains_farmland.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:cottonshiver_crop", "required": false}, - {"id": "additionaladditions:mudflower_crop", "required": false}, - {"id": "additionaladditions:crimson_blossom_crop", "required": false}, - {"id": "additionaladditions:amber_blossom_crop", "required": false}, - {"id": "additionaladditions:bulbus_crop", "required": false}, - {"id": "additionaladditions:sawtooth_fern_crop", "required": false}, - {"id": "additionaladditions:frostleaf_crop", "required": false}, - {"id": "additionaladditions:wisteria_crop", "required": false}, - {"id": "additionaladditions:spikeblossom_crop", "required": false}, - {"id": "additionaladditions:snapdragon_crop", "required": false}, - {"id": "additionaladditions:lotus_lily_crop", "required": false}, - - {"id": "additionaladditions:cottonshiver", "required": false}, - {"id": "additionaladditions:mudflower", "required": false}, - {"id": "additionaladditions:crimson_blossom", "required": false}, - {"id": "additionaladditions:amber_blossom", "required": false}, - {"id": "additionaladditions:bulbus", "required": false}, - {"id": "additionaladditions:sawtooth_fern", "required": false}, - {"id": "additionaladditions:frostleaf", "required": false}, - {"id": "additionaladditions:wisteria", "required": false}, - {"id": "additionaladditions:spikeblossom", "required": false}, - {"id": "additionaladditions:snapdragon", "required": false}, - {"id": "additionaladditions:lotus_lily", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json b/common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json deleted file mode 100644 index 1895f9ce..00000000 --- a/common/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_block", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/mineable/shovel.json b/common/src/main/resources/data/minecraft/tags/block/mineable/shovel.json deleted file mode 100644 index 742be7e6..00000000 --- a/common/src/main/resources/data/minecraft/tags/block/mineable/shovel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:patina_block", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json b/common/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json deleted file mode 100644 index 1895f9ce..00000000 --- a/common/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_block", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/arrows.json b/common/src/main/resources/data/minecraft/tags/item/arrows.json deleted file mode 100644 index 9453b575..00000000 --- a/common/src/main/resources/data/minecraft/tags/item/arrows.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rope_arrow", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/axes.json b/common/src/main/resources/data/minecraft/tags/item/axes.json deleted file mode 100644 index 3444897d..00000000 --- a/common/src/main/resources/data/minecraft/tags/item/axes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_axe", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/bee_food.json b/common/src/main/resources/data/minecraft/tags/item/bee_food.json deleted file mode 100644 index ff03ee34..00000000 --- a/common/src/main/resources/data/minecraft/tags/item/bee_food.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:cottonshiver", "required": false}, - {"id": "additionaladditions:mudflower", "required": false}, - {"id": "additionaladditions:sawtooth_fern", "required": false}, - {"id": "additionaladditions:amber_blossom", "required": false}, - {"id": "additionaladditions:spikeblossom", "required": false}, - {"id": "additionaladditions:snapdragon", "required": false}, - {"id": "additionaladditions:crimson_blossom", "required": false}, - {"id": "additionaladditions:bulbus", "required": false}, - {"id": "additionaladditions:frostleaf", "required": false}, - {"id": "additionaladditions:lotus_lily", "required": false}, - {"id": "additionaladditions:wisteria", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/chest_armor.json b/common/src/main/resources/data/minecraft/tags/item/chest_armor.json deleted file mode 100644 index ba780908..00000000 --- a/common/src/main/resources/data/minecraft/tags/item/chest_armor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_chestplate", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/foot_armor.json b/common/src/main/resources/data/minecraft/tags/item/foot_armor.json deleted file mode 100644 index b154fe9a..00000000 --- a/common/src/main/resources/data/minecraft/tags/item/foot_armor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_boots", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/head_armor.json b/common/src/main/resources/data/minecraft/tags/item/head_armor.json deleted file mode 100644 index 7b3ab6f0..00000000 --- a/common/src/main/resources/data/minecraft/tags/item/head_armor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_helmet", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/hoes.json b/common/src/main/resources/data/minecraft/tags/item/hoes.json deleted file mode 100644 index bedec3ba..00000000 --- a/common/src/main/resources/data/minecraft/tags/item/hoes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_hoe", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/leg_armor.json b/common/src/main/resources/data/minecraft/tags/item/leg_armor.json deleted file mode 100644 index 29ea1927..00000000 --- a/common/src/main/resources/data/minecraft/tags/item/leg_armor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_leggings", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/pickaxes.json b/common/src/main/resources/data/minecraft/tags/item/pickaxes.json deleted file mode 100644 index 154512d6..00000000 --- a/common/src/main/resources/data/minecraft/tags/item/pickaxes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_pickaxe", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/shovels.json b/common/src/main/resources/data/minecraft/tags/item/shovels.json deleted file mode 100644 index 8b7d7a00..00000000 --- a/common/src/main/resources/data/minecraft/tags/item/shovels.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_shovel", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/spears.json b/common/src/main/resources/data/minecraft/tags/item/spears.json deleted file mode 100644 index 0ae94f1e..00000000 --- a/common/src/main/resources/data/minecraft/tags/item/spears.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_spear", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/swords.json b/common/src/main/resources/data/minecraft/tags/item/swords.json deleted file mode 100644 index 46045233..00000000 --- a/common/src/main/resources/data/minecraft/tags/item/swords.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_sword", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/data/minecraft/tags/item/trimmable_armor.json b/common/src/main/resources/data/minecraft/tags/item/trimmable_armor.json deleted file mode 100644 index 463ff00b..00000000 --- a/common/src/main/resources/data/minecraft/tags/item/trimmable_armor.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - {"id": "additionaladditions:rose_gold_helmet", "required": false}, - {"id": "additionaladditions:rose_gold_chestplate", "required": false}, - {"id": "additionaladditions:rose_gold_leggings", "required": false}, - {"id": "additionaladditions:rose_gold_boots", "required": false} - ] -} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/blockstates/amber_blossom.json b/fabric/src/main/generated/assets/additionaladditions/blockstates/amber_blossom.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/blockstates/amber_blossom.json rename to fabric/src/main/generated/assets/additionaladditions/blockstates/amber_blossom.json index 1ca59860..87c21986 100644 --- a/common/src/main/resources/assets/additionaladditions/blockstates/amber_blossom.json +++ b/fabric/src/main/generated/assets/additionaladditions/blockstates/amber_blossom.json @@ -7,5 +7,4 @@ "model": "additionaladditions:block/amber_blossom_top" } } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/blockstates/bulbus.json b/fabric/src/main/generated/assets/additionaladditions/blockstates/bulbus.json similarity index 96% rename from common/src/main/resources/assets/additionaladditions/blockstates/bulbus.json rename to fabric/src/main/generated/assets/additionaladditions/blockstates/bulbus.json index c140bf7c..2de4cc06 100644 --- a/common/src/main/resources/assets/additionaladditions/blockstates/bulbus.json +++ b/fabric/src/main/generated/assets/additionaladditions/blockstates/bulbus.json @@ -4,5 +4,4 @@ "model": "additionaladditions:block/bulbus" } } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/blockstates/cottonshiver.json b/fabric/src/main/generated/assets/additionaladditions/blockstates/cottonshiver.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/blockstates/cottonshiver.json rename to fabric/src/main/generated/assets/additionaladditions/blockstates/cottonshiver.json index f7d1e6c2..20778d6c 100644 --- a/common/src/main/resources/assets/additionaladditions/blockstates/cottonshiver.json +++ b/fabric/src/main/generated/assets/additionaladditions/blockstates/cottonshiver.json @@ -7,5 +7,4 @@ "model": "additionaladditions:block/cottonshiver_top" } } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/blockstates/crimson_blossom.json b/fabric/src/main/generated/assets/additionaladditions/blockstates/crimson_blossom.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/blockstates/crimson_blossom.json rename to fabric/src/main/generated/assets/additionaladditions/blockstates/crimson_blossom.json index fc70f81d..5128bb62 100644 --- a/common/src/main/resources/assets/additionaladditions/blockstates/crimson_blossom.json +++ b/fabric/src/main/generated/assets/additionaladditions/blockstates/crimson_blossom.json @@ -4,5 +4,4 @@ "model": "additionaladditions:block/crimson_blossom" } } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/blockstates/frostleaf.json b/fabric/src/main/generated/assets/additionaladditions/blockstates/frostleaf.json similarity index 96% rename from common/src/main/resources/assets/additionaladditions/blockstates/frostleaf.json rename to fabric/src/main/generated/assets/additionaladditions/blockstates/frostleaf.json index 061f203e..130a9672 100644 --- a/common/src/main/resources/assets/additionaladditions/blockstates/frostleaf.json +++ b/fabric/src/main/generated/assets/additionaladditions/blockstates/frostleaf.json @@ -4,5 +4,4 @@ "model": "additionaladditions:block/frostleaf" } } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/blockstates/mudflower.json b/fabric/src/main/generated/assets/additionaladditions/blockstates/mudflower.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/blockstates/mudflower.json rename to fabric/src/main/generated/assets/additionaladditions/blockstates/mudflower.json index e0833615..22a231aa 100644 --- a/common/src/main/resources/assets/additionaladditions/blockstates/mudflower.json +++ b/fabric/src/main/generated/assets/additionaladditions/blockstates/mudflower.json @@ -7,5 +7,4 @@ "model": "additionaladditions:block/mudflower_top" } } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/blockstates/rose_gold_block.json b/fabric/src/main/generated/assets/additionaladditions/blockstates/rose_gold_block.json similarity index 100% rename from common/src/main/resources/assets/additionaladditions/blockstates/rose_gold_block.json rename to fabric/src/main/generated/assets/additionaladditions/blockstates/rose_gold_block.json diff --git a/common/src/main/resources/assets/additionaladditions/blockstates/sawtooth_fern.json b/fabric/src/main/generated/assets/additionaladditions/blockstates/sawtooth_fern.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/blockstates/sawtooth_fern.json rename to fabric/src/main/generated/assets/additionaladditions/blockstates/sawtooth_fern.json index d153c96f..b3a94f1f 100644 --- a/common/src/main/resources/assets/additionaladditions/blockstates/sawtooth_fern.json +++ b/fabric/src/main/generated/assets/additionaladditions/blockstates/sawtooth_fern.json @@ -7,5 +7,4 @@ "model": "additionaladditions:block/sawtooth_fern_top" } } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/blockstates/snapdragon.json b/fabric/src/main/generated/assets/additionaladditions/blockstates/snapdragon.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/blockstates/snapdragon.json rename to fabric/src/main/generated/assets/additionaladditions/blockstates/snapdragon.json index a672452a..5babede6 100644 --- a/common/src/main/resources/assets/additionaladditions/blockstates/snapdragon.json +++ b/fabric/src/main/generated/assets/additionaladditions/blockstates/snapdragon.json @@ -7,5 +7,4 @@ "model": "additionaladditions:block/snapdragon_top" } } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/blockstates/spikeblossom.json b/fabric/src/main/generated/assets/additionaladditions/blockstates/spikeblossom.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/blockstates/spikeblossom.json rename to fabric/src/main/generated/assets/additionaladditions/blockstates/spikeblossom.json index 64286f71..f2f51433 100644 --- a/common/src/main/resources/assets/additionaladditions/blockstates/spikeblossom.json +++ b/fabric/src/main/generated/assets/additionaladditions/blockstates/spikeblossom.json @@ -7,5 +7,4 @@ "model": "additionaladditions:block/spikeblossom_top" } } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/amber_blossom.json b/fabric/src/main/generated/assets/additionaladditions/items/amber_blossom.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/amber_blossom.json rename to fabric/src/main/generated/assets/additionaladditions/items/amber_blossom.json index 1f03d562..1591fc0b 100644 --- a/common/src/main/resources/assets/additionaladditions/items/amber_blossom.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/amber_blossom.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/amber_blossom" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/berry_pie.json b/fabric/src/main/generated/assets/additionaladditions/items/berry_pie.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/berry_pie.json rename to fabric/src/main/generated/assets/additionaladditions/items/berry_pie.json index abc50090..767e62cf 100644 --- a/common/src/main/resources/assets/additionaladditions/items/berry_pie.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/berry_pie.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/berry_pie" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/blue_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/items/blue_suspicious_dye.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/blue_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/items/blue_suspicious_dye.json index d2da9dcb..8a78631f 100644 --- a/common/src/main/resources/assets/additionaladditions/items/blue_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/blue_suspicious_dye.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/blue_suspicious_dye" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/brown_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/items/brown_suspicious_dye.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/brown_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/items/brown_suspicious_dye.json index 541f35aa..cbef7cc4 100644 --- a/common/src/main/resources/assets/additionaladditions/items/brown_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/brown_suspicious_dye.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/brown_suspicious_dye" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/bulbus.json b/fabric/src/main/generated/assets/additionaladditions/items/bulbus.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/items/bulbus.json rename to fabric/src/main/generated/assets/additionaladditions/items/bulbus.json index 084d1ac9..54cc6345 100644 --- a/common/src/main/resources/assets/additionaladditions/items/bulbus.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/bulbus.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/bulbus" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/chicken_nugget.json b/fabric/src/main/generated/assets/additionaladditions/items/chicken_nugget.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/chicken_nugget.json rename to fabric/src/main/generated/assets/additionaladditions/items/chicken_nugget.json index 48d8aaef..84743a62 100644 --- a/common/src/main/resources/assets/additionaladditions/items/chicken_nugget.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/chicken_nugget.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/chicken_nugget" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/copper_patina.json b/fabric/src/main/generated/assets/additionaladditions/items/copper_patina.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/copper_patina.json rename to fabric/src/main/generated/assets/additionaladditions/items/copper_patina.json index 77acca65..148fd1df 100644 --- a/common/src/main/resources/assets/additionaladditions/items/copper_patina.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/copper_patina.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/copper_patina" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/cottonshiver.json b/fabric/src/main/generated/assets/additionaladditions/items/cottonshiver.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/cottonshiver.json rename to fabric/src/main/generated/assets/additionaladditions/items/cottonshiver.json index ab4e0117..7492e291 100644 --- a/common/src/main/resources/assets/additionaladditions/items/cottonshiver.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/cottonshiver.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/cottonshiver" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/crimson_blossom.json b/fabric/src/main/generated/assets/additionaladditions/items/crimson_blossom.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/crimson_blossom.json rename to fabric/src/main/generated/assets/additionaladditions/items/crimson_blossom.json index 344d3eb2..66f98f89 100644 --- a/common/src/main/resources/assets/additionaladditions/items/crimson_blossom.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/crimson_blossom.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/crimson_blossom" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/cyan_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/items/cyan_suspicious_dye.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/cyan_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/items/cyan_suspicious_dye.json index dfb54b07..be9728d6 100644 --- a/common/src/main/resources/assets/additionaladditions/items/cyan_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/cyan_suspicious_dye.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/cyan_suspicious_dye" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/fried_egg.json b/fabric/src/main/generated/assets/additionaladditions/items/fried_egg.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/fried_egg.json rename to fabric/src/main/generated/assets/additionaladditions/items/fried_egg.json index ec0ef825..29ba3028 100644 --- a/common/src/main/resources/assets/additionaladditions/items/fried_egg.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/fried_egg.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/fried_egg" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/frostleaf.json b/fabric/src/main/generated/assets/additionaladditions/items/frostleaf.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/frostleaf.json rename to fabric/src/main/generated/assets/additionaladditions/items/frostleaf.json index 75c4ab0f..d3d7f57d 100644 --- a/common/src/main/resources/assets/additionaladditions/items/frostleaf.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/frostleaf.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/frostleaf" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/glow_stick.json b/fabric/src/main/generated/assets/additionaladditions/items/glow_stick.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/glow_stick.json rename to fabric/src/main/generated/assets/additionaladditions/items/glow_stick.json index 0e8a9cf0..19db3ddd 100644 --- a/common/src/main/resources/assets/additionaladditions/items/glow_stick.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/glow_stick.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/glow_stick" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/green_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/items/green_suspicious_dye.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/green_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/items/green_suspicious_dye.json index 34f63efe..7c5a949f 100644 --- a/common/src/main/resources/assets/additionaladditions/items/green_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/green_suspicious_dye.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/green_suspicious_dye" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/honeyed_apple.json b/fabric/src/main/generated/assets/additionaladditions/items/honeyed_apple.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/honeyed_apple.json rename to fabric/src/main/generated/assets/additionaladditions/items/honeyed_apple.json index 0336a6ed..7d59f221 100644 --- a/common/src/main/resources/assets/additionaladditions/items/honeyed_apple.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/honeyed_apple.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/honeyed_apple" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/light_blue_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/items/light_blue_suspicious_dye.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/light_blue_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/items/light_blue_suspicious_dye.json index 570327a1..b00b2275 100644 --- a/common/src/main/resources/assets/additionaladditions/items/light_blue_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/light_blue_suspicious_dye.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/light_blue_suspicious_dye" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/lime_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/items/lime_suspicious_dye.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/lime_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/items/lime_suspicious_dye.json index 58d5ef9b..1cc21c93 100644 --- a/common/src/main/resources/assets/additionaladditions/items/lime_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/lime_suspicious_dye.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/lime_suspicious_dye" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/magenta_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/items/magenta_suspicious_dye.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/magenta_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/items/magenta_suspicious_dye.json index dee640fc..5dd4052f 100644 --- a/common/src/main/resources/assets/additionaladditions/items/magenta_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/magenta_suspicious_dye.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/magenta_suspicious_dye" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/mudflower.json b/fabric/src/main/generated/assets/additionaladditions/items/mudflower.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/mudflower.json rename to fabric/src/main/generated/assets/additionaladditions/items/mudflower.json index 4d309d5c..7fbe0458 100644 --- a/common/src/main/resources/assets/additionaladditions/items/mudflower.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/mudflower.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/mudflower" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/music_disc_0308.json b/fabric/src/main/generated/assets/additionaladditions/items/music_disc_0308.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/music_disc_0308.json rename to fabric/src/main/generated/assets/additionaladditions/items/music_disc_0308.json index f45944d7..6287104f 100644 --- a/common/src/main/resources/assets/additionaladditions/items/music_disc_0308.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/music_disc_0308.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/music_disc_0308" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/music_disc_1007.json b/fabric/src/main/generated/assets/additionaladditions/items/music_disc_1007.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/music_disc_1007.json rename to fabric/src/main/generated/assets/additionaladditions/items/music_disc_1007.json index 0a0c3d9a..22b81693 100644 --- a/common/src/main/resources/assets/additionaladditions/items/music_disc_1007.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/music_disc_1007.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/music_disc_1007" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/music_disc_1507.json b/fabric/src/main/generated/assets/additionaladditions/items/music_disc_1507.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/music_disc_1507.json rename to fabric/src/main/generated/assets/additionaladditions/items/music_disc_1507.json index 83d8c40c..df65b409 100644 --- a/common/src/main/resources/assets/additionaladditions/items/music_disc_1507.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/music_disc_1507.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/music_disc_1507" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/orange_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/items/orange_suspicious_dye.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/orange_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/items/orange_suspicious_dye.json index 5dd8224b..b7b9b038 100644 --- a/common/src/main/resources/assets/additionaladditions/items/orange_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/orange_suspicious_dye.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/orange_suspicious_dye" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/pink_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/items/pink_suspicious_dye.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/pink_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/items/pink_suspicious_dye.json index 65b055ae..b7288df2 100644 --- a/common/src/main/resources/assets/additionaladditions/items/pink_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/pink_suspicious_dye.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/pink_suspicious_dye" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/purple_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/items/purple_suspicious_dye.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/purple_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/items/purple_suspicious_dye.json index c53c604e..b23630d2 100644 --- a/common/src/main/resources/assets/additionaladditions/items/purple_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/purple_suspicious_dye.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/purple_suspicious_dye" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/red_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/items/red_suspicious_dye.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/red_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/items/red_suspicious_dye.json index 2747acc8..bffc04bd 100644 --- a/common/src/main/resources/assets/additionaladditions/items/red_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/red_suspicious_dye.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/red_suspicious_dye" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/rope.json b/fabric/src/main/generated/assets/additionaladditions/items/rope.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/items/rope.json rename to fabric/src/main/generated/assets/additionaladditions/items/rope.json index 1d6a95b9..23177c18 100644 --- a/common/src/main/resources/assets/additionaladditions/items/rope.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/rope.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/rope" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/rope_arrow.json b/fabric/src/main/generated/assets/additionaladditions/items/rope_arrow.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/rope_arrow.json rename to fabric/src/main/generated/assets/additionaladditions/items/rope_arrow.json index c718acd0..e4ddb75e 100644 --- a/common/src/main/resources/assets/additionaladditions/items/rope_arrow.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/rope_arrow.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/rope_arrow" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/rose_gold_block.json b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_block.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/rose_gold_block.json rename to fabric/src/main/generated/assets/additionaladditions/items/rose_gold_block.json index ac8aab11..d1e214db 100644 --- a/common/src/main/resources/assets/additionaladditions/items/rose_gold_block.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_block.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/rose_gold_block" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/rose_gold_horse_armor.json b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_horse_armor.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/rose_gold_horse_armor.json rename to fabric/src/main/generated/assets/additionaladditions/items/rose_gold_horse_armor.json index 02551202..da7d0e38 100644 --- a/common/src/main/resources/assets/additionaladditions/items/rose_gold_horse_armor.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_horse_armor.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/rose_gold_horse_armor" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/rose_gold_ingot.json b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_ingot.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/rose_gold_ingot.json rename to fabric/src/main/generated/assets/additionaladditions/items/rose_gold_ingot.json index 0b0e5e52..e3a51e81 100644 --- a/common/src/main/resources/assets/additionaladditions/items/rose_gold_ingot.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_ingot.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/rose_gold_ingot" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/rose_gold_nautilus_armor.json b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_nautilus_armor.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/rose_gold_nautilus_armor.json rename to fabric/src/main/generated/assets/additionaladditions/items/rose_gold_nautilus_armor.json index b383a57f..d6f8a81c 100644 --- a/common/src/main/resources/assets/additionaladditions/items/rose_gold_nautilus_armor.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_nautilus_armor.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/rose_gold_nautilus_armor" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/sawtooth_fern.json b/fabric/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/sawtooth_fern.json rename to fabric/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json index 09237fbf..f4a24798 100644 --- a/common/src/main/resources/assets/additionaladditions/items/sawtooth_fern.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/sawtooth_fern" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/snapdragon.json b/fabric/src/main/generated/assets/additionaladditions/items/snapdragon.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/snapdragon.json rename to fabric/src/main/generated/assets/additionaladditions/items/snapdragon.json index e0d983c0..dd7f1087 100644 --- a/common/src/main/resources/assets/additionaladditions/items/snapdragon.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/snapdragon.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/snapdragon" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/spikeblossom.json b/fabric/src/main/generated/assets/additionaladditions/items/spikeblossom.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/spikeblossom.json rename to fabric/src/main/generated/assets/additionaladditions/items/spikeblossom.json index a2e9e1d2..5d6b4280 100644 --- a/common/src/main/resources/assets/additionaladditions/items/spikeblossom.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/spikeblossom.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/spikeblossom" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/trident_shard.json b/fabric/src/main/generated/assets/additionaladditions/items/trident_shard.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/trident_shard.json rename to fabric/src/main/generated/assets/additionaladditions/items/trident_shard.json index b5bba5ef..6a4c8206 100644 --- a/common/src/main/resources/assets/additionaladditions/items/trident_shard.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/trident_shard.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/trident_shard" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/white_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/items/white_suspicious_dye.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/white_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/items/white_suspicious_dye.json index 79343690..2945efd0 100644 --- a/common/src/main/resources/assets/additionaladditions/items/white_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/white_suspicious_dye.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/white_suspicious_dye" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/yellow_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/items/yellow_suspicious_dye.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/yellow_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/items/yellow_suspicious_dye.json index 1a751cdc..14d9f9f2 100644 --- a/common/src/main/resources/assets/additionaladditions/items/yellow_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/yellow_suspicious_dye.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/yellow_suspicious_dye" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/block/amber_blossom_bottom.json b/fabric/src/main/generated/assets/additionaladditions/models/block/amber_blossom_bottom.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/models/block/amber_blossom_bottom.json rename to fabric/src/main/generated/assets/additionaladditions/models/block/amber_blossom_bottom.json index a4deb8ff..3af5ca8f 100644 --- a/common/src/main/resources/assets/additionaladditions/models/block/amber_blossom_bottom.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/amber_blossom_bottom.json @@ -3,5 +3,4 @@ "textures": { "cross": "additionaladditions:block/amber_blossom_bottom" } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/block/amber_blossom_top.json b/fabric/src/main/generated/assets/additionaladditions/models/block/amber_blossom_top.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/models/block/amber_blossom_top.json rename to fabric/src/main/generated/assets/additionaladditions/models/block/amber_blossom_top.json index 8fe27ce2..d5229d46 100644 --- a/common/src/main/resources/assets/additionaladditions/models/block/amber_blossom_top.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/amber_blossom_top.json @@ -3,5 +3,4 @@ "textures": { "cross": "additionaladditions:block/amber_blossom_top" } -} - +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/models/block/bulbus.json b/fabric/src/main/generated/assets/additionaladditions/models/block/bulbus.json new file mode 100644 index 00000000..38bb4694 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/bulbus.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "additionaladditions:block/bulbus" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/block/cottonshiver_bottom.json b/fabric/src/main/generated/assets/additionaladditions/models/block/cottonshiver_bottom.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/models/block/cottonshiver_bottom.json rename to fabric/src/main/generated/assets/additionaladditions/models/block/cottonshiver_bottom.json index 69669398..bd0191c8 100644 --- a/common/src/main/resources/assets/additionaladditions/models/block/cottonshiver_bottom.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/cottonshiver_bottom.json @@ -3,5 +3,4 @@ "textures": { "cross": "additionaladditions:block/cottonshiver_bottom" } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/block/cottonshiver_top.json b/fabric/src/main/generated/assets/additionaladditions/models/block/cottonshiver_top.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/models/block/cottonshiver_top.json rename to fabric/src/main/generated/assets/additionaladditions/models/block/cottonshiver_top.json index b919fdc0..c1c2c8c1 100644 --- a/common/src/main/resources/assets/additionaladditions/models/block/cottonshiver_top.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/cottonshiver_top.json @@ -3,5 +3,4 @@ "textures": { "cross": "additionaladditions:block/cottonshiver_top" } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/block/crimson_blossom.json b/fabric/src/main/generated/assets/additionaladditions/models/block/crimson_blossom.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/models/block/crimson_blossom.json rename to fabric/src/main/generated/assets/additionaladditions/models/block/crimson_blossom.json index 763dc0a3..3e752c4b 100644 --- a/common/src/main/resources/assets/additionaladditions/models/block/crimson_blossom.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/crimson_blossom.json @@ -3,5 +3,4 @@ "textures": { "cross": "additionaladditions:block/crimson_blossom" } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/block/frostleaf.json b/fabric/src/main/generated/assets/additionaladditions/models/block/frostleaf.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/models/block/frostleaf.json rename to fabric/src/main/generated/assets/additionaladditions/models/block/frostleaf.json index 43c93743..f2696a49 100644 --- a/common/src/main/resources/assets/additionaladditions/models/block/frostleaf.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/frostleaf.json @@ -3,5 +3,4 @@ "textures": { "cross": "additionaladditions:block/frostleaf" } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/block/mudflower_bottom.json b/fabric/src/main/generated/assets/additionaladditions/models/block/mudflower_bottom.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/models/block/mudflower_bottom.json rename to fabric/src/main/generated/assets/additionaladditions/models/block/mudflower_bottom.json index b3cac8c0..23487011 100644 --- a/common/src/main/resources/assets/additionaladditions/models/block/mudflower_bottom.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/mudflower_bottom.json @@ -3,5 +3,4 @@ "textures": { "cross": "additionaladditions:block/mudflower_bottom" } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/block/mudflower_top.json b/fabric/src/main/generated/assets/additionaladditions/models/block/mudflower_top.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/models/block/mudflower_top.json rename to fabric/src/main/generated/assets/additionaladditions/models/block/mudflower_top.json index ca6404e7..75b76d9e 100644 --- a/common/src/main/resources/assets/additionaladditions/models/block/mudflower_top.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/mudflower_top.json @@ -3,5 +3,4 @@ "textures": { "cross": "additionaladditions:block/mudflower_top" } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/block/rose_gold_block.json b/fabric/src/main/generated/assets/additionaladditions/models/block/rose_gold_block.json similarity index 66% rename from common/src/main/resources/assets/additionaladditions/models/block/rose_gold_block.json rename to fabric/src/main/generated/assets/additionaladditions/models/block/rose_gold_block.json index 70ab448c..f0097765 100644 --- a/common/src/main/resources/assets/additionaladditions/models/block/rose_gold_block.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/rose_gold_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "additionaladditions:block/rose_gold_block" } diff --git a/common/src/main/resources/assets/additionaladditions/models/block/sawtooth_fern_bottom.json b/fabric/src/main/generated/assets/additionaladditions/models/block/sawtooth_fern_bottom.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/models/block/sawtooth_fern_bottom.json rename to fabric/src/main/generated/assets/additionaladditions/models/block/sawtooth_fern_bottom.json index 25031e16..c0f599e0 100644 --- a/common/src/main/resources/assets/additionaladditions/models/block/sawtooth_fern_bottom.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/sawtooth_fern_bottom.json @@ -3,5 +3,4 @@ "textures": { "cross": "additionaladditions:block/sawtooth_fern_bottom" } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/block/sawtooth_fern_top.json b/fabric/src/main/generated/assets/additionaladditions/models/block/sawtooth_fern_top.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/models/block/sawtooth_fern_top.json rename to fabric/src/main/generated/assets/additionaladditions/models/block/sawtooth_fern_top.json index 7ffad57f..fe146811 100644 --- a/common/src/main/resources/assets/additionaladditions/models/block/sawtooth_fern_top.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/sawtooth_fern_top.json @@ -3,5 +3,4 @@ "textures": { "cross": "additionaladditions:block/sawtooth_fern_top" } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/block/snapdragon_bottom.json b/fabric/src/main/generated/assets/additionaladditions/models/block/snapdragon_bottom.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/models/block/snapdragon_bottom.json rename to fabric/src/main/generated/assets/additionaladditions/models/block/snapdragon_bottom.json index 3cecb04f..11995fd0 100644 --- a/common/src/main/resources/assets/additionaladditions/models/block/snapdragon_bottom.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/snapdragon_bottom.json @@ -3,5 +3,4 @@ "textures": { "cross": "additionaladditions:block/snapdragon_bottom" } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/block/snapdragon_top.json b/fabric/src/main/generated/assets/additionaladditions/models/block/snapdragon_top.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/models/block/snapdragon_top.json rename to fabric/src/main/generated/assets/additionaladditions/models/block/snapdragon_top.json index 103ade4a..b7082cc6 100644 --- a/common/src/main/resources/assets/additionaladditions/models/block/snapdragon_top.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/snapdragon_top.json @@ -3,5 +3,4 @@ "textures": { "cross": "additionaladditions:block/snapdragon_top" } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/block/spikeblossom_bottom.json b/fabric/src/main/generated/assets/additionaladditions/models/block/spikeblossom_bottom.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/models/block/spikeblossom_bottom.json rename to fabric/src/main/generated/assets/additionaladditions/models/block/spikeblossom_bottom.json index 7f06d3b3..97bab3b9 100644 --- a/common/src/main/resources/assets/additionaladditions/models/block/spikeblossom_bottom.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/spikeblossom_bottom.json @@ -3,5 +3,4 @@ "textures": { "cross": "additionaladditions:block/spikeblossom_bottom" } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/block/spikeblossom_top.json b/fabric/src/main/generated/assets/additionaladditions/models/block/spikeblossom_top.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/models/block/spikeblossom_top.json rename to fabric/src/main/generated/assets/additionaladditions/models/block/spikeblossom_top.json index d8503b04..9fb34712 100644 --- a/common/src/main/resources/assets/additionaladditions/models/block/spikeblossom_top.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/spikeblossom_top.json @@ -3,5 +3,4 @@ "textures": { "cross": "additionaladditions:block/spikeblossom_top" } -} - +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/berry_pie.json b/fabric/src/main/generated/assets/additionaladditions/models/item/berry_pie.json similarity index 64% rename from common/src/main/resources/assets/additionaladditions/models/item/berry_pie.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/berry_pie.json index 66bf9208..d121df78 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/berry_pie.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/berry_pie.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/berry_pie" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/blue_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/models/item/blue_suspicious_dye.json similarity index 67% rename from common/src/main/resources/assets/additionaladditions/models/item/blue_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/blue_suspicious_dye.json index 222d6b44..3ae04d84 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/blue_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/blue_suspicious_dye.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/blue_suspicious_dye" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/brown_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/models/item/brown_suspicious_dye.json similarity index 68% rename from common/src/main/resources/assets/additionaladditions/models/item/brown_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/brown_suspicious_dye.json index eebd39ab..bf1aa5d0 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/brown_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/brown_suspicious_dye.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/brown_suspicious_dye" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/chicken_nugget.json b/fabric/src/main/generated/assets/additionaladditions/models/item/chicken_nugget.json similarity index 66% rename from common/src/main/resources/assets/additionaladditions/models/item/chicken_nugget.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/chicken_nugget.json index 64311daf..6d48a090 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/chicken_nugget.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/chicken_nugget.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/chicken_nugget" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/copper_patina.json b/fabric/src/main/generated/assets/additionaladditions/models/item/copper_patina.json similarity index 66% rename from common/src/main/resources/assets/additionaladditions/models/item/copper_patina.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/copper_patina.json index 72a0ed04..c09e277a 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/copper_patina.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/copper_patina.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/copper_patina" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/cyan_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/models/item/cyan_suspicious_dye.json similarity index 67% rename from common/src/main/resources/assets/additionaladditions/models/item/cyan_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/cyan_suspicious_dye.json index af21bca1..b4a1a93a 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/cyan_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/cyan_suspicious_dye.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/cyan_suspicious_dye" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/fried_egg.json b/fabric/src/main/generated/assets/additionaladditions/models/item/fried_egg.json similarity index 64% rename from common/src/main/resources/assets/additionaladditions/models/item/fried_egg.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/fried_egg.json index 92184319..2a2a168b 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/fried_egg.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/fried_egg.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/fried_egg" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/glow_stick.json b/fabric/src/main/generated/assets/additionaladditions/models/item/glow_stick.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/glow_stick.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/glow_stick.json index 828ef21e..a478cc68 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/glow_stick.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/glow_stick.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/glow_stick" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/green_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/models/item/green_suspicious_dye.json similarity index 68% rename from common/src/main/resources/assets/additionaladditions/models/item/green_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/green_suspicious_dye.json index 8f7bd284..1fa44dda 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/green_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/green_suspicious_dye.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/green_suspicious_dye" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/honeyed_apple.json b/fabric/src/main/generated/assets/additionaladditions/models/item/honeyed_apple.json similarity index 66% rename from common/src/main/resources/assets/additionaladditions/models/item/honeyed_apple.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/honeyed_apple.json index 27bab45f..568a4d7e 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/honeyed_apple.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/honeyed_apple.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/honeyed_apple" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/light_blue_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/models/item/light_blue_suspicious_dye.json similarity index 69% rename from common/src/main/resources/assets/additionaladditions/models/item/light_blue_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/light_blue_suspicious_dye.json index d3826cba..3d1fc933 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/light_blue_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/light_blue_suspicious_dye.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/light_blue_suspicious_dye" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/lime_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/models/item/lime_suspicious_dye.json similarity index 67% rename from common/src/main/resources/assets/additionaladditions/models/item/lime_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/lime_suspicious_dye.json index 84f2f9ff..05378013 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/lime_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/lime_suspicious_dye.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/lime_suspicious_dye" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/magenta_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/models/item/magenta_suspicious_dye.json similarity index 68% rename from common/src/main/resources/assets/additionaladditions/models/item/magenta_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/magenta_suspicious_dye.json index cfc2cc83..d4de848f 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/magenta_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/magenta_suspicious_dye.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/magenta_suspicious_dye" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/music_disc_0308.json b/fabric/src/main/generated/assets/additionaladditions/models/item/music_disc_0308.json similarity index 66% rename from common/src/main/resources/assets/additionaladditions/models/item/music_disc_0308.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/music_disc_0308.json index ab96f4e2..0fd54b66 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/music_disc_0308.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/music_disc_0308.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/music_disc_0308" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/music_disc_1007.json b/fabric/src/main/generated/assets/additionaladditions/models/item/music_disc_1007.json similarity index 66% rename from common/src/main/resources/assets/additionaladditions/models/item/music_disc_1007.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/music_disc_1007.json index 6b8fc800..b82c0f16 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/music_disc_1007.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/music_disc_1007.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/music_disc_1007" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/music_disc_1507.json b/fabric/src/main/generated/assets/additionaladditions/models/item/music_disc_1507.json similarity index 66% rename from common/src/main/resources/assets/additionaladditions/models/item/music_disc_1507.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/music_disc_1507.json index f17769b0..b054c4d1 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/music_disc_1507.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/music_disc_1507.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/music_disc_1507" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/orange_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/models/item/orange_suspicious_dye.json similarity index 68% rename from common/src/main/resources/assets/additionaladditions/models/item/orange_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/orange_suspicious_dye.json index a01f19bc..0b37044e 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/orange_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/orange_suspicious_dye.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/orange_suspicious_dye" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/pink_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/models/item/pink_suspicious_dye.json similarity index 67% rename from common/src/main/resources/assets/additionaladditions/models/item/pink_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/pink_suspicious_dye.json index c8dddc0b..1b4a8f45 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/pink_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/pink_suspicious_dye.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/pink_suspicious_dye" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/purple_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/models/item/purple_suspicious_dye.json similarity index 68% rename from common/src/main/resources/assets/additionaladditions/models/item/purple_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/purple_suspicious_dye.json index cf30fa51..f93383e0 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/purple_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/purple_suspicious_dye.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/purple_suspicious_dye" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/red_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/models/item/red_suspicious_dye.json similarity index 67% rename from common/src/main/resources/assets/additionaladditions/models/item/red_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/red_suspicious_dye.json index 5b080237..90328355 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/red_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/red_suspicious_dye.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/red_suspicious_dye" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rope.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rope.json similarity index 63% rename from common/src/main/resources/assets/additionaladditions/models/item/rope.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rope.json index 6841f2fa..4feb03c2 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rope.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rope.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rope" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rope_arrow.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rope_arrow.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/rope_arrow.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rope_arrow.json index de735601..01ac915a 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rope_arrow.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rope_arrow.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rope_arrow" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_horse_armor.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_horse_armor.json similarity index 68% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold_horse_armor.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_horse_armor.json index e2d908b0..1a1c6ff1 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_horse_armor.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_horse_armor.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_horse_armor" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_ingot.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_ingot.json similarity index 66% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold_ingot.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_ingot.json index e9c3e200..56de95f4 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_ingot.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_ingot.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_ingot" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_nautilus_armor.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_nautilus_armor.json similarity index 68% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold_nautilus_armor.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_nautilus_armor.json index 5b20bedc..d5360461 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_nautilus_armor.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_nautilus_armor.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_nautilus_armor" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/trident_shard.json b/fabric/src/main/generated/assets/additionaladditions/models/item/trident_shard.json similarity index 66% rename from common/src/main/resources/assets/additionaladditions/models/item/trident_shard.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/trident_shard.json index a021f26a..33df5868 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/trident_shard.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/trident_shard.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/trident_shard" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/white_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/models/item/white_suspicious_dye.json similarity index 68% rename from common/src/main/resources/assets/additionaladditions/models/item/white_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/white_suspicious_dye.json index 714ac109..91034624 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/white_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/white_suspicious_dye.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/white_suspicious_dye" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/yellow_suspicious_dye.json b/fabric/src/main/generated/assets/additionaladditions/models/item/yellow_suspicious_dye.json similarity index 68% rename from common/src/main/resources/assets/additionaladditions/models/item/yellow_suspicious_dye.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/yellow_suspicious_dye.json index fe55d76d..d959afeb 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/yellow_suspicious_dye.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/yellow_suspicious_dye.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/yellow_suspicious_dye" } diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/copper_patina/patina_block.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/building_blocks/copper_patina/patina_block.json similarity index 70% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/copper_patina/patina_block.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/building_blocks/copper_patina/patina_block.json index c7defa47..f2df1f8c 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/copper_patina/patina_block.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/building_blocks/copper_patina/patina_block.json @@ -1,27 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_patina": { - "trigger": "minecraft:inventory_changed", + "has_copper_patina": { "conditions": { "items": [ { "items": "additionaladditions:copper_patina" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:copper_patina/patina_block" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_patina", - "has_the_recipe" + "has_the_recipe", + "has_copper_patina" ] ], "rewards": { diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/berry_pie.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/berry_pie/berry_pie.json similarity index 56% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/berry_pie.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/berry_pie/berry_pie.json index 4b68f39a..d564b6cf 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/berry_pie.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/berry_pie/berry_pie.json @@ -2,31 +2,31 @@ "parent": "minecraft:recipes/root", "criteria": { "has_sweet_berries": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "items": "minecraft:sweet_berries" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "additionaladditions:berry_pie" - } + "recipe": "additionaladditions:berry_pie/berry_pie" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_sweet_berries", - "has_the_recipe" + "has_the_recipe", + "has_sweet_berries" ] ], "rewards": { "recipes": [ - "additionaladditions:berry_pie" + "additionaladditions:berry_pie/berry_pie" ] } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/honeyed_apple.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/honeyed_apple/honeyed_apple.json similarity index 55% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/honeyed_apple.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/honeyed_apple/honeyed_apple.json index 34f796d0..d26ec9a3 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/honeyed_apple.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/honeyed_apple/honeyed_apple.json @@ -2,31 +2,31 @@ "parent": "minecraft:recipes/root", "criteria": { "has_honey_bottle": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "items": "minecraft:honey_bottle" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "additionaladditions:honeyed_apple" - } + "recipe": "additionaladditions:honeyed_apple/honeyed_apple" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_honey_bottle", - "has_the_recipe" + "has_the_recipe", + "has_honey_bottle" ] ], "rewards": { "recipes": [ - "additionaladditions:honeyed_apple" + "additionaladditions:honeyed_apple/honeyed_apple" ] } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/glow_stick.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/glow_stick/glow_stick.json similarity index 51% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/glow_stick.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/glow_stick/glow_stick.json index 28244ed5..41b2db8d 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/glow_stick.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/glow_stick/glow_stick.json @@ -1,32 +1,32 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_sac": { - "trigger": "minecraft:inventory_changed", + "has_glow_ink_sac": { "conditions": { "items": [ { "items": "minecraft:glow_ink_sac" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "additionaladditions:glow_stick" - } + "recipe": "additionaladditions:glow_stick/glow_stick" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_sac", - "has_the_recipe" + "has_the_recipe", + "has_glow_ink_sac" ] ], "rewards": { "recipes": [ - "additionaladditions:glow_stick" + "additionaladditions:glow_stick/glow_stick" ] } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/rope/rope.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/rope/rope.json similarity index 73% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/rope/rope.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/rope/rope.json index b3ba4f38..4e0a0f57 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/rope/rope.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/rope/rope.json @@ -2,26 +2,26 @@ "parent": "minecraft:recipes/root", "criteria": { "has_string": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "items": "minecraft:string" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:rope/rope" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_string", - "has_the_recipe" + "has_the_recipe", + "has_string" ] ], "rewards": { diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/rope/rope_arrow.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/rope/rope_arrow.json similarity index 74% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/rope/rope_arrow.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/rope/rope_arrow.json index 8d4709e0..86b2b381 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/rope/rope_arrow.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/rope/rope_arrow.json @@ -2,26 +2,26 @@ "parent": "minecraft:recipes/root", "criteria": { "has_rope": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "items": "additionaladditions:rope" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:rope/rope_arrow" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_rope", - "has_the_recipe" + "has_the_recipe", + "has_rope" ] ], "rewards": { diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/redstone/tinted_redstone_lamp/tinted_redstone_lamp.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/redstone/tinted_redstone_lamp/tinted_redstone_lamp.json new file mode 100644 index 00000000..333ed56b --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/redstone/tinted_redstone_lamp/tinted_redstone_lamp.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_amethyst_shard": { + "conditions": { + "items": [ + { + "items": "minecraft:amethyst_shard" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:tinted_redstone_lamp/tinted_redstone_lamp" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_amethyst_shard" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:tinted_redstone_lamp/tinted_redstone_lamp" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/barometer/barometer.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/barometer/barometer.json new file mode 100644 index 00000000..4fab3b5e --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/barometer/barometer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_redstone": { + "conditions": { + "items": [ + { + "items": "minecraft:redstone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:barometer/barometer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_redstone" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:barometer/barometer" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/pocket_jukebox.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/pocket_jukebox/pocket_jukebox.json similarity index 54% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/pocket_jukebox.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/pocket_jukebox/pocket_jukebox.json index 7cf94ed2..cb56aaa1 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/pocket_jukebox.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/pocket_jukebox/pocket_jukebox.json @@ -2,31 +2,31 @@ "parent": "minecraft:recipes/root", "criteria": { "has_jukebox": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "items": "minecraft:jukebox" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "additionaladditions:pocket_jukebox" - } + "recipe": "additionaladditions:pocket_jukebox/pocket_jukebox" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_jukebox", - "has_the_recipe" + "has_the_recipe", + "has_jukebox" ] ], "rewards": { "recipes": [ - "additionaladditions:pocket_jukebox" + "additionaladditions:pocket_jukebox/pocket_jukebox" ] } } \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/watering_can/watering_can.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/watering_can/watering_can.json new file mode 100644 index 00000000..7dbcba33 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/watering_can/watering_can.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_copper_ingot": { + "conditions": { + "items": [ + { + "items": "minecraft:copper_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:watering_can/watering_can" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_copper_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:watering_can/watering_can" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/wrench.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/wrench/wrench.json similarity index 53% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/wrench.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/wrench/wrench.json index 90b67f96..f4baeb46 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/wrench.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/wrench/wrench.json @@ -1,32 +1,32 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_copper": { - "trigger": "minecraft:inventory_changed", + "has_copper_ingot": { "conditions": { "items": [ { "items": "minecraft:copper_ingot" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "additionaladditions:wrench" - } + "recipe": "additionaladditions:wrench/wrench" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_copper", - "has_the_recipe" + "has_the_recipe", + "has_copper_ingot" ] ], "rewards": { "recipes": [ - "additionaladditions:wrench" + "additionaladditions:wrench/wrench" ] } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/barometer.json b/fabric/src/main/generated/data/additionaladditions/recipe/barometer/barometer.json similarity index 73% rename from common/src/main/resources/data/additionaladditions/recipe/barometer.json rename to fabric/src/main/generated/data/additionaladditions/recipe/barometer/barometer.json index 8884f2f5..5d98d584 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/barometer.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/barometer/barometer.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "C": "minecraft:copper_ingot", + "R": "minecraft:redstone" + }, "pattern": [ " C ", "CRC", "CCC" ], - "key": { - "C": "minecraft:copper_ingot", - "R": "minecraft:redstone" - }, "result": { - "id": "additionaladditions:barometer", - "count": 1 + "id": "additionaladditions:barometer" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/berry_pie.json b/fabric/src/main/generated/data/additionaladditions/recipe/berry_pie/berry_pie.json similarity index 57% rename from common/src/main/resources/data/additionaladditions/recipe/berry_pie.json rename to fabric/src/main/generated/data/additionaladditions/recipe/berry_pie/berry_pie.json index 227b8264..db84b846 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/berry_pie.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/berry_pie/berry_pie.json @@ -1,5 +1,6 @@ { - "type": "crafting_shapeless", + "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ "minecraft:wheat", "minecraft:sweet_berries", @@ -7,7 +8,6 @@ "minecraft:egg" ], "result": { - "id": "additionaladditions:berry_pie", - "count": 1 + "id": "additionaladditions:berry_pie" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/copper_patina/patina_block.json b/fabric/src/main/generated/data/additionaladditions/recipe/copper_patina/patina_block.json similarity index 69% rename from common/src/main/resources/data/additionaladditions/recipe/copper_patina/patina_block.json rename to fabric/src/main/generated/data/additionaladditions/recipe/copper_patina/patina_block.json index bc598a55..de1aa4bc 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/copper_patina/patina_block.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/copper_patina/patina_block.json @@ -1,14 +1,14 @@ { "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "P": "additionaladditions:copper_patina" + }, "pattern": [ "PP", "PP" ], - "key": { - "P": "additionaladditions:copper_patina" - }, "result": { - "id": "additionaladditions:patina_block", - "count": 1 + "id": "additionaladditions:patina_block" } } \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/recipe/glow_stick/glow_stick.json b/fabric/src/main/generated/data/additionaladditions/recipe/glow_stick/glow_stick.json new file mode 100644 index 00000000..c1d33b71 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/recipe/glow_stick/glow_stick.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "minecraft:stick", + "minecraft:glow_ink_sac" + ], + "result": { + "count": 3, + "id": "additionaladditions:glow_stick" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/recipe/honeyed_apple/honeyed_apple.json b/fabric/src/main/generated/data/additionaladditions/recipe/honeyed_apple/honeyed_apple.json new file mode 100644 index 00000000..826cac85 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/recipe/honeyed_apple/honeyed_apple.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "minecraft:honey_bottle", + "minecraft:apple" + ], + "result": { + "id": "additionaladditions:honeyed_apple" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/pocket_jukebox.json b/fabric/src/main/generated/data/additionaladditions/recipe/pocket_jukebox/pocket_jukebox.json similarity index 54% rename from common/src/main/resources/data/additionaladditions/recipe/pocket_jukebox.json rename to fabric/src/main/generated/data/additionaladditions/recipe/pocket_jukebox/pocket_jukebox.json index 50b3dda1..bc03c2c9 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/pocket_jukebox.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/pocket_jukebox/pocket_jukebox.json @@ -1,17 +1,17 @@ { "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "C": "minecraft:copper_ingot", + "J": "minecraft:jukebox", + "R": "minecraft:redstone" + }, "pattern": [ "CRC", "CJC", "CCC" ], - "key": { - "C": "minecraft:copper_ingot", - "R": "minecraft:redstone", - "J": "minecraft:jukebox" - }, "result": { - "id": "additionaladditions:pocket_jukebox", - "count": 1 + "id": "additionaladditions:pocket_jukebox" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rope/rope.json b/fabric/src/main/generated/data/additionaladditions/recipe/rope/rope.json similarity index 69% rename from common/src/main/resources/data/additionaladditions/recipe/rope/rope.json rename to fabric/src/main/generated/data/additionaladditions/recipe/rope/rope.json index d80d5480..f6fa0d17 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/rope/rope.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rope/rope.json @@ -1,15 +1,14 @@ { "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "S": "minecraft:string" + }, "pattern": [ - " ", "S", "S" ], - "key": { - "S": "minecraft:string" - }, "result": { - "id": "additionaladditions:rope", - "count": 1 + "id": "additionaladditions:rope" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rope/rope_arrow.json b/fabric/src/main/generated/data/additionaladditions/recipe/rope/rope_arrow.json similarity index 75% rename from common/src/main/resources/data/additionaladditions/recipe/rope/rope_arrow.json rename to fabric/src/main/generated/data/additionaladditions/recipe/rope/rope_arrow.json index 021e737d..c895a8fb 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/rope/rope_arrow.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rope/rope_arrow.json @@ -1,5 +1,6 @@ { - "type": "crafting_shapeless", + "type": "minecraft:crafting_shapeless", + "category": "misc", "ingredients": [ "minecraft:arrow", "additionaladditions:rope", @@ -12,7 +13,6 @@ "additionaladditions:rope" ], "result": { - "id": "additionaladditions:rope_arrow", - "count": 1 + "id": "additionaladditions:rope_arrow" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/tinted_redstone_lamp.json b/fabric/src/main/generated/data/additionaladditions/recipe/tinted_redstone_lamp/tinted_redstone_lamp.json similarity index 71% rename from common/src/main/resources/data/additionaladditions/recipe/tinted_redstone_lamp.json rename to fabric/src/main/generated/data/additionaladditions/recipe/tinted_redstone_lamp/tinted_redstone_lamp.json index 0e1da196..5ba84f2d 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/tinted_redstone_lamp.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/tinted_redstone_lamp/tinted_redstone_lamp.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", + "category": "redstone", + "key": { + "A": "minecraft:amethyst_shard", + "L": "minecraft:redstone_lamp" + }, "pattern": [ " A ", "ALA", " A " ], - "key": { - "A": "minecraft:amethyst_shard", - "L": "minecraft:redstone_lamp" - }, "result": { - "id": "additionaladditions:tinted_redstone_lamp", - "count": 1 + "id": "additionaladditions:tinted_redstone_lamp" } } \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/recipe/watering_can/watering_can.json b/fabric/src/main/generated/data/additionaladditions/recipe/watering_can/watering_can.json new file mode 100644 index 00000000..105217a1 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/recipe/watering_can/watering_can.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "B": "minecraft:bucket", + "C": "minecraft:copper_ingot" + }, + "pattern": [ + "C ", + "CBC", + " C " + ], + "result": { + "id": "additionaladditions:watering_can" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/wrench.json b/fabric/src/main/generated/data/additionaladditions/recipe/wrench/wrench.json similarity index 71% rename from common/src/main/resources/data/additionaladditions/recipe/wrench.json rename to fabric/src/main/generated/data/additionaladditions/recipe/wrench/wrench.json index a6f029bd..8767d38f 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/wrench.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/wrench/wrench.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "C": "minecraft:copper_ingot" + }, "pattern": [ "C C", " C ", " C " ], - "key": { - "C": "minecraft:copper_ingot" - }, "result": { - "id": "additionaladditions:wrench", - "count": 1 + "id": "additionaladditions:wrench" } } \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/tags/item/albums.json b/fabric/src/main/generated/data/additionaladditions/tags/item/albums.json new file mode 100644 index 00000000..a0608d00 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/tags/item/albums.json @@ -0,0 +1,21 @@ +{ + "values": [ + "additionaladditions:album", + "additionaladditions:white_album", + "additionaladditions:light_gray_album", + "additionaladditions:gray_album", + "additionaladditions:black_album", + "additionaladditions:brown_album", + "additionaladditions:red_album", + "additionaladditions:orange_album", + "additionaladditions:yellow_album", + "additionaladditions:lime_album", + "additionaladditions:green_album", + "additionaladditions:cyan_album", + "additionaladditions:light_blue_album", + "additionaladditions:blue_album", + "additionaladditions:purple_album", + "additionaladditions:magenta_album", + "additionaladditions:pink_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/tags/item/repairs_rose_gold_armor.json b/fabric/src/main/generated/data/additionaladditions/tags/item/repairs_rose_gold_armor.json new file mode 100644 index 00000000..ccb5676c --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/tags/item/repairs_rose_gold_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_ingot" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/tags/item/suspicious_dyes.json b/fabric/src/main/generated/data/additionaladditions/tags/item/suspicious_dyes.json new file mode 100644 index 00000000..eaaa3e69 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/tags/item/suspicious_dyes.json @@ -0,0 +1,17 @@ +{ + "values": [ + "additionaladditions:white_suspicious_dye", + "additionaladditions:brown_suspicious_dye", + "additionaladditions:red_suspicious_dye", + "additionaladditions:orange_suspicious_dye", + "additionaladditions:yellow_suspicious_dye", + "additionaladditions:lime_suspicious_dye", + "additionaladditions:green_suspicious_dye", + "additionaladditions:cyan_suspicious_dye", + "additionaladditions:light_blue_suspicious_dye", + "additionaladditions:blue_suspicious_dye", + "additionaladditions:purple_suspicious_dye", + "additionaladditions:magenta_suspicious_dye", + "additionaladditions:pink_suspicious_dye" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/flowers.json b/fabric/src/main/generated/data/c/tags/block/flowers.json new file mode 100644 index 00000000..288c4a95 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/block/flowers.json @@ -0,0 +1,6 @@ +{ + "values": [ + "additionaladditions:wisteria", + "additionaladditions:lotus_lily" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/flowers/small.json b/fabric/src/main/generated/data/c/tags/block/flowers/small.json new file mode 100644 index 00000000..6e616e7e --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/block/flowers/small.json @@ -0,0 +1,7 @@ +{ + "values": [ + "additionaladditions:crimson_blossom", + "additionaladditions:bulbus", + "additionaladditions:frostleaf" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/flowers/tall.json b/fabric/src/main/generated/data/c/tags/block/flowers/tall.json new file mode 100644 index 00000000..aa643b88 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/block/flowers/tall.json @@ -0,0 +1,10 @@ +{ + "values": [ + "additionaladditions:cottonshiver", + "additionaladditions:mudflower", + "additionaladditions:amber_blossom", + "additionaladditions:sawtooth_fern", + "additionaladditions:spikeblossom", + "additionaladditions:snapdragon" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/block/ropes.json b/fabric/src/main/generated/data/c/tags/block/ropes.json new file mode 100644 index 00000000..ceb96688 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/block/ropes.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rope" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dyed/black.json b/fabric/src/main/generated/data/c/tags/item/dyed/black.json new file mode 100644 index 00000000..328bb1aa --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dyed/black.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:black_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dyed/blue.json b/fabric/src/main/generated/data/c/tags/item/dyed/blue.json new file mode 100644 index 00000000..a2557c02 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dyed/blue.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:blue_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dyed/brown.json b/fabric/src/main/generated/data/c/tags/item/dyed/brown.json new file mode 100644 index 00000000..3e2d7098 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dyed/brown.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:brown_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dyed/cyan.json b/fabric/src/main/generated/data/c/tags/item/dyed/cyan.json new file mode 100644 index 00000000..c629ccad --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dyed/cyan.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:cyan_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dyed/gray.json b/fabric/src/main/generated/data/c/tags/item/dyed/gray.json new file mode 100644 index 00000000..d0511098 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dyed/gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:gray_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dyed/green.json b/fabric/src/main/generated/data/c/tags/item/dyed/green.json new file mode 100644 index 00000000..3dd70c46 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dyed/green.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:green_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dyed/light_blue.json b/fabric/src/main/generated/data/c/tags/item/dyed/light_blue.json new file mode 100644 index 00000000..2bca1346 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dyed/light_blue.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:light_blue_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dyed/light_gray.json b/fabric/src/main/generated/data/c/tags/item/dyed/light_gray.json new file mode 100644 index 00000000..e260599f --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dyed/light_gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:light_gray_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dyed/lime.json b/fabric/src/main/generated/data/c/tags/item/dyed/lime.json new file mode 100644 index 00000000..9a8a3e11 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dyed/lime.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:lime_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dyed/magenta.json b/fabric/src/main/generated/data/c/tags/item/dyed/magenta.json new file mode 100644 index 00000000..4e726c4d --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dyed/magenta.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:magenta_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dyed/orange.json b/fabric/src/main/generated/data/c/tags/item/dyed/orange.json new file mode 100644 index 00000000..8fa2ef38 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dyed/orange.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:orange_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dyed/pink.json b/fabric/src/main/generated/data/c/tags/item/dyed/pink.json new file mode 100644 index 00000000..244e23ae --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dyed/pink.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:pink_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dyed/purple.json b/fabric/src/main/generated/data/c/tags/item/dyed/purple.json new file mode 100644 index 00000000..1af65bab --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dyed/purple.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:purple_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dyed/red.json b/fabric/src/main/generated/data/c/tags/item/dyed/red.json new file mode 100644 index 00000000..41268012 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dyed/red.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:red_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dyed/white.json b/fabric/src/main/generated/data/c/tags/item/dyed/white.json new file mode 100644 index 00000000..bad90315 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dyed/white.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:white_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/dyed/yellow.json b/fabric/src/main/generated/data/c/tags/item/dyed/yellow.json new file mode 100644 index 00000000..2fa376c2 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/dyed/yellow.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:yellow_album" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/flowers.json b/fabric/src/main/generated/data/c/tags/item/flowers.json new file mode 100644 index 00000000..288c4a95 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/flowers.json @@ -0,0 +1,6 @@ +{ + "values": [ + "additionaladditions:wisteria", + "additionaladditions:lotus_lily" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/flowers/small.json b/fabric/src/main/generated/data/c/tags/item/flowers/small.json new file mode 100644 index 00000000..6e616e7e --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/flowers/small.json @@ -0,0 +1,7 @@ +{ + "values": [ + "additionaladditions:crimson_blossom", + "additionaladditions:bulbus", + "additionaladditions:frostleaf" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/flowers/tall.json b/fabric/src/main/generated/data/c/tags/item/flowers/tall.json new file mode 100644 index 00000000..aa643b88 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/flowers/tall.json @@ -0,0 +1,10 @@ +{ + "values": [ + "additionaladditions:cottonshiver", + "additionaladditions:mudflower", + "additionaladditions:amber_blossom", + "additionaladditions:sawtooth_fern", + "additionaladditions:spikeblossom", + "additionaladditions:snapdragon" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/foods.json b/fabric/src/main/generated/data/c/tags/item/foods.json new file mode 100644 index 00000000..9451b09f --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/foods.json @@ -0,0 +1,6 @@ +{ + "values": [ + "additionaladditions:honeyed_apple", + "additionaladditions:chicken_nugget" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/foods/pie.json b/fabric/src/main/generated/data/c/tags/item/foods/pie.json new file mode 100644 index 00000000..01c73f6e --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/foods/pie.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:berry_pie" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ingots/rose_gold.json b/fabric/src/main/generated/data/c/tags/item/ingots/rose_gold.json new file mode 100644 index 00000000..ccb5676c --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/ingots/rose_gold.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_ingot" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/music_discs.json b/fabric/src/main/generated/data/c/tags/item/music_discs.json new file mode 100644 index 00000000..714cabaa --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/music_discs.json @@ -0,0 +1,7 @@ +{ + "values": [ + "additionaladditions:music_disc_0308", + "additionaladditions:music_disc_1007", + "additionaladditions:music_disc_1507" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/ropes.json b/fabric/src/main/generated/data/c/tags/item/ropes.json new file mode 100644 index 00000000..ceb96688 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/ropes.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rope" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/seeds.json b/fabric/src/main/generated/data/c/tags/item/seeds.json new file mode 100644 index 00000000..c513f49a --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/seeds.json @@ -0,0 +1,13 @@ +{ + "values": [ + "additionaladditions:cottonshiver_pod", + "additionaladditions:mudflower_seeds", + "additionaladditions:crimson_blossom_seeds", + "additionaladditions:amber_blossom_seeds", + "additionaladditions:bulbus_pod", + "additionaladditions:sawtooth_fern_fiddlehead", + "additionaladditions:frostleaf_pod", + "additionaladditions:spikeblossom_seeds", + "additionaladditions:snapdragon_pod" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/storage_blocks/rose_gold.json b/fabric/src/main/generated/data/c/tags/item/storage_blocks/rose_gold.json new file mode 100644 index 00000000..02d18e70 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/storage_blocks/rose_gold.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_block" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/c/tags/item/tools/wrench.json b/fabric/src/main/generated/data/c/tags/item/tools/wrench.json new file mode 100644 index 00000000..edec6c16 --- /dev/null +++ b/fabric/src/main/generated/data/c/tags/item/tools/wrench.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:wrench" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/block/beacon_base_blocks.json b/fabric/src/main/generated/data/minecraft/tags/block/beacon_base_blocks.json new file mode 100644 index 00000000..02d18e70 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/block/beacon_base_blocks.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_block" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/block/bee_attractive.json b/fabric/src/main/generated/data/minecraft/tags/block/bee_attractive.json new file mode 100644 index 00000000..525ecd53 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/block/bee_attractive.json @@ -0,0 +1,15 @@ +{ + "values": [ + "additionaladditions:cottonshiver", + "additionaladditions:mudflower", + "additionaladditions:crimson_blossom", + "additionaladditions:amber_blossom", + "additionaladditions:bulbus", + "additionaladditions:sawtooth_fern", + "additionaladditions:frostleaf", + "additionaladditions:wisteria", + "additionaladditions:spikeblossom", + "additionaladditions:snapdragon", + "additionaladditions:lotus_lily" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/block/climbable.json b/fabric/src/main/generated/data/minecraft/tags/block/climbable.json new file mode 100644 index 00000000..ceb96688 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/block/climbable.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rope" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/block/crops.json b/fabric/src/main/generated/data/minecraft/tags/block/crops.json new file mode 100644 index 00000000..04cba471 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/block/crops.json @@ -0,0 +1,15 @@ +{ + "values": [ + "additionaladditions:cottonshiver_crop", + "additionaladditions:mudflower_crop", + "additionaladditions:crimson_blossom_crop", + "additionaladditions:amber_blossom_crop", + "additionaladditions:bulbus_crop", + "additionaladditions:sawtooth_fern_crop", + "additionaladditions:frostleaf_crop", + "additionaladditions:wisteria_crop", + "additionaladditions:spikeblossom_crop", + "additionaladditions:snapdragon_crop", + "additionaladditions:lotus_lily_crop" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/block/incorrect_for_gold_tool.json b/fabric/src/main/generated/data/minecraft/tags/block/incorrect_for_gold_tool.json new file mode 100644 index 00000000..02d18e70 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/block/incorrect_for_gold_tool.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_block" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/block/incorrect_for_stone_tool.json b/fabric/src/main/generated/data/minecraft/tags/block/incorrect_for_stone_tool.json new file mode 100644 index 00000000..02d18e70 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/block/incorrect_for_stone_tool.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_block" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/block/incorrect_for_wooden_tool.json b/fabric/src/main/generated/data/minecraft/tags/block/incorrect_for_wooden_tool.json new file mode 100644 index 00000000..02d18e70 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/block/incorrect_for_wooden_tool.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_block" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/block/maintains_farmland.json b/fabric/src/main/generated/data/minecraft/tags/block/maintains_farmland.json new file mode 100644 index 00000000..86cb0765 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/block/maintains_farmland.json @@ -0,0 +1,26 @@ +{ + "values": [ + "additionaladditions:cottonshiver", + "additionaladditions:cottonshiver_crop", + "additionaladditions:mudflower", + "additionaladditions:mudflower_crop", + "additionaladditions:crimson_blossom", + "additionaladditions:crimson_blossom_crop", + "additionaladditions:amber_blossom", + "additionaladditions:amber_blossom_crop", + "additionaladditions:bulbus", + "additionaladditions:bulbus_crop", + "additionaladditions:sawtooth_fern", + "additionaladditions:sawtooth_fern_crop", + "additionaladditions:frostleaf", + "additionaladditions:frostleaf_crop", + "additionaladditions:wisteria", + "additionaladditions:wisteria_crop", + "additionaladditions:spikeblossom", + "additionaladditions:spikeblossom_crop", + "additionaladditions:snapdragon", + "additionaladditions:snapdragon_crop", + "additionaladditions:lotus_lily", + "additionaladditions:lotus_lily_crop" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json b/fabric/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json new file mode 100644 index 00000000..02d18e70 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_block" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/block/mineable/shovel.json b/fabric/src/main/generated/data/minecraft/tags/block/mineable/shovel.json new file mode 100644 index 00000000..bdaeeb47 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/block/mineable/shovel.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:patina_block" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json b/fabric/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json new file mode 100644 index 00000000..02d18e70 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_block" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/item/arrows.json b/fabric/src/main/generated/data/minecraft/tags/item/arrows.json new file mode 100644 index 00000000..028ee04b --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/item/arrows.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rope_arrow" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/item/axes.json b/fabric/src/main/generated/data/minecraft/tags/item/axes.json new file mode 100644 index 00000000..d04830c6 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/item/axes.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_axe" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/item/bee_food.json b/fabric/src/main/generated/data/minecraft/tags/item/bee_food.json new file mode 100644 index 00000000..525ecd53 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/item/bee_food.json @@ -0,0 +1,15 @@ +{ + "values": [ + "additionaladditions:cottonshiver", + "additionaladditions:mudflower", + "additionaladditions:crimson_blossom", + "additionaladditions:amber_blossom", + "additionaladditions:bulbus", + "additionaladditions:sawtooth_fern", + "additionaladditions:frostleaf", + "additionaladditions:wisteria", + "additionaladditions:spikeblossom", + "additionaladditions:snapdragon", + "additionaladditions:lotus_lily" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/item/chest_armor.json b/fabric/src/main/generated/data/minecraft/tags/item/chest_armor.json new file mode 100644 index 00000000..333dfb19 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/item/chest_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_chestplate" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/item/foot_armor.json b/fabric/src/main/generated/data/minecraft/tags/item/foot_armor.json new file mode 100644 index 00000000..a0e6f097 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/item/foot_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_boots" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/item/head_armor.json b/fabric/src/main/generated/data/minecraft/tags/item/head_armor.json new file mode 100644 index 00000000..7d0ec2ef --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/item/head_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_helmet" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/item/hoes.json b/fabric/src/main/generated/data/minecraft/tags/item/hoes.json new file mode 100644 index 00000000..6129c4b6 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/item/hoes.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_hoe" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/item/leg_armor.json b/fabric/src/main/generated/data/minecraft/tags/item/leg_armor.json new file mode 100644 index 00000000..e33c6c6e --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/item/leg_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_leggings" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/item/pickaxes.json b/fabric/src/main/generated/data/minecraft/tags/item/pickaxes.json new file mode 100644 index 00000000..ceef13f3 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/item/pickaxes.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_pickaxe" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/item/shovels.json b/fabric/src/main/generated/data/minecraft/tags/item/shovels.json new file mode 100644 index 00000000..11fa3d9f --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/item/shovels.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_shovel" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/item/spears.json b/fabric/src/main/generated/data/minecraft/tags/item/spears.json new file mode 100644 index 00000000..5ff52430 --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/item/spears.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_spear" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/item/swords.json b/fabric/src/main/generated/data/minecraft/tags/item/swords.json new file mode 100644 index 00000000..f3e8ddda --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/item/swords.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_sword" + ] +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/minecraft/tags/item/trimmable_armor.json b/fabric/src/main/generated/data/minecraft/tags/item/trimmable_armor.json new file mode 100644 index 00000000..5376510b --- /dev/null +++ b/fabric/src/main/generated/data/minecraft/tags/item/trimmable_armor.json @@ -0,0 +1,8 @@ +{ + "values": [ + "additionaladditions:rose_gold_helmet", + "additionaladditions:rose_gold_chestplate", + "additionaladditions:rose_gold_leggings", + "additionaladditions:rose_gold_boots" + ] +} \ No newline at end of file diff --git a/fabric/src/main/java/one/dqu/additionaladditions/util/fabric/FluidHelperImpl.java b/fabric/src/main/java/one/dqu/additionaladditions/core/util/fabric/FluidHelperImpl.java similarity index 87% rename from fabric/src/main/java/one/dqu/additionaladditions/util/fabric/FluidHelperImpl.java rename to fabric/src/main/java/one/dqu/additionaladditions/core/util/fabric/FluidHelperImpl.java index b64f80b6..7ab021d3 100644 --- a/fabric/src/main/java/one/dqu/additionaladditions/util/fabric/FluidHelperImpl.java +++ b/fabric/src/main/java/one/dqu/additionaladditions/core/util/fabric/FluidHelperImpl.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.util.fabric; +package one.dqu.additionaladditions.core.util.fabric; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidStorage; import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant; @@ -9,7 +9,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraft.world.level.material.Fluid; -import one.dqu.additionaladditions.util.FluidHelper; +import one.dqu.additionaladditions.core.util.FluidHelper; public class FluidHelperImpl { public static FluidHelper.Transaction modded(Player player, BlockPos pos, Direction side, int amount, Fluid fluid) { @@ -17,7 +17,8 @@ public static FluidHelper.Transaction modded(Player player, BlockPos pos, Direct Storage storage = FluidStorage.SIDED.find(level, pos, side); if (storage == null) { - return new FluidHelper.Transaction(0, (committed) -> {}); + return new FluidHelper.Transaction(0, (committed) -> { + }); } FluidVariant fluidVariant = FluidVariant.of(fluid); @@ -28,7 +29,7 @@ public static FluidHelper.Transaction modded(Player player, BlockPos pos, Direct transaction.abort(); } - return new FluidHelper.Transaction((int)(extracted / 81L), (committed) -> { + return new FluidHelper.Transaction((int) (extracted / 81L), (committed) -> { fluid.getPickupSound().ifPresent((sound) -> level.playSound(null, pos, sound, net.minecraft.sounds.SoundSource.BLOCKS)); try (Transaction transaction = Transaction.openOuter()) { diff --git a/fabric/src/main/java/one/dqu/additionaladditions/util/fabric/ModCompatibilityImpl.java b/fabric/src/main/java/one/dqu/additionaladditions/core/util/fabric/ModCompatibilityImpl.java similarity index 79% rename from fabric/src/main/java/one/dqu/additionaladditions/util/fabric/ModCompatibilityImpl.java rename to fabric/src/main/java/one/dqu/additionaladditions/core/util/fabric/ModCompatibilityImpl.java index 7bcf139a..7bb8b467 100644 --- a/fabric/src/main/java/one/dqu/additionaladditions/util/fabric/ModCompatibilityImpl.java +++ b/fabric/src/main/java/one/dqu/additionaladditions/core/util/fabric/ModCompatibilityImpl.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.util.fabric; +package one.dqu.additionaladditions.core.util.fabric; import net.fabricmc.api.EnvType; import net.fabricmc.loader.api.FabricLoader; @@ -33,14 +33,14 @@ public static void add(Supplier condition, String description, String.. AdditionalAdditions.LOGGER.warn("[{}] ⚠️ IMPORTANT", AdditionalAdditions.NAMESPACE); AdditionalAdditions.LOGGER.warn("[{}] Mod Incompatibility: {}", AdditionalAdditions.NAMESPACE, description); - if (isClientSide()) { - toasts.add( () -> SystemToast.multiline( - Minecraft.getInstance(), - SystemToast.SystemToastId.PACK_LOAD_FAILURE, - Component.literal( "Additional Additions" ), - Component.literal( description ) - ) ); - } + if (isClientSide()) { + toasts.add(() -> SystemToast.multiline( + Minecraft.getInstance(), + SystemToast.SystemToastId.PACK_LOAD_FAILURE, + Component.literal("Additional Additions"), + Component.literal(description) + )); + } } public static boolean isModPresent(String... modids) { @@ -53,9 +53,9 @@ public static boolean isModPresent(String... modids) { } public static void showToasts() { - if (!isClientSide()) { - return; - } + if (!isClientSide()) { + return; + } for (Supplier toastSupplier : toasts) { Minecraft.getInstance().getToastManager().addToast(toastSupplier.get()); } diff --git a/fabric/src/main/java/one/dqu/additionaladditions/util/fabric/RegistrarImpl.java b/fabric/src/main/java/one/dqu/additionaladditions/core/util/fabric/RegistrarImpl.java similarity index 91% rename from fabric/src/main/java/one/dqu/additionaladditions/util/fabric/RegistrarImpl.java rename to fabric/src/main/java/one/dqu/additionaladditions/core/util/fabric/RegistrarImpl.java index 3f30fc97..7b6859c2 100644 --- a/fabric/src/main/java/one/dqu/additionaladditions/util/fabric/RegistrarImpl.java +++ b/fabric/src/main/java/one/dqu/additionaladditions/core/util/fabric/RegistrarImpl.java @@ -1,8 +1,8 @@ -package one.dqu.additionaladditions.util.fabric; +package one.dqu.additionaladditions.core.util.fabric; import net.minecraft.core.Registry; import net.minecraft.resources.Identifier; -import one.dqu.additionaladditions.util.Registrar; +import one.dqu.additionaladditions.core.util.Registrar; import java.util.ArrayList; import java.util.List; diff --git a/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsClientFabric.java b/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsClientFabric.java index c46229ea..6d24bf67 100644 --- a/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsClientFabric.java +++ b/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsClientFabric.java @@ -27,14 +27,14 @@ import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.config.io.ConfigLoader; import one.dqu.additionaladditions.config.network.ConfigSyncS2CPayload; -import one.dqu.additionaladditions.entity.RopeArrowRenderer; -import one.dqu.additionaladditions.feature.PocketJukeboxPlayer; +import one.dqu.additionaladditions.core.util.fabric.ModCompatibilityImpl; import one.dqu.additionaladditions.feature.glint.GlintResourceGenerator; +import one.dqu.additionaladditions.feature.pocket_jukebox.PocketJukeboxPlayer; +import one.dqu.additionaladditions.feature.rope.RopeArrowRenderer; import one.dqu.additionaladditions.recipe.ClientRecipeCache; import one.dqu.additionaladditions.registry.AABlocks; import one.dqu.additionaladditions.registry.AAEntities; import one.dqu.additionaladditions.registry.AAMisc; -import one.dqu.additionaladditions.util.fabric.ModCompatibilityImpl; import java.util.HashMap; import java.util.List; diff --git a/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsDatagenFabric.java b/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsDatagenFabric.java index 4416a809..5509cc2a 100644 --- a/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsDatagenFabric.java +++ b/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsDatagenFabric.java @@ -1,14 +1,20 @@ package one.dqu.additionaladditions.fabric; +import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider; import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import net.fabricmc.fabric.api.datagen.v1.FabricPackOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricDynamicRegistryProvider; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; +import net.minecraft.client.data.models.BlockModelGenerators; +import net.minecraft.client.data.models.ItemModelGenerators; import net.minecraft.core.HolderLookup; import net.minecraft.core.RegistrySetBuilder; import net.minecraft.core.registries.Registries; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.data.recipes.RecipeProvider; import one.dqu.additionaladditions.AdditionalAdditions; -import one.dqu.additionaladditions.gametest.datagen.AAGameTestDatagen; +import one.dqu.additionaladditions.core.datagen.*; import java.util.concurrent.CompletableFuture; @@ -17,6 +23,27 @@ public class AdditionalAdditionsDatagenFabric implements DataGeneratorEntrypoint public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { FabricDataGenerator.Pack pack = fabricDataGenerator.createPack(); pack.addProvider(RegistryProvider::new); + + pack.addProvider(ModelProvider::new); + pack.addProvider(AAItemTagDatagenProvider::new); + pack.addProvider(AABlockTagDatagenProvider::new); + pack.addProvider(RecipeProviderRunner::new); + } + + private static class ModelProvider extends FabricModelProvider { + ModelProvider(FabricPackOutput output) { + super(output); + } + + @Override + public void generateBlockStateModels(BlockModelGenerators gen) { + AABlockDatagen.generateBlockStateModels(gen); + } + + @Override + public void generateItemModels(ItemModelGenerators gen) { + AAItemDatagen.generateItemModels(gen); + } } @Override @@ -24,6 +51,22 @@ public void buildRegistry(RegistrySetBuilder registryBuilder) { registryBuilder.add(Registries.TEST_INSTANCE, AAGameTestDatagen::bootstrap); } + private static class RecipeProviderRunner extends FabricRecipeProvider { + RecipeProviderRunner(FabricPackOutput output, CompletableFuture registries) { + super(output, registries); + } + + @Override + protected RecipeProvider createRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + return new AARecipeDatagenProvider(registries, output); + } + + @Override + public String getName() { + return AdditionalAdditions.NAMESPACE + " Recipes"; + } + } + private static class RegistryProvider extends FabricDynamicRegistryProvider { RegistryProvider(FabricPackOutput output, CompletableFuture registriesFuture) { super(output, registriesFuture); @@ -39,4 +82,4 @@ public String getName() { return AdditionalAdditions.NAMESPACE; } } -} \ No newline at end of file +} diff --git a/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsFabric.java b/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsFabric.java index 9a80d485..67435087 100644 --- a/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsFabric.java +++ b/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsFabric.java @@ -15,10 +15,10 @@ import one.dqu.additionaladditions.config.ConfigProperty; import one.dqu.additionaladditions.config.network.ConfigSyncS2CPayload; import one.dqu.additionaladditions.registry.AAMisc; -import one.dqu.additionaladditions.util.CreativeAdder; -import one.dqu.additionaladditions.util.LootAdder; -import one.dqu.additionaladditions.util.LootTableExtension; -import one.dqu.additionaladditions.util.fabric.RegistrarImpl; +import one.dqu.additionaladditions.core.util.CreativeAdder; +import one.dqu.additionaladditions.core.util.LootAdder; +import one.dqu.additionaladditions.core.util.LootTableExtension; +import one.dqu.additionaladditions.core.util.fabric.RegistrarImpl; import java.util.Map; import java.util.stream.Collectors; diff --git a/fabric/src/main/java/one/dqu/additionaladditions/mixin/fabric/LootTableBuilderMixin.java b/fabric/src/main/java/one/dqu/additionaladditions/mixin/fabric/LootTableBuilderMixin.java index 08b8f62c..bc4409b7 100644 --- a/fabric/src/main/java/one/dqu/additionaladditions/mixin/fabric/LootTableBuilderMixin.java +++ b/fabric/src/main/java/one/dqu/additionaladditions/mixin/fabric/LootTableBuilderMixin.java @@ -3,7 +3,7 @@ import com.google.common.collect.ImmutableList; import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable; -import one.dqu.additionaladditions.util.LootTableExtension; +import one.dqu.additionaladditions.core.util.LootTableExtension; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mutable; diff --git a/neoforge/build.gradle b/neoforge/build.gradle index cb01d281..eeb4680d 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -16,7 +16,7 @@ loom { runs { data { - serverData() + clientData() programArgs "--all", "--mod", "additionaladditions" programArgs "--output", file("src/main/generated").absolutePath vmArg "-Dadditionaladditions.datagen=true" diff --git a/neoforge/src/main/generated/assets/additionaladditions/blockstates/amber_blossom.json b/neoforge/src/main/generated/assets/additionaladditions/blockstates/amber_blossom.json new file mode 100644 index 00000000..87c21986 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/blockstates/amber_blossom.json @@ -0,0 +1,10 @@ +{ + "variants": { + "half=lower": { + "model": "additionaladditions:block/amber_blossom_bottom" + }, + "half=upper": { + "model": "additionaladditions:block/amber_blossom_top" + } + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/blockstates/bulbus.json b/neoforge/src/main/generated/assets/additionaladditions/blockstates/bulbus.json new file mode 100644 index 00000000..2de4cc06 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/blockstates/bulbus.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "additionaladditions:block/bulbus" + } + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/blockstates/cottonshiver.json b/neoforge/src/main/generated/assets/additionaladditions/blockstates/cottonshiver.json new file mode 100644 index 00000000..20778d6c --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/blockstates/cottonshiver.json @@ -0,0 +1,10 @@ +{ + "variants": { + "half=lower": { + "model": "additionaladditions:block/cottonshiver_bottom" + }, + "half=upper": { + "model": "additionaladditions:block/cottonshiver_top" + } + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/blockstates/crimson_blossom.json b/neoforge/src/main/generated/assets/additionaladditions/blockstates/crimson_blossom.json new file mode 100644 index 00000000..5128bb62 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/blockstates/crimson_blossom.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "additionaladditions:block/crimson_blossom" + } + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/blockstates/frostleaf.json b/neoforge/src/main/generated/assets/additionaladditions/blockstates/frostleaf.json new file mode 100644 index 00000000..130a9672 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/blockstates/frostleaf.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "additionaladditions:block/frostleaf" + } + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/blockstates/mudflower.json b/neoforge/src/main/generated/assets/additionaladditions/blockstates/mudflower.json new file mode 100644 index 00000000..22a231aa --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/blockstates/mudflower.json @@ -0,0 +1,10 @@ +{ + "variants": { + "half=lower": { + "model": "additionaladditions:block/mudflower_bottom" + }, + "half=upper": { + "model": "additionaladditions:block/mudflower_top" + } + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/blockstates/rose_gold_block.json b/neoforge/src/main/generated/assets/additionaladditions/blockstates/rose_gold_block.json new file mode 100644 index 00000000..4ac768d7 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/blockstates/rose_gold_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "additionaladditions:block/rose_gold_block" + } + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/blockstates/sawtooth_fern.json b/neoforge/src/main/generated/assets/additionaladditions/blockstates/sawtooth_fern.json new file mode 100644 index 00000000..b3a94f1f --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/blockstates/sawtooth_fern.json @@ -0,0 +1,10 @@ +{ + "variants": { + "half=lower": { + "model": "additionaladditions:block/sawtooth_fern_bottom" + }, + "half=upper": { + "model": "additionaladditions:block/sawtooth_fern_top" + } + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/blockstates/snapdragon.json b/neoforge/src/main/generated/assets/additionaladditions/blockstates/snapdragon.json new file mode 100644 index 00000000..5babede6 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/blockstates/snapdragon.json @@ -0,0 +1,10 @@ +{ + "variants": { + "half=lower": { + "model": "additionaladditions:block/snapdragon_bottom" + }, + "half=upper": { + "model": "additionaladditions:block/snapdragon_top" + } + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/blockstates/spikeblossom.json b/neoforge/src/main/generated/assets/additionaladditions/blockstates/spikeblossom.json new file mode 100644 index 00000000..f2f51433 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/blockstates/spikeblossom.json @@ -0,0 +1,10 @@ +{ + "variants": { + "half=lower": { + "model": "additionaladditions:block/spikeblossom_bottom" + }, + "half=upper": { + "model": "additionaladditions:block/spikeblossom_top" + } + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/amber_blossom.json b/neoforge/src/main/generated/assets/additionaladditions/items/amber_blossom.json new file mode 100644 index 00000000..1591fc0b --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/amber_blossom.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/amber_blossom" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/berry_pie.json b/neoforge/src/main/generated/assets/additionaladditions/items/berry_pie.json new file mode 100644 index 00000000..767e62cf --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/berry_pie.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/berry_pie" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/blue_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/items/blue_suspicious_dye.json new file mode 100644 index 00000000..8a78631f --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/blue_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/blue_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/brown_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/items/brown_suspicious_dye.json new file mode 100644 index 00000000..cbef7cc4 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/brown_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/brown_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/bulbus.json b/neoforge/src/main/generated/assets/additionaladditions/items/bulbus.json new file mode 100644 index 00000000..54cc6345 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/bulbus.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/bulbus" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/chicken_nugget.json b/neoforge/src/main/generated/assets/additionaladditions/items/chicken_nugget.json new file mode 100644 index 00000000..84743a62 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/chicken_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/chicken_nugget" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/copper_patina.json b/neoforge/src/main/generated/assets/additionaladditions/items/copper_patina.json new file mode 100644 index 00000000..148fd1df --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/copper_patina.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/copper_patina" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/cottonshiver.json b/neoforge/src/main/generated/assets/additionaladditions/items/cottonshiver.json new file mode 100644 index 00000000..7492e291 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/cottonshiver.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/cottonshiver" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/crimson_blossom.json b/neoforge/src/main/generated/assets/additionaladditions/items/crimson_blossom.json new file mode 100644 index 00000000..66f98f89 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/crimson_blossom.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/crimson_blossom" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/cyan_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/items/cyan_suspicious_dye.json new file mode 100644 index 00000000..be9728d6 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/cyan_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/cyan_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/fried_egg.json b/neoforge/src/main/generated/assets/additionaladditions/items/fried_egg.json new file mode 100644 index 00000000..29ba3028 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/fried_egg.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/fried_egg" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/frostleaf.json b/neoforge/src/main/generated/assets/additionaladditions/items/frostleaf.json new file mode 100644 index 00000000..d3d7f57d --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/frostleaf.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/frostleaf" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/glow_stick.json b/neoforge/src/main/generated/assets/additionaladditions/items/glow_stick.json new file mode 100644 index 00000000..19db3ddd --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/glow_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/glow_stick" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/green_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/items/green_suspicious_dye.json new file mode 100644 index 00000000..7c5a949f --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/green_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/green_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/honeyed_apple.json b/neoforge/src/main/generated/assets/additionaladditions/items/honeyed_apple.json new file mode 100644 index 00000000..7d59f221 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/honeyed_apple.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/honeyed_apple" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/light_blue_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/items/light_blue_suspicious_dye.json new file mode 100644 index 00000000..b00b2275 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/light_blue_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/light_blue_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/lime_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/items/lime_suspicious_dye.json new file mode 100644 index 00000000..1cc21c93 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/lime_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/lime_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/magenta_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/items/magenta_suspicious_dye.json new file mode 100644 index 00000000..5dd4052f --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/magenta_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/magenta_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/mudflower.json b/neoforge/src/main/generated/assets/additionaladditions/items/mudflower.json new file mode 100644 index 00000000..7fbe0458 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/mudflower.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/mudflower" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/music_disc_0308.json b/neoforge/src/main/generated/assets/additionaladditions/items/music_disc_0308.json new file mode 100644 index 00000000..6287104f --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/music_disc_0308.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/music_disc_0308" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/music_disc_1007.json b/neoforge/src/main/generated/assets/additionaladditions/items/music_disc_1007.json new file mode 100644 index 00000000..22b81693 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/music_disc_1007.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/music_disc_1007" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/music_disc_1507.json b/neoforge/src/main/generated/assets/additionaladditions/items/music_disc_1507.json new file mode 100644 index 00000000..df65b409 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/music_disc_1507.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/music_disc_1507" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/orange_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/items/orange_suspicious_dye.json new file mode 100644 index 00000000..b7b9b038 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/orange_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/orange_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/pink_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/items/pink_suspicious_dye.json new file mode 100644 index 00000000..b7288df2 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/pink_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/pink_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/purple_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/items/purple_suspicious_dye.json new file mode 100644 index 00000000..b23630d2 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/purple_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/purple_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/red_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/items/red_suspicious_dye.json new file mode 100644 index 00000000..bffc04bd --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/red_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/red_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rope.json b/neoforge/src/main/generated/assets/additionaladditions/items/rope.json new file mode 100644 index 00000000..23177c18 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rope.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rope" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rope_arrow.json b/neoforge/src/main/generated/assets/additionaladditions/items/rope_arrow.json new file mode 100644 index 00000000..e4ddb75e --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rope_arrow.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rope_arrow" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_block.json b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_block.json new file mode 100644 index 00000000..d1e214db --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_block" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_horse_armor.json b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_horse_armor.json new file mode 100644 index 00000000..da7d0e38 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_horse_armor" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_ingot.json b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_ingot.json new file mode 100644 index 00000000..e3a51e81 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_ingot.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_ingot" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_nautilus_armor.json b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_nautilus_armor.json new file mode 100644 index 00000000..d6f8a81c --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_nautilus_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_nautilus_armor" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json b/neoforge/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json new file mode 100644 index 00000000..f4a24798 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/sawtooth_fern" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/snapdragon.json b/neoforge/src/main/generated/assets/additionaladditions/items/snapdragon.json new file mode 100644 index 00000000..dd7f1087 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/snapdragon.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/snapdragon" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/spikeblossom.json b/neoforge/src/main/generated/assets/additionaladditions/items/spikeblossom.json new file mode 100644 index 00000000..5d6b4280 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/spikeblossom.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/spikeblossom" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/trident_shard.json b/neoforge/src/main/generated/assets/additionaladditions/items/trident_shard.json new file mode 100644 index 00000000..6a4c8206 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/trident_shard.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/trident_shard" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/white_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/items/white_suspicious_dye.json new file mode 100644 index 00000000..2945efd0 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/white_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/white_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/yellow_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/items/yellow_suspicious_dye.json new file mode 100644 index 00000000..14d9f9f2 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/yellow_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/yellow_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/amber_blossom_bottom.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/amber_blossom_bottom.json new file mode 100644 index 00000000..3af5ca8f --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/amber_blossom_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "additionaladditions:block/amber_blossom_bottom" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/amber_blossom_top.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/amber_blossom_top.json new file mode 100644 index 00000000..d5229d46 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/amber_blossom_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "additionaladditions:block/amber_blossom_top" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/bulbus.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/bulbus.json new file mode 100644 index 00000000..38bb4694 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/bulbus.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "additionaladditions:block/bulbus" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/cottonshiver_bottom.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/cottonshiver_bottom.json new file mode 100644 index 00000000..bd0191c8 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/cottonshiver_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "additionaladditions:block/cottonshiver_bottom" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/cottonshiver_top.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/cottonshiver_top.json new file mode 100644 index 00000000..c1c2c8c1 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/cottonshiver_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "additionaladditions:block/cottonshiver_top" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/crimson_blossom.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/crimson_blossom.json new file mode 100644 index 00000000..3e752c4b --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/crimson_blossom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "additionaladditions:block/crimson_blossom" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/frostleaf.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/frostleaf.json new file mode 100644 index 00000000..f2696a49 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/frostleaf.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "additionaladditions:block/frostleaf" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/mudflower_bottom.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/mudflower_bottom.json new file mode 100644 index 00000000..23487011 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/mudflower_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "additionaladditions:block/mudflower_bottom" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/mudflower_top.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/mudflower_top.json new file mode 100644 index 00000000..75b76d9e --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/mudflower_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "additionaladditions:block/mudflower_top" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/rose_gold_block.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/rose_gold_block.json new file mode 100644 index 00000000..f0097765 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/rose_gold_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "additionaladditions:block/rose_gold_block" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/sawtooth_fern_bottom.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/sawtooth_fern_bottom.json new file mode 100644 index 00000000..c0f599e0 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/sawtooth_fern_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "additionaladditions:block/sawtooth_fern_bottom" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/sawtooth_fern_top.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/sawtooth_fern_top.json new file mode 100644 index 00000000..fe146811 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/sawtooth_fern_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "additionaladditions:block/sawtooth_fern_top" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/snapdragon_bottom.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/snapdragon_bottom.json new file mode 100644 index 00000000..11995fd0 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/snapdragon_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "additionaladditions:block/snapdragon_bottom" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/snapdragon_top.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/snapdragon_top.json new file mode 100644 index 00000000..b7082cc6 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/snapdragon_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "additionaladditions:block/snapdragon_top" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/spikeblossom_bottom.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/spikeblossom_bottom.json new file mode 100644 index 00000000..97bab3b9 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/spikeblossom_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "additionaladditions:block/spikeblossom_bottom" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/spikeblossom_top.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/spikeblossom_top.json new file mode 100644 index 00000000..9fb34712 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/spikeblossom_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cross", + "textures": { + "cross": "additionaladditions:block/spikeblossom_top" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/berry_pie.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/berry_pie.json new file mode 100644 index 00000000..d121df78 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/berry_pie.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/berry_pie" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/blue_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/blue_suspicious_dye.json new file mode 100644 index 00000000..3ae04d84 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/blue_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/blue_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/brown_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/brown_suspicious_dye.json new file mode 100644 index 00000000..bf1aa5d0 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/brown_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/brown_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/chicken_nugget.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/chicken_nugget.json new file mode 100644 index 00000000..6d48a090 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/chicken_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/chicken_nugget" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/copper_patina.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/copper_patina.json new file mode 100644 index 00000000..c09e277a --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/copper_patina.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/copper_patina" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/cyan_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/cyan_suspicious_dye.json new file mode 100644 index 00000000..b4a1a93a --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/cyan_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/cyan_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/fried_egg.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/fried_egg.json new file mode 100644 index 00000000..2a2a168b --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/fried_egg.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/fried_egg" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/glow_stick.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/glow_stick.json new file mode 100644 index 00000000..a478cc68 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/glow_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/glow_stick" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/green_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/green_suspicious_dye.json new file mode 100644 index 00000000..1fa44dda --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/green_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/green_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/honeyed_apple.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/honeyed_apple.json new file mode 100644 index 00000000..568a4d7e --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/honeyed_apple.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/honeyed_apple" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/light_blue_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/light_blue_suspicious_dye.json new file mode 100644 index 00000000..3d1fc933 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/light_blue_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/light_blue_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/lime_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/lime_suspicious_dye.json new file mode 100644 index 00000000..05378013 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/lime_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/lime_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/magenta_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/magenta_suspicious_dye.json new file mode 100644 index 00000000..d4de848f --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/magenta_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/magenta_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/music_disc_0308.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/music_disc_0308.json new file mode 100644 index 00000000..0fd54b66 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/music_disc_0308.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/music_disc_0308" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/music_disc_1007.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/music_disc_1007.json new file mode 100644 index 00000000..b82c0f16 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/music_disc_1007.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/music_disc_1007" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/music_disc_1507.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/music_disc_1507.json new file mode 100644 index 00000000..b054c4d1 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/music_disc_1507.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/music_disc_1507" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/orange_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/orange_suspicious_dye.json new file mode 100644 index 00000000..0b37044e --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/orange_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/orange_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/pink_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/pink_suspicious_dye.json new file mode 100644 index 00000000..1b4a8f45 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/pink_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/pink_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/purple_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/purple_suspicious_dye.json new file mode 100644 index 00000000..f93383e0 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/purple_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/purple_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/red_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/red_suspicious_dye.json new file mode 100644 index 00000000..90328355 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/red_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/red_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rope.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rope.json new file mode 100644 index 00000000..4feb03c2 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rope.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rope" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rope_arrow.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rope_arrow.json new file mode 100644 index 00000000..01ac915a --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rope_arrow.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rope_arrow" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_horse_armor.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_horse_armor.json new file mode 100644 index 00000000..1a1c6ff1 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_horse_armor.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_horse_armor" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_ingot.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_ingot.json new file mode 100644 index 00000000..56de95f4 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_ingot" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_nautilus_armor.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_nautilus_armor.json new file mode 100644 index 00000000..d5360461 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_nautilus_armor.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_nautilus_armor" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/trident_shard.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/trident_shard.json new file mode 100644 index 00000000..33df5868 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/trident_shard.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/trident_shard" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/white_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/white_suspicious_dye.json new file mode 100644 index 00000000..91034624 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/white_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/white_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/yellow_suspicious_dye.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/yellow_suspicious_dye.json new file mode 100644 index 00000000..d959afeb --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/yellow_suspicious_dye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/yellow_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/building_blocks/copper_patina/patina_block.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/building_blocks/copper_patina/patina_block.json new file mode 100644 index 00000000..f2df1f8c --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/building_blocks/copper_patina/patina_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_copper_patina": { + "conditions": { + "items": [ + { + "items": "additionaladditions:copper_patina" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:copper_patina/patina_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_copper_patina" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:copper_patina/patina_block" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/berry_pie/berry_pie.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/berry_pie/berry_pie.json new file mode 100644 index 00000000..d564b6cf --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/berry_pie/berry_pie.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_sweet_berries": { + "conditions": { + "items": [ + { + "items": "minecraft:sweet_berries" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:berry_pie/berry_pie" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_sweet_berries" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:berry_pie/berry_pie" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/honeyed_apple/honeyed_apple.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/honeyed_apple/honeyed_apple.json new file mode 100644 index 00000000..d26ec9a3 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/honeyed_apple/honeyed_apple.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_honey_bottle": { + "conditions": { + "items": [ + { + "items": "minecraft:honey_bottle" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:honeyed_apple/honeyed_apple" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_honey_bottle" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:honeyed_apple/honeyed_apple" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/glow_stick/glow_stick.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/glow_stick/glow_stick.json new file mode 100644 index 00000000..41b2db8d --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/glow_stick/glow_stick.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_glow_ink_sac": { + "conditions": { + "items": [ + { + "items": "minecraft:glow_ink_sac" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:glow_stick/glow_stick" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_glow_ink_sac" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:glow_stick/glow_stick" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/rope/rope.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/rope/rope.json new file mode 100644 index 00000000..4e0a0f57 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/rope/rope.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_string": { + "conditions": { + "items": [ + { + "items": "minecraft:string" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rope/rope" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_string" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rope/rope" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/rope/rope_arrow.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/rope/rope_arrow.json new file mode 100644 index 00000000..86b2b381 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/rope/rope_arrow.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rope": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rope" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rope/rope_arrow" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rope" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rope/rope_arrow" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/redstone/tinted_redstone_lamp/tinted_redstone_lamp.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/redstone/tinted_redstone_lamp/tinted_redstone_lamp.json new file mode 100644 index 00000000..333ed56b --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/redstone/tinted_redstone_lamp/tinted_redstone_lamp.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_amethyst_shard": { + "conditions": { + "items": [ + { + "items": "minecraft:amethyst_shard" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:tinted_redstone_lamp/tinted_redstone_lamp" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_amethyst_shard" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:tinted_redstone_lamp/tinted_redstone_lamp" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/barometer/barometer.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/barometer/barometer.json new file mode 100644 index 00000000..4fab3b5e --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/barometer/barometer.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_redstone": { + "conditions": { + "items": [ + { + "items": "minecraft:redstone" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:barometer/barometer" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_redstone" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:barometer/barometer" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/pocket_jukebox/pocket_jukebox.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/pocket_jukebox/pocket_jukebox.json new file mode 100644 index 00000000..cb56aaa1 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/pocket_jukebox/pocket_jukebox.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_jukebox": { + "conditions": { + "items": [ + { + "items": "minecraft:jukebox" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:pocket_jukebox/pocket_jukebox" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_jukebox" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:pocket_jukebox/pocket_jukebox" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/watering_can/watering_can.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/watering_can/watering_can.json new file mode 100644 index 00000000..7dbcba33 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/watering_can/watering_can.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_copper_ingot": { + "conditions": { + "items": [ + { + "items": "minecraft:copper_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:watering_can/watering_can" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_copper_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:watering_can/watering_can" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/watering_can.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/wrench/wrench.json similarity index 53% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/watering_can.json rename to neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/wrench/wrench.json index d4f6fc35..f4baeb46 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/watering_can.json +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/wrench/wrench.json @@ -1,32 +1,32 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_copper": { - "trigger": "minecraft:inventory_changed", + "has_copper_ingot": { "conditions": { "items": [ { "items": "minecraft:copper_ingot" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "additionaladditions:watering_can" - } + "recipe": "additionaladditions:wrench/wrench" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_copper", - "has_the_recipe" + "has_the_recipe", + "has_copper_ingot" ] ], "rewards": { "recipes": [ - "additionaladditions:watering_can" + "additionaladditions:wrench/wrench" ] } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/watering_can.json b/neoforge/src/main/generated/data/additionaladditions/recipe/barometer/barometer.json similarity index 50% rename from common/src/main/resources/data/additionaladditions/recipe/watering_can.json rename to neoforge/src/main/generated/data/additionaladditions/recipe/barometer/barometer.json index d6a53298..5d98d584 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/watering_can.json +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/barometer/barometer.json @@ -1,16 +1,16 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "C ", - "CBC", - " C " - ], + "category": "equipment", "key": { "C": "minecraft:copper_ingot", - "B": "minecraft:bucket" + "R": "minecraft:redstone" }, + "pattern": [ + " C ", + "CRC", + "CCC" + ], "result": { - "id": "additionaladditions:watering_can", - "count": 1 + "id": "additionaladditions:barometer" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/berry_pie/berry_pie.json b/neoforge/src/main/generated/data/additionaladditions/recipe/berry_pie/berry_pie.json new file mode 100644 index 00000000..db84b846 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/berry_pie/berry_pie.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "minecraft:wheat", + "minecraft:sweet_berries", + "minecraft:sugar", + "minecraft:egg" + ], + "result": { + "id": "additionaladditions:berry_pie" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/copper_patina/patina_block.json b/neoforge/src/main/generated/data/additionaladditions/recipe/copper_patina/patina_block.json new file mode 100644 index 00000000..de1aa4bc --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/copper_patina/patina_block.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "P": "additionaladditions:copper_patina" + }, + "pattern": [ + "PP", + "PP" + ], + "result": { + "id": "additionaladditions:patina_block" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/glow_stick/glow_stick.json b/neoforge/src/main/generated/data/additionaladditions/recipe/glow_stick/glow_stick.json new file mode 100644 index 00000000..c1d33b71 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/glow_stick/glow_stick.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "minecraft:stick", + "minecraft:glow_ink_sac" + ], + "result": { + "count": 3, + "id": "additionaladditions:glow_stick" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/honeyed_apple/honeyed_apple.json b/neoforge/src/main/generated/data/additionaladditions/recipe/honeyed_apple/honeyed_apple.json new file mode 100644 index 00000000..826cac85 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/honeyed_apple/honeyed_apple.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "minecraft:honey_bottle", + "minecraft:apple" + ], + "result": { + "id": "additionaladditions:honeyed_apple" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/pocket_jukebox/pocket_jukebox.json b/neoforge/src/main/generated/data/additionaladditions/recipe/pocket_jukebox/pocket_jukebox.json new file mode 100644 index 00000000..bc03c2c9 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/pocket_jukebox/pocket_jukebox.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "C": "minecraft:copper_ingot", + "J": "minecraft:jukebox", + "R": "minecraft:redstone" + }, + "pattern": [ + "CRC", + "CJC", + "CCC" + ], + "result": { + "id": "additionaladditions:pocket_jukebox" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rope/rope.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rope/rope.json new file mode 100644 index 00000000..f6fa0d17 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rope/rope.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "S": "minecraft:string" + }, + "pattern": [ + "S", + "S" + ], + "result": { + "id": "additionaladditions:rope" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rope/rope_arrow.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rope/rope_arrow.json new file mode 100644 index 00000000..c895a8fb --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rope/rope_arrow.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + "minecraft:arrow", + "additionaladditions:rope", + "additionaladditions:rope", + "additionaladditions:rope", + "additionaladditions:rope", + "additionaladditions:rope", + "additionaladditions:rope", + "additionaladditions:rope", + "additionaladditions:rope" + ], + "result": { + "id": "additionaladditions:rope_arrow" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/tinted_redstone_lamp/tinted_redstone_lamp.json b/neoforge/src/main/generated/data/additionaladditions/recipe/tinted_redstone_lamp/tinted_redstone_lamp.json new file mode 100644 index 00000000..5ba84f2d --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/tinted_redstone_lamp/tinted_redstone_lamp.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "redstone", + "key": { + "A": "minecraft:amethyst_shard", + "L": "minecraft:redstone_lamp" + }, + "pattern": [ + " A ", + "ALA", + " A " + ], + "result": { + "id": "additionaladditions:tinted_redstone_lamp" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/watering_can/watering_can.json b/neoforge/src/main/generated/data/additionaladditions/recipe/watering_can/watering_can.json new file mode 100644 index 00000000..105217a1 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/watering_can/watering_can.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "B": "minecraft:bucket", + "C": "minecraft:copper_ingot" + }, + "pattern": [ + "C ", + "CBC", + " C " + ], + "result": { + "id": "additionaladditions:watering_can" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/wrench/wrench.json b/neoforge/src/main/generated/data/additionaladditions/recipe/wrench/wrench.json new file mode 100644 index 00000000..8767d38f --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/wrench/wrench.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "C": "minecraft:copper_ingot" + }, + "pattern": [ + "C C", + " C ", + " C " + ], + "result": { + "id": "additionaladditions:wrench" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/tags/item/albums.json b/neoforge/src/main/generated/data/additionaladditions/tags/item/albums.json new file mode 100644 index 00000000..a0608d00 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/tags/item/albums.json @@ -0,0 +1,21 @@ +{ + "values": [ + "additionaladditions:album", + "additionaladditions:white_album", + "additionaladditions:light_gray_album", + "additionaladditions:gray_album", + "additionaladditions:black_album", + "additionaladditions:brown_album", + "additionaladditions:red_album", + "additionaladditions:orange_album", + "additionaladditions:yellow_album", + "additionaladditions:lime_album", + "additionaladditions:green_album", + "additionaladditions:cyan_album", + "additionaladditions:light_blue_album", + "additionaladditions:blue_album", + "additionaladditions:purple_album", + "additionaladditions:magenta_album", + "additionaladditions:pink_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/tags/item/repairs_rose_gold_armor.json b/neoforge/src/main/generated/data/additionaladditions/tags/item/repairs_rose_gold_armor.json new file mode 100644 index 00000000..ccb5676c --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/tags/item/repairs_rose_gold_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_ingot" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/tags/item/suspicious_dyes.json b/neoforge/src/main/generated/data/additionaladditions/tags/item/suspicious_dyes.json new file mode 100644 index 00000000..eaaa3e69 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/tags/item/suspicious_dyes.json @@ -0,0 +1,17 @@ +{ + "values": [ + "additionaladditions:white_suspicious_dye", + "additionaladditions:brown_suspicious_dye", + "additionaladditions:red_suspicious_dye", + "additionaladditions:orange_suspicious_dye", + "additionaladditions:yellow_suspicious_dye", + "additionaladditions:lime_suspicious_dye", + "additionaladditions:green_suspicious_dye", + "additionaladditions:cyan_suspicious_dye", + "additionaladditions:light_blue_suspicious_dye", + "additionaladditions:blue_suspicious_dye", + "additionaladditions:purple_suspicious_dye", + "additionaladditions:magenta_suspicious_dye", + "additionaladditions:pink_suspicious_dye" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/block/flowers.json b/neoforge/src/main/generated/data/c/tags/block/flowers.json new file mode 100644 index 00000000..288c4a95 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/block/flowers.json @@ -0,0 +1,6 @@ +{ + "values": [ + "additionaladditions:wisteria", + "additionaladditions:lotus_lily" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/block/flowers/small.json b/neoforge/src/main/generated/data/c/tags/block/flowers/small.json new file mode 100644 index 00000000..6e616e7e --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/block/flowers/small.json @@ -0,0 +1,7 @@ +{ + "values": [ + "additionaladditions:crimson_blossom", + "additionaladditions:bulbus", + "additionaladditions:frostleaf" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/block/flowers/tall.json b/neoforge/src/main/generated/data/c/tags/block/flowers/tall.json new file mode 100644 index 00000000..aa643b88 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/block/flowers/tall.json @@ -0,0 +1,10 @@ +{ + "values": [ + "additionaladditions:cottonshiver", + "additionaladditions:mudflower", + "additionaladditions:amber_blossom", + "additionaladditions:sawtooth_fern", + "additionaladditions:spikeblossom", + "additionaladditions:snapdragon" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/block/ropes.json b/neoforge/src/main/generated/data/c/tags/block/ropes.json new file mode 100644 index 00000000..ceb96688 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/block/ropes.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rope" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/dyed/black.json b/neoforge/src/main/generated/data/c/tags/item/dyed/black.json new file mode 100644 index 00000000..328bb1aa --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/dyed/black.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:black_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/dyed/blue.json b/neoforge/src/main/generated/data/c/tags/item/dyed/blue.json new file mode 100644 index 00000000..a2557c02 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/dyed/blue.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:blue_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/dyed/brown.json b/neoforge/src/main/generated/data/c/tags/item/dyed/brown.json new file mode 100644 index 00000000..3e2d7098 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/dyed/brown.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:brown_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/dyed/cyan.json b/neoforge/src/main/generated/data/c/tags/item/dyed/cyan.json new file mode 100644 index 00000000..c629ccad --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/dyed/cyan.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:cyan_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/dyed/gray.json b/neoforge/src/main/generated/data/c/tags/item/dyed/gray.json new file mode 100644 index 00000000..d0511098 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/dyed/gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:gray_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/dyed/green.json b/neoforge/src/main/generated/data/c/tags/item/dyed/green.json new file mode 100644 index 00000000..3dd70c46 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/dyed/green.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:green_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/dyed/light_blue.json b/neoforge/src/main/generated/data/c/tags/item/dyed/light_blue.json new file mode 100644 index 00000000..2bca1346 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/dyed/light_blue.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:light_blue_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/dyed/light_gray.json b/neoforge/src/main/generated/data/c/tags/item/dyed/light_gray.json new file mode 100644 index 00000000..e260599f --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/dyed/light_gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:light_gray_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/dyed/lime.json b/neoforge/src/main/generated/data/c/tags/item/dyed/lime.json new file mode 100644 index 00000000..9a8a3e11 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/dyed/lime.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:lime_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/dyed/magenta.json b/neoforge/src/main/generated/data/c/tags/item/dyed/magenta.json new file mode 100644 index 00000000..4e726c4d --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/dyed/magenta.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:magenta_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/dyed/orange.json b/neoforge/src/main/generated/data/c/tags/item/dyed/orange.json new file mode 100644 index 00000000..8fa2ef38 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/dyed/orange.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:orange_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/dyed/pink.json b/neoforge/src/main/generated/data/c/tags/item/dyed/pink.json new file mode 100644 index 00000000..244e23ae --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/dyed/pink.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:pink_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/dyed/purple.json b/neoforge/src/main/generated/data/c/tags/item/dyed/purple.json new file mode 100644 index 00000000..1af65bab --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/dyed/purple.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:purple_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/dyed/red.json b/neoforge/src/main/generated/data/c/tags/item/dyed/red.json new file mode 100644 index 00000000..41268012 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/dyed/red.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:red_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/dyed/white.json b/neoforge/src/main/generated/data/c/tags/item/dyed/white.json new file mode 100644 index 00000000..bad90315 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/dyed/white.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:white_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/dyed/yellow.json b/neoforge/src/main/generated/data/c/tags/item/dyed/yellow.json new file mode 100644 index 00000000..2fa376c2 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/dyed/yellow.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:yellow_album" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/flowers.json b/neoforge/src/main/generated/data/c/tags/item/flowers.json new file mode 100644 index 00000000..288c4a95 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/flowers.json @@ -0,0 +1,6 @@ +{ + "values": [ + "additionaladditions:wisteria", + "additionaladditions:lotus_lily" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/flowers/small.json b/neoforge/src/main/generated/data/c/tags/item/flowers/small.json new file mode 100644 index 00000000..6e616e7e --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/flowers/small.json @@ -0,0 +1,7 @@ +{ + "values": [ + "additionaladditions:crimson_blossom", + "additionaladditions:bulbus", + "additionaladditions:frostleaf" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/flowers/tall.json b/neoforge/src/main/generated/data/c/tags/item/flowers/tall.json new file mode 100644 index 00000000..aa643b88 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/flowers/tall.json @@ -0,0 +1,10 @@ +{ + "values": [ + "additionaladditions:cottonshiver", + "additionaladditions:mudflower", + "additionaladditions:amber_blossom", + "additionaladditions:sawtooth_fern", + "additionaladditions:spikeblossom", + "additionaladditions:snapdragon" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/foods.json b/neoforge/src/main/generated/data/c/tags/item/foods.json new file mode 100644 index 00000000..9451b09f --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/foods.json @@ -0,0 +1,6 @@ +{ + "values": [ + "additionaladditions:honeyed_apple", + "additionaladditions:chicken_nugget" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/foods/pie.json b/neoforge/src/main/generated/data/c/tags/item/foods/pie.json new file mode 100644 index 00000000..01c73f6e --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/foods/pie.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:berry_pie" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/ingots/rose_gold.json b/neoforge/src/main/generated/data/c/tags/item/ingots/rose_gold.json new file mode 100644 index 00000000..ccb5676c --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/ingots/rose_gold.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_ingot" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/music_discs.json b/neoforge/src/main/generated/data/c/tags/item/music_discs.json new file mode 100644 index 00000000..714cabaa --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/music_discs.json @@ -0,0 +1,7 @@ +{ + "values": [ + "additionaladditions:music_disc_0308", + "additionaladditions:music_disc_1007", + "additionaladditions:music_disc_1507" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/ropes.json b/neoforge/src/main/generated/data/c/tags/item/ropes.json new file mode 100644 index 00000000..ceb96688 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/ropes.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rope" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/seeds.json b/neoforge/src/main/generated/data/c/tags/item/seeds.json new file mode 100644 index 00000000..c513f49a --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/seeds.json @@ -0,0 +1,13 @@ +{ + "values": [ + "additionaladditions:cottonshiver_pod", + "additionaladditions:mudflower_seeds", + "additionaladditions:crimson_blossom_seeds", + "additionaladditions:amber_blossom_seeds", + "additionaladditions:bulbus_pod", + "additionaladditions:sawtooth_fern_fiddlehead", + "additionaladditions:frostleaf_pod", + "additionaladditions:spikeblossom_seeds", + "additionaladditions:snapdragon_pod" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/storage_blocks/rose_gold.json b/neoforge/src/main/generated/data/c/tags/item/storage_blocks/rose_gold.json new file mode 100644 index 00000000..02d18e70 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/storage_blocks/rose_gold.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_block" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/c/tags/item/tools/wrench.json b/neoforge/src/main/generated/data/c/tags/item/tools/wrench.json new file mode 100644 index 00000000..edec6c16 --- /dev/null +++ b/neoforge/src/main/generated/data/c/tags/item/tools/wrench.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:wrench" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/block/beacon_base_blocks.json b/neoforge/src/main/generated/data/minecraft/tags/block/beacon_base_blocks.json new file mode 100644 index 00000000..02d18e70 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/block/beacon_base_blocks.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_block" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/block/bee_attractive.json b/neoforge/src/main/generated/data/minecraft/tags/block/bee_attractive.json new file mode 100644 index 00000000..525ecd53 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/block/bee_attractive.json @@ -0,0 +1,15 @@ +{ + "values": [ + "additionaladditions:cottonshiver", + "additionaladditions:mudflower", + "additionaladditions:crimson_blossom", + "additionaladditions:amber_blossom", + "additionaladditions:bulbus", + "additionaladditions:sawtooth_fern", + "additionaladditions:frostleaf", + "additionaladditions:wisteria", + "additionaladditions:spikeblossom", + "additionaladditions:snapdragon", + "additionaladditions:lotus_lily" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/block/climbable.json b/neoforge/src/main/generated/data/minecraft/tags/block/climbable.json new file mode 100644 index 00000000..ceb96688 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/block/climbable.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rope" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/block/crops.json b/neoforge/src/main/generated/data/minecraft/tags/block/crops.json new file mode 100644 index 00000000..04cba471 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/block/crops.json @@ -0,0 +1,15 @@ +{ + "values": [ + "additionaladditions:cottonshiver_crop", + "additionaladditions:mudflower_crop", + "additionaladditions:crimson_blossom_crop", + "additionaladditions:amber_blossom_crop", + "additionaladditions:bulbus_crop", + "additionaladditions:sawtooth_fern_crop", + "additionaladditions:frostleaf_crop", + "additionaladditions:wisteria_crop", + "additionaladditions:spikeblossom_crop", + "additionaladditions:snapdragon_crop", + "additionaladditions:lotus_lily_crop" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/block/incorrect_for_gold_tool.json b/neoforge/src/main/generated/data/minecraft/tags/block/incorrect_for_gold_tool.json new file mode 100644 index 00000000..02d18e70 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/block/incorrect_for_gold_tool.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_block" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/block/incorrect_for_stone_tool.json b/neoforge/src/main/generated/data/minecraft/tags/block/incorrect_for_stone_tool.json new file mode 100644 index 00000000..02d18e70 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/block/incorrect_for_stone_tool.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_block" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/block/incorrect_for_wooden_tool.json b/neoforge/src/main/generated/data/minecraft/tags/block/incorrect_for_wooden_tool.json new file mode 100644 index 00000000..02d18e70 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/block/incorrect_for_wooden_tool.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_block" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/block/maintains_farmland.json b/neoforge/src/main/generated/data/minecraft/tags/block/maintains_farmland.json new file mode 100644 index 00000000..86cb0765 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/block/maintains_farmland.json @@ -0,0 +1,26 @@ +{ + "values": [ + "additionaladditions:cottonshiver", + "additionaladditions:cottonshiver_crop", + "additionaladditions:mudflower", + "additionaladditions:mudflower_crop", + "additionaladditions:crimson_blossom", + "additionaladditions:crimson_blossom_crop", + "additionaladditions:amber_blossom", + "additionaladditions:amber_blossom_crop", + "additionaladditions:bulbus", + "additionaladditions:bulbus_crop", + "additionaladditions:sawtooth_fern", + "additionaladditions:sawtooth_fern_crop", + "additionaladditions:frostleaf", + "additionaladditions:frostleaf_crop", + "additionaladditions:wisteria", + "additionaladditions:wisteria_crop", + "additionaladditions:spikeblossom", + "additionaladditions:spikeblossom_crop", + "additionaladditions:snapdragon", + "additionaladditions:snapdragon_crop", + "additionaladditions:lotus_lily", + "additionaladditions:lotus_lily_crop" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json b/neoforge/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json new file mode 100644 index 00000000..02d18e70 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_block" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/block/mineable/shovel.json b/neoforge/src/main/generated/data/minecraft/tags/block/mineable/shovel.json new file mode 100644 index 00000000..bdaeeb47 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/block/mineable/shovel.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:patina_block" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json b/neoforge/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json new file mode 100644 index 00000000..02d18e70 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/block/needs_iron_tool.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_block" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/item/arrows.json b/neoforge/src/main/generated/data/minecraft/tags/item/arrows.json new file mode 100644 index 00000000..028ee04b --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/item/arrows.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rope_arrow" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/item/axes.json b/neoforge/src/main/generated/data/minecraft/tags/item/axes.json new file mode 100644 index 00000000..d04830c6 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/item/axes.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_axe" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/item/bee_food.json b/neoforge/src/main/generated/data/minecraft/tags/item/bee_food.json new file mode 100644 index 00000000..525ecd53 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/item/bee_food.json @@ -0,0 +1,15 @@ +{ + "values": [ + "additionaladditions:cottonshiver", + "additionaladditions:mudflower", + "additionaladditions:crimson_blossom", + "additionaladditions:amber_blossom", + "additionaladditions:bulbus", + "additionaladditions:sawtooth_fern", + "additionaladditions:frostleaf", + "additionaladditions:wisteria", + "additionaladditions:spikeblossom", + "additionaladditions:snapdragon", + "additionaladditions:lotus_lily" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/item/chest_armor.json b/neoforge/src/main/generated/data/minecraft/tags/item/chest_armor.json new file mode 100644 index 00000000..333dfb19 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/item/chest_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_chestplate" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/item/foot_armor.json b/neoforge/src/main/generated/data/minecraft/tags/item/foot_armor.json new file mode 100644 index 00000000..a0e6f097 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/item/foot_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_boots" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/item/head_armor.json b/neoforge/src/main/generated/data/minecraft/tags/item/head_armor.json new file mode 100644 index 00000000..7d0ec2ef --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/item/head_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_helmet" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/item/hoes.json b/neoforge/src/main/generated/data/minecraft/tags/item/hoes.json new file mode 100644 index 00000000..6129c4b6 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/item/hoes.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_hoe" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/item/leg_armor.json b/neoforge/src/main/generated/data/minecraft/tags/item/leg_armor.json new file mode 100644 index 00000000..e33c6c6e --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/item/leg_armor.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_leggings" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/item/pickaxes.json b/neoforge/src/main/generated/data/minecraft/tags/item/pickaxes.json new file mode 100644 index 00000000..ceef13f3 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/item/pickaxes.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_pickaxe" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/item/shovels.json b/neoforge/src/main/generated/data/minecraft/tags/item/shovels.json new file mode 100644 index 00000000..11fa3d9f --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/item/shovels.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_shovel" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/item/spears.json b/neoforge/src/main/generated/data/minecraft/tags/item/spears.json new file mode 100644 index 00000000..5ff52430 --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/item/spears.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_spear" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/item/swords.json b/neoforge/src/main/generated/data/minecraft/tags/item/swords.json new file mode 100644 index 00000000..f3e8ddda --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/item/swords.json @@ -0,0 +1,5 @@ +{ + "values": [ + "additionaladditions:rose_gold_sword" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/minecraft/tags/item/trimmable_armor.json b/neoforge/src/main/generated/data/minecraft/tags/item/trimmable_armor.json new file mode 100644 index 00000000..5376510b --- /dev/null +++ b/neoforge/src/main/generated/data/minecraft/tags/item/trimmable_armor.json @@ -0,0 +1,8 @@ +{ + "values": [ + "additionaladditions:rose_gold_helmet", + "additionaladditions:rose_gold_chestplate", + "additionaladditions:rose_gold_leggings", + "additionaladditions:rose_gold_boots" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/java/one/dqu/additionaladditions/util/neoforge/FluidHelperImpl.java b/neoforge/src/main/java/one/dqu/additionaladditions/core/util/neoforge/FluidHelperImpl.java similarity index 91% rename from neoforge/src/main/java/one/dqu/additionaladditions/util/neoforge/FluidHelperImpl.java rename to neoforge/src/main/java/one/dqu/additionaladditions/core/util/neoforge/FluidHelperImpl.java index 4f38899b..8df245dd 100644 --- a/neoforge/src/main/java/one/dqu/additionaladditions/util/neoforge/FluidHelperImpl.java +++ b/neoforge/src/main/java/one/dqu/additionaladditions/core/util/neoforge/FluidHelperImpl.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.util.neoforge; +package one.dqu.additionaladditions.core.util.neoforge; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -10,7 +10,7 @@ import net.neoforged.neoforge.transfer.ResourceHandler; import net.neoforged.neoforge.transfer.fluid.FluidResource; import net.neoforged.neoforge.transfer.transaction.Transaction; -import one.dqu.additionaladditions.util.FluidHelper; +import one.dqu.additionaladditions.core.util.FluidHelper; public class FluidHelperImpl { public static FluidHelper.Transaction modded(Player player, BlockPos pos, Direction side, int amount, Fluid fluid) { @@ -18,7 +18,8 @@ public static FluidHelper.Transaction modded(Player player, BlockPos pos, Direct ResourceHandler handler = level.getCapability(Capabilities.Fluid.BLOCK, pos, side); if (handler == null) { - return new FluidHelper.Transaction(0, (committed) -> {}); + return new FluidHelper.Transaction(0, (committed) -> { + }); } FluidResource resource = FluidResource.of(fluid); diff --git a/neoforge/src/main/java/one/dqu/additionaladditions/util/neoforge/ModCompatibilityImpl.java b/neoforge/src/main/java/one/dqu/additionaladditions/core/util/neoforge/ModCompatibilityImpl.java similarity index 78% rename from neoforge/src/main/java/one/dqu/additionaladditions/util/neoforge/ModCompatibilityImpl.java rename to neoforge/src/main/java/one/dqu/additionaladditions/core/util/neoforge/ModCompatibilityImpl.java index d206d20d..9905bc37 100644 --- a/neoforge/src/main/java/one/dqu/additionaladditions/util/neoforge/ModCompatibilityImpl.java +++ b/neoforge/src/main/java/one/dqu/additionaladditions/core/util/neoforge/ModCompatibilityImpl.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.util.neoforge; +package one.dqu.additionaladditions.core.util.neoforge; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.toasts.SystemToast; @@ -33,14 +33,14 @@ public static void add(Supplier condition, String description, String.. AdditionalAdditions.LOGGER.warn("[{}] ⚠️ IMPORTANT", AdditionalAdditions.NAMESPACE); AdditionalAdditions.LOGGER.warn("[{}] Mod Incompatibility: {}", AdditionalAdditions.NAMESPACE, description); - if (isClientSide()) { - toasts.add( () -> SystemToast.multiline( - Minecraft.getInstance(), - SystemToast.SystemToastId.PACK_LOAD_FAILURE, - Component.literal( "Additional Additions" ), - Component.literal( description ) - ) ); - } + if (isClientSide()) { + toasts.add(() -> SystemToast.multiline( + Minecraft.getInstance(), + SystemToast.SystemToastId.PACK_LOAD_FAILURE, + Component.literal("Additional Additions"), + Component.literal(description) + )); + } } public static boolean isModPresent(String... modids) { @@ -53,9 +53,9 @@ public static boolean isModPresent(String... modids) { } public static void showToasts() { - if (!isClientSide()) { - return; - } + if (!isClientSide()) { + return; + } for (Supplier toastSupplier : toasts) { Minecraft.getInstance().getToastManager().addToast(toastSupplier.get()); } diff --git a/neoforge/src/main/java/one/dqu/additionaladditions/util/neoforge/RegistrarImpl.java b/neoforge/src/main/java/one/dqu/additionaladditions/core/util/neoforge/RegistrarImpl.java similarity index 93% rename from neoforge/src/main/java/one/dqu/additionaladditions/util/neoforge/RegistrarImpl.java rename to neoforge/src/main/java/one/dqu/additionaladditions/core/util/neoforge/RegistrarImpl.java index d6663c41..e3ce4998 100644 --- a/neoforge/src/main/java/one/dqu/additionaladditions/util/neoforge/RegistrarImpl.java +++ b/neoforge/src/main/java/one/dqu/additionaladditions/core/util/neoforge/RegistrarImpl.java @@ -1,11 +1,11 @@ -package one.dqu.additionaladditions.util.neoforge; +package one.dqu.additionaladditions.core.util.neoforge; import net.minecraft.core.Registry; import net.minecraft.resources.Identifier; import net.neoforged.bus.api.IEventBus; import net.neoforged.neoforge.registries.DeferredRegister; import one.dqu.additionaladditions.AdditionalAdditions; -import one.dqu.additionaladditions.util.Registrar; +import one.dqu.additionaladditions.core.util.Registrar; import java.util.ArrayList; import java.util.List; diff --git a/neoforge/src/main/java/one/dqu/additionaladditions/mixin/neoforge/LootTableMixin.java b/neoforge/src/main/java/one/dqu/additionaladditions/mixin/neoforge/LootTableMixin.java index 9e6c0d67..6655f1a6 100644 --- a/neoforge/src/main/java/one/dqu/additionaladditions/mixin/neoforge/LootTableMixin.java +++ b/neoforge/src/main/java/one/dqu/additionaladditions/mixin/neoforge/LootTableMixin.java @@ -2,7 +2,7 @@ import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.LootTable; -import one.dqu.additionaladditions.util.LootTableExtension; +import one.dqu.additionaladditions.core.util.LootTableExtension; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AANeoForgeRecipeProvider.java b/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AANeoForgeRecipeProvider.java new file mode 100644 index 00000000..3debc8d1 --- /dev/null +++ b/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AANeoForgeRecipeProvider.java @@ -0,0 +1,26 @@ +package one.dqu.additionaladditions.neoforge; + +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.data.recipes.RecipeProvider; +import one.dqu.additionaladditions.AdditionalAdditions; +import one.dqu.additionaladditions.core.datagen.AARecipeDatagenProvider; + +import java.util.concurrent.CompletableFuture; + +public class AANeoForgeRecipeProvider extends RecipeProvider.Runner { + public AANeoForgeRecipeProvider(PackOutput output, CompletableFuture registries) { + super(output, registries); + } + + @Override + protected RecipeProvider createRecipeProvider(HolderLookup.Provider registries, RecipeOutput output) { + return new AARecipeDatagenProvider(registries, output); + } + + @Override + public String getName() { + return AdditionalAdditions.NAMESPACE + " Recipes"; + } +} diff --git a/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AdditionalAdditionsDatagenNeoForge.java b/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AdditionalAdditionsDatagenNeoForge.java index bd913b98..5ffda06f 100644 --- a/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AdditionalAdditionsDatagenNeoForge.java +++ b/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AdditionalAdditionsDatagenNeoForge.java @@ -1,15 +1,52 @@ package one.dqu.additionaladditions.neoforge; +import net.minecraft.client.data.models.BlockModelGenerators; +import net.minecraft.client.data.models.ItemModelGenerators; +import net.minecraft.client.data.models.ModelProvider; +import net.minecraft.core.Holder; +import net.minecraft.data.PackOutput; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.data.event.GatherDataEvent; import one.dqu.additionaladditions.AdditionalAdditions; -import one.dqu.additionaladditions.gametest.datagen.AAGameTestDatagen; +import one.dqu.additionaladditions.core.datagen.*; + +import java.util.stream.Stream; @EventBusSubscriber(modid = AdditionalAdditions.NAMESPACE) public class AdditionalAdditionsDatagenNeoForge { + // everything runs on client datagen because either neoforge or architectury are being silly + // combined data run doesn't work and doing a server run clears client run data @SubscribeEvent - public static void onGatherData(GatherDataEvent.Server event) { + public static void onGatherData(GatherDataEvent.Client event) { event.createDatapackRegistryObjects(AAGameTestDatagen.registryBuilder()); + event.createProvider(AAModelProvider::new); + event.createProvider(AAItemTagDatagenProvider::new); + event.createProvider(AABlockTagDatagenProvider::new); + event.createProvider(AANeoForgeRecipeProvider::new); + } + + private static class AAModelProvider extends ModelProvider { + AAModelProvider(PackOutput output) { + super(output, AdditionalAdditions.NAMESPACE); + } + + @Override + protected void registerModels(BlockModelGenerators blocks, ItemModelGenerators items) { + AABlockDatagen.generateBlockStateModels(blocks); + AAItemDatagen.generateItemModels(items); + } + + @Override + protected Stream> getKnownBlocks() { + return AABlockDatagen.knownBlocks(); + } + + @Override + protected Stream> getKnownItems() { + return AAItemDatagen.knownItems(); + } } } diff --git a/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AdditionalAdditionsNeoForge.java b/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AdditionalAdditionsNeoForge.java index 17e60131..e30536ba 100644 --- a/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AdditionalAdditionsNeoForge.java +++ b/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AdditionalAdditionsNeoForge.java @@ -29,17 +29,17 @@ import one.dqu.additionaladditions.config.io.ConfigLoader; import one.dqu.additionaladditions.config.network.ConfigSyncS2CPayload; import one.dqu.additionaladditions.config.network.neoforge.ConfigSyncTask; -import one.dqu.additionaladditions.entity.RopeArrowRenderer; -import one.dqu.additionaladditions.feature.PocketJukeboxPlayer; +import one.dqu.additionaladditions.core.util.CreativeAdder; +import one.dqu.additionaladditions.core.util.LootAdder; +import one.dqu.additionaladditions.core.util.LootTableExtension; +import one.dqu.additionaladditions.core.util.neoforge.ModCompatibilityImpl; +import one.dqu.additionaladditions.core.util.neoforge.RegistrarImpl; import one.dqu.additionaladditions.feature.glint.GlintResourceGenerator; +import one.dqu.additionaladditions.feature.pocket_jukebox.PocketJukeboxPlayer; +import one.dqu.additionaladditions.feature.rope.RopeArrowRenderer; import one.dqu.additionaladditions.recipe.neoforge.JEIBrewingRecipeSync; import one.dqu.additionaladditions.registry.AABlocks; import one.dqu.additionaladditions.registry.AAEntities; -import one.dqu.additionaladditions.util.CreativeAdder; -import one.dqu.additionaladditions.util.LootAdder; -import one.dqu.additionaladditions.util.LootTableExtension; -import one.dqu.additionaladditions.util.neoforge.ModCompatibilityImpl; -import one.dqu.additionaladditions.util.neoforge.RegistrarImpl; @Mod(AdditionalAdditions.NAMESPACE) public final class AdditionalAdditionsNeoForge { diff --git a/neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/JEIBrewingRecipeSync.java b/neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/JEIBrewingRecipeSync.java index 3a263a89..8618c665 100644 --- a/neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/JEIBrewingRecipeSync.java +++ b/neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/JEIBrewingRecipeSync.java @@ -6,10 +6,9 @@ import net.neoforged.neoforge.client.event.RecipesReceivedEvent; import net.neoforged.neoforge.common.NeoForge; import net.neoforged.neoforge.event.OnDatapackSyncEvent; -import one.dqu.additionaladditions.recipe.BrewingRecipe; import one.dqu.additionaladditions.recipe.ClientRecipeCache; import one.dqu.additionaladditions.registry.AAMisc; -import one.dqu.additionaladditions.util.ModCompatibility; +import one.dqu.additionaladditions.core.util.ModCompatibility; import java.util.HashMap; import java.util.List; @@ -17,10 +16,12 @@ /** * Syncs custom recipes from the server to the client so that JEI can display them. + * * @see ClientRecipeCache */ public final class JEIBrewingRecipeSync { - private JEIBrewingRecipeSync() {} + private JEIBrewingRecipeSync() { + } public static void register() { if (!ModCompatibility.isModPresent("jei")) return; From 15a451f467b1984efe3de9a50e1bcbdffad4534f Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Fri, 19 Jun 2026 19:51:43 +0100 Subject: [PATCH 06/27] 26.1: update architectury loom to 1.17 --- build.gradle | 2 +- neoforge/build.gradle | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 138fe0c5..b02a9bfd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'dev.architectury.loom-no-remap' version '1.14-SNAPSHOT' apply false + id 'dev.architectury.loom-no-remap' version '1.17-SNAPSHOT' apply false id 'architectury-plugin' version '3.5-SNAPSHOT' id 'com.gradleup.shadow' version '8.3.6' apply false } diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 4bb2e999..01af4207 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -18,7 +18,7 @@ mergedAccessWidener.text = ([header] + commonBody + platformBody).join("\n") + " loom { neoForge { - + convertAccessWideners(tasks.named('jar', Jar), 'additionaladditions.accesswidener') } accessWidenerPath = mergedAccessWidener @@ -90,13 +90,3 @@ shadowJar { jar { archiveClassifier = "raw" } - -//remapJar { -// inputFile.set shadowJar.archiveFile -// atAccessWideners.add(mergedAccessWidener.name) -//} - -//remapJar { -// inputFile.set shadowJar.archiveFile -// atAccessWideners.add("additionaladditions.accesswidener") -//} From db0d28881388bd69455be063c97f2217a6e7887b Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Fri, 19 Jun 2026 19:52:32 +0100 Subject: [PATCH 07/27] update github workflow to java 25 --- .github/workflows/gradle.yml | 50 ++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 03d78fe3..8aaf6dfc 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -23,28 +23,28 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - - name: Set up JDK 21 - uses: actions/setup-java@v4 - with: - java-version: '21' - distribution: 'temurin' - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - - name: Build with Gradle - run: ./gradlew build - - - name: Publish Fabric artifacts - uses: actions/upload-artifact@v4 - with: - name: Fabric-Package - path: fabric/build/libs/*.jar - - - name: Publish NeoForge artifacts - uses: actions/upload-artifact@v4 - with: - name: NeoForge-Package - path: neoforge/build/libs/*.jar + - uses: actions/checkout@v4 + + - name: Set up JDK 25 + uses: actions/setup-java@v4 + with: + java-version: '25' + distribution: 'temurin' + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build with Gradle + run: ./gradlew build + + - name: Publish Fabric artifacts + uses: actions/upload-artifact@v4 + with: + name: Fabric-Package + path: fabric/build/libs/*.jar + + - name: Publish NeoForge artifacts + uses: actions/upload-artifact@v4 + with: + name: NeoForge-Package + path: neoforge/build/libs/*.jar From f3cac82888eee4b7c871fbc4cb29a341d166af4c Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Fri, 19 Jun 2026 20:03:22 +0100 Subject: [PATCH 08/27] 26.1: refactor: consistency fixes --- .../core/builder/AAItem.java | 10 ------- .../feature/album/AlbumContent.java | 22 +++++++------- .../SuspiciousDyeContent.java} | 6 ++-- .../SuspiciousDyeItem.java | 2 +- .../glint/GlintColor.java | 6 ++-- .../glint/GlintColorHolder.java | 3 +- .../glint/GlintContext.java | 2 +- .../glint/GlintRenderTypes.java | 9 ++---- .../glint/GlintResourceGenerator.java | 4 +-- .../HumanoidArmorLayerMixin.java | 4 +-- .../ItemFeatureRendererMixin.java | 4 +-- .../ItemModelResolverMixin.java | 4 +-- .../ItemStackRenderStateMixin.java | 6 ++-- .../RenderBuffersMixin.java | 4 +-- .../RenderTypesMixin.java | 6 ++-- .../WingsLayerMixin.java | 4 +-- .../additionaladditions/recipe/JEICompat.java | 4 +-- .../recipe/SuspiciousDyeRecipe.java | 4 +-- .../additionaladditions/registry/AAItems.java | 30 +++++++++---------- .../additionaladditions/registry/AAMisc.java | 2 +- .../resources/additionaladditions.mixins.json | 14 ++++----- .../AdditionalAdditionsClientFabric.java | 2 +- .../neoforge/AdditionalAdditionsNeoForge.java | 2 +- 23 files changed, 72 insertions(+), 82 deletions(-) rename common/src/main/java/one/dqu/additionaladditions/feature/{dye/SuspiciousDyes.java => suspicious_dye/SuspiciousDyeContent.java} (87%) rename common/src/main/java/one/dqu/additionaladditions/feature/{dye => suspicious_dye}/SuspiciousDyeItem.java (85%) rename common/src/main/java/one/dqu/additionaladditions/feature/{ => suspicious_dye}/glint/GlintColor.java (92%) rename common/src/main/java/one/dqu/additionaladditions/feature/{ => suspicious_dye}/glint/GlintColorHolder.java (79%) rename common/src/main/java/one/dqu/additionaladditions/feature/{ => suspicious_dye}/glint/GlintContext.java (95%) rename common/src/main/java/one/dqu/additionaladditions/feature/{ => suspicious_dye}/glint/GlintRenderTypes.java (92%) rename common/src/main/java/one/dqu/additionaladditions/feature/{ => suspicious_dye}/glint/GlintResourceGenerator.java (98%) rename common/src/main/java/one/dqu/additionaladditions/mixin/{glint => suspicious_dye}/HumanoidArmorLayerMixin.java (87%) rename common/src/main/java/one/dqu/additionaladditions/mixin/{glint => suspicious_dye}/ItemFeatureRendererMixin.java (91%) rename common/src/main/java/one/dqu/additionaladditions/mixin/{glint => suspicious_dye}/ItemModelResolverMixin.java (91%) rename common/src/main/java/one/dqu/additionaladditions/mixin/{glint => suspicious_dye}/ItemStackRenderStateMixin.java (91%) rename common/src/main/java/one/dqu/additionaladditions/mixin/{glint => suspicious_dye}/RenderBuffersMixin.java (92%) rename common/src/main/java/one/dqu/additionaladditions/mixin/{glint => suspicious_dye}/RenderTypesMixin.java (89%) rename common/src/main/java/one/dqu/additionaladditions/mixin/{glint => suspicious_dye}/WingsLayerMixin.java (86%) diff --git a/common/src/main/java/one/dqu/additionaladditions/core/builder/AAItem.java b/common/src/main/java/one/dqu/additionaladditions/core/builder/AAItem.java index 51fb3f13..0e4e6f16 100644 --- a/common/src/main/java/one/dqu/additionaladditions/core/builder/AAItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/builder/AAItem.java @@ -47,16 +47,6 @@ public AAItem() { this.factory = (Function) (Function) Item::new; } - public AAItem(AAItem template) { - this.config = template.config; - this.factory = template.factory; - this.props = template.props; - this.initializer = template.initializer; - this.tags.addAll(template.tags); - this.model = template.model; - this.recipe = template.recipe; - } - public AAItem config(ConfigProperty config) { this.config = config; return this; diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumContent.java index 3899beb5..8956f114 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumContent.java @@ -5,6 +5,7 @@ import net.minecraft.world.item.Items; import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.core.builder.AAItem; +import one.dqu.additionaladditions.core.builder.AAReg; import one.dqu.additionaladditions.core.builder.CreativePosition; import one.dqu.additionaladditions.registry.AAMisc; import one.dqu.additionaladditions.registry.AATags; @@ -12,20 +13,21 @@ import java.util.function.Supplier; public class AlbumContent { - public static final AAItem TEMPLATE = new AAItem() - .config(Config.ALBUM) - .factory(AlbumItem::new) - .creative(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.BEFORE) - .props(p -> p - .stacksTo(1) - .component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)) - .tags(AATags.ALBUMS); + private static AAItem album() { + return AAReg.item(AlbumItem::new) + .config(Config.ALBUM) + .creative(Items.MUSIC_DISC_13, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.BEFORE) + .props(p -> p + .stacksTo(1) + .component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)) + .tags(AATags.ALBUMS); + } public static Supplier album(String id) { - return new AAItem<>(TEMPLATE).make(id); + return album().make(id); } public static Supplier album(String id, DyeColor color) { - return new AAItem<>(TEMPLATE).tags(AATags.dyed(color)).make(id); + return album().tags(AATags.dyed(color)).make(id); } } diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/dye/SuspiciousDyes.java b/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/SuspiciousDyeContent.java similarity index 87% rename from common/src/main/java/one/dqu/additionaladditions/feature/dye/SuspiciousDyes.java rename to common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/SuspiciousDyeContent.java index 10217c20..1a941a4f 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/dye/SuspiciousDyes.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/SuspiciousDyeContent.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.feature.dye; +package one.dqu.additionaladditions.feature.suspicious_dye; import net.minecraft.core.component.DataComponents; import net.minecraft.world.item.CreativeModeTabs; @@ -8,13 +8,13 @@ import one.dqu.additionaladditions.core.builder.AAReg; import one.dqu.additionaladditions.core.builder.CreativePosition; import one.dqu.additionaladditions.core.datagen.template.Models; -import one.dqu.additionaladditions.feature.glint.GlintColor; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintColor; import one.dqu.additionaladditions.registry.AAMisc; import one.dqu.additionaladditions.registry.AATags; import java.util.function.Supplier; -public class SuspiciousDyes { +public class SuspiciousDyeContent { public static Supplier suspiciousDye(DyeColor color) { return AAReg.item(p -> new SuspiciousDyeItem(color, p)) .config(Config.SUSPICIOUS_DYE) diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/dye/SuspiciousDyeItem.java b/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/SuspiciousDyeItem.java similarity index 85% rename from common/src/main/java/one/dqu/additionaladditions/feature/dye/SuspiciousDyeItem.java rename to common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/SuspiciousDyeItem.java index 58e1ef3b..a5a55e90 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/dye/SuspiciousDyeItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/SuspiciousDyeItem.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.feature.dye; +package one.dqu.additionaladditions.feature.suspicious_dye; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintColor.java b/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/glint/GlintColor.java similarity index 92% rename from common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintColor.java rename to common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/glint/GlintColor.java index d556eaea..135885db 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintColor.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/glint/GlintColor.java @@ -1,8 +1,9 @@ -package one.dqu.additionaladditions.feature.glint; +package one.dqu.additionaladditions.feature.suspicious_dye.glint; import com.mojang.serialization.Codec; import io.netty.buffer.ByteBuf; import net.minecraft.ChatFormatting; +import net.minecraft.core.component.DataComponentGetter; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.contents.TranslatableContents; @@ -11,7 +12,6 @@ import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; import net.minecraft.world.item.TooltipFlag; -import net.minecraft.core.component.DataComponentGetter; import net.minecraft.world.item.component.TooltipProvider; import java.util.function.Consumer; @@ -33,7 +33,7 @@ public void addToTooltip(Item.TooltipContext context, Consumer consum String key = "additionaladditions.gui.glint." + color.getSerializedName(); consumer.accept( MutableComponent.create(new TranslatableContents(key, null, new String[]{})) - .withStyle(ChatFormatting.GRAY) + .withStyle(ChatFormatting.GRAY) ); } } diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintColorHolder.java b/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/glint/GlintColorHolder.java similarity index 79% rename from common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintColorHolder.java rename to common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/glint/GlintColorHolder.java index f8c8d7cd..9e135f1a 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintColorHolder.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/glint/GlintColorHolder.java @@ -1,9 +1,10 @@ -package one.dqu.additionaladditions.feature.glint; +package one.dqu.additionaladditions.feature.suspicious_dye.glint; import net.minecraft.world.item.DyeColor; import org.jetbrains.annotations.Nullable; public interface GlintColorHolder { @Nullable DyeColor additionaladditions$getGlintColor(); + void additionaladditions$setGlintColor(@Nullable DyeColor color); } diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintContext.java b/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/glint/GlintContext.java similarity index 95% rename from common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintContext.java rename to common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/glint/GlintContext.java index 579f527b..d20f08de 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintContext.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/glint/GlintContext.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.feature.glint; +package one.dqu.additionaladditions.feature.suspicious_dye.glint; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintRenderTypes.java b/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/glint/GlintRenderTypes.java similarity index 92% rename from common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintRenderTypes.java rename to common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/glint/GlintRenderTypes.java index 1d3e9b9d..b63143c8 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintRenderTypes.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/glint/GlintRenderTypes.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.feature.glint; +package one.dqu.additionaladditions.feature.suspicious_dye.glint; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.textures.AddressMode; @@ -7,11 +7,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.renderer.RenderPipelines; -import net.minecraft.client.renderer.rendertype.LayeringTransform; -import net.minecraft.client.renderer.rendertype.OutputTarget; -import net.minecraft.client.renderer.rendertype.RenderSetup; -import net.minecraft.client.renderer.rendertype.RenderType; -import net.minecraft.client.renderer.rendertype.TextureTransform; +import net.minecraft.client.renderer.rendertype.*; import net.minecraft.resources.Identifier; import net.minecraft.world.item.DyeColor; import one.dqu.additionaladditions.AdditionalAdditions; @@ -54,6 +50,7 @@ public static Collection getRenderTypes() { types.addAll(GLINT_TRANSLUCENT.values()); return types; } + static { for (DyeColor color : DyeColor.values()) { Identifier itemTexture = Identifier.tryBuild( diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintResourceGenerator.java b/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/glint/GlintResourceGenerator.java similarity index 98% rename from common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintResourceGenerator.java rename to common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/glint/GlintResourceGenerator.java index e6041002..b202bc8d 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/glint/GlintResourceGenerator.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/glint/GlintResourceGenerator.java @@ -1,7 +1,6 @@ -package one.dqu.additionaladditions.feature.glint; +package one.dqu.additionaladditions.feature.suspicious_dye.glint; import com.mojang.blaze3d.platform.NativeImage; -import one.dqu.additionaladditions.AdditionalAdditions; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; @@ -12,6 +11,7 @@ import net.minecraft.server.packs.resources.Resource; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.world.item.DyeColor; +import one.dqu.additionaladditions.AdditionalAdditions; import one.dqu.additionaladditions.config.Config; import java.util.Locale; diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/HumanoidArmorLayerMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/HumanoidArmorLayerMixin.java similarity index 87% rename from common/src/main/java/one/dqu/additionaladditions/mixin/glint/HumanoidArmorLayerMixin.java rename to common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/HumanoidArmorLayerMixin.java index 41225650..4ebcef82 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/HumanoidArmorLayerMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/HumanoidArmorLayerMixin.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.mixin.glint; +package one.dqu.additionaladditions.mixin.suspicious_dye; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.SubmitNodeCollector; @@ -6,7 +6,7 @@ import net.minecraft.client.renderer.entity.state.HumanoidRenderState; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.ItemStack; -import one.dqu.additionaladditions.feature.glint.GlintContext; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintContext; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemFeatureRendererMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/ItemFeatureRendererMixin.java similarity index 91% rename from common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemFeatureRendererMixin.java rename to common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/ItemFeatureRendererMixin.java index cedae046..e34e5405 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemFeatureRendererMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/ItemFeatureRendererMixin.java @@ -1,11 +1,11 @@ -package one.dqu.additionaladditions.mixin.glint; +package one.dqu.additionaladditions.mixin.suspicious_dye; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.OutlineBufferSource; import net.minecraft.client.renderer.SubmitNodeStorage; import net.minecraft.client.renderer.feature.ItemFeatureRenderer; import net.minecraft.world.item.DyeColor; -import one.dqu.additionaladditions.feature.glint.GlintContext; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintContext; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemModelResolverMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/ItemModelResolverMixin.java similarity index 91% rename from common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemModelResolverMixin.java rename to common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/ItemModelResolverMixin.java index 44d81e23..bb5367b8 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemModelResolverMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/ItemModelResolverMixin.java @@ -1,4 +1,4 @@ -package one.dqu.additionaladditions.mixin.glint; +package one.dqu.additionaladditions.mixin.suspicious_dye; import net.minecraft.client.renderer.item.ItemModelResolver; import net.minecraft.client.renderer.item.ItemStackRenderState; @@ -7,7 +7,7 @@ import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import one.dqu.additionaladditions.feature.glint.GlintColorHolder; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintColorHolder; import one.dqu.additionaladditions.registry.AAMisc; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemStackRenderStateMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/ItemStackRenderStateMixin.java similarity index 91% rename from common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemStackRenderStateMixin.java rename to common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/ItemStackRenderStateMixin.java index e5991427..b0bdc5c4 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/ItemStackRenderStateMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/ItemStackRenderStateMixin.java @@ -1,11 +1,11 @@ -package one.dqu.additionaladditions.mixin.glint; +package one.dqu.additionaladditions.mixin.suspicious_dye; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.SubmitNodeCollector; import net.minecraft.client.renderer.item.ItemStackRenderState; import net.minecraft.world.item.DyeColor; -import one.dqu.additionaladditions.feature.glint.GlintColorHolder; -import one.dqu.additionaladditions.feature.glint.GlintContext; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintColorHolder; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintContext; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/RenderBuffersMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/RenderBuffersMixin.java similarity index 92% rename from common/src/main/java/one/dqu/additionaladditions/mixin/glint/RenderBuffersMixin.java rename to common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/RenderBuffersMixin.java index 0f546c8d..18036143 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/RenderBuffersMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/RenderBuffersMixin.java @@ -1,11 +1,11 @@ -package one.dqu.additionaladditions.mixin.glint; +package one.dqu.additionaladditions.mixin.suspicious_dye; import com.mojang.blaze3d.vertex.ByteBufferBuilder; import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap; import net.minecraft.client.renderer.RenderBuffers; import net.minecraft.client.renderer.rendertype.RenderType; import net.minecraft.client.renderer.rendertype.RenderTypes; -import one.dqu.additionaladditions.feature.glint.GlintRenderTypes; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintRenderTypes; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/RenderTypesMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/RenderTypesMixin.java similarity index 89% rename from common/src/main/java/one/dqu/additionaladditions/mixin/glint/RenderTypesMixin.java rename to common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/RenderTypesMixin.java index c8da1fd8..94c88fe1 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/RenderTypesMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/RenderTypesMixin.java @@ -1,9 +1,9 @@ -package one.dqu.additionaladditions.mixin.glint; +package one.dqu.additionaladditions.mixin.suspicious_dye; import net.minecraft.client.renderer.rendertype.RenderType; import net.minecraft.client.renderer.rendertype.RenderTypes; -import one.dqu.additionaladditions.feature.glint.GlintContext; -import one.dqu.additionaladditions.feature.glint.GlintRenderTypes; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintContext; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintRenderTypes; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/WingsLayerMixin.java b/common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/WingsLayerMixin.java similarity index 86% rename from common/src/main/java/one/dqu/additionaladditions/mixin/glint/WingsLayerMixin.java rename to common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/WingsLayerMixin.java index 3a18b835..1c5cc375 100644 --- a/common/src/main/java/one/dqu/additionaladditions/mixin/glint/WingsLayerMixin.java +++ b/common/src/main/java/one/dqu/additionaladditions/mixin/suspicious_dye/WingsLayerMixin.java @@ -1,10 +1,10 @@ -package one.dqu.additionaladditions.mixin.glint; +package one.dqu.additionaladditions.mixin.suspicious_dye; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.SubmitNodeCollector; import net.minecraft.client.renderer.entity.layers.WingsLayer; import net.minecraft.client.renderer.entity.state.HumanoidRenderState; -import one.dqu.additionaladditions.feature.glint.GlintContext; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintContext; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/common/src/main/java/one/dqu/additionaladditions/recipe/JEICompat.java b/common/src/main/java/one/dqu/additionaladditions/recipe/JEICompat.java index 4076e691..bbdb138c 100644 --- a/common/src/main/java/one/dqu/additionaladditions/recipe/JEICompat.java +++ b/common/src/main/java/one/dqu/additionaladditions/recipe/JEICompat.java @@ -27,8 +27,8 @@ import one.dqu.additionaladditions.config.ConfigProperty; import one.dqu.additionaladditions.config.Toggleable; import one.dqu.additionaladditions.core.util.ModCompatibility; -import one.dqu.additionaladditions.feature.dye.SuspiciousDyeItem; -import one.dqu.additionaladditions.feature.glint.GlintColor; +import one.dqu.additionaladditions.feature.suspicious_dye.SuspiciousDyeItem; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintColor; import one.dqu.additionaladditions.registry.AAItems; import one.dqu.additionaladditions.registry.AAMisc; import one.dqu.additionaladditions.registry.AATags; diff --git a/common/src/main/java/one/dqu/additionaladditions/recipe/SuspiciousDyeRecipe.java b/common/src/main/java/one/dqu/additionaladditions/recipe/SuspiciousDyeRecipe.java index f580454b..e3a50ae4 100644 --- a/common/src/main/java/one/dqu/additionaladditions/recipe/SuspiciousDyeRecipe.java +++ b/common/src/main/java/one/dqu/additionaladditions/recipe/SuspiciousDyeRecipe.java @@ -12,8 +12,8 @@ import net.minecraft.world.item.crafting.display.ShapelessCraftingRecipeDisplay; import net.minecraft.world.item.crafting.display.SlotDisplay; import net.minecraft.world.level.Level; -import one.dqu.additionaladditions.feature.dye.SuspiciousDyeItem; -import one.dqu.additionaladditions.feature.glint.GlintColor; +import one.dqu.additionaladditions.feature.suspicious_dye.SuspiciousDyeItem; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintColor; import one.dqu.additionaladditions.registry.AAMisc; import one.dqu.additionaladditions.registry.AATags; diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AAItems.java b/common/src/main/java/one/dqu/additionaladditions/registry/AAItems.java index ce47c877..21a38d4e 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AAItems.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AAItems.java @@ -19,8 +19,6 @@ import one.dqu.additionaladditions.feature.barometer.BarometerContent; import one.dqu.additionaladditions.feature.copper_patina.CopperPatinaContent; import one.dqu.additionaladditions.feature.copper_patina.CopperPatinaItem; -import one.dqu.additionaladditions.feature.dye.SuspiciousDyeItem; -import one.dqu.additionaladditions.feature.dye.SuspiciousDyes; import one.dqu.additionaladditions.feature.food.FoodContent; import one.dqu.additionaladditions.feature.glow_stick.GlowStickContent; import one.dqu.additionaladditions.feature.music_disc.MusicDiscContent; @@ -31,6 +29,8 @@ import one.dqu.additionaladditions.feature.rope.RopeContent; import one.dqu.additionaladditions.feature.rose_gold.RoseGoldContent; import one.dqu.additionaladditions.feature.sniffer_plants.SnifferPlantsContent; +import one.dqu.additionaladditions.feature.suspicious_dye.SuspiciousDyeContent; +import one.dqu.additionaladditions.feature.suspicious_dye.SuspiciousDyeItem; import one.dqu.additionaladditions.feature.trident.TridentShardContent; import one.dqu.additionaladditions.feature.watering_can.WateringCanContent; import one.dqu.additionaladditions.feature.watering_can.WateringCanItem; @@ -152,19 +152,19 @@ public static Identifier configPathFor(Item item) { // SUSPICIOUS DYE - public static final Supplier WHITE_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.WHITE); - public static final Supplier BROWN_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.BROWN); - public static final Supplier RED_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.RED); - public static final Supplier ORANGE_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.ORANGE); - public static final Supplier YELLOW_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.YELLOW); - public static final Supplier LIME_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.LIME); - public static final Supplier GREEN_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.GREEN); - public static final Supplier CYAN_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.CYAN); - public static final Supplier LIGHT_BLUE_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.LIGHT_BLUE); - public static final Supplier BLUE_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.BLUE); - public static final Supplier PURPLE_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.PURPLE); - public static final Supplier MAGENTA_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.MAGENTA); - public static final Supplier PINK_SUSPICIOUS_DYE = SuspiciousDyes.suspiciousDye(DyeColor.PINK); + public static final Supplier WHITE_SUSPICIOUS_DYE = SuspiciousDyeContent.suspiciousDye(DyeColor.WHITE); + public static final Supplier BROWN_SUSPICIOUS_DYE = SuspiciousDyeContent.suspiciousDye(DyeColor.BROWN); + public static final Supplier RED_SUSPICIOUS_DYE = SuspiciousDyeContent.suspiciousDye(DyeColor.RED); + public static final Supplier ORANGE_SUSPICIOUS_DYE = SuspiciousDyeContent.suspiciousDye(DyeColor.ORANGE); + public static final Supplier YELLOW_SUSPICIOUS_DYE = SuspiciousDyeContent.suspiciousDye(DyeColor.YELLOW); + public static final Supplier LIME_SUSPICIOUS_DYE = SuspiciousDyeContent.suspiciousDye(DyeColor.LIME); + public static final Supplier GREEN_SUSPICIOUS_DYE = SuspiciousDyeContent.suspiciousDye(DyeColor.GREEN); + public static final Supplier CYAN_SUSPICIOUS_DYE = SuspiciousDyeContent.suspiciousDye(DyeColor.CYAN); + public static final Supplier LIGHT_BLUE_SUSPICIOUS_DYE = SuspiciousDyeContent.suspiciousDye(DyeColor.LIGHT_BLUE); + public static final Supplier BLUE_SUSPICIOUS_DYE = SuspiciousDyeContent.suspiciousDye(DyeColor.BLUE); + public static final Supplier PURPLE_SUSPICIOUS_DYE = SuspiciousDyeContent.suspiciousDye(DyeColor.PURPLE); + public static final Supplier MAGENTA_SUSPICIOUS_DYE = SuspiciousDyeContent.suspiciousDye(DyeColor.MAGENTA); + public static final Supplier PINK_SUSPICIOUS_DYE = SuspiciousDyeContent.suspiciousDye(DyeColor.PINK); // OTHER diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AAMisc.java b/common/src/main/java/one/dqu/additionaladditions/registry/AAMisc.java index 8eac3d0e..97efc1e4 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AAMisc.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AAMisc.java @@ -11,7 +11,7 @@ import one.dqu.additionaladditions.AdditionalAdditions; import one.dqu.additionaladditions.core.util.SimplePlayerTrigger; import one.dqu.additionaladditions.feature.album.AlbumContents; -import one.dqu.additionaladditions.feature.glint.GlintColor; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintColor; import one.dqu.additionaladditions.recipe.BrewingRecipe; import one.dqu.additionaladditions.recipe.SuspiciousDyeRecipe; diff --git a/common/src/main/resources/additionaladditions.mixins.json b/common/src/main/resources/additionaladditions.mixins.json index 10c4f30e..5383c9aa 100644 --- a/common/src/main/resources/additionaladditions.mixins.json +++ b/common/src/main/resources/additionaladditions.mixins.json @@ -5,13 +5,13 @@ "minVersion": "0.8", "client": [ "GuiMixin", - "glint.HumanoidArmorLayerMixin", - "glint.ItemModelResolverMixin", - "glint.ItemFeatureRendererMixin", - "glint.ItemStackRenderStateMixin", - "glint.RenderBuffersMixin", - "glint.RenderTypesMixin", - "glint.WingsLayerMixin" + "suspicious_dye.HumanoidArmorLayerMixin", + "suspicious_dye.ItemFeatureRendererMixin", + "suspicious_dye.ItemModelResolverMixin", + "suspicious_dye.ItemStackRenderStateMixin", + "suspicious_dye.RenderBuffersMixin", + "suspicious_dye.RenderTypesMixin", + "suspicious_dye.WingsLayerMixin" ], "mixins": [ "BrewingStandBlockEntityMixin", diff --git a/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsClientFabric.java b/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsClientFabric.java index 6d24bf67..2ae60ba2 100644 --- a/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsClientFabric.java +++ b/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsClientFabric.java @@ -28,9 +28,9 @@ import one.dqu.additionaladditions.config.io.ConfigLoader; import one.dqu.additionaladditions.config.network.ConfigSyncS2CPayload; import one.dqu.additionaladditions.core.util.fabric.ModCompatibilityImpl; -import one.dqu.additionaladditions.feature.glint.GlintResourceGenerator; import one.dqu.additionaladditions.feature.pocket_jukebox.PocketJukeboxPlayer; import one.dqu.additionaladditions.feature.rope.RopeArrowRenderer; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintResourceGenerator; import one.dqu.additionaladditions.recipe.ClientRecipeCache; import one.dqu.additionaladditions.registry.AABlocks; import one.dqu.additionaladditions.registry.AAEntities; diff --git a/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AdditionalAdditionsNeoForge.java b/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AdditionalAdditionsNeoForge.java index e30536ba..b97aa580 100644 --- a/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AdditionalAdditionsNeoForge.java +++ b/neoforge/src/main/java/one/dqu/additionaladditions/neoforge/AdditionalAdditionsNeoForge.java @@ -34,9 +34,9 @@ import one.dqu.additionaladditions.core.util.LootTableExtension; import one.dqu.additionaladditions.core.util.neoforge.ModCompatibilityImpl; import one.dqu.additionaladditions.core.util.neoforge.RegistrarImpl; -import one.dqu.additionaladditions.feature.glint.GlintResourceGenerator; import one.dqu.additionaladditions.feature.pocket_jukebox.PocketJukeboxPlayer; import one.dqu.additionaladditions.feature.rope.RopeArrowRenderer; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintResourceGenerator; import one.dqu.additionaladditions.recipe.neoforge.JEIBrewingRecipeSync; import one.dqu.additionaladditions.registry.AABlocks; import one.dqu.additionaladditions.registry.AAEntities; From 24ce7c81d94dc6ffb0b55aafdd1f206a78a1187d Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Fri, 19 Jun 2026 20:29:18 +0100 Subject: [PATCH 09/27] 26.1: fix: bulbus block model --- .../core/datagen/template/Models.java | 5 +++ .../model/TallCrossModelTemplate.java | 38 +++++++++++++++++++ .../sniffer_plants/SnifferPlantsContent.java | 8 +++- .../additionaladditions.accesswidener | 4 ++ .../models/block/bulbus.json | 5 ++- .../models/block/bulbus.json | 5 ++- 6 files changed, 59 insertions(+), 6 deletions(-) create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/datagen/template/model/TallCrossModelTemplate.java diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java index e80213f4..a3f965d3 100644 --- a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java @@ -6,6 +6,7 @@ import net.minecraft.world.level.block.Block; import one.dqu.additionaladditions.core.datagen.AABlockDatagen; import one.dqu.additionaladditions.core.datagen.AAItemDatagen; +import one.dqu.additionaladditions.core.datagen.template.model.TallCrossModelTemplate; /** * Datagen template presets for blocks and items. @@ -29,6 +30,10 @@ public static void doublePlant(Block block) { AABlockDatagen.currentGen().createDoublePlant(block, BlockModelGenerators.PlantType.NOT_TINTED); } + public static void tallCross(Block block) { + TallCrossModelTemplate.createTallCrossBlock(AABlockDatagen.currentGen(), block); + } + // Items public static void flat(Item item) { diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/model/TallCrossModelTemplate.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/model/TallCrossModelTemplate.java new file mode 100644 index 00000000..6742c621 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/model/TallCrossModelTemplate.java @@ -0,0 +1,38 @@ +package one.dqu.additionaladditions.core.datagen.template.model; + +import net.minecraft.client.data.models.BlockModelGenerators; +import net.minecraft.client.data.models.blockstates.MultiVariantGenerator; +import net.minecraft.client.data.models.model.ModelTemplate; +import net.minecraft.client.data.models.model.TextureMapping; +import net.minecraft.client.data.models.model.TextureSlot; +import net.minecraft.client.resources.model.sprite.Material; +import net.minecraft.resources.Identifier; +import net.minecraft.world.level.block.Block; +import one.dqu.additionaladditions.AdditionalAdditions; + +import java.util.Optional; + +public class TallCrossModelTemplate { + private static final TextureSlot BOTTOM = TextureSlot.create("0"); + private static final TextureSlot TOP = TextureSlot.create("1"); + + private static final ModelTemplate TALL_CROSS = new ModelTemplate( + Optional.of(Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, "block/tall_cross")), + Optional.empty(), + BOTTOM, TOP + ); + + public static void createTallCrossBlock(BlockModelGenerators gen, Block block) { + String id = block.builtInRegistryHolder().key().identifier().getPath(); + + TextureMapping textures = new TextureMapping() + .put(BOTTOM, new Material(Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, "block/" + id + "_bottom"))) + .put(TOP, new Material(Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, "block/" + id + "_top"))); + + Identifier model = TALL_CROSS.create(block, textures, gen.modelOutput); + + gen.blockStateOutput.accept( + MultiVariantGenerator.dispatch(block, BlockModelGenerators.plainVariant(model)) + ); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java index 20ceca54..c8ef69f9 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java @@ -44,9 +44,13 @@ private static Supplier doublePlant(String id) { } private static Supplier flower(String id, Holder effect) { + return flower(id, effect, Models::cross); + } + + private static Supplier flower(String id, Holder effect, Consumer model) { return AAReg.block(p -> new FlowerBlock(effect, 5f, p)).props(PLANT_PROPS) .tags(AATags.C_FLOWERS_SMALL_BLOCK, BlockTags.BEE_ATTRACTIVE, BlockTags.MAINTAINS_FARMLAND) - .model(Models::cross) + .model(model) .make(id); } @@ -124,7 +128,7 @@ public static Supplier amberBlossomCrop() { } public static Supplier bulbus() { - return flower("bulbus", MobEffects.NIGHT_VISION); + return flower("bulbus", MobEffects.NIGHT_VISION, Models::tallCross); } public static Supplier bulbusCrop() { diff --git a/common/src/main/resources/additionaladditions.accesswidener b/common/src/main/resources/additionaladditions.accesswidener index fb9e0203..4133af10 100644 --- a/common/src/main/resources/additionaladditions.accesswidener +++ b/common/src/main/resources/additionaladditions.accesswidener @@ -32,6 +32,10 @@ accessible class net/minecraft/client/data/models/BlockModelGenerators$PlantType accessible method net/minecraft/client/data/models/BlockModelGenerators createTrivialCube (Lnet/minecraft/world/level/block/Block;)V accessible method net/minecraft/client/data/models/BlockModelGenerators createCrossBlock (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/client/data/models/BlockModelGenerators$PlantType;)V accessible method net/minecraft/client/data/models/BlockModelGenerators createDoublePlant (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/client/data/models/BlockModelGenerators$PlantType;)V +accessible method net/minecraft/client/data/models/BlockModelGenerators plainVariant (Lnet/minecraft/resources/Identifier;)Lnet/minecraft/client/data/models/MultiVariant; +accessible field net/minecraft/client/data/models/BlockModelGenerators blockStateOutput Ljava/util/function/Consumer; +accessible field net/minecraft/client/data/models/BlockModelGenerators modelOutput Ljava/util/function/BiConsumer; +accessible method net/minecraft/client/data/models/model/TextureSlot create (Ljava/lang/String;)Lnet/minecraft/client/data/models/model/TextureSlot; accessible method net/minecraft/client/data/models/ItemModelGenerators generateFlatItem (Lnet/minecraft/world/item/Item;Lnet/minecraft/client/data/models/model/ModelTemplate;)V accessible method net/minecraft/client/data/models/ItemModelGenerators declareCustomModelItem (Lnet/minecraft/world/item/Item;)V accessible field net/minecraft/data/recipes/RecipeProvider items Lnet/minecraft/core/HolderGetter; \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/models/block/bulbus.json b/fabric/src/main/generated/assets/additionaladditions/models/block/bulbus.json index 38bb4694..a1fcddf4 100644 --- a/fabric/src/main/generated/assets/additionaladditions/models/block/bulbus.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/bulbus.json @@ -1,6 +1,7 @@ { - "parent": "minecraft:block/cross", + "parent": "additionaladditions:block/tall_cross", "textures": { - "cross": "additionaladditions:block/bulbus" + "0": "additionaladditions:block/bulbus_bottom", + "1": "additionaladditions:block/bulbus_top" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/bulbus.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/bulbus.json index 38bb4694..a1fcddf4 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/models/block/bulbus.json +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/bulbus.json @@ -1,6 +1,7 @@ { - "parent": "minecraft:block/cross", + "parent": "additionaladditions:block/tall_cross", "textures": { - "cross": "additionaladditions:block/bulbus" + "0": "additionaladditions:block/bulbus_bottom", + "1": "additionaladditions:block/bulbus_top" } } \ No newline at end of file From 510dd5a934aa009f93a1574a47410e02509e049a Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Fri, 19 Jun 2026 21:03:00 +0100 Subject: [PATCH 10/27] 26.1: datagen rose gold, albums --- .../core/datagen/template/Models.java | 26 ++++++ .../template/model/AlbumModelTemplate.java | 32 +++++++ .../core/material/AAMaterial.java | 21 ++--- .../feature/album/AlbumContent.java | 2 + .../redstone_lamp/RedstoneLampContent.java | 2 + .../feature/rose_gold/RoseGoldContent.java | 7 ++ .../sniffer_plants/SnifferPlantsContent.java | 9 +- .../feature/wrench/WrenchContent.java | 2 + .../additionaladditions.accesswidener | 4 + .../additionaladditions/items/album.json | 14 --- .../items/black_album.json | 14 --- .../additionaladditions/items/blue_album.json | 14 --- .../items/brown_album.json | 14 --- .../additionaladditions/items/cyan_album.json | 14 --- .../additionaladditions/items/gray_album.json | 14 --- .../items/green_album.json | 14 --- .../items/light_blue_album.json | 14 --- .../items/light_gray_album.json | 14 --- .../additionaladditions/items/lime_album.json | 14 --- .../items/magenta_album.json | 14 --- .../items/orange_album.json | 14 --- .../additionaladditions/items/pink_album.json | 14 --- .../items/purple_album.json | 14 --- .../additionaladditions/items/red_album.json | 14 --- .../items/rose_gold_boots.json | 89 ------------------- .../items/rose_gold_chestplate.json | 89 ------------------- .../items/rose_gold_helmet.json | 89 ------------------- .../items/rose_gold_leggings.json | 89 ------------------- .../items/white_album.json | 14 --- .../items/yellow_album.json | 14 --- .../models/item/mysterious_bundle.json | 6 -- .../additionaladditions/items/album.json | 14 +++ .../items/amber_blossom_seeds.json | 2 +- .../items/black_album.json | 14 +++ .../additionaladditions/items/blue_album.json | 14 +++ .../items/brown_album.json | 14 +++ .../additionaladditions/items/bulbus_pod.json | 2 +- .../items/cottonshiver_pod.json | 2 +- .../items/crimson_blossom_seeds.json | 2 +- .../additionaladditions/items/cyan_album.json | 14 +++ .../items/frostleaf_pod.json | 2 +- .../additionaladditions/items/gray_album.json | 14 +++ .../items/green_album.json | 14 +++ .../items/light_blue_album.json | 14 +++ .../items/light_gray_album.json | 14 +++ .../additionaladditions/items/lime_album.json | 14 +++ .../items/lotus_lily_pod.json | 2 +- .../items/magenta_album.json | 14 +++ .../items/mudflower_seeds.json | 2 +- .../items/orange_album.json | 14 +++ .../additionaladditions/items/pink_album.json | 14 +++ .../items/purple_album.json | 14 +++ .../additionaladditions/items/red_album.json | 14 +++ .../items/rose_gold_axe.json | 2 +- .../items/rose_gold_boots.json | 89 +++++++++++++++++++ .../items/rose_gold_chestplate.json | 89 +++++++++++++++++++ .../items/rose_gold_helmet.json | 89 +++++++++++++++++++ .../items/rose_gold_hoe.json | 2 +- .../items/rose_gold_leggings.json | 89 +++++++++++++++++++ .../items/rose_gold_pickaxe.json | 2 +- .../items/rose_gold_shovel.json | 2 +- .../items/rose_gold_spear.json | 2 +- .../items/rose_gold_sword.json | 2 +- .../items/sawtooth_fern_fiddlehead.json | 2 +- .../items/snapdragon_pod.json | 2 +- .../items/spikeblossom_seeds.json | 2 +- .../items/tinted_redstone_lamp.json | 2 +- .../items/white_album.json | 14 +++ .../additionaladditions/items/wrench.json | 2 +- .../items/yellow_album.json | 14 +++ .../models/item}/album_0.json | 2 +- .../models/item}/album_1.json | 2 +- .../models/item/amber_blossom_seeds.json | 2 +- .../models/item}/black_album_0.json | 2 +- .../models/item}/black_album_1.json | 2 +- .../models/item}/blue_album_0.json | 2 +- .../models/item}/blue_album_1.json | 2 +- .../models/item}/brown_album_0.json | 2 +- .../models/item}/brown_album_1.json | 2 +- .../models/item/bulbus_pod.json | 2 +- .../models/item/cottonshiver_pod.json | 2 +- .../models/item/crimson_blossom_seeds.json | 2 +- .../models/item}/cyan_album_0.json | 2 +- .../models/item}/cyan_album_1.json | 2 +- .../models/item/frostleaf_pod.json | 2 +- .../models/item}/gray_album_0.json | 2 +- .../models/item}/gray_album_1.json | 2 +- .../models/item}/green_album_0.json | 2 +- .../models/item}/green_album_1.json | 2 +- .../models/item}/light_blue_album_0.json | 2 +- .../models/item}/light_blue_album_1.json | 2 +- .../models/item}/light_gray_album_0.json | 2 +- .../models/item}/light_gray_album_1.json | 2 +- .../models/item}/lime_album_0.json | 2 +- .../models/item}/lime_album_1.json | 2 +- .../models/item/lotus_lily_pod.json | 2 +- .../models/item}/magenta_album_0.json | 2 +- .../models/item}/magenta_album_1.json | 2 +- .../models/item/mudflower_seeds.json | 2 +- .../models/item}/orange_album_0.json | 2 +- .../models/item}/orange_album_1.json | 2 +- .../models/item}/pink_album_0.json | 2 +- .../models/item}/pink_album_1.json | 2 +- .../models/item}/purple_album_0.json | 2 +- .../models/item}/purple_album_1.json | 2 +- .../models/item}/red_album_0.json | 2 +- .../models/item}/red_album_1.json | 2 +- .../models/item/rose_gold_axe.json | 2 +- .../models/item/rose_gold_boots.json | 4 +- .../item/rose_gold_boots_amethyst_trim.json | 4 +- .../item/rose_gold_boots_copper_trim.json | 4 +- .../item/rose_gold_boots_diamond_trim.json | 4 +- .../item/rose_gold_boots_emerald_trim.json | 4 +- .../item/rose_gold_boots_gold_trim.json | 4 +- .../item/rose_gold_boots_iron_trim.json | 4 +- .../item/rose_gold_boots_lapis_trim.json | 4 +- .../item/rose_gold_boots_netherite_trim.json | 4 +- .../item/rose_gold_boots_quartz_trim.json | 4 +- .../item/rose_gold_boots_redstone_trim.json | 4 +- .../item/rose_gold_boots_resin_trim.json | 4 +- .../models/item/rose_gold_chestplate.json | 4 +- .../rose_gold_chestplate_amethyst_trim.json | 4 +- .../rose_gold_chestplate_copper_trim.json | 4 +- .../rose_gold_chestplate_diamond_trim.json | 4 +- .../rose_gold_chestplate_emerald_trim.json | 4 +- .../item/rose_gold_chestplate_gold_trim.json | 4 +- .../item/rose_gold_chestplate_iron_trim.json | 4 +- .../item/rose_gold_chestplate_lapis_trim.json | 4 +- .../rose_gold_chestplate_netherite_trim.json | 4 +- .../rose_gold_chestplate_quartz_trim.json | 4 +- .../rose_gold_chestplate_redstone_trim.json | 4 +- .../item/rose_gold_chestplate_resin_trim.json | 4 +- .../models/item/rose_gold_helmet.json | 4 +- .../item/rose_gold_helmet_amethyst_trim.json | 4 +- .../item/rose_gold_helmet_copper_trim.json | 4 +- .../item/rose_gold_helmet_diamond_trim.json | 4 +- .../item/rose_gold_helmet_emerald_trim.json | 4 +- .../item/rose_gold_helmet_gold_trim.json | 4 +- .../item/rose_gold_helmet_iron_trim.json | 4 +- .../item/rose_gold_helmet_lapis_trim.json | 4 +- .../item/rose_gold_helmet_netherite_trim.json | 4 +- .../item/rose_gold_helmet_quartz_trim.json | 4 +- .../item/rose_gold_helmet_redstone_trim.json | 4 +- .../item/rose_gold_helmet_resin_trim.json | 4 +- .../models/item/rose_gold_hoe.json | 2 +- .../models/item/rose_gold_leggings.json | 4 +- .../rose_gold_leggings_amethyst_trim.json | 4 +- .../item/rose_gold_leggings_copper_trim.json | 4 +- .../item/rose_gold_leggings_diamond_trim.json | 4 +- .../item/rose_gold_leggings_emerald_trim.json | 4 +- .../item/rose_gold_leggings_gold_trim.json | 4 +- .../item/rose_gold_leggings_iron_trim.json | 4 +- .../item/rose_gold_leggings_lapis_trim.json | 4 +- .../rose_gold_leggings_netherite_trim.json | 4 +- .../item/rose_gold_leggings_quartz_trim.json | 4 +- .../rose_gold_leggings_redstone_trim.json | 4 +- .../item/rose_gold_leggings_resin_trim.json | 4 +- .../models/item/rose_gold_pickaxe.json | 2 +- .../models/item/rose_gold_shovel.json | 2 +- .../models/item/rose_gold_spear.json | 4 +- .../models/item/rose_gold_spear_in_hand.json | 4 +- .../models/item/rose_gold_sword.json | 2 +- .../models/item/sawtooth_fern_fiddlehead.json | 2 +- .../models/item/snapdragon_pod.json | 2 +- .../models/item/spikeblossom_seeds.json | 2 +- .../models/item}/white_album_0.json | 2 +- .../models/item}/white_album_1.json | 2 +- .../models/item/wrench.json | 2 +- .../models/item}/yellow_album_0.json | 2 +- .../models/item}/yellow_album_1.json | 2 +- .../additionaladditions/items/album.json | 14 +++ .../items/amber_blossom_seeds.json | 6 ++ .../items/black_album.json | 14 +++ .../additionaladditions/items/blue_album.json | 14 +++ .../items/brown_album.json | 14 +++ .../additionaladditions/items/bulbus_pod.json | 6 ++ .../items/cottonshiver_pod.json | 6 ++ .../items/crimson_blossom_seeds.json | 6 ++ .../additionaladditions/items/cyan_album.json | 14 +++ .../items/frostleaf_pod.json | 6 ++ .../additionaladditions/items/gray_album.json | 14 +++ .../items/green_album.json | 14 +++ .../items/light_blue_album.json | 14 +++ .../items/light_gray_album.json | 14 +++ .../additionaladditions/items/lime_album.json | 14 +++ .../items/lotus_lily_pod.json | 6 ++ .../items/magenta_album.json | 14 +++ .../items/mudflower_seeds.json | 6 ++ .../items/orange_album.json | 14 +++ .../additionaladditions/items/pink_album.json | 14 +++ .../items/purple_album.json | 14 +++ .../additionaladditions/items/red_album.json | 14 +++ .../items/rose_gold_axe.json | 6 ++ .../items/rose_gold_boots.json | 89 +++++++++++++++++++ .../items/rose_gold_chestplate.json | 89 +++++++++++++++++++ .../items/rose_gold_helmet.json | 89 +++++++++++++++++++ .../items/rose_gold_hoe.json | 6 ++ .../items/rose_gold_leggings.json | 89 +++++++++++++++++++ .../items/rose_gold_pickaxe.json | 6 ++ .../items/rose_gold_shovel.json | 6 ++ .../items/rose_gold_spear.json | 25 ++++++ .../items/rose_gold_sword.json | 6 ++ .../items/sawtooth_fern_fiddlehead.json | 6 ++ .../items/snapdragon_pod.json | 6 ++ .../items/spikeblossom_seeds.json | 6 ++ .../items/tinted_redstone_lamp.json | 6 ++ .../items/white_album.json | 14 +++ .../additionaladditions/items/wrench.json | 6 ++ .../items/yellow_album.json | 14 +++ .../models/item/album_0.json | 6 ++ .../models/item/album_1.json | 7 ++ .../models/item/amber_blossom_seeds.json | 6 ++ .../models/item/black_album_0.json | 6 ++ .../models/item/black_album_1.json | 7 ++ .../models/item/blue_album_0.json | 6 ++ .../models/item/blue_album_1.json | 7 ++ .../models/item/brown_album_0.json | 6 ++ .../models/item/brown_album_1.json | 7 ++ .../models/item/bulbus_pod.json | 6 ++ .../models/item/cottonshiver_pod.json | 6 ++ .../models/item/crimson_blossom_seeds.json | 6 ++ .../models/item/cyan_album_0.json | 6 ++ .../models/item/cyan_album_1.json | 7 ++ .../models/item/frostleaf_pod.json | 6 ++ .../models/item/gray_album_0.json | 6 ++ .../models/item/gray_album_1.json | 7 ++ .../models/item/green_album_0.json | 6 ++ .../models/item/green_album_1.json | 7 ++ .../models/item/light_blue_album_0.json | 6 ++ .../models/item/light_blue_album_1.json | 7 ++ .../models/item/light_gray_album_0.json | 6 ++ .../models/item/light_gray_album_1.json | 7 ++ .../models/item/lime_album_0.json | 6 ++ .../models/item/lime_album_1.json | 7 ++ .../models/item/lotus_lily_pod.json | 6 ++ .../models/item/magenta_album_0.json | 6 ++ .../models/item/magenta_album_1.json | 7 ++ .../models/item/mudflower_seeds.json | 6 ++ .../models/item/orange_album_0.json | 6 ++ .../models/item/orange_album_1.json | 7 ++ .../models/item/pink_album_0.json | 6 ++ .../models/item/pink_album_1.json | 7 ++ .../models/item/purple_album_0.json | 6 ++ .../models/item/purple_album_1.json | 7 ++ .../models/item/red_album_0.json | 6 ++ .../models/item/red_album_1.json | 7 ++ .../models/item/rose_gold_axe.json | 6 ++ .../models/item/rose_gold_boots.json | 6 ++ .../item/rose_gold_boots_amethyst_trim.json | 7 ++ .../item/rose_gold_boots_copper_trim.json | 7 ++ .../item/rose_gold_boots_diamond_trim.json | 7 ++ .../item/rose_gold_boots_emerald_trim.json | 7 ++ .../item/rose_gold_boots_gold_trim.json | 7 ++ .../item/rose_gold_boots_iron_trim.json | 7 ++ .../item/rose_gold_boots_lapis_trim.json | 7 ++ .../item/rose_gold_boots_netherite_trim.json | 7 ++ .../item/rose_gold_boots_quartz_trim.json | 7 ++ .../item/rose_gold_boots_redstone_trim.json | 7 ++ .../item/rose_gold_boots_resin_trim.json | 7 ++ .../models/item/rose_gold_chestplate.json | 6 ++ .../rose_gold_chestplate_amethyst_trim.json | 7 ++ .../rose_gold_chestplate_copper_trim.json | 7 ++ .../rose_gold_chestplate_diamond_trim.json | 7 ++ .../rose_gold_chestplate_emerald_trim.json | 7 ++ .../item/rose_gold_chestplate_gold_trim.json | 7 ++ .../item/rose_gold_chestplate_iron_trim.json | 7 ++ .../item/rose_gold_chestplate_lapis_trim.json | 7 ++ .../rose_gold_chestplate_netherite_trim.json | 7 ++ .../rose_gold_chestplate_quartz_trim.json | 7 ++ .../rose_gold_chestplate_redstone_trim.json | 7 ++ .../item/rose_gold_chestplate_resin_trim.json | 7 ++ .../models/item/rose_gold_helmet.json | 6 ++ .../item/rose_gold_helmet_amethyst_trim.json | 7 ++ .../item/rose_gold_helmet_copper_trim.json | 7 ++ .../item/rose_gold_helmet_diamond_trim.json | 7 ++ .../item/rose_gold_helmet_emerald_trim.json | 7 ++ .../item/rose_gold_helmet_gold_trim.json | 7 ++ .../item/rose_gold_helmet_iron_trim.json | 7 ++ .../item/rose_gold_helmet_lapis_trim.json | 7 ++ .../item/rose_gold_helmet_netherite_trim.json | 7 ++ .../item/rose_gold_helmet_quartz_trim.json | 7 ++ .../item/rose_gold_helmet_redstone_trim.json | 7 ++ .../item/rose_gold_helmet_resin_trim.json | 7 ++ .../models/item/rose_gold_hoe.json | 6 ++ .../models/item/rose_gold_leggings.json | 6 ++ .../rose_gold_leggings_amethyst_trim.json | 7 ++ .../item/rose_gold_leggings_copper_trim.json | 7 ++ .../item/rose_gold_leggings_diamond_trim.json | 7 ++ .../item/rose_gold_leggings_emerald_trim.json | 7 ++ .../item/rose_gold_leggings_gold_trim.json | 7 ++ .../item/rose_gold_leggings_iron_trim.json | 7 ++ .../item/rose_gold_leggings_lapis_trim.json | 7 ++ .../rose_gold_leggings_netherite_trim.json | 7 ++ .../item/rose_gold_leggings_quartz_trim.json | 7 ++ .../rose_gold_leggings_redstone_trim.json | 7 ++ .../item/rose_gold_leggings_resin_trim.json | 7 ++ .../models/item/rose_gold_pickaxe.json | 6 ++ .../models/item/rose_gold_shovel.json | 6 ++ .../models/item/rose_gold_spear.json | 6 ++ .../models/item/rose_gold_spear_in_hand.json | 6 ++ .../models/item/rose_gold_sword.json | 6 ++ .../models/item/sawtooth_fern_fiddlehead.json | 6 ++ .../models/item/snapdragon_pod.json | 6 ++ .../models/item/spikeblossom_seeds.json | 6 ++ .../models/item/white_album_0.json | 6 ++ .../models/item/white_album_1.json | 7 ++ .../models/item/wrench.json | 6 ++ .../models/item/yellow_album_0.json | 6 ++ .../models/item/yellow_album_1.json | 7 ++ 309 files changed, 2233 insertions(+), 784 deletions(-) create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/datagen/template/model/AlbumModelTemplate.java delete mode 100644 common/src/main/resources/assets/additionaladditions/items/album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/black_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/blue_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/brown_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/cyan_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/gray_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/green_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/light_blue_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/light_gray_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/lime_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/magenta_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/orange_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/pink_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/purple_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/red_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/rose_gold_boots.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/rose_gold_chestplate.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/rose_gold_helmet.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/rose_gold_leggings.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/white_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/items/yellow_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/mysterious_bundle.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/album.json rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/amber_blossom_seeds.json (98%) create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/black_album.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/blue_album.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/brown_album.json rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/bulbus_pod.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/cottonshiver_pod.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/crimson_blossom_seeds.json (98%) create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/cyan_album.json rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/frostleaf_pod.json (98%) create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/gray_album.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/green_album.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/light_blue_album.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/light_gray_album.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/lime_album.json rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/lotus_lily_pod.json (98%) create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/magenta_album.json rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/mudflower_seeds.json (98%) create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/orange_album.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/pink_album.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/purple_album.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/red_album.json rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/rose_gold_axe.json (98%) create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/rose_gold_boots.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/rose_gold_chestplate.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/rose_gold_helmet.json rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/rose_gold_hoe.json (98%) create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/rose_gold_leggings.json rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/rose_gold_pickaxe.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/rose_gold_shovel.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/rose_gold_spear.json (99%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/rose_gold_sword.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/sawtooth_fern_fiddlehead.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/snapdragon_pod.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/spikeblossom_seeds.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/tinted_redstone_lamp.json (98%) create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/white_album.json rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/wrench.json (97%) create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/yellow_album.json rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/album_0.json (63%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/album_1.json (75%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/amber_blossom_seeds.json (98%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/black_album_0.json (65%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/black_album_1.json (76%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/blue_album_0.json (65%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/blue_album_1.json (76%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/brown_album_0.json (65%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/brown_album_1.json (76%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/bulbus_pod.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/cottonshiver_pod.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/crimson_blossom_seeds.json (98%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/cyan_album_0.json (65%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/cyan_album_1.json (76%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/frostleaf_pod.json (98%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/gray_album_0.json (65%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/gray_album_1.json (76%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/green_album_0.json (65%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/green_album_1.json (76%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/light_blue_album_0.json (66%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/light_blue_album_1.json (77%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/light_gray_album_0.json (66%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/light_gray_album_1.json (77%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/lime_album_0.json (65%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/lime_album_1.json (76%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/lotus_lily_pod.json (98%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/magenta_album_0.json (66%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/magenta_album_1.json (77%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/mudflower_seeds.json (98%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/orange_album_0.json (65%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/orange_album_1.json (76%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/pink_album_0.json (65%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/pink_album_1.json (76%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/purple_album_0.json (65%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/purple_album_1.json (76%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/red_album_0.json (64%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/red_album_1.json (76%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/rose_gold_axe.json (66%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/rose_gold_boots.json (65%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_amethyst_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_amethyst_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_copper_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_copper_trim.json (76%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_diamond_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_diamond_trim.json (76%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_emerald_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_emerald_trim.json (76%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_gold_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_gold_trim.json (76%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_iron_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_iron_trim.json (76%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_lapis_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_lapis_trim.json (76%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_netherite_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_netherite_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_quartz_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_quartz_trim.json (76%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_redstone_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_redstone_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_resin_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_resin_trim.json (76%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/rose_gold_chestplate.json (67%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_amethyst_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_amethyst_trim.json (78%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_copper_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_copper_trim.json (78%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_diamond_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_diamond_trim.json (78%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_emerald_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_emerald_trim.json (78%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_gold_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_gold_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_iron_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_iron_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_lapis_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_lapis_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_netherite_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_netherite_trim.json (78%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_quartz_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_quartz_trim.json (78%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_redstone_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_redstone_trim.json (78%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_resin_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_resin_trim.json (77%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/rose_gold_helmet.json (66%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_amethyst_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_amethyst_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_copper_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_copper_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_diamond_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_diamond_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_emerald_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_emerald_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_gold_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_gold_trim.json (76%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_iron_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_iron_trim.json (76%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_lapis_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_lapis_trim.json (76%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_netherite_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_netherite_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_quartz_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_quartz_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_redstone_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_redstone_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_resin_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_resin_trim.json (76%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/rose_gold_hoe.json (66%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/rose_gold_leggings.json (66%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_amethyst_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_amethyst_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_copper_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_copper_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_diamond_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_diamond_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_emerald_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_emerald_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_gold_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_gold_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_iron_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_iron_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_lapis_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_lapis_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_netherite_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_netherite_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_quartz_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_quartz_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_redstone_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_redstone_trim.json (77%) rename common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_resin_trim.json => fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_resin_trim.json (77%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/rose_gold_pickaxe.json (67%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/rose_gold_shovel.json (67%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/rose_gold_spear.json (65%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/rose_gold_spear_in_hand.json (65%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/rose_gold_sword.json (67%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/sawtooth_fern_fiddlehead.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/snapdragon_pod.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/spikeblossom_seeds.json (98%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/white_album_0.json (65%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/white_album_1.json (76%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/wrench.json (64%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/yellow_album_0.json (65%) rename {common/src/main/resources/assets/additionaladditions/models/item/album => fabric/src/main/generated/assets/additionaladditions/models/item}/yellow_album_1.json (76%) create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/amber_blossom_seeds.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/black_album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/blue_album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/brown_album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/bulbus_pod.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/cottonshiver_pod.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/crimson_blossom_seeds.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/cyan_album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/frostleaf_pod.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/gray_album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/green_album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/light_blue_album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/light_gray_album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/lime_album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/lotus_lily_pod.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/magenta_album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/mudflower_seeds.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/orange_album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/pink_album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/purple_album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/red_album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_axe.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_boots.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_chestplate.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_helmet.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_hoe.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_leggings.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_pickaxe.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_shovel.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_spear.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_sword.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/sawtooth_fern_fiddlehead.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/snapdragon_pod.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/spikeblossom_seeds.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/white_album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/wrench.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/yellow_album.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/album_1.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/amber_blossom_seeds.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/black_album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/black_album_1.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/blue_album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/blue_album_1.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/brown_album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/brown_album_1.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/bulbus_pod.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/cottonshiver_pod.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/crimson_blossom_seeds.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/cyan_album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/cyan_album_1.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/frostleaf_pod.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/gray_album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/gray_album_1.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/green_album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/green_album_1.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/light_blue_album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/light_blue_album_1.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/light_gray_album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/light_gray_album_1.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/lime_album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/lime_album_1.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/lotus_lily_pod.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/magenta_album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/magenta_album_1.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/mudflower_seeds.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/orange_album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/orange_album_1.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/pink_album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/pink_album_1.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/purple_album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/purple_album_1.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/red_album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/red_album_1.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_axe.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_amethyst_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_copper_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_diamond_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_emerald_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_gold_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_iron_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_lapis_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_netherite_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_quartz_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_redstone_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_resin_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_amethyst_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_copper_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_diamond_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_emerald_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_gold_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_iron_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_lapis_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_netherite_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_quartz_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_redstone_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_resin_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_amethyst_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_copper_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_diamond_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_emerald_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_gold_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_iron_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_lapis_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_netherite_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_quartz_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_redstone_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_resin_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_hoe.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_amethyst_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_copper_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_diamond_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_emerald_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_gold_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_iron_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_lapis_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_netherite_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_quartz_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_redstone_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_resin_trim.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_pickaxe.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_shovel.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_spear.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_spear_in_hand.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_sword.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/sawtooth_fern_fiddlehead.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/snapdragon_pod.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/spikeblossom_seeds.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/white_album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/white_album_1.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/wrench.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/yellow_album_0.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/yellow_album_1.json diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java index a3f965d3..36067cd6 100644 --- a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java @@ -1,11 +1,17 @@ package one.dqu.additionaladditions.core.datagen.template; import net.minecraft.client.data.models.BlockModelGenerators; +import net.minecraft.client.data.models.ItemModelGenerators; import net.minecraft.client.data.models.model.ModelTemplates; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; import net.minecraft.world.item.Item; +import net.minecraft.world.item.equipment.ArmorType; +import net.minecraft.world.item.equipment.EquipmentAsset; import net.minecraft.world.level.block.Block; import one.dqu.additionaladditions.core.datagen.AABlockDatagen; import one.dqu.additionaladditions.core.datagen.AAItemDatagen; +import one.dqu.additionaladditions.core.datagen.template.model.AlbumModelTemplate; import one.dqu.additionaladditions.core.datagen.template.model.TallCrossModelTemplate; /** @@ -44,7 +50,27 @@ public static void handheld(Item item) { AAItemDatagen.currentGen().generateFlatItem(item, ModelTemplates.FLAT_HANDHELD_ITEM); } + public static void spear(Item item) { + AAItemDatagen.currentGen().generateSpear(item); + } + public static void customModel(Item item) { AAItemDatagen.currentGen().declareCustomModelItem(item); } + + public static void album(Item item) { + AlbumModelTemplate.createAlbum(AAItemDatagen.currentGen(), item); + } + + // armor with a trim_material dispatch + public static void armorTrim(Item item, ResourceKey asset, ArmorType armorType) { + Identifier slotTrimPrefix = switch (armorType) { + case HELMET -> ItemModelGenerators.TRIM_PREFIX_HELMET; + case CHESTPLATE -> ItemModelGenerators.TRIM_PREFIX_CHESTPLATE; + case LEGGINGS -> ItemModelGenerators.TRIM_PREFIX_LEGGINGS; + case BOOTS -> ItemModelGenerators.TRIM_PREFIX_BOOTS; + default -> throw new IllegalArgumentException("Invalid armor slot: " + armorType); + }; + AAItemDatagen.currentGen().generateTrimmableItem(item, asset, slotTrimPrefix, false); + } } diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/model/AlbumModelTemplate.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/model/AlbumModelTemplate.java new file mode 100644 index 00000000..20f5d296 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/model/AlbumModelTemplate.java @@ -0,0 +1,32 @@ +package one.dqu.additionaladditions.core.datagen.template.model; + +import net.minecraft.client.data.models.ItemModelGenerators; +import net.minecraft.client.data.models.model.ItemModelUtils; +import net.minecraft.client.data.models.model.ModelLocationUtils; +import net.minecraft.client.data.models.model.ModelTemplates; +import net.minecraft.client.data.models.model.TextureMapping; +import net.minecraft.client.resources.model.sprite.Material; +import net.minecraft.resources.Identifier; +import net.minecraft.world.item.Item; +import one.dqu.additionaladditions.AdditionalAdditions; +import one.dqu.additionaladditions.client.HasDiscProperty; + +public class AlbumModelTemplate { + private static final Material OVERLAY = new Material( + Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, "item/album_overlay")); + + public static void createAlbum(ItemModelGenerators gen, Item item) { + Material texture = TextureMapping.getItemTexture(item); + Identifier base = ModelLocationUtils.getModelLocation(item); + + Identifier empty = base.withSuffix("_0"); + ModelTemplates.FLAT_ITEM.create(empty, TextureMapping.layer0(texture), gen.modelOutput); + + Identifier filled = base.withSuffix("_1"); + ModelTemplates.TWO_LAYERED_ITEM.create(filled, TextureMapping.layered(texture, OVERLAY), gen.modelOutput); + + gen.itemModelOutput.accept(item, ItemModelUtils.conditional( + new HasDiscProperty(), ItemModelUtils.plainModel(filled), ItemModelUtils.plainModel(empty) + )); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/core/material/AAMaterial.java b/common/src/main/java/one/dqu/additionaladditions/core/material/AAMaterial.java index 6a699acb..b2455cd6 100644 --- a/common/src/main/java/one/dqu/additionaladditions/core/material/AAMaterial.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/material/AAMaterial.java @@ -58,6 +58,13 @@ public DataComponentInitializers.Initializer initializerFor(ToolType toolT }; } + public ResourceKey equipmentAsset() { + return ResourceKey.create( + ResourceKey.createRegistryKey(Identifier.withDefaultNamespace("equipment_asset")), + Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, name) + ); + } + public DataComponentInitializers.Initializer initializerFor(ArmorType armorType) { if (armorType == ArmorType.BODY) { throw new IllegalArgumentException("BODY armor type not supported by this method. Material: " + name); @@ -187,14 +194,9 @@ private void applyHumanoidArmorComponents( builder.set(DataComponents.ENCHANTABLE, new Enchantable(material.enchantability())); builder.set(DataComponents.ATTRIBUTE_MODIFIERS, createArmorAttributes(type, material, armorLike)); - ResourceKey assetId = ResourceKey.create( - ResourceKey.createRegistryKey(Identifier.withDefaultNamespace("equipment_asset")), - Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, name) - ); - Equippable equippable = Equippable.builder(type.getSlot()) .setEquipSound(material.equipSound()) - .setAsset(assetId) + .setAsset(equipmentAsset()) .build(); builder.set(DataComponents.EQUIPPABLE, equippable); } @@ -210,14 +212,9 @@ private void applyAnimalArmorComponents( builder.set(DataComponents.ENCHANTABLE, new Enchantable(material.enchantability())); builder.set(DataComponents.ATTRIBUTE_MODIFIERS, createArmorAttributes(ArmorType.BODY, material, armorLike)); - ResourceKey assetId = ResourceKey.create( - ResourceKey.createRegistryKey(Identifier.withDefaultNamespace("equipment_asset")), - Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, name) - ); - Equippable equippable = Equippable.builder(EquipmentSlot.BODY) .setEquipSound(armorType.equipSound()) - .setAsset(assetId) + .setAsset(equipmentAsset()) .setAllowedEntities(entityTypes.getOrThrow(armorType.canWearTag())) .setDamageOnHurt(false) .setEquipOnInteract(true) diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumContent.java index 8956f114..0ce75d5b 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumContent.java @@ -7,6 +7,7 @@ import one.dqu.additionaladditions.core.builder.AAItem; import one.dqu.additionaladditions.core.builder.AAReg; import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Models; import one.dqu.additionaladditions.registry.AAMisc; import one.dqu.additionaladditions.registry.AATags; @@ -20,6 +21,7 @@ private static AAItem album() { .props(p -> p .stacksTo(1) .component(AAMisc.ALBUM_CONTENTS_COMPONENT.get(), AlbumContents.EMPTY)) + .model(Models::album) .tags(AATags.ALBUMS); } diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/redstone_lamp/RedstoneLampContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/redstone_lamp/RedstoneLampContent.java index e236a24a..c2a7ae99 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/redstone_lamp/RedstoneLampContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/redstone_lamp/RedstoneLampContent.java @@ -10,6 +10,7 @@ import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.core.builder.AAReg; import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Models; import one.dqu.additionaladditions.core.datagen.template.Recipes; import one.dqu.additionaladditions.registry.AABlocks; @@ -32,6 +33,7 @@ public static Supplier tintedRedstoneLampItem() { .config(Config.TINTED_REDSTONE_LAMP) .creative(Items.REDSTONE_LAMP, CreativeModeTabs.REDSTONE_BLOCKS, CreativePosition.AFTER) .creative(Items.REDSTONE_LAMP, CreativeModeTabs.FUNCTIONAL_BLOCKS, CreativePosition.AFTER) + .model(Models::customModel) .recipe(Recipes.shaped(" A ", "ALA", " A ", Map.of('A', Items.AMETHYST_SHARD, 'L', Items.REDSTONE_LAMP), RecipeCategory.REDSTONE).unlockedBy(Items.AMETHYST_SHARD)) .make("tinted_redstone_lamp"); } diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/RoseGoldContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/RoseGoldContent.java index 2758a822..253135ae 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/RoseGoldContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/RoseGoldContent.java @@ -66,6 +66,7 @@ private static Supplier armor(String id, ArmorType armorType, Item anchor) .config(Config.ROSE_GOLD) .material(AAMaterials.ROSE_GOLD, armorType) .creative(anchor, CreativeModeTabs.COMBAT, CreativePosition.AFTER) + .model(item -> Models.armorTrim(item, AAMaterials.ROSE_GOLD.equipmentAsset(), armorType)) .tags(slotTag, ItemTags.TRIMMABLE_ARMOR) .make(id); } @@ -111,6 +112,7 @@ public static Supplier sword() { .config(Config.ROSE_GOLD) .material(AAMaterials.ROSE_GOLD, ToolType.SWORD) .creative(Items.GOLDEN_SWORD, CreativeModeTabs.COMBAT, CreativePosition.AFTER) + .model(Models::handheld) .tags(ItemTags.SWORDS) .make("rose_gold_sword"); } @@ -120,6 +122,7 @@ public static Supplier spear() { .config(Config.ROSE_GOLD) .material(AAMaterials.ROSE_GOLD, ToolType.SPEAR) .creative(Items.GOLDEN_SPEAR, CreativeModeTabs.COMBAT, CreativePosition.AFTER) + .model(Models::spear) .tags(ItemTags.SPEARS) .make("rose_gold_spear"); } @@ -129,6 +132,7 @@ public static Supplier shovel() { .config(Config.ROSE_GOLD) .material(AAMaterials.ROSE_GOLD, ToolType.SHOVEL) .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) + .model(Models::handheld) .tags(ItemTags.SHOVELS) .make("rose_gold_shovel"); } @@ -138,6 +142,7 @@ public static Supplier pickaxe() { .config(Config.ROSE_GOLD) .material(AAMaterials.ROSE_GOLD, ToolType.PICKAXE) .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) + .model(Models::handheld) .tags(ItemTags.PICKAXES) .make("rose_gold_pickaxe"); } @@ -148,6 +153,7 @@ public static Supplier axe() { .material(AAMaterials.ROSE_GOLD, ToolType.AXE) .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) .creative(Items.GOLDEN_AXE, CreativeModeTabs.COMBAT, CreativePosition.AFTER) + .model(Models::handheld) .tags(ItemTags.AXES) .make("rose_gold_axe"); } @@ -157,6 +163,7 @@ public static Supplier hoe() { .config(Config.ROSE_GOLD) .material(AAMaterials.ROSE_GOLD, ToolType.HOE) .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) + .model(Models::handheld) .tags(ItemTags.HOES) .make("rose_gold_hoe"); } diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java index c8ef69f9..6aaf77a1 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java @@ -73,11 +73,12 @@ private static Supplier plantItem(String id, Supplier blo private static Supplier podItem(String id, Supplier block, ItemLike anchor) { return itemBuilder(p -> new BlockItem(block.get(), p), anchor, true) .tags(AATags.C_SEEDS) + .model(Models::flat) .make(id); } - private static Supplier vineItem(String id, Supplier block, ItemLike anchor) { - return itemBuilder(p -> new BlockItem(block.get(), p), anchor, true).make(id); + private static Supplier vineItem(String id, Supplier block, ItemLike anchor, Consumer model) { + return itemBuilder(p -> new BlockItem(block.get(), p), anchor, true).model(model).make(id); } private static AAItem itemBuilder(Function factory, ItemLike anchor, boolean pod) { @@ -267,7 +268,7 @@ public static Supplier wisteriaItem() { } public static Supplier wisteriaVines() { - return vineItem("wisteria_vines", AABlocks.WISTERIA_CROP, Items.PITCHER_POD); + return vineItem("wisteria_vines", AABlocks.WISTERIA_CROP, Items.PITCHER_POD, null); } public static Supplier spikeblossomItem() { @@ -295,6 +296,6 @@ public static Supplier lotusLilyItem() { } public static Supplier lotusLilyPod() { - return vineItem("lotus_lily_pod", AABlocks.LOTUS_LILY_CROP, Items.PITCHER_POD); + return vineItem("lotus_lily_pod", AABlocks.LOTUS_LILY_CROP, Items.PITCHER_POD, Models::flat); } } diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/wrench/WrenchContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/wrench/WrenchContent.java index 75821917..d9b9e614 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/wrench/WrenchContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/wrench/WrenchContent.java @@ -7,6 +7,7 @@ import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.core.builder.AAReg; import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Models; import one.dqu.additionaladditions.core.datagen.template.Recipes; import one.dqu.additionaladditions.registry.AATags; @@ -23,6 +24,7 @@ public static Supplier wrench() { .component(DataComponents.DAMAGE, 0)) .creative(Items.BONE_MEAL, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) .creative(Items.TARGET, CreativeModeTabs.REDSTONE_BLOCKS, CreativePosition.AFTER) + .model(Models::handheld) .tags(AATags.C_TOOLS_WRENCH) .recipe(Recipes.shaped("C C", " C ", " C ", Map.of('C', Items.COPPER_INGOT), RecipeCategory.TOOLS).unlockedBy(Items.COPPER_INGOT)) .make("wrench"); diff --git a/common/src/main/resources/additionaladditions.accesswidener b/common/src/main/resources/additionaladditions.accesswidener index 4133af10..fa14b218 100644 --- a/common/src/main/resources/additionaladditions.accesswidener +++ b/common/src/main/resources/additionaladditions.accesswidener @@ -37,5 +37,9 @@ accessible field net/minecraft/client/data/models/BlockModelGenerators blockStat accessible field net/minecraft/client/data/models/BlockModelGenerators modelOutput Ljava/util/function/BiConsumer; accessible method net/minecraft/client/data/models/model/TextureSlot create (Ljava/lang/String;)Lnet/minecraft/client/data/models/model/TextureSlot; accessible method net/minecraft/client/data/models/ItemModelGenerators generateFlatItem (Lnet/minecraft/world/item/Item;Lnet/minecraft/client/data/models/model/ModelTemplate;)V +accessible method net/minecraft/client/data/models/ItemModelGenerators generateSpear (Lnet/minecraft/world/item/Item;)V +accessible method net/minecraft/client/data/models/ItemModelGenerators generateTrimmableItem (Lnet/minecraft/world/item/Item;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/Identifier;Z)V +accessible field net/minecraft/client/data/models/ItemModelGenerators itemModelOutput Lnet/minecraft/client/data/models/ItemModelOutput; +accessible field net/minecraft/client/data/models/ItemModelGenerators modelOutput Ljava/util/function/BiConsumer; accessible method net/minecraft/client/data/models/ItemModelGenerators declareCustomModelItem (Lnet/minecraft/world/item/Item;)V accessible field net/minecraft/data/recipes/RecipeProvider items Lnet/minecraft/core/HolderGetter; \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/album.json b/common/src/main/resources/assets/additionaladditions/items/album.json deleted file mode 100644 index 87813124..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/black_album.json b/common/src/main/resources/assets/additionaladditions/items/black_album.json deleted file mode 100644 index 35f39982..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/black_album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/black_album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/black_album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/blue_album.json b/common/src/main/resources/assets/additionaladditions/items/blue_album.json deleted file mode 100644 index 25bb3417..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/blue_album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/blue_album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/blue_album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/brown_album.json b/common/src/main/resources/assets/additionaladditions/items/brown_album.json deleted file mode 100644 index 2695b0c3..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/brown_album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/brown_album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/brown_album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/cyan_album.json b/common/src/main/resources/assets/additionaladditions/items/cyan_album.json deleted file mode 100644 index 12b566c0..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/cyan_album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/cyan_album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/cyan_album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/gray_album.json b/common/src/main/resources/assets/additionaladditions/items/gray_album.json deleted file mode 100644 index 00caf03e..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/gray_album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/gray_album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/gray_album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/green_album.json b/common/src/main/resources/assets/additionaladditions/items/green_album.json deleted file mode 100644 index 42dee9c7..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/green_album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/green_album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/green_album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/light_blue_album.json b/common/src/main/resources/assets/additionaladditions/items/light_blue_album.json deleted file mode 100644 index 85f8d158..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/light_blue_album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/light_blue_album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/light_blue_album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/light_gray_album.json b/common/src/main/resources/assets/additionaladditions/items/light_gray_album.json deleted file mode 100644 index a2ebafe9..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/light_gray_album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/light_gray_album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/light_gray_album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/lime_album.json b/common/src/main/resources/assets/additionaladditions/items/lime_album.json deleted file mode 100644 index 66d43e9f..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/lime_album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/lime_album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/lime_album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/magenta_album.json b/common/src/main/resources/assets/additionaladditions/items/magenta_album.json deleted file mode 100644 index 15fce235..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/magenta_album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/magenta_album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/magenta_album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/orange_album.json b/common/src/main/resources/assets/additionaladditions/items/orange_album.json deleted file mode 100644 index fede97f6..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/orange_album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/orange_album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/orange_album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/pink_album.json b/common/src/main/resources/assets/additionaladditions/items/pink_album.json deleted file mode 100644 index b70c9611..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/pink_album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/pink_album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/pink_album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/purple_album.json b/common/src/main/resources/assets/additionaladditions/items/purple_album.json deleted file mode 100644 index 5ac95848..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/purple_album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/purple_album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/purple_album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/red_album.json b/common/src/main/resources/assets/additionaladditions/items/red_album.json deleted file mode 100644 index 694a5126..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/red_album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/red_album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/red_album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/rose_gold_boots.json b/common/src/main/resources/assets/additionaladditions/items/rose_gold_boots.json deleted file mode 100644 index 297263c3..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/rose_gold_boots.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "model": { - "type": "minecraft:select", - "property": "minecraft:trim_material", - "fallback": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold_boots" - }, - "cases": [ - { - "when": "minecraft:quartz", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/boots_quartz_trim" - } - }, - { - "when": "minecraft:iron", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/boots_iron_trim" - } - }, - { - "when": "minecraft:netherite", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/boots_netherite_trim" - } - }, - { - "when": "minecraft:redstone", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/boots_redstone_trim" - } - }, - { - "when": "minecraft:copper", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/boots_copper_trim" - } - }, - { - "when": "minecraft:gold", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/boots_gold_trim" - } - }, - { - "when": "minecraft:emerald", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/boots_emerald_trim" - } - }, - { - "when": "minecraft:diamond", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/boots_diamond_trim" - } - }, - { - "when": "minecraft:lapis", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/boots_lapis_trim" - } - }, - { - "when": "minecraft:amethyst", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/boots_amethyst_trim" - } - }, - { - "when": "minecraft:resin", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/boots_resin_trim" - } - } - ] - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/rose_gold_chestplate.json b/common/src/main/resources/assets/additionaladditions/items/rose_gold_chestplate.json deleted file mode 100644 index 7089e0f6..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/rose_gold_chestplate.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "model": { - "type": "minecraft:select", - "property": "minecraft:trim_material", - "fallback": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold_chestplate" - }, - "cases": [ - { - "when": "minecraft:quartz", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/chestplate_quartz_trim" - } - }, - { - "when": "minecraft:iron", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/chestplate_iron_trim" - } - }, - { - "when": "minecraft:netherite", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/chestplate_netherite_trim" - } - }, - { - "when": "minecraft:redstone", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/chestplate_redstone_trim" - } - }, - { - "when": "minecraft:copper", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/chestplate_copper_trim" - } - }, - { - "when": "minecraft:gold", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/chestplate_gold_trim" - } - }, - { - "when": "minecraft:emerald", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/chestplate_emerald_trim" - } - }, - { - "when": "minecraft:diamond", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/chestplate_diamond_trim" - } - }, - { - "when": "minecraft:lapis", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/chestplate_lapis_trim" - } - }, - { - "when": "minecraft:amethyst", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/chestplate_amethyst_trim" - } - }, - { - "when": "minecraft:resin", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/chestplate_resin_trim" - } - } - ] - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/rose_gold_helmet.json b/common/src/main/resources/assets/additionaladditions/items/rose_gold_helmet.json deleted file mode 100644 index 743e617a..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/rose_gold_helmet.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "model": { - "type": "minecraft:select", - "property": "minecraft:trim_material", - "fallback": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold_helmet" - }, - "cases": [ - { - "when": "minecraft:quartz", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/helmet_quartz_trim" - } - }, - { - "when": "minecraft:iron", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/helmet_iron_trim" - } - }, - { - "when": "minecraft:netherite", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/helmet_netherite_trim" - } - }, - { - "when": "minecraft:redstone", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/helmet_redstone_trim" - } - }, - { - "when": "minecraft:copper", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/helmet_copper_trim" - } - }, - { - "when": "minecraft:gold", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/helmet_gold_trim" - } - }, - { - "when": "minecraft:emerald", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/helmet_emerald_trim" - } - }, - { - "when": "minecraft:diamond", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/helmet_diamond_trim" - } - }, - { - "when": "minecraft:lapis", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/helmet_lapis_trim" - } - }, - { - "when": "minecraft:amethyst", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/helmet_amethyst_trim" - } - }, - { - "when": "minecraft:resin", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/helmet_resin_trim" - } - } - ] - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/rose_gold_leggings.json b/common/src/main/resources/assets/additionaladditions/items/rose_gold_leggings.json deleted file mode 100644 index 298875c5..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/rose_gold_leggings.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "model": { - "type": "minecraft:select", - "property": "minecraft:trim_material", - "fallback": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold_leggings" - }, - "cases": [ - { - "when": "minecraft:quartz", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/leggings_quartz_trim" - } - }, - { - "when": "minecraft:iron", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/leggings_iron_trim" - } - }, - { - "when": "minecraft:netherite", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/leggings_netherite_trim" - } - }, - { - "when": "minecraft:redstone", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/leggings_redstone_trim" - } - }, - { - "when": "minecraft:copper", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/leggings_copper_trim" - } - }, - { - "when": "minecraft:gold", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/leggings_gold_trim" - } - }, - { - "when": "minecraft:emerald", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/leggings_emerald_trim" - } - }, - { - "when": "minecraft:diamond", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/leggings_diamond_trim" - } - }, - { - "when": "minecraft:lapis", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/leggings_lapis_trim" - } - }, - { - "when": "minecraft:amethyst", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/leggings_amethyst_trim" - } - }, - { - "when": "minecraft:resin", - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold/leggings_resin_trim" - } - } - ] - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/white_album.json b/common/src/main/resources/assets/additionaladditions/items/white_album.json deleted file mode 100644 index 7603721c..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/white_album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/white_album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/white_album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/items/yellow_album.json b/common/src/main/resources/assets/additionaladditions/items/yellow_album.json deleted file mode 100644 index de0af532..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/yellow_album.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "model": { - "type": "minecraft:condition", - "property": "additionaladditions:has_disc", - "on_true": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/yellow_album_1" - }, - "on_false": { - "type": "minecraft:model", - "model": "additionaladditions:item/album/yellow_album_0" - } - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/mysterious_bundle.json b/common/src/main/resources/assets/additionaladditions/models/item/mysterious_bundle.json deleted file mode 100644 index 2b23bf24..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/mysterious_bundle.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/mysterious_bundle" - } -} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/album.json b/fabric/src/main/generated/assets/additionaladditions/items/album.json new file mode 100644 index 00000000..6a2b099b --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/amber_blossom_seeds.json b/fabric/src/main/generated/assets/additionaladditions/items/amber_blossom_seeds.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/amber_blossom_seeds.json rename to fabric/src/main/generated/assets/additionaladditions/items/amber_blossom_seeds.json index 1a1f0f33..bb61304d 100644 --- a/common/src/main/resources/assets/additionaladditions/items/amber_blossom_seeds.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/amber_blossom_seeds.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/amber_blossom_seeds" } -} +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/black_album.json b/fabric/src/main/generated/assets/additionaladditions/items/black_album.json new file mode 100644 index 00000000..720ffb37 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/black_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/black_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/black_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/blue_album.json b/fabric/src/main/generated/assets/additionaladditions/items/blue_album.json new file mode 100644 index 00000000..a5be21ae --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/blue_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/blue_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/blue_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/brown_album.json b/fabric/src/main/generated/assets/additionaladditions/items/brown_album.json new file mode 100644 index 00000000..fb54b7e1 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/brown_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/brown_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/brown_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/bulbus_pod.json b/fabric/src/main/generated/assets/additionaladditions/items/bulbus_pod.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/bulbus_pod.json rename to fabric/src/main/generated/assets/additionaladditions/items/bulbus_pod.json index a63782ae..fde19419 100644 --- a/common/src/main/resources/assets/additionaladditions/items/bulbus_pod.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/bulbus_pod.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/bulbus_pod" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/cottonshiver_pod.json b/fabric/src/main/generated/assets/additionaladditions/items/cottonshiver_pod.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/cottonshiver_pod.json rename to fabric/src/main/generated/assets/additionaladditions/items/cottonshiver_pod.json index 7ef06677..d8359acf 100644 --- a/common/src/main/resources/assets/additionaladditions/items/cottonshiver_pod.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/cottonshiver_pod.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/cottonshiver_pod" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/crimson_blossom_seeds.json b/fabric/src/main/generated/assets/additionaladditions/items/crimson_blossom_seeds.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/crimson_blossom_seeds.json rename to fabric/src/main/generated/assets/additionaladditions/items/crimson_blossom_seeds.json index 2d639242..01f9b008 100644 --- a/common/src/main/resources/assets/additionaladditions/items/crimson_blossom_seeds.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/crimson_blossom_seeds.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/crimson_blossom_seeds" } -} +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/cyan_album.json b/fabric/src/main/generated/assets/additionaladditions/items/cyan_album.json new file mode 100644 index 00000000..a1d55969 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/cyan_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/cyan_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/cyan_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/frostleaf_pod.json b/fabric/src/main/generated/assets/additionaladditions/items/frostleaf_pod.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/frostleaf_pod.json rename to fabric/src/main/generated/assets/additionaladditions/items/frostleaf_pod.json index 4382bbef..784d1608 100644 --- a/common/src/main/resources/assets/additionaladditions/items/frostleaf_pod.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/frostleaf_pod.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/frostleaf_pod" } -} +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/gray_album.json b/fabric/src/main/generated/assets/additionaladditions/items/gray_album.json new file mode 100644 index 00000000..a77dbf49 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/gray_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/gray_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/gray_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/green_album.json b/fabric/src/main/generated/assets/additionaladditions/items/green_album.json new file mode 100644 index 00000000..1d260039 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/green_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/green_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/green_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/light_blue_album.json b/fabric/src/main/generated/assets/additionaladditions/items/light_blue_album.json new file mode 100644 index 00000000..4584a062 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/light_blue_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/light_blue_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/light_blue_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/light_gray_album.json b/fabric/src/main/generated/assets/additionaladditions/items/light_gray_album.json new file mode 100644 index 00000000..5c29c97a --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/light_gray_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/light_gray_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/light_gray_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/lime_album.json b/fabric/src/main/generated/assets/additionaladditions/items/lime_album.json new file mode 100644 index 00000000..c0d0a65f --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/lime_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/lime_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/lime_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/lotus_lily_pod.json b/fabric/src/main/generated/assets/additionaladditions/items/lotus_lily_pod.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/lotus_lily_pod.json rename to fabric/src/main/generated/assets/additionaladditions/items/lotus_lily_pod.json index 6938e5ac..ca31af6d 100644 --- a/common/src/main/resources/assets/additionaladditions/items/lotus_lily_pod.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/lotus_lily_pod.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/lotus_lily_pod" } -} +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/magenta_album.json b/fabric/src/main/generated/assets/additionaladditions/items/magenta_album.json new file mode 100644 index 00000000..cfbad32a --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/magenta_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/magenta_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/magenta_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/mudflower_seeds.json b/fabric/src/main/generated/assets/additionaladditions/items/mudflower_seeds.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/mudflower_seeds.json rename to fabric/src/main/generated/assets/additionaladditions/items/mudflower_seeds.json index 799c32f9..b4c28a57 100644 --- a/common/src/main/resources/assets/additionaladditions/items/mudflower_seeds.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/mudflower_seeds.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/mudflower_seeds" } -} +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/orange_album.json b/fabric/src/main/generated/assets/additionaladditions/items/orange_album.json new file mode 100644 index 00000000..2dd0032a --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/orange_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/orange_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/orange_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/pink_album.json b/fabric/src/main/generated/assets/additionaladditions/items/pink_album.json new file mode 100644 index 00000000..7edbf8c0 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/pink_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/pink_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/pink_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/purple_album.json b/fabric/src/main/generated/assets/additionaladditions/items/purple_album.json new file mode 100644 index 00000000..bf4fde6e --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/purple_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/purple_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/purple_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/red_album.json b/fabric/src/main/generated/assets/additionaladditions/items/red_album.json new file mode 100644 index 00000000..a8d5eabe --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/red_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/red_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/red_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/rose_gold_axe.json b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_axe.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/rose_gold_axe.json rename to fabric/src/main/generated/assets/additionaladditions/items/rose_gold_axe.json index c373587f..17a50025 100644 --- a/common/src/main/resources/assets/additionaladditions/items/rose_gold_axe.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_axe.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/rose_gold_axe" } -} +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_boots.json b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_boots.json new file mode 100644 index 00000000..c2d797ed --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_boots.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_chestplate.json b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_chestplate.json new file mode 100644 index 00000000..b6ae94d7 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_chestplate.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_helmet.json b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_helmet.json new file mode 100644 index 00000000..48778c37 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_helmet.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/rose_gold_hoe.json b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_hoe.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/rose_gold_hoe.json rename to fabric/src/main/generated/assets/additionaladditions/items/rose_gold_hoe.json index c1c95c31..4908f6d4 100644 --- a/common/src/main/resources/assets/additionaladditions/items/rose_gold_hoe.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_hoe.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/rose_gold_hoe" } -} +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_leggings.json b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_leggings.json new file mode 100644 index 00000000..368687fc --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_leggings.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/rose_gold_pickaxe.json b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_pickaxe.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/rose_gold_pickaxe.json rename to fabric/src/main/generated/assets/additionaladditions/items/rose_gold_pickaxe.json index 1854ba75..f8e3d196 100644 --- a/common/src/main/resources/assets/additionaladditions/items/rose_gold_pickaxe.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_pickaxe.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/rose_gold_pickaxe" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/rose_gold_shovel.json b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_shovel.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/rose_gold_shovel.json rename to fabric/src/main/generated/assets/additionaladditions/items/rose_gold_shovel.json index 43498423..72d0ef35 100644 --- a/common/src/main/resources/assets/additionaladditions/items/rose_gold_shovel.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_shovel.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/rose_gold_shovel" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/rose_gold_spear.json b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_spear.json similarity index 99% rename from common/src/main/resources/assets/additionaladditions/items/rose_gold_spear.json rename to fabric/src/main/generated/assets/additionaladditions/items/rose_gold_spear.json index 1c9b3e2a..40bc6876 100644 --- a/common/src/main/resources/assets/additionaladditions/items/rose_gold_spear.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_spear.json @@ -22,4 +22,4 @@ "property": "minecraft:display_context" }, "swap_animation_scale": 1.95 -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/rose_gold_sword.json b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_sword.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/rose_gold_sword.json rename to fabric/src/main/generated/assets/additionaladditions/items/rose_gold_sword.json index 5a1a8c0b..f76bdfd9 100644 --- a/common/src/main/resources/assets/additionaladditions/items/rose_gold_sword.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_sword.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/rose_gold_sword" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/sawtooth_fern_fiddlehead.json b/fabric/src/main/generated/assets/additionaladditions/items/sawtooth_fern_fiddlehead.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/sawtooth_fern_fiddlehead.json rename to fabric/src/main/generated/assets/additionaladditions/items/sawtooth_fern_fiddlehead.json index 2208eea8..46946879 100644 --- a/common/src/main/resources/assets/additionaladditions/items/sawtooth_fern_fiddlehead.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/sawtooth_fern_fiddlehead.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/sawtooth_fern_fiddlehead" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/snapdragon_pod.json b/fabric/src/main/generated/assets/additionaladditions/items/snapdragon_pod.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/snapdragon_pod.json rename to fabric/src/main/generated/assets/additionaladditions/items/snapdragon_pod.json index 67ea1d97..3f673a49 100644 --- a/common/src/main/resources/assets/additionaladditions/items/snapdragon_pod.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/snapdragon_pod.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/snapdragon_pod" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/spikeblossom_seeds.json b/fabric/src/main/generated/assets/additionaladditions/items/spikeblossom_seeds.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/spikeblossom_seeds.json rename to fabric/src/main/generated/assets/additionaladditions/items/spikeblossom_seeds.json index 5e5065cb..43a67ef4 100644 --- a/common/src/main/resources/assets/additionaladditions/items/spikeblossom_seeds.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/spikeblossom_seeds.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/spikeblossom_seeds" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/tinted_redstone_lamp.json b/fabric/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/items/tinted_redstone_lamp.json rename to fabric/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json index 7064e574..532357b1 100644 --- a/common/src/main/resources/assets/additionaladditions/items/tinted_redstone_lamp.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/tinted_redstone_lamp" } -} +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/white_album.json b/fabric/src/main/generated/assets/additionaladditions/items/white_album.json new file mode 100644 index 00000000..49dd00be --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/white_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/white_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/white_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/items/wrench.json b/fabric/src/main/generated/assets/additionaladditions/items/wrench.json similarity index 97% rename from common/src/main/resources/assets/additionaladditions/items/wrench.json rename to fabric/src/main/generated/assets/additionaladditions/items/wrench.json index 97d895f2..9e3950fb 100644 --- a/common/src/main/resources/assets/additionaladditions/items/wrench.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/wrench.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:item/wrench" } -} +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/yellow_album.json b/fabric/src/main/generated/assets/additionaladditions/items/yellow_album.json new file mode 100644 index 00000000..2c0d4ed0 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/yellow_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/yellow_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/yellow_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/album_0.json similarity index 63% rename from common/src/main/resources/assets/additionaladditions/models/item/album/album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/album_0.json index a037e504..95338c16 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/album_1.json similarity index 75% rename from common/src/main/resources/assets/additionaladditions/models/item/album/album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/album_1.json index df1e2ecd..2f52d0ed 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/album", "layer1": "additionaladditions:item/album_overlay" diff --git a/common/src/main/resources/assets/additionaladditions/models/item/amber_blossom_seeds.json b/fabric/src/main/generated/assets/additionaladditions/models/item/amber_blossom_seeds.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/amber_blossom_seeds.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/amber_blossom_seeds.json index 64e65224..11d5577a 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/amber_blossom_seeds.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/amber_blossom_seeds.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/amber_blossom_seeds" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/black_album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/black_album_0.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/album/black_album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/black_album_0.json index 8247556c..92230e35 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/black_album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/black_album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/black_album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/black_album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/black_album_1.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/album/black_album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/black_album_1.json index be3f9092..69ab245a 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/black_album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/black_album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/black_album", "layer1": "additionaladditions:item/album_overlay" diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/blue_album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/blue_album_0.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/album/blue_album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/blue_album_0.json index c020f9eb..37efc762 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/blue_album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/blue_album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/blue_album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/blue_album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/blue_album_1.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/album/blue_album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/blue_album_1.json index 0449c617..8d757a6c 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/blue_album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/blue_album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/blue_album", "layer1": "additionaladditions:item/album_overlay" diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/brown_album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/brown_album_0.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/album/brown_album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/brown_album_0.json index ca965a2d..42712fb3 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/brown_album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/brown_album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/brown_album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/brown_album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/brown_album_1.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/album/brown_album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/brown_album_1.json index aecb641e..9ba32e87 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/brown_album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/brown_album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/brown_album", "layer1": "additionaladditions:item/album_overlay" diff --git a/common/src/main/resources/assets/additionaladditions/models/item/bulbus_pod.json b/fabric/src/main/generated/assets/additionaladditions/models/item/bulbus_pod.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/bulbus_pod.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/bulbus_pod.json index 9474333f..40ed5c4e 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/bulbus_pod.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/bulbus_pod.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/bulbus_pod" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/cottonshiver_pod.json b/fabric/src/main/generated/assets/additionaladditions/models/item/cottonshiver_pod.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/cottonshiver_pod.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/cottonshiver_pod.json index 51bf4285..ec443091 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/cottonshiver_pod.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/cottonshiver_pod.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/cottonshiver_pod" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/crimson_blossom_seeds.json b/fabric/src/main/generated/assets/additionaladditions/models/item/crimson_blossom_seeds.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/crimson_blossom_seeds.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/crimson_blossom_seeds.json index 8f790b4e..a8d1d6f7 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/crimson_blossom_seeds.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/crimson_blossom_seeds.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/crimson_blossom_seeds" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/cyan_album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/cyan_album_0.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/album/cyan_album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/cyan_album_0.json index a5344786..1253ad2f 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/cyan_album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/cyan_album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/cyan_album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/cyan_album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/cyan_album_1.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/album/cyan_album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/cyan_album_1.json index 5c9968f2..16b2b5f6 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/cyan_album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/cyan_album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/cyan_album", "layer1": "additionaladditions:item/album_overlay" diff --git a/common/src/main/resources/assets/additionaladditions/models/item/frostleaf_pod.json b/fabric/src/main/generated/assets/additionaladditions/models/item/frostleaf_pod.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/frostleaf_pod.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/frostleaf_pod.json index ef8fea06..37ec4ad6 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/frostleaf_pod.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/frostleaf_pod.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/frostleaf_pod" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/gray_album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/gray_album_0.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/album/gray_album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/gray_album_0.json index 7c6d00a8..dfacf8ab 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/gray_album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/gray_album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/gray_album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/gray_album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/gray_album_1.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/album/gray_album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/gray_album_1.json index 33bdb15a..178565a1 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/gray_album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/gray_album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/gray_album", "layer1": "additionaladditions:item/album_overlay" diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/green_album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/green_album_0.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/album/green_album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/green_album_0.json index 60d21d0b..b26eab83 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/green_album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/green_album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/green_album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/green_album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/green_album_1.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/album/green_album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/green_album_1.json index 866e9075..94c99bcd 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/green_album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/green_album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/green_album", "layer1": "additionaladditions:item/album_overlay" diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/light_blue_album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/light_blue_album_0.json similarity index 66% rename from common/src/main/resources/assets/additionaladditions/models/item/album/light_blue_album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/light_blue_album_0.json index 9b99b043..7e172bae 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/light_blue_album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/light_blue_album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/light_blue_album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/light_blue_album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/light_blue_album_1.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/album/light_blue_album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/light_blue_album_1.json index 21769a1a..d2dd84a8 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/light_blue_album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/light_blue_album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/light_blue_album", "layer1": "additionaladditions:item/album_overlay" diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/light_gray_album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/light_gray_album_0.json similarity index 66% rename from common/src/main/resources/assets/additionaladditions/models/item/album/light_gray_album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/light_gray_album_0.json index eb19430b..b05b0163 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/light_gray_album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/light_gray_album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/light_gray_album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/light_gray_album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/light_gray_album_1.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/album/light_gray_album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/light_gray_album_1.json index c617898e..218ef8d2 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/light_gray_album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/light_gray_album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/light_gray_album", "layer1": "additionaladditions:item/album_overlay" diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/lime_album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/lime_album_0.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/album/lime_album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/lime_album_0.json index 2c28e9bd..f0167d7e 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/lime_album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/lime_album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/lime_album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/lime_album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/lime_album_1.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/album/lime_album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/lime_album_1.json index 2fed8dd2..17ee4d05 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/lime_album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/lime_album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/lime_album", "layer1": "additionaladditions:item/album_overlay" diff --git a/common/src/main/resources/assets/additionaladditions/models/item/lotus_lily_pod.json b/fabric/src/main/generated/assets/additionaladditions/models/item/lotus_lily_pod.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/lotus_lily_pod.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/lotus_lily_pod.json index 6843e75f..e0d45f8b 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/lotus_lily_pod.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/lotus_lily_pod.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/lotus_lily_pod" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/magenta_album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/magenta_album_0.json similarity index 66% rename from common/src/main/resources/assets/additionaladditions/models/item/album/magenta_album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/magenta_album_0.json index b3c98efc..b053d0be 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/magenta_album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/magenta_album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/magenta_album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/magenta_album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/magenta_album_1.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/album/magenta_album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/magenta_album_1.json index 13e075c1..55a4b388 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/magenta_album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/magenta_album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/magenta_album", "layer1": "additionaladditions:item/album_overlay" diff --git a/common/src/main/resources/assets/additionaladditions/models/item/mudflower_seeds.json b/fabric/src/main/generated/assets/additionaladditions/models/item/mudflower_seeds.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/mudflower_seeds.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/mudflower_seeds.json index 7524c336..42160a46 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/mudflower_seeds.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/mudflower_seeds.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/mudflower_seeds" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/orange_album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/orange_album_0.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/album/orange_album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/orange_album_0.json index c4c2329a..fd484b49 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/orange_album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/orange_album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/orange_album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/orange_album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/orange_album_1.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/album/orange_album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/orange_album_1.json index 014cf71a..85f4997e 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/orange_album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/orange_album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/orange_album", "layer1": "additionaladditions:item/album_overlay" diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/pink_album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/pink_album_0.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/album/pink_album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/pink_album_0.json index 1c72755a..4648c926 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/pink_album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/pink_album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/pink_album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/pink_album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/pink_album_1.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/album/pink_album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/pink_album_1.json index 167c38e0..c45ac2a4 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/pink_album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/pink_album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/pink_album", "layer1": "additionaladditions:item/album_overlay" diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/purple_album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/purple_album_0.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/album/purple_album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/purple_album_0.json index e4ee6800..dd2b0118 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/purple_album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/purple_album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/purple_album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/purple_album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/purple_album_1.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/album/purple_album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/purple_album_1.json index c6e8a661..9a1b36fe 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/purple_album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/purple_album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/purple_album", "layer1": "additionaladditions:item/album_overlay" diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/red_album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/red_album_0.json similarity index 64% rename from common/src/main/resources/assets/additionaladditions/models/item/album/red_album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/red_album_0.json index cf86687b..ef8301f3 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/red_album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/red_album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/red_album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/red_album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/red_album_1.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/album/red_album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/red_album_1.json index 2d09e045..5ad981bf 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/red_album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/red_album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/red_album", "layer1": "additionaladditions:item/album_overlay" diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_axe.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_axe.json similarity index 66% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold_axe.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_axe.json index 8894b17c..82c16006 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_axe.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_axe.json @@ -1,5 +1,5 @@ { - "parent": "item/handheld", + "parent": "minecraft:item/handheld", "textures": { "layer0": "additionaladditions:item/rose_gold_axe" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_boots.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold_boots.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots.json index 3da9a5ca..2d085ced 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_boots.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_boots" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_amethyst_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_amethyst_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_amethyst_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_amethyst_trim.json index db009bee..7349d6a9 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_amethyst_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_amethyst_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_boots", "layer1": "minecraft:trims/items/boots_trim_amethyst" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_copper_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_copper_trim.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_copper_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_copper_trim.json index e7754af1..a619d5c0 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_copper_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_copper_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_boots", "layer1": "minecraft:trims/items/boots_trim_copper" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_diamond_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_diamond_trim.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_diamond_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_diamond_trim.json index 0889496c..18217914 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_diamond_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_diamond_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_boots", "layer1": "minecraft:trims/items/boots_trim_diamond" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_emerald_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_emerald_trim.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_emerald_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_emerald_trim.json index 3cbe4d29..dbb8bd50 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_emerald_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_emerald_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_boots", "layer1": "minecraft:trims/items/boots_trim_emerald" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_gold_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_gold_trim.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_gold_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_gold_trim.json index 11942243..5d94f46e 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_gold_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_gold_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_boots", "layer1": "minecraft:trims/items/boots_trim_gold" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_iron_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_iron_trim.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_iron_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_iron_trim.json index 62824984..eac0872d 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_iron_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_iron_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_boots", "layer1": "minecraft:trims/items/boots_trim_iron" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_lapis_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_lapis_trim.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_lapis_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_lapis_trim.json index 85341d51..d8f06792 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_lapis_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_lapis_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_boots", "layer1": "minecraft:trims/items/boots_trim_lapis" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_netherite_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_netherite_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_netherite_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_netherite_trim.json index fcac0791..7f2a2324 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_netherite_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_netherite_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_boots", "layer1": "minecraft:trims/items/boots_trim_netherite" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_quartz_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_quartz_trim.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_quartz_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_quartz_trim.json index fde879b6..9438d0a0 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_quartz_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_quartz_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_boots", "layer1": "minecraft:trims/items/boots_trim_quartz" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_redstone_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_redstone_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_redstone_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_redstone_trim.json index 7be9a0aa..ef160bac 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_redstone_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_redstone_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_boots", "layer1": "minecraft:trims/items/boots_trim_redstone" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_resin_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_resin_trim.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_resin_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_resin_trim.json index c1143f3d..665136a8 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/boots_resin_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_resin_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_boots", "layer1": "minecraft:trims/items/boots_trim_resin" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_chestplate.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate.json similarity index 67% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold_chestplate.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate.json index 19e9da40..f544387b 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_chestplate.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_chestplate" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_amethyst_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_amethyst_trim.json similarity index 78% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_amethyst_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_amethyst_trim.json index d2611330..c8e2ebc3 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_amethyst_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_amethyst_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_chestplate", "layer1": "minecraft:trims/items/chestplate_trim_amethyst" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_copper_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_copper_trim.json similarity index 78% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_copper_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_copper_trim.json index 17d6835a..a96773d2 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_copper_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_copper_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_chestplate", "layer1": "minecraft:trims/items/chestplate_trim_copper" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_diamond_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_diamond_trim.json similarity index 78% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_diamond_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_diamond_trim.json index 2cf6ccca..fa8ad28a 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_diamond_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_diamond_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_chestplate", "layer1": "minecraft:trims/items/chestplate_trim_diamond" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_emerald_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_emerald_trim.json similarity index 78% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_emerald_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_emerald_trim.json index 68d2638a..65338988 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_emerald_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_emerald_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_chestplate", "layer1": "minecraft:trims/items/chestplate_trim_emerald" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_gold_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_gold_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_gold_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_gold_trim.json index d367a25e..1fd7a982 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_gold_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_gold_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_chestplate", "layer1": "minecraft:trims/items/chestplate_trim_gold" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_iron_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_iron_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_iron_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_iron_trim.json index 78d0a06c..f577524e 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_iron_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_iron_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_chestplate", "layer1": "minecraft:trims/items/chestplate_trim_iron" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_lapis_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_lapis_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_lapis_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_lapis_trim.json index b704e444..5f1bcf2e 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_lapis_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_lapis_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_chestplate", "layer1": "minecraft:trims/items/chestplate_trim_lapis" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_netherite_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_netherite_trim.json similarity index 78% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_netherite_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_netherite_trim.json index d5cb2911..df877dc2 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_netherite_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_netherite_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_chestplate", "layer1": "minecraft:trims/items/chestplate_trim_netherite" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_quartz_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_quartz_trim.json similarity index 78% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_quartz_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_quartz_trim.json index 0f365942..75fc621d 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_quartz_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_quartz_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_chestplate", "layer1": "minecraft:trims/items/chestplate_trim_quartz" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_redstone_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_redstone_trim.json similarity index 78% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_redstone_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_redstone_trim.json index fe1a30b3..1b9c87b0 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_redstone_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_redstone_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_chestplate", "layer1": "minecraft:trims/items/chestplate_trim_redstone" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_resin_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_resin_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_resin_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_resin_trim.json index f6916244..b8ea738a 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/chestplate_resin_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_resin_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_chestplate", "layer1": "minecraft:trims/items/chestplate_trim_resin" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_helmet.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet.json similarity index 66% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold_helmet.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet.json index 2ad4736d..e7ff4580 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_helmet.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_helmet" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_amethyst_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_amethyst_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_amethyst_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_amethyst_trim.json index e54f3b71..b39d253a 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_amethyst_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_amethyst_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_helmet", "layer1": "minecraft:trims/items/helmet_trim_amethyst" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_copper_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_copper_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_copper_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_copper_trim.json index 0ce076d9..660d8ee5 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_copper_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_copper_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_helmet", "layer1": "minecraft:trims/items/helmet_trim_copper" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_diamond_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_diamond_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_diamond_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_diamond_trim.json index afa2aaf2..4ffaaa14 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_diamond_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_diamond_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_helmet", "layer1": "minecraft:trims/items/helmet_trim_diamond" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_emerald_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_emerald_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_emerald_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_emerald_trim.json index 7489c388..1d613fde 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_emerald_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_emerald_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_helmet", "layer1": "minecraft:trims/items/helmet_trim_emerald" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_gold_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_gold_trim.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_gold_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_gold_trim.json index 41fa7600..d896a222 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_gold_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_gold_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_helmet", "layer1": "minecraft:trims/items/helmet_trim_gold" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_iron_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_iron_trim.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_iron_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_iron_trim.json index f61b9bf6..6235a6e9 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_iron_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_iron_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_helmet", "layer1": "minecraft:trims/items/helmet_trim_iron" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_lapis_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_lapis_trim.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_lapis_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_lapis_trim.json index 0ad49b32..8a872fe3 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_lapis_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_lapis_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_helmet", "layer1": "minecraft:trims/items/helmet_trim_lapis" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_netherite_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_netherite_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_netherite_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_netherite_trim.json index c79325b6..9ee8883a 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_netherite_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_netherite_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_helmet", "layer1": "minecraft:trims/items/helmet_trim_netherite" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_quartz_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_quartz_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_quartz_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_quartz_trim.json index 392c48b7..4d87e81c 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_quartz_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_quartz_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_helmet", "layer1": "minecraft:trims/items/helmet_trim_quartz" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_redstone_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_redstone_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_redstone_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_redstone_trim.json index 2f1e00fd..5e0e5005 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_redstone_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_redstone_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_helmet", "layer1": "minecraft:trims/items/helmet_trim_redstone" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_resin_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_resin_trim.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_resin_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_resin_trim.json index f753ac2e..528fc823 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/helmet_resin_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_resin_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_helmet", "layer1": "minecraft:trims/items/helmet_trim_resin" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_hoe.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_hoe.json similarity index 66% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold_hoe.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_hoe.json index 6c7e87f4..cd488b32 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_hoe.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_hoe.json @@ -1,5 +1,5 @@ { - "parent": "item/handheld", + "parent": "minecraft:item/handheld", "textures": { "layer0": "additionaladditions:item/rose_gold_hoe" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_leggings.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings.json similarity index 66% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold_leggings.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings.json index 5c768993..5ee7c6f9 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_leggings.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_leggings" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_amethyst_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_amethyst_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_amethyst_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_amethyst_trim.json index 4b471adb..f7a3e20c 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_amethyst_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_amethyst_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_leggings", "layer1": "minecraft:trims/items/leggings_trim_amethyst" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_copper_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_copper_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_copper_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_copper_trim.json index eb094b47..424ce2a3 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_copper_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_copper_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_leggings", "layer1": "minecraft:trims/items/leggings_trim_copper" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_diamond_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_diamond_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_diamond_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_diamond_trim.json index 09fbfd9c..02ece533 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_diamond_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_diamond_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_leggings", "layer1": "minecraft:trims/items/leggings_trim_diamond" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_emerald_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_emerald_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_emerald_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_emerald_trim.json index ec3082d2..94df2228 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_emerald_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_emerald_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_leggings", "layer1": "minecraft:trims/items/leggings_trim_emerald" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_gold_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_gold_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_gold_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_gold_trim.json index 170049b8..82a52f46 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_gold_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_gold_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_leggings", "layer1": "minecraft:trims/items/leggings_trim_gold" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_iron_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_iron_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_iron_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_iron_trim.json index bcc187f6..64a3b0cb 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_iron_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_iron_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_leggings", "layer1": "minecraft:trims/items/leggings_trim_iron" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_lapis_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_lapis_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_lapis_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_lapis_trim.json index 16f80191..a5cf09bc 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_lapis_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_lapis_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_leggings", "layer1": "minecraft:trims/items/leggings_trim_lapis" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_netherite_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_netherite_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_netherite_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_netherite_trim.json index 7f923c68..635a2a22 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_netherite_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_netherite_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_leggings", "layer1": "minecraft:trims/items/leggings_trim_netherite" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_quartz_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_quartz_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_quartz_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_quartz_trim.json index 8f3be1b2..1b9de19e 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_quartz_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_quartz_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_leggings", "layer1": "minecraft:trims/items/leggings_trim_quartz" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_redstone_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_redstone_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_redstone_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_redstone_trim.json index 133a3755..fa03ccb3 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_redstone_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_redstone_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_leggings", "layer1": "minecraft:trims/items/leggings_trim_redstone" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_resin_trim.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_resin_trim.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_resin_trim.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_resin_trim.json index 14232e28..6d716cc4 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold/leggings_resin_trim.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_resin_trim.json @@ -1,7 +1,7 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_leggings", "layer1": "minecraft:trims/items/leggings_trim_resin" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_pickaxe.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_pickaxe.json similarity index 67% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold_pickaxe.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_pickaxe.json index c087a542..132d1e34 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_pickaxe.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_pickaxe.json @@ -1,5 +1,5 @@ { - "parent": "item/handheld", + "parent": "minecraft:item/handheld", "textures": { "layer0": "additionaladditions:item/rose_gold_pickaxe" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_shovel.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_shovel.json similarity index 67% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold_shovel.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_shovel.json index f7020eb6..d9688dc8 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_shovel.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_shovel.json @@ -1,5 +1,5 @@ { - "parent": "item/handheld", + "parent": "minecraft:item/handheld", "textures": { "layer0": "additionaladditions:item/rose_gold_shovel" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_spear.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_spear.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold_spear.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_spear.json index 9eb7d899..052252e4 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_spear.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_spear.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/rose_gold_spear" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_spear_in_hand.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_spear_in_hand.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold_spear_in_hand.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_spear_in_hand.json index e55055c1..16d14294 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_spear_in_hand.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_spear_in_hand.json @@ -1,6 +1,6 @@ { - "parent": "item/spear_in_hand", + "parent": "minecraft:item/spear_in_hand", "textures": { "layer0": "additionaladditions:item/rose_gold_spear_in_hand" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_sword.json b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_sword.json similarity index 67% rename from common/src/main/resources/assets/additionaladditions/models/item/rose_gold_sword.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_sword.json index 29f7eff0..6c35cd7e 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_sword.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/rose_gold_sword.json @@ -1,5 +1,5 @@ { - "parent": "item/handheld", + "parent": "minecraft:item/handheld", "textures": { "layer0": "additionaladditions:item/rose_gold_sword" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/sawtooth_fern_fiddlehead.json b/fabric/src/main/generated/assets/additionaladditions/models/item/sawtooth_fern_fiddlehead.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/sawtooth_fern_fiddlehead.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/sawtooth_fern_fiddlehead.json index ac2613fb..eedaeec1 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/sawtooth_fern_fiddlehead.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/sawtooth_fern_fiddlehead.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/sawtooth_fern_fiddlehead" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/snapdragon_pod.json b/fabric/src/main/generated/assets/additionaladditions/models/item/snapdragon_pod.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/snapdragon_pod.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/snapdragon_pod.json index 543baa55..6ab26ad6 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/snapdragon_pod.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/snapdragon_pod.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/snapdragon_pod" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/spikeblossom_seeds.json b/fabric/src/main/generated/assets/additionaladditions/models/item/spikeblossom_seeds.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/spikeblossom_seeds.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/spikeblossom_seeds.json index 1db80053..5e52f4aa 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/spikeblossom_seeds.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/spikeblossom_seeds.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/spikeblossom_seeds" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/white_album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/white_album_0.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/album/white_album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/white_album_0.json index 17585331..eab66100 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/white_album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/white_album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/white_album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/white_album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/white_album_1.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/album/white_album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/white_album_1.json index bfdcca14..3c11435c 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/white_album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/white_album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/white_album", "layer1": "additionaladditions:item/album_overlay" diff --git a/common/src/main/resources/assets/additionaladditions/models/item/wrench.json b/fabric/src/main/generated/assets/additionaladditions/models/item/wrench.json similarity index 64% rename from common/src/main/resources/assets/additionaladditions/models/item/wrench.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/wrench.json index 0006f5ae..cd9c1a75 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/wrench.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/wrench.json @@ -1,5 +1,5 @@ { - "parent": "item/handheld", + "parent": "minecraft:item/handheld", "textures": { "layer0": "additionaladditions:item/wrench" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/yellow_album_0.json b/fabric/src/main/generated/assets/additionaladditions/models/item/yellow_album_0.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/item/album/yellow_album_0.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/yellow_album_0.json index 272b8227..6845a883 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/yellow_album_0.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/yellow_album_0.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/yellow_album" } diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album/yellow_album_1.json b/fabric/src/main/generated/assets/additionaladditions/models/item/yellow_album_1.json similarity index 76% rename from common/src/main/resources/assets/additionaladditions/models/item/album/yellow_album_1.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/yellow_album_1.json index 3d734f42..e99373f9 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/album/yellow_album_1.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/yellow_album_1.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/yellow_album", "layer1": "additionaladditions:item/album_overlay" diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/album.json b/neoforge/src/main/generated/assets/additionaladditions/items/album.json new file mode 100644 index 00000000..6a2b099b --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/amber_blossom_seeds.json b/neoforge/src/main/generated/assets/additionaladditions/items/amber_blossom_seeds.json new file mode 100644 index 00000000..bb61304d --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/amber_blossom_seeds.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/amber_blossom_seeds" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/black_album.json b/neoforge/src/main/generated/assets/additionaladditions/items/black_album.json new file mode 100644 index 00000000..720ffb37 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/black_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/black_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/black_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/blue_album.json b/neoforge/src/main/generated/assets/additionaladditions/items/blue_album.json new file mode 100644 index 00000000..a5be21ae --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/blue_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/blue_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/blue_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/brown_album.json b/neoforge/src/main/generated/assets/additionaladditions/items/brown_album.json new file mode 100644 index 00000000..fb54b7e1 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/brown_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/brown_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/brown_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/bulbus_pod.json b/neoforge/src/main/generated/assets/additionaladditions/items/bulbus_pod.json new file mode 100644 index 00000000..fde19419 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/bulbus_pod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/bulbus_pod" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/cottonshiver_pod.json b/neoforge/src/main/generated/assets/additionaladditions/items/cottonshiver_pod.json new file mode 100644 index 00000000..d8359acf --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/cottonshiver_pod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/cottonshiver_pod" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/crimson_blossom_seeds.json b/neoforge/src/main/generated/assets/additionaladditions/items/crimson_blossom_seeds.json new file mode 100644 index 00000000..01f9b008 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/crimson_blossom_seeds.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/crimson_blossom_seeds" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/cyan_album.json b/neoforge/src/main/generated/assets/additionaladditions/items/cyan_album.json new file mode 100644 index 00000000..a1d55969 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/cyan_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/cyan_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/cyan_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/frostleaf_pod.json b/neoforge/src/main/generated/assets/additionaladditions/items/frostleaf_pod.json new file mode 100644 index 00000000..784d1608 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/frostleaf_pod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/frostleaf_pod" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/gray_album.json b/neoforge/src/main/generated/assets/additionaladditions/items/gray_album.json new file mode 100644 index 00000000..a77dbf49 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/gray_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/gray_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/gray_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/green_album.json b/neoforge/src/main/generated/assets/additionaladditions/items/green_album.json new file mode 100644 index 00000000..1d260039 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/green_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/green_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/green_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/light_blue_album.json b/neoforge/src/main/generated/assets/additionaladditions/items/light_blue_album.json new file mode 100644 index 00000000..4584a062 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/light_blue_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/light_blue_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/light_blue_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/light_gray_album.json b/neoforge/src/main/generated/assets/additionaladditions/items/light_gray_album.json new file mode 100644 index 00000000..5c29c97a --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/light_gray_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/light_gray_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/light_gray_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/lime_album.json b/neoforge/src/main/generated/assets/additionaladditions/items/lime_album.json new file mode 100644 index 00000000..c0d0a65f --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/lime_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/lime_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/lime_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/lotus_lily_pod.json b/neoforge/src/main/generated/assets/additionaladditions/items/lotus_lily_pod.json new file mode 100644 index 00000000..ca31af6d --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/lotus_lily_pod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/lotus_lily_pod" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/magenta_album.json b/neoforge/src/main/generated/assets/additionaladditions/items/magenta_album.json new file mode 100644 index 00000000..cfbad32a --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/magenta_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/magenta_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/magenta_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/mudflower_seeds.json b/neoforge/src/main/generated/assets/additionaladditions/items/mudflower_seeds.json new file mode 100644 index 00000000..b4c28a57 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/mudflower_seeds.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/mudflower_seeds" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/orange_album.json b/neoforge/src/main/generated/assets/additionaladditions/items/orange_album.json new file mode 100644 index 00000000..2dd0032a --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/orange_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/orange_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/orange_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/pink_album.json b/neoforge/src/main/generated/assets/additionaladditions/items/pink_album.json new file mode 100644 index 00000000..7edbf8c0 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/pink_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/pink_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/pink_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/purple_album.json b/neoforge/src/main/generated/assets/additionaladditions/items/purple_album.json new file mode 100644 index 00000000..bf4fde6e --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/purple_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/purple_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/purple_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/red_album.json b/neoforge/src/main/generated/assets/additionaladditions/items/red_album.json new file mode 100644 index 00000000..a8d5eabe --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/red_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/red_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/red_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_axe.json b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_axe.json new file mode 100644 index 00000000..17a50025 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_axe" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_boots.json b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_boots.json new file mode 100644 index 00000000..c2d797ed --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_boots.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_boots" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_chestplate.json b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_chestplate.json new file mode 100644 index 00000000..b6ae94d7 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_chestplate.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_chestplate" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_helmet.json b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_helmet.json new file mode 100644 index 00000000..48778c37 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_helmet.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_helmet" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_hoe.json b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_hoe.json new file mode 100644 index 00000000..4908f6d4 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_hoe" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_leggings.json b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_leggings.json new file mode 100644 index 00000000..368687fc --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_leggings.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_leggings" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_pickaxe.json b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_pickaxe.json new file mode 100644 index 00000000..f8e3d196 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_pickaxe" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_shovel.json b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_shovel.json new file mode 100644 index 00000000..72d0ef35 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_shovel" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_spear.json b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_spear.json new file mode 100644 index 00000000..40bc6876 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_spear.json @@ -0,0 +1,25 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_spear" + }, + "when": [ + "gui", + "ground", + "fixed", + "on_shelf" + ] + } + ], + "fallback": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_spear_in_hand" + }, + "property": "minecraft:display_context" + }, + "swap_animation_scale": 1.95 +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_sword.json b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_sword.json new file mode 100644 index 00000000..f76bdfd9 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/rose_gold_sword" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/sawtooth_fern_fiddlehead.json b/neoforge/src/main/generated/assets/additionaladditions/items/sawtooth_fern_fiddlehead.json new file mode 100644 index 00000000..46946879 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/sawtooth_fern_fiddlehead.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/sawtooth_fern_fiddlehead" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/snapdragon_pod.json b/neoforge/src/main/generated/assets/additionaladditions/items/snapdragon_pod.json new file mode 100644 index 00000000..3f673a49 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/snapdragon_pod.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/snapdragon_pod" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/spikeblossom_seeds.json b/neoforge/src/main/generated/assets/additionaladditions/items/spikeblossom_seeds.json new file mode 100644 index 00000000..43a67ef4 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/spikeblossom_seeds.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/spikeblossom_seeds" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json b/neoforge/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json new file mode 100644 index 00000000..532357b1 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/tinted_redstone_lamp" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/white_album.json b/neoforge/src/main/generated/assets/additionaladditions/items/white_album.json new file mode 100644 index 00000000..49dd00be --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/white_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/white_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/white_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/wrench.json b/neoforge/src/main/generated/assets/additionaladditions/items/wrench.json new file mode 100644 index 00000000..9e3950fb --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/wrench.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/wrench" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/yellow_album.json b/neoforge/src/main/generated/assets/additionaladditions/items/yellow_album.json new file mode 100644 index 00000000..2c0d4ed0 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/yellow_album.json @@ -0,0 +1,14 @@ +{ + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "additionaladditions:item/yellow_album_0" + }, + "on_true": { + "type": "minecraft:model", + "model": "additionaladditions:item/yellow_album_1" + }, + "property": "additionaladditions:has_disc" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/album_0.json new file mode 100644 index 00000000..95338c16 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/album_1.json new file mode 100644 index 00000000..2f52d0ed --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/amber_blossom_seeds.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/amber_blossom_seeds.json new file mode 100644 index 00000000..11d5577a --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/amber_blossom_seeds.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/amber_blossom_seeds" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/black_album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/black_album_0.json new file mode 100644 index 00000000..92230e35 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/black_album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/black_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/black_album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/black_album_1.json new file mode 100644 index 00000000..69ab245a --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/black_album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/black_album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/blue_album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/blue_album_0.json new file mode 100644 index 00000000..37efc762 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/blue_album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/blue_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/blue_album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/blue_album_1.json new file mode 100644 index 00000000..8d757a6c --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/blue_album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/blue_album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/brown_album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/brown_album_0.json new file mode 100644 index 00000000..42712fb3 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/brown_album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/brown_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/brown_album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/brown_album_1.json new file mode 100644 index 00000000..9ba32e87 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/brown_album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/brown_album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/bulbus_pod.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/bulbus_pod.json new file mode 100644 index 00000000..40ed5c4e --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/bulbus_pod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/bulbus_pod" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/cottonshiver_pod.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/cottonshiver_pod.json new file mode 100644 index 00000000..ec443091 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/cottonshiver_pod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/cottonshiver_pod" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/crimson_blossom_seeds.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/crimson_blossom_seeds.json new file mode 100644 index 00000000..a8d1d6f7 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/crimson_blossom_seeds.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/crimson_blossom_seeds" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/cyan_album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/cyan_album_0.json new file mode 100644 index 00000000..1253ad2f --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/cyan_album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/cyan_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/cyan_album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/cyan_album_1.json new file mode 100644 index 00000000..16b2b5f6 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/cyan_album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/cyan_album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/frostleaf_pod.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/frostleaf_pod.json new file mode 100644 index 00000000..37ec4ad6 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/frostleaf_pod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/frostleaf_pod" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/gray_album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/gray_album_0.json new file mode 100644 index 00000000..dfacf8ab --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/gray_album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/gray_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/gray_album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/gray_album_1.json new file mode 100644 index 00000000..178565a1 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/gray_album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/gray_album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/green_album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/green_album_0.json new file mode 100644 index 00000000..b26eab83 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/green_album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/green_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/green_album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/green_album_1.json new file mode 100644 index 00000000..94c99bcd --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/green_album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/green_album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/light_blue_album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/light_blue_album_0.json new file mode 100644 index 00000000..7e172bae --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/light_blue_album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/light_blue_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/light_blue_album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/light_blue_album_1.json new file mode 100644 index 00000000..d2dd84a8 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/light_blue_album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/light_blue_album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/light_gray_album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/light_gray_album_0.json new file mode 100644 index 00000000..b05b0163 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/light_gray_album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/light_gray_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/light_gray_album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/light_gray_album_1.json new file mode 100644 index 00000000..218ef8d2 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/light_gray_album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/light_gray_album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/lime_album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/lime_album_0.json new file mode 100644 index 00000000..f0167d7e --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/lime_album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/lime_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/lime_album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/lime_album_1.json new file mode 100644 index 00000000..17ee4d05 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/lime_album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/lime_album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/lotus_lily_pod.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/lotus_lily_pod.json new file mode 100644 index 00000000..e0d45f8b --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/lotus_lily_pod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/lotus_lily_pod" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/magenta_album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/magenta_album_0.json new file mode 100644 index 00000000..b053d0be --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/magenta_album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/magenta_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/magenta_album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/magenta_album_1.json new file mode 100644 index 00000000..55a4b388 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/magenta_album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/magenta_album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/mudflower_seeds.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/mudflower_seeds.json new file mode 100644 index 00000000..42160a46 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/mudflower_seeds.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/mudflower_seeds" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/orange_album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/orange_album_0.json new file mode 100644 index 00000000..fd484b49 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/orange_album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/orange_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/orange_album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/orange_album_1.json new file mode 100644 index 00000000..85f4997e --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/orange_album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/orange_album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/pink_album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/pink_album_0.json new file mode 100644 index 00000000..4648c926 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/pink_album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/pink_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/pink_album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/pink_album_1.json new file mode 100644 index 00000000..c45ac2a4 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/pink_album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/pink_album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/purple_album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/purple_album_0.json new file mode 100644 index 00000000..dd2b0118 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/purple_album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/purple_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/purple_album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/purple_album_1.json new file mode 100644 index 00000000..9a1b36fe --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/purple_album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/purple_album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/red_album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/red_album_0.json new file mode 100644 index 00000000..ef8301f3 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/red_album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/red_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/red_album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/red_album_1.json new file mode 100644 index 00000000..5ad981bf --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/red_album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/red_album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_axe.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_axe.json new file mode 100644 index 00000000..82c16006 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "additionaladditions:item/rose_gold_axe" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots.json new file mode 100644 index 00000000..2d085ced --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_boots" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_amethyst_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_amethyst_trim.json new file mode 100644 index 00000000..7349d6a9 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_boots", + "layer1": "minecraft:trims/items/boots_trim_amethyst" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_copper_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_copper_trim.json new file mode 100644 index 00000000..a619d5c0 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_boots", + "layer1": "minecraft:trims/items/boots_trim_copper" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_diamond_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_diamond_trim.json new file mode 100644 index 00000000..18217914 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_boots", + "layer1": "minecraft:trims/items/boots_trim_diamond" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_emerald_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_emerald_trim.json new file mode 100644 index 00000000..dbb8bd50 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_boots", + "layer1": "minecraft:trims/items/boots_trim_emerald" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_gold_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_gold_trim.json new file mode 100644 index 00000000..5d94f46e --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_boots", + "layer1": "minecraft:trims/items/boots_trim_gold" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_iron_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_iron_trim.json new file mode 100644 index 00000000..eac0872d --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_boots", + "layer1": "minecraft:trims/items/boots_trim_iron" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_lapis_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_lapis_trim.json new file mode 100644 index 00000000..d8f06792 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_boots", + "layer1": "minecraft:trims/items/boots_trim_lapis" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_netherite_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_netherite_trim.json new file mode 100644 index 00000000..7f2a2324 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_boots", + "layer1": "minecraft:trims/items/boots_trim_netherite" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_quartz_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_quartz_trim.json new file mode 100644 index 00000000..9438d0a0 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_boots", + "layer1": "minecraft:trims/items/boots_trim_quartz" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_redstone_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_redstone_trim.json new file mode 100644 index 00000000..ef160bac --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_boots", + "layer1": "minecraft:trims/items/boots_trim_redstone" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_resin_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_resin_trim.json new file mode 100644 index 00000000..665136a8 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_boots_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_boots", + "layer1": "minecraft:trims/items/boots_trim_resin" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate.json new file mode 100644 index 00000000..f544387b --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_chestplate" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_amethyst_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_amethyst_trim.json new file mode 100644 index 00000000..c8e2ebc3 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_amethyst" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_copper_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_copper_trim.json new file mode 100644 index 00000000..a96773d2 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_copper" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_diamond_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_diamond_trim.json new file mode 100644 index 00000000..fa8ad28a --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_diamond" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_emerald_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_emerald_trim.json new file mode 100644 index 00000000..65338988 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_emerald" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_gold_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_gold_trim.json new file mode 100644 index 00000000..1fd7a982 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_gold" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_iron_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_iron_trim.json new file mode 100644 index 00000000..f577524e --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_iron" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_lapis_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_lapis_trim.json new file mode 100644 index 00000000..5f1bcf2e --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_lapis" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_netherite_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_netherite_trim.json new file mode 100644 index 00000000..df877dc2 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_netherite" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_quartz_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_quartz_trim.json new file mode 100644 index 00000000..75fc621d --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_quartz" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_redstone_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_redstone_trim.json new file mode 100644 index 00000000..1b9c87b0 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_redstone" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_resin_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_resin_trim.json new file mode 100644 index 00000000..b8ea738a --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_chestplate_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_resin" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet.json new file mode 100644 index 00000000..e7ff4580 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_helmet" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_amethyst_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_amethyst_trim.json new file mode 100644 index 00000000..b39d253a --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_helmet", + "layer1": "minecraft:trims/items/helmet_trim_amethyst" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_copper_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_copper_trim.json new file mode 100644 index 00000000..660d8ee5 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_helmet", + "layer1": "minecraft:trims/items/helmet_trim_copper" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_diamond_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_diamond_trim.json new file mode 100644 index 00000000..4ffaaa14 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_helmet", + "layer1": "minecraft:trims/items/helmet_trim_diamond" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_emerald_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_emerald_trim.json new file mode 100644 index 00000000..1d613fde --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_helmet", + "layer1": "minecraft:trims/items/helmet_trim_emerald" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_gold_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_gold_trim.json new file mode 100644 index 00000000..d896a222 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_helmet", + "layer1": "minecraft:trims/items/helmet_trim_gold" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_iron_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_iron_trim.json new file mode 100644 index 00000000..6235a6e9 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_helmet", + "layer1": "minecraft:trims/items/helmet_trim_iron" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_lapis_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_lapis_trim.json new file mode 100644 index 00000000..8a872fe3 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_helmet", + "layer1": "minecraft:trims/items/helmet_trim_lapis" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_netherite_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_netherite_trim.json new file mode 100644 index 00000000..9ee8883a --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_helmet", + "layer1": "minecraft:trims/items/helmet_trim_netherite" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_quartz_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_quartz_trim.json new file mode 100644 index 00000000..4d87e81c --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_helmet", + "layer1": "minecraft:trims/items/helmet_trim_quartz" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_redstone_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_redstone_trim.json new file mode 100644 index 00000000..5e0e5005 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_helmet", + "layer1": "minecraft:trims/items/helmet_trim_redstone" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_resin_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_resin_trim.json new file mode 100644 index 00000000..528fc823 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_helmet_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_helmet", + "layer1": "minecraft:trims/items/helmet_trim_resin" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_hoe.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_hoe.json new file mode 100644 index 00000000..cd488b32 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "additionaladditions:item/rose_gold_hoe" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings.json new file mode 100644 index 00000000..5ee7c6f9 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_leggings" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_amethyst_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_amethyst_trim.json new file mode 100644 index 00000000..f7a3e20c --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_amethyst_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_leggings", + "layer1": "minecraft:trims/items/leggings_trim_amethyst" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_copper_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_copper_trim.json new file mode 100644 index 00000000..424ce2a3 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_copper_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_leggings", + "layer1": "minecraft:trims/items/leggings_trim_copper" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_diamond_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_diamond_trim.json new file mode 100644 index 00000000..02ece533 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_diamond_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_leggings", + "layer1": "minecraft:trims/items/leggings_trim_diamond" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_emerald_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_emerald_trim.json new file mode 100644 index 00000000..94df2228 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_emerald_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_leggings", + "layer1": "minecraft:trims/items/leggings_trim_emerald" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_gold_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_gold_trim.json new file mode 100644 index 00000000..82a52f46 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_gold_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_leggings", + "layer1": "minecraft:trims/items/leggings_trim_gold" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_iron_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_iron_trim.json new file mode 100644 index 00000000..64a3b0cb --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_iron_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_leggings", + "layer1": "minecraft:trims/items/leggings_trim_iron" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_lapis_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_lapis_trim.json new file mode 100644 index 00000000..a5cf09bc --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_lapis_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_leggings", + "layer1": "minecraft:trims/items/leggings_trim_lapis" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_netherite_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_netherite_trim.json new file mode 100644 index 00000000..635a2a22 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_netherite_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_leggings", + "layer1": "minecraft:trims/items/leggings_trim_netherite" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_quartz_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_quartz_trim.json new file mode 100644 index 00000000..1b9de19e --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_quartz_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_leggings", + "layer1": "minecraft:trims/items/leggings_trim_quartz" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_redstone_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_redstone_trim.json new file mode 100644 index 00000000..fa03ccb3 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_redstone_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_leggings", + "layer1": "minecraft:trims/items/leggings_trim_redstone" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_resin_trim.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_resin_trim.json new file mode 100644 index 00000000..6d716cc4 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_leggings_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_leggings", + "layer1": "minecraft:trims/items/leggings_trim_resin" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_pickaxe.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_pickaxe.json new file mode 100644 index 00000000..132d1e34 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "additionaladditions:item/rose_gold_pickaxe" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_shovel.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_shovel.json new file mode 100644 index 00000000..d9688dc8 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "additionaladditions:item/rose_gold_shovel" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_spear.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_spear.json new file mode 100644 index 00000000..052252e4 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_spear.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/rose_gold_spear" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_spear_in_hand.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_spear_in_hand.json new file mode 100644 index 00000000..16d14294 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_spear_in_hand.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/spear_in_hand", + "textures": { + "layer0": "additionaladditions:item/rose_gold_spear_in_hand" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_sword.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_sword.json new file mode 100644 index 00000000..6c35cd7e --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/rose_gold_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "additionaladditions:item/rose_gold_sword" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/sawtooth_fern_fiddlehead.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/sawtooth_fern_fiddlehead.json new file mode 100644 index 00000000..eedaeec1 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/sawtooth_fern_fiddlehead.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/sawtooth_fern_fiddlehead" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/snapdragon_pod.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/snapdragon_pod.json new file mode 100644 index 00000000..6ab26ad6 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/snapdragon_pod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/snapdragon_pod" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/spikeblossom_seeds.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/spikeblossom_seeds.json new file mode 100644 index 00000000..5e52f4aa --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/spikeblossom_seeds.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/spikeblossom_seeds" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/white_album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/white_album_0.json new file mode 100644 index 00000000..eab66100 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/white_album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/white_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/white_album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/white_album_1.json new file mode 100644 index 00000000..3c11435c --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/white_album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/white_album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/wrench.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/wrench.json new file mode 100644 index 00000000..cd9c1a75 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/wrench.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "additionaladditions:item/wrench" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/yellow_album_0.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/yellow_album_0.json new file mode 100644 index 00000000..6845a883 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/yellow_album_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/yellow_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/yellow_album_1.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/yellow_album_1.json new file mode 100644 index 00000000..e99373f9 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/yellow_album_1.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/yellow_album", + "layer1": "additionaladditions:item/album_overlay" + } +} \ No newline at end of file From 52a61674e76212ec5000e4448e2d844a03bb335b Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Fri, 19 Jun 2026 21:12:50 +0100 Subject: [PATCH 11/27] 26.1: datagen barometer --- .../core/datagen/template/Models.java | 5 + .../model/BarometerModelTemplate.java | 39 ++++++ .../feature/barometer/BarometerContent.java | 2 + .../additionaladditions/items/barometer.json | 78 +++++------ .../models/item/barometer_00.json | 2 +- .../models/item/barometer_01.json | 2 +- .../models/item/barometer_02.json | 2 +- .../models/item/barometer_03.json | 2 +- .../models/item/barometer_04.json | 2 +- .../models/item/barometer_05.json | 2 +- .../models/item/barometer_06.json | 2 +- .../models/item/barometer_07.json | 2 +- .../models/item/barometer_08.json | 2 +- .../models/item/barometer_09.json | 2 +- .../models/item/barometer_10.json | 2 +- .../models/item/barometer_11.json | 2 +- .../models/item/barometer_12.json | 2 +- .../models/item/barometer_13.json | 2 +- .../models/item/barometer_14.json | 2 +- .../models/item/barometer_15.json | 2 +- .../additionaladditions/items/barometer.json | 124 ++++++++++++++++++ .../models/item/barometer_00.json | 6 + .../models/item/barometer_01.json | 6 + .../models/item/barometer_02.json | 6 + .../models/item/barometer_03.json | 6 + .../models/item/barometer_04.json | 6 + .../models/item/barometer_05.json | 4 +- .../models/item/barometer_06.json | 6 + .../models/item/barometer_07.json | 6 + .../models/item/barometer_08.json | 6 + .../models/item/barometer_09.json | 6 + .../models/item/barometer_10.json | 6 + .../models/item/barometer_11.json | 6 + .../models/item/barometer_12.json | 6 + .../models/item/barometer_13.json | 6 + .../models/item/barometer_14.json | 6 + .../models/item/barometer_15.json | 6 + 37 files changed, 317 insertions(+), 57 deletions(-) create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/datagen/template/model/BarometerModelTemplate.java rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/items/barometer.json (77%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/barometer_00.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/barometer_01.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/barometer_02.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/barometer_03.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/barometer_04.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/barometer_05.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/barometer_06.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/barometer_07.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/barometer_08.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/barometer_09.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/barometer_10.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/barometer_11.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/barometer_12.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/barometer_13.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/barometer_14.json (98%) rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/item/barometer_15.json (98%) create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/barometer.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_00.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_01.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_02.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_03.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_04.json rename common/src/main/resources/assets/additionaladditions/models/item/barometer.json => neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_05.json (64%) create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_06.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_07.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_08.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_09.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_10.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_11.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_12.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_13.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_14.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_15.json diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java index 36067cd6..2fd2ad93 100644 --- a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java @@ -12,6 +12,7 @@ import one.dqu.additionaladditions.core.datagen.AABlockDatagen; import one.dqu.additionaladditions.core.datagen.AAItemDatagen; import one.dqu.additionaladditions.core.datagen.template.model.AlbumModelTemplate; +import one.dqu.additionaladditions.core.datagen.template.model.BarometerModelTemplate; import one.dqu.additionaladditions.core.datagen.template.model.TallCrossModelTemplate; /** @@ -62,6 +63,10 @@ public static void album(Item item) { AlbumModelTemplate.createAlbum(AAItemDatagen.currentGen(), item); } + public static void barometer(Item item) { + BarometerModelTemplate.createBarometer(AAItemDatagen.currentGen(), item); + } + // armor with a trim_material dispatch public static void armorTrim(Item item, ResourceKey asset, ArmorType armorType) { Identifier slotTrimPrefix = switch (armorType) { diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/model/BarometerModelTemplate.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/model/BarometerModelTemplate.java new file mode 100644 index 00000000..9c6f2f18 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/model/BarometerModelTemplate.java @@ -0,0 +1,39 @@ +package one.dqu.additionaladditions.core.datagen.template.model; + +import net.minecraft.client.data.models.ItemModelGenerators; +import net.minecraft.client.data.models.model.ItemModelUtils; +import net.minecraft.client.data.models.model.ModelLocationUtils; +import net.minecraft.client.data.models.model.ModelTemplates; +import net.minecraft.client.data.models.model.TextureMapping; +import net.minecraft.client.renderer.item.RangeSelectItemModel; +import net.minecraft.resources.Identifier; +import net.minecraft.world.item.Item; +import one.dqu.additionaladditions.client.BarometerAngleProperty; + +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + +public class BarometerModelTemplate { + public static void createBarometer(ItemModelGenerators gen, Item item) { + Identifier base = ModelLocationUtils.getModelLocation(item); + List overrides = new ArrayList<>(16); + Identifier fallback = null; + + for (int i = 0; i < 16; i++) { + String suffix = String.format(Locale.ROOT, "_%02d", i); + Identifier frame = base.withSuffix(suffix); + + ModelTemplates.FLAT_ITEM.create(frame, TextureMapping.layer0(TextureMapping.getItemTexture(item, suffix)), gen.modelOutput); + overrides.add(ItemModelUtils.override(ItemModelUtils.plainModel(frame), (float) i / 16)); + + if (i == 5) { + fallback = frame; + } + } + + gen.itemModelOutput.accept(item, ItemModelUtils.rangeSelect( + new BarometerAngleProperty(), ItemModelUtils.plainModel(fallback), overrides) + ); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/barometer/BarometerContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/barometer/BarometerContent.java index 64b0e0ac..66a5278c 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/barometer/BarometerContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/barometer/BarometerContent.java @@ -7,6 +7,7 @@ import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.core.builder.AAReg; import one.dqu.additionaladditions.core.builder.CreativePosition; +import one.dqu.additionaladditions.core.datagen.template.Models; import one.dqu.additionaladditions.core.datagen.template.Recipes; import java.util.Map; @@ -17,6 +18,7 @@ public static Supplier barometer() { return AAReg.item() .config(Config.BAROMETER) .creative(Items.CLOCK, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) + .model(Models::barometer) .recipe(Recipes.shaped(" C ", "CRC", "CCC", Map.of('C', Items.COPPER_INGOT, 'R', Items.REDSTONE), RecipeCategory.TOOLS).unlockedBy(Items.REDSTONE)) .make("barometer"); } diff --git a/common/src/main/resources/assets/additionaladditions/items/barometer.json b/fabric/src/main/generated/assets/additionaladditions/items/barometer.json similarity index 77% rename from common/src/main/resources/assets/additionaladditions/items/barometer.json rename to fabric/src/main/generated/assets/additionaladditions/items/barometer.json index 2ce2d369..68ab04dd 100644 --- a/common/src/main/resources/assets/additionaladditions/items/barometer.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/barometer.json @@ -1,124 +1,124 @@ { "model": { "type": "minecraft:range_dispatch", - "property": "additionaladditions:barometer_angle", - "fallback": { - "type": "minecraft:model", - "model": "additionaladditions:item/barometer_05" - }, "entries": [ { - "threshold": 0.0, "model": { "type": "minecraft:model", "model": "additionaladditions:item/barometer_00" - } + }, + "threshold": 0.0 }, { - "threshold": 0.0625, "model": { "type": "minecraft:model", "model": "additionaladditions:item/barometer_01" - } + }, + "threshold": 0.0625 }, { - "threshold": 0.125, "model": { "type": "minecraft:model", "model": "additionaladditions:item/barometer_02" - } + }, + "threshold": 0.125 }, { - "threshold": 0.1875, "model": { "type": "minecraft:model", "model": "additionaladditions:item/barometer_03" - } + }, + "threshold": 0.1875 }, { - "threshold": 0.25, "model": { "type": "minecraft:model", "model": "additionaladditions:item/barometer_04" - } + }, + "threshold": 0.25 }, { - "threshold": 0.3125, "model": { "type": "minecraft:model", "model": "additionaladditions:item/barometer_05" - } + }, + "threshold": 0.3125 }, { - "threshold": 0.375, "model": { "type": "minecraft:model", "model": "additionaladditions:item/barometer_06" - } + }, + "threshold": 0.375 }, { - "threshold": 0.4375, "model": { "type": "minecraft:model", "model": "additionaladditions:item/barometer_07" - } + }, + "threshold": 0.4375 }, { - "threshold": 0.5, "model": { "type": "minecraft:model", "model": "additionaladditions:item/barometer_08" - } + }, + "threshold": 0.5 }, { - "threshold": 0.5625, "model": { "type": "minecraft:model", "model": "additionaladditions:item/barometer_09" - } + }, + "threshold": 0.5625 }, { - "threshold": 0.625, "model": { "type": "minecraft:model", "model": "additionaladditions:item/barometer_10" - } + }, + "threshold": 0.625 }, { - "threshold": 0.6875, "model": { "type": "minecraft:model", "model": "additionaladditions:item/barometer_11" - } + }, + "threshold": 0.6875 }, { - "threshold": 0.75, "model": { "type": "minecraft:model", "model": "additionaladditions:item/barometer_12" - } + }, + "threshold": 0.75 }, { - "threshold": 0.8125, "model": { "type": "minecraft:model", "model": "additionaladditions:item/barometer_13" - } + }, + "threshold": 0.8125 }, { - "threshold": 0.875, "model": { "type": "minecraft:model", "model": "additionaladditions:item/barometer_14" - } + }, + "threshold": 0.875 }, { - "threshold": 0.9375, "model": { "type": "minecraft:model", "model": "additionaladditions:item/barometer_15" - } + }, + "threshold": 0.9375 } - ] + ], + "fallback": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_05" + }, + "property": "additionaladditions:barometer_angle" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer_00.json b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_00.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer_00.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/barometer_00.json index 7d61eb31..cf643bca 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer_00.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_00.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/barometer_00" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer_01.json b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_01.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer_01.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/barometer_01.json index 9aaa5d4c..66b03716 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer_01.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_01.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/barometer_01" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer_02.json b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_02.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer_02.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/barometer_02.json index a0636012..4a669cb1 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer_02.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_02.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/barometer_02" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer_03.json b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_03.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer_03.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/barometer_03.json index 2c18421c..2ebd6fd4 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer_03.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_03.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/barometer_03" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer_04.json b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_04.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer_04.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/barometer_04.json index 081ff66a..d1b3a5e7 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer_04.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_04.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/barometer_04" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer_05.json b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_05.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer_05.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/barometer_05.json index cba36ea4..360036d5 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer_05.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_05.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/barometer_05" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer_06.json b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_06.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer_06.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/barometer_06.json index 3250b9d5..1b356ee7 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer_06.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_06.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/barometer_06" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer_07.json b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_07.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer_07.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/barometer_07.json index f29364d0..fea61ae0 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer_07.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_07.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/barometer_07" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer_08.json b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_08.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer_08.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/barometer_08.json index 6f1601a1..78687446 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer_08.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_08.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/barometer_08" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer_09.json b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_09.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer_09.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/barometer_09.json index ec073a1e..2d7a0e46 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer_09.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_09.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/barometer_09" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer_10.json b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_10.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer_10.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/barometer_10.json index bd122d98..f564b3f6 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer_10.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_10.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/barometer_10" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer_11.json b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_11.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer_11.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/barometer_11.json index 03cc587e..eba3fbba 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer_11.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_11.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/barometer_11" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer_12.json b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_12.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer_12.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/barometer_12.json index ce893a01..033af87e 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer_12.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_12.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/barometer_12" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer_13.json b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_13.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer_13.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/barometer_13.json index 557497f5..75294d34 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer_13.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_13.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/barometer_13" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer_14.json b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_14.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer_14.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/barometer_14.json index add6cce4..254d8f62 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer_14.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_14.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/barometer_14" } -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer_15.json b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_15.json similarity index 98% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer_15.json rename to fabric/src/main/generated/assets/additionaladditions/models/item/barometer_15.json index 29587a11..49fddc99 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer_15.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/barometer_15.json @@ -3,4 +3,4 @@ "textures": { "layer0": "additionaladditions:item/barometer_15" } -} +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/barometer.json b/neoforge/src/main/generated/assets/additionaladditions/items/barometer.json new file mode 100644 index 00000000..68ab04dd --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/barometer.json @@ -0,0 +1,124 @@ +{ + "model": { + "type": "minecraft:range_dispatch", + "entries": [ + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_00" + }, + "threshold": 0.0 + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_01" + }, + "threshold": 0.0625 + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_02" + }, + "threshold": 0.125 + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_03" + }, + "threshold": 0.1875 + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_04" + }, + "threshold": 0.25 + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_05" + }, + "threshold": 0.3125 + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_06" + }, + "threshold": 0.375 + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_07" + }, + "threshold": 0.4375 + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_08" + }, + "threshold": 0.5 + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_09" + }, + "threshold": 0.5625 + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_10" + }, + "threshold": 0.625 + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_11" + }, + "threshold": 0.6875 + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_12" + }, + "threshold": 0.75 + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_13" + }, + "threshold": 0.8125 + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_14" + }, + "threshold": 0.875 + }, + { + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_15" + }, + "threshold": 0.9375 + } + ], + "fallback": { + "type": "minecraft:model", + "model": "additionaladditions:item/barometer_05" + }, + "property": "additionaladditions:barometer_angle" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_00.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_00.json new file mode 100644 index 00000000..cf643bca --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_00.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/barometer_00" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_01.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_01.json new file mode 100644 index 00000000..66b03716 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_01.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/barometer_01" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_02.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_02.json new file mode 100644 index 00000000..4a669cb1 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_02.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/barometer_02" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_03.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_03.json new file mode 100644 index 00000000..2ebd6fd4 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_03.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/barometer_03" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_04.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_04.json new file mode 100644 index 00000000..d1b3a5e7 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_04.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/barometer_04" + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/barometer.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_05.json similarity index 64% rename from common/src/main/resources/assets/additionaladditions/models/item/barometer.json rename to neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_05.json index 0dddaa1e..360036d5 100644 --- a/common/src/main/resources/assets/additionaladditions/models/item/barometer.json +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_05.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "additionaladditions:item/barometer_05" } -} +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_06.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_06.json new file mode 100644 index 00000000..1b356ee7 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_06.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/barometer_06" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_07.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_07.json new file mode 100644 index 00000000..fea61ae0 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_07.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/barometer_07" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_08.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_08.json new file mode 100644 index 00000000..78687446 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_08.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/barometer_08" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_09.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_09.json new file mode 100644 index 00000000..2d7a0e46 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_09.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/barometer_09" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_10.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_10.json new file mode 100644 index 00000000..f564b3f6 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_10.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/barometer_10" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_11.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_11.json new file mode 100644 index 00000000..eba3fbba --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_11.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/barometer_11" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_12.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_12.json new file mode 100644 index 00000000..033af87e --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_12.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/barometer_12" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_13.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_13.json new file mode 100644 index 00000000..75294d34 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_13.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/barometer_13" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_14.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_14.json new file mode 100644 index 00000000..254d8f62 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_14.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/barometer_14" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_15.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_15.json new file mode 100644 index 00000000..49fddc99 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/barometer_15.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:item/barometer_15" + } +} \ No newline at end of file From 6aa6c1cfa4649becdfea5c14db37f12fa0a73d39 Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Fri, 19 Jun 2026 21:17:51 +0100 Subject: [PATCH 12/27] 26.1: fix: jar build --- fabric/build.gradle | 14 ++++++++++---- neoforge/build.gradle | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/fabric/build.gradle b/fabric/build.gradle index cfced29e..598631be 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -71,11 +71,17 @@ processResources { from(mergedAccessWidener) } +jar { + archiveClassifier = "raw" +} + shadowJar { + dependsOn(jar) + mainSpec.sourcePaths.clear() + from(zipTree(jar.archiveFile)) + configurations = [project.configurations.shadowBundle] - archiveClassifier = 'dev-shadow' + archiveClassifier = null } -jar { - archiveClassifier = "raw" -} +assemble.dependsOn shadowJar diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 01af4207..d0f53f0a 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -82,11 +82,17 @@ processResources { from(mergedAccessWidener) } +jar { + archiveClassifier = "raw" +} + shadowJar { + dependsOn(jar) + mainSpec.sourcePaths.clear() + from(zipTree(jar.archiveFile)) + configurations = [project.configurations.shadowBundle] - archiveClassifier = 'dev-shadow' + archiveClassifier = null } -jar { - archiveClassifier = "raw" -} +assemble.dependsOn shadowJar From 43cabf82fc7703243147be1bcbee1843f298f135 Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Fri, 19 Jun 2026 21:53:25 +0100 Subject: [PATCH 13/27] 26.1: gradle AW merge fixes --- fabric/build.gradle | 23 ++++++++++++++++++----- neoforge/build.gradle | 23 ++++++++++++++++++----- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/fabric/build.gradle b/fabric/build.gradle index 598631be..3976545c 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -8,13 +8,20 @@ architectury { } def mergedAccessWidener = layout.buildDirectory.file("generated/accesswidener/additionaladditions.accesswidener").get().asFile -mergedAccessWidener.parentFile.mkdirs() def commonAw = project(":common").file("src/main/resources/additionaladditions.accesswidener") def platformAw = project(":common").file("src/main/resources/additionaladditions.fabric.accesswidener") -def header = commonAw.readLines().find { it.trim().startsWith("accessWidener") } ?: "accessWidener v2 official" -def commonBody = commonAw.readLines().findAll { !it.trim().startsWith("accessWidener") } -def platformBody = platformAw.readLines().findAll { !it.trim().startsWith("accessWidener") } -mergedAccessWidener.text = ([header] + commonBody + platformBody).join("\n") + "\n" + +def generateMergedAccessWidener = tasks.register('generateMergedAccessWidener') { + inputs.files(commonAw, platformAw) + outputs.file(mergedAccessWidener) + doLast { + def header = commonAw.readLines().find { it.trim().startsWith("accessWidener") } ?: "accessWidener v2 official" + def commonBody = commonAw.readLines().findAll { !it.trim().startsWith("accessWidener") } + def platformBody = platformAw.readLines().findAll { !it.trim().startsWith("accessWidener") } + mergedAccessWidener.parentFile.mkdirs() + mergedAccessWidener.text = ([header] + commonBody + platformBody).join("\n") + "\n" + } +} loom { accessWidenerPath = mergedAccessWidener @@ -68,13 +75,19 @@ processResources { expand version: inputs.properties.version } + dependsOn(generateMergedAccessWidener) from(mergedAccessWidener) } jar { + dependsOn(generateMergedAccessWidener) archiveClassifier = "raw" } +tasks.named('validateAccessWidener') { + dependsOn(generateMergedAccessWidener) +} + shadowJar { dependsOn(jar) mainSpec.sourcePaths.clear() diff --git a/neoforge/build.gradle b/neoforge/build.gradle index d0f53f0a..1070f99a 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -8,13 +8,20 @@ architectury { } def mergedAccessWidener = layout.buildDirectory.file("generated/accesswidener/additionaladditions.accesswidener").get().asFile -mergedAccessWidener.parentFile.mkdirs() def commonAw = project(":common").file("src/main/resources/additionaladditions.accesswidener") def platformAw = project(":common").file("src/main/resources/additionaladditions.neoforge.accesswidener") -def header = commonAw.readLines().find { it.trim().startsWith("accessWidener") } ?: "accessWidener v2 official" -def commonBody = commonAw.readLines().findAll { !it.trim().startsWith("accessWidener") } -def platformBody = platformAw.readLines().findAll { !it.trim().startsWith("accessWidener") } -mergedAccessWidener.text = ([header] + commonBody + platformBody).join("\n") + "\n" + +def generateMergedAccessWidener = tasks.register('generateMergedAccessWidener') { + inputs.files(commonAw, platformAw) + outputs.file(mergedAccessWidener) + doLast { + def header = commonAw.readLines().find { it.trim().startsWith("accessWidener") } ?: "accessWidener v2 official" + def commonBody = commonAw.readLines().findAll { !it.trim().startsWith("accessWidener") } + def platformBody = platformAw.readLines().findAll { !it.trim().startsWith("accessWidener") } + mergedAccessWidener.parentFile.mkdirs() + mergedAccessWidener.text = ([header] + commonBody + platformBody).join("\n") + "\n" + } +} loom { neoForge { @@ -79,13 +86,19 @@ processResources { expand version: inputs.properties.version } + dependsOn(generateMergedAccessWidener) from(mergedAccessWidener) } jar { + dependsOn(generateMergedAccessWidener) archiveClassifier = "raw" } +tasks.named('validateAccessWidener') { + dependsOn(generateMergedAccessWidener) +} + shadowJar { dependsOn(jar) mainSpec.sourcePaths.clear() From 0f1bb0ead37339775eab18dbe7b9be61d87a34f7 Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Fri, 19 Jun 2026 22:23:40 +0100 Subject: [PATCH 14/27] 26.1: datagen: blockitem fixes, remove old files --- .../core/datagen/AAItemDatagen.java | 21 ++++--------------- .../copper_patina/CopperPatinaContent.java | 1 + .../redstone_lamp/RedstoneLampContent.java | 2 -- .../items/patina_block.json | 6 ------ .../models/item/album.json | 6 ------ .../models/item/black_album.json | 6 ------ .../models/item/blue_album.json | 6 ------ .../models/item/brown_album.json | 6 ------ .../models/item/cyan_album.json | 6 ------ .../models/item/gray_album.json | 6 ------ .../models/item/green_album.json | 6 ------ .../models/item/light_blue_album.json | 6 ------ .../models/item/light_gray_album.json | 6 ------ .../models/item/lime_album.json | 6 ------ .../models/item/magenta_album.json | 6 ------ .../models/item/orange_album.json | 6 ------ .../models/item/patina_block.json | 3 --- .../models/item/pink_album.json | 6 ------ .../models/item/purple_album.json | 6 ------ .../models/item/red_album.json | 6 ------ .../models/item/rose_gold_block.json | 3 --- .../models/item/tinted_redstone_lamp.json | 3 --- .../models/item/white_album.json | 6 ------ .../models/item/yellow_album.json | 6 ------ .../blockstates/patina_block.json | 7 +++++++ .../items/amber_blossom.json | 2 +- .../additionaladditions/items/bulbus.json | 2 +- .../items/cottonshiver.json | 2 +- .../items/crimson_blossom.json | 2 +- .../additionaladditions/items/frostleaf.json | 2 +- .../additionaladditions/items/mudflower.json | 2 +- .../items/patina_block.json | 6 ++++++ .../items/rose_gold_block.json | 2 +- .../items/sawtooth_fern.json | 2 +- .../additionaladditions/items/snapdragon.json | 2 +- .../items/spikeblossom.json | 2 +- .../items/tinted_redstone_lamp.json | 6 ------ .../models/block/patina_block.json | 2 +- .../blockstates/patina_block.json | 7 +++++++ .../items/amber_blossom.json | 2 +- .../additionaladditions/items/bulbus.json | 2 +- .../items/cottonshiver.json | 2 +- .../items/crimson_blossom.json | 2 +- .../additionaladditions/items/frostleaf.json | 2 +- .../additionaladditions/items/lotus_lily.json | 6 ++++++ .../additionaladditions/items/mudflower.json | 2 +- .../items/patina_block.json | 6 ++++++ .../items/rose_gold_block.json | 2 +- .../items/sawtooth_fern.json | 2 +- .../additionaladditions/items/snapdragon.json | 2 +- .../items/spikeblossom.json | 2 +- .../items/tinted_redstone_lamp.json | 2 +- .../additionaladditions/items/wisteria.json | 6 ++++++ .../items/wisteria_vines.json | 6 ++++++ .../models/block/patina_block.json | 6 ++++++ 55 files changed, 77 insertions(+), 164 deletions(-) delete mode 100644 common/src/main/resources/assets/additionaladditions/items/patina_block.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/black_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/blue_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/brown_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/cyan_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/gray_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/green_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/light_blue_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/light_gray_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/lime_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/magenta_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/orange_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/patina_block.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/pink_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/purple_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/red_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/rose_gold_block.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/tinted_redstone_lamp.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/white_album.json delete mode 100644 common/src/main/resources/assets/additionaladditions/models/item/yellow_album.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/blockstates/patina_block.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/patina_block.json delete mode 100644 fabric/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json rename {common/src/main/resources => fabric/src/main/generated}/assets/additionaladditions/models/block/patina_block.json (65%) create mode 100644 neoforge/src/main/generated/assets/additionaladditions/blockstates/patina_block.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/lotus_lily.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/patina_block.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/wisteria.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/items/wisteria_vines.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/block/patina_block.json diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemDatagen.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemDatagen.java index 3f7c2f22..6318feae 100644 --- a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemDatagen.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemDatagen.java @@ -5,6 +5,7 @@ import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.Identifier; import net.minecraft.tags.TagKey; +import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import one.dqu.additionaladditions.AdditionalAdditions; import one.dqu.additionaladditions.core.datagen.template.Recipes; @@ -12,10 +13,8 @@ import java.util.ArrayList; import java.util.List; -import java.util.Set; import java.util.function.Consumer; import java.util.function.Supplier; -import java.util.stream.Collectors; import java.util.stream.Stream; public class AAItemDatagen { @@ -31,7 +30,7 @@ public record Entry( // recipes are associated with item entries. used by AARecipeDatagenProvider @Nullable Recipes.RecipeEntry recipe, - + List> tags ) { } @@ -52,9 +51,9 @@ public static ItemModelGenerators currentGen() { // for neoforge public static Stream> knownItems() { if (entries == null) return Stream.empty(); - Set generatedBlocks = generatedBlockIds(); return entries.stream() - .filter(e -> e.model != null || generatedBlocks.contains(e.id())) + // keep block items so that ModelProvider handles them in finalizeAndValidate + .filter(e -> e.model() != null || BuiltInRegistries.ITEM.getValue(e.id()) instanceof BlockItem) .map(e -> BuiltInRegistries.ITEM.getValue(e.id()).builtInRegistryHolder()); } @@ -62,22 +61,10 @@ public static void generateItemModels(ItemModelGenerators gen) { if (entries == null) return; currentGen = gen; - Set generatedBlocks = generatedBlockIds(); for (Entry entry : entries) { if (entry.model() != null) { entry.model().accept(entry.item().get()); } - // block models are generated in AABlockDatagen, but need an item template def to reference them - if (generatedBlocks.contains(entry.id())) { - gen.declareCustomModelItem(entry.item().get()); - } } } - - private static Set generatedBlockIds() { - return AABlockDatagen.entries().stream() - .filter(e -> e.model() != null) - .map(AABlockDatagen.Entry::id) - .collect(Collectors.toSet()); - } } diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaContent.java index 97e03785..1ea2d5c0 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaContent.java @@ -39,6 +39,7 @@ public static Supplier patinaBlock() { .sound(SoundType.ROOTED_DIRT) .strength(0.5f)) .tags(BlockTags.MINEABLE_WITH_SHOVEL) + .model(Models::cube) .make("patina_block"); } diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/redstone_lamp/RedstoneLampContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/redstone_lamp/RedstoneLampContent.java index c2a7ae99..e236a24a 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/redstone_lamp/RedstoneLampContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/redstone_lamp/RedstoneLampContent.java @@ -10,7 +10,6 @@ import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.core.builder.AAReg; import one.dqu.additionaladditions.core.builder.CreativePosition; -import one.dqu.additionaladditions.core.datagen.template.Models; import one.dqu.additionaladditions.core.datagen.template.Recipes; import one.dqu.additionaladditions.registry.AABlocks; @@ -33,7 +32,6 @@ public static Supplier tintedRedstoneLampItem() { .config(Config.TINTED_REDSTONE_LAMP) .creative(Items.REDSTONE_LAMP, CreativeModeTabs.REDSTONE_BLOCKS, CreativePosition.AFTER) .creative(Items.REDSTONE_LAMP, CreativeModeTabs.FUNCTIONAL_BLOCKS, CreativePosition.AFTER) - .model(Models::customModel) .recipe(Recipes.shaped(" A ", "ALA", " A ", Map.of('A', Items.AMETHYST_SHARD, 'L', Items.REDSTONE_LAMP), RecipeCategory.REDSTONE).unlockedBy(Items.AMETHYST_SHARD)) .make("tinted_redstone_lamp"); } diff --git a/common/src/main/resources/assets/additionaladditions/items/patina_block.json b/common/src/main/resources/assets/additionaladditions/items/patina_block.json deleted file mode 100644 index 72417457..00000000 --- a/common/src/main/resources/assets/additionaladditions/items/patina_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/patina_block" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/album.json b/common/src/main/resources/assets/additionaladditions/models/item/album.json deleted file mode 100644 index 21f84fa9..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/album" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/black_album.json b/common/src/main/resources/assets/additionaladditions/models/item/black_album.json deleted file mode 100644 index 0dc0ea45..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/black_album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/black_album" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/blue_album.json b/common/src/main/resources/assets/additionaladditions/models/item/blue_album.json deleted file mode 100644 index af1c6f99..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/blue_album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/blue_album" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/brown_album.json b/common/src/main/resources/assets/additionaladditions/models/item/brown_album.json deleted file mode 100644 index bdea818a..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/brown_album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/brown_album" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/cyan_album.json b/common/src/main/resources/assets/additionaladditions/models/item/cyan_album.json deleted file mode 100644 index d336dc37..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/cyan_album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/cyan_album" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/gray_album.json b/common/src/main/resources/assets/additionaladditions/models/item/gray_album.json deleted file mode 100644 index a81a3af7..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/gray_album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/gray_album" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/green_album.json b/common/src/main/resources/assets/additionaladditions/models/item/green_album.json deleted file mode 100644 index 3c69496f..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/green_album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/green_album" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/light_blue_album.json b/common/src/main/resources/assets/additionaladditions/models/item/light_blue_album.json deleted file mode 100644 index 2205d291..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/light_blue_album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/light_blue_album" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/light_gray_album.json b/common/src/main/resources/assets/additionaladditions/models/item/light_gray_album.json deleted file mode 100644 index 5fa3285c..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/light_gray_album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/light_gray_album" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/lime_album.json b/common/src/main/resources/assets/additionaladditions/models/item/lime_album.json deleted file mode 100644 index 05970d07..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/lime_album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/lime_album" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/magenta_album.json b/common/src/main/resources/assets/additionaladditions/models/item/magenta_album.json deleted file mode 100644 index 50f6f63c..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/magenta_album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/magenta_album" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/orange_album.json b/common/src/main/resources/assets/additionaladditions/models/item/orange_album.json deleted file mode 100644 index 6cb3bc74..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/orange_album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/orange_album" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/patina_block.json b/common/src/main/resources/assets/additionaladditions/models/item/patina_block.json deleted file mode 100644 index b8a6281f..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/patina_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "additionaladditions:block/patina_block" -} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/pink_album.json b/common/src/main/resources/assets/additionaladditions/models/item/pink_album.json deleted file mode 100644 index 4983ac24..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/pink_album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/pink_album" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/purple_album.json b/common/src/main/resources/assets/additionaladditions/models/item/purple_album.json deleted file mode 100644 index a5cd8b78..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/purple_album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/purple_album" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/red_album.json b/common/src/main/resources/assets/additionaladditions/models/item/red_album.json deleted file mode 100644 index f86868d7..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/red_album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/red_album" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_block.json b/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_block.json deleted file mode 100644 index 8ca09c2e..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/rose_gold_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "additionaladditions:block/rose_gold_block" -} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/tinted_redstone_lamp.json b/common/src/main/resources/assets/additionaladditions/models/item/tinted_redstone_lamp.json deleted file mode 100644 index 646829ac..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/tinted_redstone_lamp.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "additionaladditions:block/tinted_redstone_lamp" -} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/item/white_album.json b/common/src/main/resources/assets/additionaladditions/models/item/white_album.json deleted file mode 100644 index 8f33d1f8..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/white_album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/white_album" - } -} diff --git a/common/src/main/resources/assets/additionaladditions/models/item/yellow_album.json b/common/src/main/resources/assets/additionaladditions/models/item/yellow_album.json deleted file mode 100644 index 59baba7f..00000000 --- a/common/src/main/resources/assets/additionaladditions/models/item/yellow_album.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "additionaladditions:item/yellow_album" - } -} diff --git a/fabric/src/main/generated/assets/additionaladditions/blockstates/patina_block.json b/fabric/src/main/generated/assets/additionaladditions/blockstates/patina_block.json new file mode 100644 index 00000000..a4885b7d --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/blockstates/patina_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "additionaladditions:block/patina_block" + } + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/amber_blossom.json b/fabric/src/main/generated/assets/additionaladditions/items/amber_blossom.json index 1591fc0b..b22451c9 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/amber_blossom.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/amber_blossom.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/amber_blossom" + "model": "additionaladditions:block/amber_blossom" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/bulbus.json b/fabric/src/main/generated/assets/additionaladditions/items/bulbus.json index 54cc6345..ea935723 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/bulbus.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/bulbus.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/bulbus" + "model": "additionaladditions:block/bulbus" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/cottonshiver.json b/fabric/src/main/generated/assets/additionaladditions/items/cottonshiver.json index 7492e291..6d48341d 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/cottonshiver.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/cottonshiver.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/cottonshiver" + "model": "additionaladditions:block/cottonshiver" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/crimson_blossom.json b/fabric/src/main/generated/assets/additionaladditions/items/crimson_blossom.json index 66f98f89..7a31cce5 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/crimson_blossom.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/crimson_blossom.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/crimson_blossom" + "model": "additionaladditions:block/crimson_blossom" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/frostleaf.json b/fabric/src/main/generated/assets/additionaladditions/items/frostleaf.json index d3d7f57d..1276c59f 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/frostleaf.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/frostleaf.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/frostleaf" + "model": "additionaladditions:block/frostleaf" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/mudflower.json b/fabric/src/main/generated/assets/additionaladditions/items/mudflower.json index 7fbe0458..d9f4e559 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/mudflower.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/mudflower.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/mudflower" + "model": "additionaladditions:block/mudflower" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/patina_block.json b/fabric/src/main/generated/assets/additionaladditions/items/patina_block.json new file mode 100644 index 00000000..df3bfbbb --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/patina_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:block/patina_block" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_block.json b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_block.json index d1e214db..5cd8ecff 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_block.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/rose_gold_block.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold_block" + "model": "additionaladditions:block/rose_gold_block" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json b/fabric/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json index f4a24798..ef785665 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/sawtooth_fern" + "model": "additionaladditions:block/sawtooth_fern" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/snapdragon.json b/fabric/src/main/generated/assets/additionaladditions/items/snapdragon.json index dd7f1087..ef971705 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/snapdragon.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/snapdragon.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/snapdragon" + "model": "additionaladditions:block/snapdragon" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/spikeblossom.json b/fabric/src/main/generated/assets/additionaladditions/items/spikeblossom.json index 5d6b4280..15988ee4 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/spikeblossom.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/spikeblossom.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/spikeblossom" + "model": "additionaladditions:block/spikeblossom" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json b/fabric/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json deleted file mode 100644 index 532357b1..00000000 --- a/fabric/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "additionaladditions:item/tinted_redstone_lamp" - } -} \ No newline at end of file diff --git a/common/src/main/resources/assets/additionaladditions/models/block/patina_block.json b/fabric/src/main/generated/assets/additionaladditions/models/block/patina_block.json similarity index 65% rename from common/src/main/resources/assets/additionaladditions/models/block/patina_block.json rename to fabric/src/main/generated/assets/additionaladditions/models/block/patina_block.json index 135e5703..9c37297d 100644 --- a/common/src/main/resources/assets/additionaladditions/models/block/patina_block.json +++ b/fabric/src/main/generated/assets/additionaladditions/models/block/patina_block.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "minecraft:block/cube_all", "textures": { "all": "additionaladditions:block/patina_block" } diff --git a/neoforge/src/main/generated/assets/additionaladditions/blockstates/patina_block.json b/neoforge/src/main/generated/assets/additionaladditions/blockstates/patina_block.json new file mode 100644 index 00000000..a4885b7d --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/blockstates/patina_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "additionaladditions:block/patina_block" + } + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/amber_blossom.json b/neoforge/src/main/generated/assets/additionaladditions/items/amber_blossom.json index 1591fc0b..b22451c9 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/amber_blossom.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/amber_blossom.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/amber_blossom" + "model": "additionaladditions:block/amber_blossom" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/bulbus.json b/neoforge/src/main/generated/assets/additionaladditions/items/bulbus.json index 54cc6345..ea935723 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/bulbus.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/bulbus.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/bulbus" + "model": "additionaladditions:block/bulbus" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/cottonshiver.json b/neoforge/src/main/generated/assets/additionaladditions/items/cottonshiver.json index 7492e291..6d48341d 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/cottonshiver.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/cottonshiver.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/cottonshiver" + "model": "additionaladditions:block/cottonshiver" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/crimson_blossom.json b/neoforge/src/main/generated/assets/additionaladditions/items/crimson_blossom.json index 66f98f89..7a31cce5 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/crimson_blossom.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/crimson_blossom.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/crimson_blossom" + "model": "additionaladditions:block/crimson_blossom" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/frostleaf.json b/neoforge/src/main/generated/assets/additionaladditions/items/frostleaf.json index d3d7f57d..1276c59f 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/frostleaf.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/frostleaf.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/frostleaf" + "model": "additionaladditions:block/frostleaf" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/lotus_lily.json b/neoforge/src/main/generated/assets/additionaladditions/items/lotus_lily.json new file mode 100644 index 00000000..55a77a4f --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/lotus_lily.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:block/lotus_lily" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/mudflower.json b/neoforge/src/main/generated/assets/additionaladditions/items/mudflower.json index 7fbe0458..d9f4e559 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/mudflower.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/mudflower.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/mudflower" + "model": "additionaladditions:block/mudflower" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/patina_block.json b/neoforge/src/main/generated/assets/additionaladditions/items/patina_block.json new file mode 100644 index 00000000..df3bfbbb --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/patina_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:block/patina_block" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_block.json b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_block.json index d1e214db..5cd8ecff 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_block.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/rose_gold_block.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/rose_gold_block" + "model": "additionaladditions:block/rose_gold_block" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json b/neoforge/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json index f4a24798..ef785665 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/sawtooth_fern" + "model": "additionaladditions:block/sawtooth_fern" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/snapdragon.json b/neoforge/src/main/generated/assets/additionaladditions/items/snapdragon.json index dd7f1087..ef971705 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/snapdragon.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/snapdragon.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/snapdragon" + "model": "additionaladditions:block/snapdragon" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/spikeblossom.json b/neoforge/src/main/generated/assets/additionaladditions/items/spikeblossom.json index 5d6b4280..15988ee4 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/spikeblossom.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/spikeblossom.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/spikeblossom" + "model": "additionaladditions:block/spikeblossom" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json b/neoforge/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json index 532357b1..b27cf37d 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:item/tinted_redstone_lamp" + "model": "additionaladditions:block/tinted_redstone_lamp" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/wisteria.json b/neoforge/src/main/generated/assets/additionaladditions/items/wisteria.json new file mode 100644 index 00000000..318f5c05 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/wisteria.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:block/wisteria" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/wisteria_vines.json b/neoforge/src/main/generated/assets/additionaladditions/items/wisteria_vines.json new file mode 100644 index 00000000..31f8aba3 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/items/wisteria_vines.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:block/wisteria_crop" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/block/patina_block.json b/neoforge/src/main/generated/assets/additionaladditions/models/block/patina_block.json new file mode 100644 index 00000000..9c37297d --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/block/patina_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "additionaladditions:block/patina_block" + } +} \ No newline at end of file From 061507935bac15bf6768102a7dd94fd25debe67e Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Sat, 20 Jun 2026 11:34:03 +0100 Subject: [PATCH 15/27] 26.1: gametest watering can, sniffer plants --- .../feature/watering_can/WateringCanItem.java | 26 +-- .../gametest/SnifferPlantsTests.java | 141 +++++++++++++++ .../gametest/WateringCanTests.java | 165 ++++++++++++++++++ .../registry/AAGameTests.java | 30 +++- .../test_environment/fast_growth.json | 6 + .../sniffer_plants_natural_growth.json | 7 + .../test_instance/sniffer_plants_stages.json | 7 + .../watering_can_fill_water_cauldron.json | 7 + .../watering_can_fill_water_full.json | 7 + .../watering_can_fill_water_partial.json | 7 + .../watering_can_interact_crop.json | 7 + .../watering_can_interact_farmland.json | 7 + .../watering_can_interact_grown_crop.json | 7 + .../watering_can_interact_no_farmland.json | 7 + 14 files changed, 416 insertions(+), 15 deletions(-) create mode 100644 common/src/main/java/one/dqu/additionaladditions/gametest/SnifferPlantsTests.java create mode 100644 common/src/main/java/one/dqu/additionaladditions/gametest/WateringCanTests.java create mode 100644 common/src/main/resources/data/additionaladditions/test_environment/fast_growth.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_natural_growth.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_stages.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_cauldron.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_full.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_partial.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_crop.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_farmland.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_grown_crop.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_no_farmland.json diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/watering_can/WateringCanItem.java b/common/src/main/java/one/dqu/additionaladditions/feature/watering_can/WateringCanItem.java index 4134e43b..9f0b65dc 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/watering_can/WateringCanItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/watering_can/WateringCanItem.java @@ -1,29 +1,31 @@ package one.dqu.additionaladditions.feature.watering_can; -import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.sounds.SoundSource; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.item.Item; -import one.dqu.additionaladditions.config.Config; -import one.dqu.additionaladditions.core.util.FluidHelper; -import one.dqu.additionaladditions.registry.AAMisc; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.core.particles.ParticleTypes; import net.minecraft.server.level.ServerLevel; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; import net.minecraft.util.Mth; import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.ClipContext; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.BonemealableBlock; +import net.minecraft.world.level.block.FarmlandBlock; +import net.minecraft.world.level.block.GrassBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.material.Fluids; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.core.util.FluidHelper; +import one.dqu.additionaladditions.registry.AAMisc; public class WateringCanItem extends Item { public WateringCanItem(Properties settings) { @@ -85,9 +87,11 @@ public InteractionResult use(Level world, Player player, InteractionHand hand) { boolean shouldFertilize = world.random.nextFloat() < Config.WATERING_CAN.get().fertilizeChance(); if (shouldFertilize && fertilizable.isBonemealSuccess(world, world.random, pos, state)) { fertilizable.performBonemeal((ServerLevel) world, world.random, pos, state); - - AAMisc.FERTILIZE_WITH_WATERING_CAN_TRIGGER.get().trigger((ServerPlayer) player); world.playSound(null, pos, SoundEvents.BONE_MEAL_USE, SoundSource.BLOCKS); + + if (player instanceof ServerPlayer serverPlayer) { + AAMisc.FERTILIZE_WITH_WATERING_CAN_TRIGGER.get().trigger(serverPlayer); + } } else { world.playSound(null, pos, SoundEvents.BOTTLE_EMPTY, SoundSource.BLOCKS); } diff --git a/common/src/main/java/one/dqu/additionaladditions/gametest/SnifferPlantsTests.java b/common/src/main/java/one/dqu/additionaladditions/gametest/SnifferPlantsTests.java new file mode 100644 index 00000000..790e9a41 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/gametest/SnifferPlantsTests.java @@ -0,0 +1,141 @@ +package one.dqu.additionaladditions.gametest; + +import net.minecraft.core.BlockPos; +import net.minecraft.gametest.framework.GameTestHelper; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.block.state.properties.DoubleBlockHalf; +import one.dqu.additionaladditions.feature.sniffer_plants.FlowerCropBlock; +import one.dqu.additionaladditions.feature.sniffer_plants.LotusLilyCropBlock; +import one.dqu.additionaladditions.feature.sniffer_plants.WisteriaCropBlock; +import one.dqu.additionaladditions.registry.AABlocks; + +import java.util.List; +import java.util.function.Supplier; + +public class SnifferPlantsTests { + private record CropDef(Supplier crop, Supplier grown, int maxAge, BlockPos pos) { + } + + private static final List FLOWER_CROPS = List.of( + new CropDef(AABlocks.COTTONSHIVER_CROP, AABlocks.COTTONSHIVER, 2, new BlockPos(1, 2, 1)), + new CropDef(AABlocks.MUDFLOWER_CROP, AABlocks.MUDFLOWER, 2, new BlockPos(2, 2, 1)), + new CropDef(AABlocks.CRIMSON_BLOSSOM_CROP, AABlocks.CRIMSON_BLOSSOM, 2, new BlockPos(3, 2, 1)), + new CropDef(AABlocks.AMBER_BLOSSOM_CROP, AABlocks.AMBER_BLOSSOM, 2, new BlockPos(1, 2, 2)), + new CropDef(AABlocks.BULBUS_CROP, AABlocks.BULBUS, 2, new BlockPos(2, 2, 2)), + new CropDef(AABlocks.SAWTOOTH_FERN_CROP, AABlocks.SAWTOOTH_FERN, 3, new BlockPos(3, 2, 2)), + new CropDef(AABlocks.FROSTLEAF_CROP, AABlocks.FROSTLEAF, 2, new BlockPos(1, 2, 3)), + new CropDef(AABlocks.SPIKEBLOSSOM_CROP, AABlocks.SPIKEBLOSSOM, 2, new BlockPos(2, 2, 3)), + new CropDef(AABlocks.SNAPDRAGON_CROP, AABlocks.SNAPDRAGON, 2, new BlockPos(3, 2, 3)) + ); + private static final BlockPos WISTERIA_POS = new BlockPos(6, 2, 1); + private static final BlockPos LOTUS_POS = new BlockPos(8, 2, 2); + + private static void bonemeal(GameTestHelper ctx, BlockPos relPos) { + ServerLevel level = ctx.getLevel(); + BlockPos abs = ctx.absolutePos(relPos); + BlockState state = level.getBlockState(abs); + ((BonemealableBlock) state.getBlock()).performBonemeal(level, level.getRandom(), abs, state); + } + + private static void assertGrown(GameTestHelper ctx, CropDef def) { + Block grown = def.grown().get(); + ctx.assertBlockPresent(grown, def.pos()); + if (grown instanceof DoublePlantBlock) { + ctx.assertBlockProperty(def.pos(), DoublePlantBlock.HALF, DoubleBlockHalf.LOWER); + ctx.assertBlockPresent(grown, def.pos().above()); + ctx.assertBlockProperty(def.pos().above(), DoublePlantBlock.HALF, DoubleBlockHalf.UPPER); + } + } + + private static void buildField(GameTestHelper ctx) { + for (int x = 0; x <= 9; x++) { + for (int z = 0; z <= 4; z++) { + ctx.setBlock(new BlockPos(x, 0, z), Blocks.DIRT); + } + } + + BlockState moistFarmland = Blocks.FARMLAND.defaultBlockState().setValue(BlockStateProperties.MOISTURE, FarmlandBlock.MAX_MOISTURE); + for (CropDef def : FLOWER_CROPS) { + ctx.setBlock(def.pos().below(), moistFarmland); + } + + ctx.setBlock(new BlockPos(4, 1, 2), Blocks.WATER); + ctx.setBlock(new BlockPos(5, 1, 2), Blocks.STONE); + ctx.setBlock(new BlockPos(4, 1, 1), Blocks.STONE); + ctx.setBlock(new BlockPos(4, 1, 3), Blocks.STONE); + + ctx.setBlock(new BlockPos(6, 1, 2), Blocks.STONE); + ctx.setBlock(new BlockPos(6, 2, 2), Blocks.STONE); + + ctx.setBlock(new BlockPos(8, 1, 2), Blocks.WATER); + ctx.setBlock(new BlockPos(7, 1, 2), Blocks.STONE); + ctx.setBlock(new BlockPos(9, 1, 2), Blocks.STONE); + ctx.setBlock(new BlockPos(8, 1, 1), Blocks.STONE); + ctx.setBlock(new BlockPos(8, 1, 3), Blocks.STONE); + + ctx.setBlock(new BlockPos(2, 4, 2), Blocks.GLOWSTONE); + ctx.setBlock(new BlockPos(6, 4, 1), Blocks.GLOWSTONE); + ctx.setBlock(new BlockPos(8, 4, 2), Blocks.GLOWSTONE); + } + + private static void plantCrops(GameTestHelper ctx) { + for (CropDef def : FLOWER_CROPS) { + ctx.setBlock(def.pos(), def.crop().get()); + } + ctx.setBlock(WISTERIA_POS, AABlocks.WISTERIA_CROP.get().defaultBlockState().setValue(BlockStateProperties.SOUTH, true)); + ctx.setBlock(LOTUS_POS, AABlocks.LOTUS_LILY_CROP.get()); + } + + // tests each growth stage with bone meal + public static void stages(GameTestHelper ctx) { + buildField(ctx); + plantCrops(ctx); + + for (CropDef def : FLOWER_CROPS) { + ctx.assertBlockPresent(def.crop().get(), def.pos()); + ctx.assertBlockProperty(def.pos(), FlowerCropBlock.AGE, 0); + + for (int age = 1; age < def.maxAge(); age++) { + bonemeal(ctx, def.pos()); + ctx.assertBlockPresent(def.crop().get(), def.pos()); + ctx.assertBlockProperty(def.pos(), FlowerCropBlock.AGE, age); + } + + bonemeal(ctx, def.pos()); + assertGrown(ctx, def); + } + + // Wisteria + ctx.assertBlockProperty(WISTERIA_POS, WisteriaCropBlock.AGE, 0); + bonemeal(ctx, WISTERIA_POS); + ctx.assertBlockProperty(WISTERIA_POS, WisteriaCropBlock.AGE, 1); + bonemeal(ctx, WISTERIA_POS); + ctx.assertBlockPresent(AABlocks.WISTERIA.get(), WISTERIA_POS); + + // Lotus lily + ctx.assertBlockProperty(LOTUS_POS, LotusLilyCropBlock.AGE, 0); + bonemeal(ctx, LOTUS_POS); + ctx.assertBlockPresent(AABlocks.LOTUS_LILY.get(), LOTUS_POS); + + ctx.succeed(); + } + + // tests all plants grow naturally with random ticks + public static void naturalGrowth(GameTestHelper ctx) { + buildField(ctx); + plantCrops(ctx); + + ctx.startSequence() + .thenWaitUntil(() -> { + for (CropDef def : FLOWER_CROPS) { + assertGrown(ctx, def); + } + ctx.assertBlockPresent(AABlocks.WISTERIA.get(), WISTERIA_POS); + ctx.assertBlockPresent(AABlocks.LOTUS_LILY.get(), LOTUS_POS); + }) + .thenSucceed(); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/gametest/WateringCanTests.java b/common/src/main/java/one/dqu/additionaladditions/gametest/WateringCanTests.java new file mode 100644 index 00000000..3752f4e7 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/gametest/WateringCanTests.java @@ -0,0 +1,165 @@ +package one.dqu.additionaladditions.gametest; + +import net.minecraft.core.BlockPos; +import net.minecraft.gametest.framework.GameTestHelper; +import net.minecraft.network.chat.Component; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.GameType; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.LayeredCauldronBlock; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import one.dqu.additionaladditions.registry.AAItems; +import one.dqu.additionaladditions.registry.AAMisc; + +public class WateringCanTests { + private static ItemStack can(int level) { + ItemStack stack = AAItems.WATERING_CAN.get().getDefaultInstance(); + if (level > 0) { + stack.set(AAMisc.WATER_LEVEL_COMPONENT.get(), level); + } + return stack; + } + + private static int canLevel(Player player) { + return player.getMainHandItem().getOrDefault(AAMisc.WATER_LEVEL_COMPONENT.get(), 0); + } + + private static Player player(GameTestHelper ctx, GameType mode, int level) { + Player player = ctx.makeMockPlayer(mode); + player.setItemInHand(InteractionHand.MAIN_HAND, can(level)); + return player; + } + + private static void aim(GameTestHelper ctx, Player player, BlockPos relTarget) { + BlockPos abs = ctx.absolutePos(relTarget); + player.snapTo(abs.getX() + 0.5, abs.getY() + 2.0, abs.getZ() + 0.5); + player.setXRot(90f); + player.setYRot(0f); + } + + private static void use(GameTestHelper ctx, Player player) { + AAItems.WATERING_CAN.get().use(ctx.getLevel(), player, InteractionHand.MAIN_HAND); + } + + private static void assertCanLevel(GameTestHelper ctx, Player player, int expected) { + int actual = canLevel(player); + ctx.assertTrue(actual == expected, Component.literal("Expected watering can level " + expected + " but was " + actual)); + } + + // Empty can on a water source drains the full bucket and removes the source + public static void fillWaterFull(GameTestHelper ctx) { + BlockPos water = new BlockPos(2, 1, 2); + ctx.setBlock(water, Blocks.WATER); + ctx.setBlock(new BlockPos(1, 1, 2), Blocks.STONE); + ctx.setBlock(new BlockPos(3, 1, 2), Blocks.STONE); + ctx.setBlock(new BlockPos(2, 1, 1), Blocks.STONE); + ctx.setBlock(new BlockPos(2, 1, 3), Blocks.STONE); + + Player player = player(ctx, GameType.SURVIVAL, 0); + aim(ctx, player, water); + use(ctx, player); + + ctx.assertBlockPresent(Blocks.AIR, water); + assertCanLevel(ctx, player, 10); + ctx.succeed(); + } + + // Half full can only needs 500mb, less than a bucket, so the source stays + public static void fillWaterPartial(GameTestHelper ctx) { + BlockPos water = new BlockPos(2, 1, 2); + ctx.setBlock(water, Blocks.WATER); + ctx.setBlock(new BlockPos(1, 1, 2), Blocks.STONE); + ctx.setBlock(new BlockPos(3, 1, 2), Blocks.STONE); + ctx.setBlock(new BlockPos(2, 1, 1), Blocks.STONE); + ctx.setBlock(new BlockPos(2, 1, 3), Blocks.STONE); + + Player player = player(ctx, GameType.SURVIVAL, 5); + aim(ctx, player, water); + use(ctx, player); + + ctx.assertBlockPresent(Blocks.WATER, water); + assertCanLevel(ctx, player, 10); + ctx.succeed(); + } + + // Half full can drains 2 of 3 cauldron layers, leaving level 1 + public static void fillWaterCauldron(GameTestHelper ctx) { + BlockPos cauldron = new BlockPos(2, 1, 2); + ctx.setBlock(cauldron, Blocks.WATER_CAULDRON.defaultBlockState().setValue(LayeredCauldronBlock.LEVEL, 3)); + + Player player = player(ctx, GameType.SURVIVAL, 5); + aim(ctx, player, cauldron); + use(ctx, player); + + ctx.assertBlockProperty(cauldron, LayeredCauldronBlock.LEVEL, 1); + ctx.succeed(); + } + + // Watering farmland moistens it and uses one level + public static void interactFarmland(GameTestHelper ctx) { + BlockPos farmland = new BlockPos(2, 1, 2); + ctx.setBlock(farmland, Blocks.FARMLAND.defaultBlockState().setValue(BlockStateProperties.MOISTURE, 0)); + + Player player = player(ctx, GameType.SURVIVAL, 5); + aim(ctx, player, farmland); + use(ctx, player); + + ctx.assertBlockProperty(farmland, BlockStateProperties.MOISTURE, 7); + assertCanLevel(ctx, player, 4); + ctx.succeed(); + } + + // Watering a crop moistens the farmland below and (eventually) grows it + public static void interactCrop(GameTestHelper ctx) { + BlockPos farmland = new BlockPos(2, 1, 2); + BlockPos crop = farmland.above(); + ctx.setBlock(farmland, Blocks.FARMLAND.defaultBlockState().setValue(BlockStateProperties.MOISTURE, 0)); + ctx.setBlock(crop, Blocks.WHEAT); + + Player player = player(ctx, GameType.CREATIVE, 0); + aim(ctx, player, crop); + + for (int i = 0; i < 500 && ctx.getBlockState(crop).getValue(BlockStateProperties.AGE_7) < 7; i++) { + use(ctx, player); + } + + ctx.assertBlockProperty(crop, BlockStateProperties.AGE_7, 7); + ctx.assertBlockProperty(farmland, BlockStateProperties.MOISTURE, 7); + ctx.succeed(); + } + + // Watering a grown crop does not grow it, but still moistens and uses a level + public static void interactGrownCrop(GameTestHelper ctx) { + BlockPos farmland = new BlockPos(2, 1, 2); + BlockPos crop = farmland.above(); + ctx.setBlock(farmland, Blocks.FARMLAND.defaultBlockState().setValue(BlockStateProperties.MOISTURE, 0)); + ctx.setBlock(crop, Blocks.WHEAT.defaultBlockState().setValue(BlockStateProperties.AGE_7, 7)); + + Player player = player(ctx, GameType.SURVIVAL, 5); + aim(ctx, player, crop); + use(ctx, player); + + ctx.assertBlockProperty(crop, BlockStateProperties.AGE_7, 7); + ctx.assertBlockProperty(farmland, BlockStateProperties.MOISTURE, 7); + assertCanLevel(ctx, player, 4); + ctx.succeed(); + } + + // A non growable crop with no farmland below does nothing, no level is used + public static void interactNoFarmland(GameTestHelper ctx) { + BlockPos base = new BlockPos(2, 1, 2); + BlockPos crop = base.above(); + ctx.setBlock(base, Blocks.STONE); + ctx.setBlock(crop, Blocks.WHEAT.defaultBlockState().setValue(BlockStateProperties.AGE_7, 7)); + + Player player = player(ctx, GameType.SURVIVAL, 5); + aim(ctx, player, crop); + use(ctx, player); + + ctx.assertBlockProperty(crop, BlockStateProperties.AGE_7, 7); + assertCanLevel(ctx, player, 5); + ctx.succeed(); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java b/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java index 97c52d7e..71f8ffb5 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java @@ -1,12 +1,20 @@ package one.dqu.additionaladditions.registry; +import net.minecraft.core.registries.Registries; +import net.minecraft.gametest.framework.TestEnvironmentDefinition; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import one.dqu.additionaladditions.AdditionalAdditions; import one.dqu.additionaladditions.core.builder.AAGameTest; -import one.dqu.additionaladditions.gametest.CopperPatinaTests; -import one.dqu.additionaladditions.gametest.MiscTests; -import one.dqu.additionaladditions.gametest.RopeArrowTests; -import one.dqu.additionaladditions.gametest.WrenchTests; +import one.dqu.additionaladditions.gametest.*; public class AAGameTests { + // data/additionaladditions/test_environment/fast_growth.json + private static final ResourceKey> FAST_GROWTH = ResourceKey.create( + Registries.TEST_ENVIRONMENT, + Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, "fast_growth") + ); + public static void registerAll() { // misc new AAGameTest().function(MiscTests::example).create("example"); @@ -35,5 +43,19 @@ public static void registerAll() { new AAGameTest().maxTicks(200).function(WrenchTests::hopper).create("wrench_hopper"); new AAGameTest().function(WrenchTests::piston).create("wrench_piston"); new AAGameTest().function(WrenchTests::player).create("wrench_player"); + + // sniffer plants + new AAGameTest().structure("empty_big").function(SnifferPlantsTests::stages).create("sniffer_plants_stages"); + new AAGameTest().structure("empty_big").maxTicks(2000).environment(FAST_GROWTH) + .function(SnifferPlantsTests::naturalGrowth).create("sniffer_plants_natural_growth"); + + // watering can + new AAGameTest().structure("empty_big").function(WateringCanTests::fillWaterFull).create("watering_can_fill_water_full"); + new AAGameTest().structure("empty_big").function(WateringCanTests::fillWaterPartial).create("watering_can_fill_water_partial"); + new AAGameTest().structure("empty_big").function(WateringCanTests::fillWaterCauldron).create("watering_can_fill_water_cauldron"); + new AAGameTest().structure("empty_big").function(WateringCanTests::interactFarmland).create("watering_can_interact_farmland"); + new AAGameTest().structure("empty_big").function(WateringCanTests::interactCrop).create("watering_can_interact_crop"); + new AAGameTest().structure("empty_big").function(WateringCanTests::interactGrownCrop).create("watering_can_interact_grown_crop"); + new AAGameTest().structure("empty_big").function(WateringCanTests::interactNoFarmland).create("watering_can_interact_no_farmland"); } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/test_environment/fast_growth.json b/common/src/main/resources/data/additionaladditions/test_environment/fast_growth.json new file mode 100644 index 00000000..5aa043ce --- /dev/null +++ b/common/src/main/resources/data/additionaladditions/test_environment/fast_growth.json @@ -0,0 +1,6 @@ +{ + "type": "minecraft:game_rules", + "rules": { + "minecraft:random_tick_speed": 4096 + } +} diff --git a/neoforge/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_natural_growth.json b/neoforge/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_natural_growth.json new file mode 100644 index 00000000..497edfc5 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_natural_growth.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "additionaladditions:fast_growth", + "function": "additionaladditions:sniffer_plants_natural_growth", + "max_ticks": 2000, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_stages.json b/neoforge/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_stages.json new file mode 100644 index 00000000..bea231e7 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_stages.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:sniffer_plants_stages", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_cauldron.json b/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_cauldron.json new file mode 100644 index 00000000..866af74f --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_cauldron.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:watering_can_fill_water_cauldron", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_full.json b/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_full.json new file mode 100644 index 00000000..03190fa3 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_full.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:watering_can_fill_water_full", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_partial.json b/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_partial.json new file mode 100644 index 00000000..2c4e7529 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_partial.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:watering_can_fill_water_partial", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_crop.json b/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_crop.json new file mode 100644 index 00000000..9e5c274b --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_crop.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:watering_can_interact_crop", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_farmland.json b/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_farmland.json new file mode 100644 index 00000000..9156ddce --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_farmland.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:watering_can_interact_farmland", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_grown_crop.json b/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_grown_crop.json new file mode 100644 index 00000000..1ac83c49 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_grown_crop.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:watering_can_interact_grown_crop", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_no_farmland.json b/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_no_farmland.json new file mode 100644 index 00000000..a5d4b6c6 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_no_farmland.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:watering_can_interact_no_farmland", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file From 9ef7cbab4f41b5868c016fc38052ea6c22433c47 Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Sat, 20 Jun 2026 11:34:15 +0100 Subject: [PATCH 16/27] 26.1: add gametest run configuration to gradle --- fabric/build.gradle | 9 +++++++++ neoforge/build.gradle | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/fabric/build.gradle b/fabric/build.gradle index 3976545c..ec112c82 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -25,6 +25,15 @@ def generateMergedAccessWidener = tasks.register('generateMergedAccessWidener') loom { accessWidenerPath = mergedAccessWidener + + runs { + gameTest { + server() + name "Game Test" + vmArg "-DbundlerMainClass=net.minecraft.gametest.Main" + vmArg "-Dfabric-api.gametest" + } + } } sourceSets { diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 1070f99a..930ad591 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -37,6 +37,12 @@ loom { programArgs "--output", file("src/main/generated").absolutePath vmArg "-Dadditionaladditions.datagen=true" } + gameTest { + environment "server" + forgeTemplate "gameTestServer" + name "Game Test" + property 'neoforge.enableGameTest', 'true' + } } } From 579f721d5505bd3e6b9b7f9c4fcee7c9af51035b Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Sat, 20 Jun 2026 11:50:41 +0100 Subject: [PATCH 17/27] 26.1: add gametests for config reload --- .../gametest/ConfigTests.java | 64 +++++++++++++++++++ .../registry/AAGameTests.java | 4 ++ .../config_rose_gold_armor_reload.json | 7 ++ .../config_rose_gold_pickaxe_reload.json | 7 ++ 4 files changed, 82 insertions(+) create mode 100644 common/src/main/java/one/dqu/additionaladditions/gametest/ConfigTests.java create mode 100644 neoforge/src/main/generated/data/additionaladditions/test_instance/config_rose_gold_armor_reload.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/test_instance/config_rose_gold_pickaxe_reload.json diff --git a/common/src/main/java/one/dqu/additionaladditions/gametest/ConfigTests.java b/common/src/main/java/one/dqu/additionaladditions/gametest/ConfigTests.java new file mode 100644 index 00000000..1d6badfe --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/gametest/ConfigTests.java @@ -0,0 +1,64 @@ +package one.dqu.additionaladditions.gametest; + +import net.minecraft.core.component.DataComponentInitializers; +import net.minecraft.core.component.DataComponents; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.gametest.framework.GameTestHelper; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.config.type.ArmorItemConfig; +import one.dqu.additionaladditions.config.type.ToolItemConfig; +import one.dqu.additionaladditions.registry.AAItems; + +import java.util.function.Supplier; + +public class ConfigTests { + // reruns every item component initializer like a datapack reload does + private static void reinit(GameTestHelper ctx) { + BuiltInRegistries.DATA_COMPONENT_INITIALIZERS.build(ctx.getLevel().registryAccess()) + .forEach(DataComponentInitializers.PendingComponents::apply); + } + + private static int maxDamage(Supplier item) { + return item.get().components().getOrDefault(DataComponents.MAX_DAMAGE, -1); + } + + public static void roseGoldPickaxeReload(GameTestHelper ctx) { + ToolItemConfig original = Config.ROSE_GOLD_PICKAXE.get(); + int bumped = original.durability() + 500; + try { + ctx.assertTrue(maxDamage(AAItems.ROSE_GOLD_PICKAXE) == original.durability(), + Component.literal("Pickaxe MAX_DAMAGE should start at config durability " + original.durability())); + + Config.ROSE_GOLD_PICKAXE.set(new ToolItemConfig(original.attackSpeed(), original.attackDamage(), original.blockBreakSpeed(), bumped)); + reinit(ctx); + + ctx.assertTrue(maxDamage(AAItems.ROSE_GOLD_PICKAXE) == bumped, + Component.literal("Pickaxe MAX_DAMAGE should be " + bumped + " after reload but was " + maxDamage(AAItems.ROSE_GOLD_PICKAXE))); + } finally { + Config.ROSE_GOLD_PICKAXE.set(original); + reinit(ctx); + } + ctx.succeed(); + } + + public static void roseGoldArmorReload(GameTestHelper ctx) { + ArmorItemConfig original = Config.ROSE_GOLD_HELMET.get(); + int bumped = original.durability() + 500; + try { + ctx.assertTrue(maxDamage(AAItems.ROSE_GOLD_HELMET) == original.durability(), + Component.literal("Helmet MAX_DAMAGE should start at config durability " + original.durability())); + + Config.ROSE_GOLD_HELMET.set(new ArmorItemConfig(original.protection(), bumped)); + reinit(ctx); + + ctx.assertTrue(maxDamage(AAItems.ROSE_GOLD_HELMET) == bumped, + Component.literal("Helmet MAX_DAMAGE should be " + bumped + " after reload but was " + maxDamage(AAItems.ROSE_GOLD_HELMET))); + } finally { + Config.ROSE_GOLD_HELMET.set(original); + reinit(ctx); + } + ctx.succeed(); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java b/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java index 71f8ffb5..2b75235a 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java @@ -49,6 +49,10 @@ public static void registerAll() { new AAGameTest().structure("empty_big").maxTicks(2000).environment(FAST_GROWTH) .function(SnifferPlantsTests::naturalGrowth).create("sniffer_plants_natural_growth"); + // config + new AAGameTest().function(ConfigTests::roseGoldPickaxeReload).create("config_rose_gold_pickaxe_reload"); + new AAGameTest().function(ConfigTests::roseGoldArmorReload).create("config_rose_gold_armor_reload"); + // watering can new AAGameTest().structure("empty_big").function(WateringCanTests::fillWaterFull).create("watering_can_fill_water_full"); new AAGameTest().structure("empty_big").function(WateringCanTests::fillWaterPartial).create("watering_can_fill_water_partial"); diff --git a/neoforge/src/main/generated/data/additionaladditions/test_instance/config_rose_gold_armor_reload.json b/neoforge/src/main/generated/data/additionaladditions/test_instance/config_rose_gold_armor_reload.json new file mode 100644 index 00000000..819fe521 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/test_instance/config_rose_gold_armor_reload.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:config_rose_gold_armor_reload", + "max_ticks": 100, + "structure": "additionaladditions:empty" +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/test_instance/config_rose_gold_pickaxe_reload.json b/neoforge/src/main/generated/data/additionaladditions/test_instance/config_rose_gold_pickaxe_reload.json new file mode 100644 index 00000000..d58e7f92 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/test_instance/config_rose_gold_pickaxe_reload.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:config_rose_gold_pickaxe_reload", + "max_ticks": 100, + "structure": "additionaladditions:empty" +} \ No newline at end of file From 745b96ddba9fbe124f1d9aa5a17086cb13efc326 Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Sat, 20 Jun 2026 12:45:31 +0100 Subject: [PATCH 18/27] 26.1: fix gradle build again --- fabric/build.gradle | 16 +++++++++++----- neoforge/build.gradle | 16 +++++++++++----- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/fabric/build.gradle b/fabric/build.gradle index ec112c82..85e0343a 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -11,15 +11,21 @@ def mergedAccessWidener = layout.buildDirectory.file("generated/accesswidener/ad def commonAw = project(":common").file("src/main/resources/additionaladditions.accesswidener") def platformAw = project(":common").file("src/main/resources/additionaladditions.fabric.accesswidener") +def writeMergedAccessWidener = { + def header = commonAw.readLines().find { it.trim().startsWith("accessWidener") } ?: "accessWidener v2 official" + def commonBody = commonAw.readLines().findAll { !it.trim().startsWith("accessWidener") } + def platformBody = platformAw.readLines().findAll { !it.trim().startsWith("accessWidener") } + mergedAccessWidener.parentFile.mkdirs() + mergedAccessWidener.text = ([header] + commonBody + platformBody).join("\n") + "\n" +} + +writeMergedAccessWidener() + def generateMergedAccessWidener = tasks.register('generateMergedAccessWidener') { inputs.files(commonAw, platformAw) outputs.file(mergedAccessWidener) doLast { - def header = commonAw.readLines().find { it.trim().startsWith("accessWidener") } ?: "accessWidener v2 official" - def commonBody = commonAw.readLines().findAll { !it.trim().startsWith("accessWidener") } - def platformBody = platformAw.readLines().findAll { !it.trim().startsWith("accessWidener") } - mergedAccessWidener.parentFile.mkdirs() - mergedAccessWidener.text = ([header] + commonBody + platformBody).join("\n") + "\n" + writeMergedAccessWidener() } } diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 930ad591..8de82164 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -11,15 +11,21 @@ def mergedAccessWidener = layout.buildDirectory.file("generated/accesswidener/ad def commonAw = project(":common").file("src/main/resources/additionaladditions.accesswidener") def platformAw = project(":common").file("src/main/resources/additionaladditions.neoforge.accesswidener") +def writeMergedAccessWidener = { + def header = commonAw.readLines().find { it.trim().startsWith("accessWidener") } ?: "accessWidener v2 official" + def commonBody = commonAw.readLines().findAll { !it.trim().startsWith("accessWidener") } + def platformBody = platformAw.readLines().findAll { !it.trim().startsWith("accessWidener") } + mergedAccessWidener.parentFile.mkdirs() + mergedAccessWidener.text = ([header] + commonBody + platformBody).join("\n") + "\n" +} + +writeMergedAccessWidener() + def generateMergedAccessWidener = tasks.register('generateMergedAccessWidener') { inputs.files(commonAw, platformAw) outputs.file(mergedAccessWidener) doLast { - def header = commonAw.readLines().find { it.trim().startsWith("accessWidener") } ?: "accessWidener v2 official" - def commonBody = commonAw.readLines().findAll { !it.trim().startsWith("accessWidener") } - def platformBody = platformAw.readLines().findAll { !it.trim().startsWith("accessWidener") } - mergedAccessWidener.parentFile.mkdirs() - mergedAccessWidener.text = ([header] + commonBody + platformBody).join("\n") + "\n" + writeMergedAccessWidener() } } From fa7d5296f31698cbe6870156dc771a29f1f70eeb Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Sat, 20 Jun 2026 20:12:06 +0100 Subject: [PATCH 19/27] 26.1: fix: gametest datagen on fabric --- .../core/datagen/AAGameTestDatagen.java | 18 +++++++++++++++++- .../AdditionalAdditionsDatagenFabric.java | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAGameTestDatagen.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAGameTestDatagen.java index 172a4ff2..8014774a 100644 --- a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAGameTestDatagen.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAGameTestDatagen.java @@ -11,11 +11,14 @@ import one.dqu.additionaladditions.AdditionalAdditions; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; import java.util.function.Consumer; public class AAGameTestDatagen { private static List entries = AdditionalAdditions.DATAGEN ? new ArrayList<>() : null; + private static final Set>> environments = AdditionalAdditions.DATAGEN ? new HashSet<>() : null; public record Entry( Identifier id, @@ -27,8 +30,9 @@ public record Entry( } public static void register(Entry entry) { - if (entries == null) return; + if (entries == null || environments == null) return; entries.add(entry); + environments.add(entry.environment()); } public static void bootstrap(BootstrapContext context) { @@ -55,6 +59,18 @@ public static void bootstrap(BootstrapContext context) { entries = null; } + // for fabric + // register empty test environments just so the test instance references resolve + // because fabric doesnt load datapack jsons during datagen + // actual definitions are manual in common/src/main/resources/... + public static void bootstrapEnvironments(BootstrapContext> context) { + for (ResourceKey> environment : environments) { + if (environment.identifier().getNamespace().equals(AdditionalAdditions.NAMESPACE)) { + context.register(environment, new TestEnvironmentDefinition.AllOf(List.of())); + } + } + } + public static RegistrySetBuilder registryBuilder() { return new RegistrySetBuilder().add(Registries.TEST_INSTANCE, AAGameTestDatagen::bootstrap); } diff --git a/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsDatagenFabric.java b/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsDatagenFabric.java index 5509cc2a..93378203 100644 --- a/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsDatagenFabric.java +++ b/fabric/src/main/java/one/dqu/additionaladditions/fabric/AdditionalAdditionsDatagenFabric.java @@ -48,6 +48,7 @@ public void generateItemModels(ItemModelGenerators gen) { @Override public void buildRegistry(RegistrySetBuilder registryBuilder) { + registryBuilder.add(Registries.TEST_ENVIRONMENT, AAGameTestDatagen::bootstrapEnvironments); registryBuilder.add(Registries.TEST_INSTANCE, AAGameTestDatagen::bootstrap); } From 24078b1700b3941bf382d38421ead0be84fed380 Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Sat, 20 Jun 2026 21:18:30 +0100 Subject: [PATCH 20/27] 26.1: datagen more recipes --- .../core/builder/AAItem.java | 26 ++++- .../core/datagen/AAItemDatagen.java | 4 +- .../core/datagen/AARecipeDatagenProvider.java | 43 +++++--- .../core/datagen/template/Recipes.java | 98 +++++++++++++------ .../datagen/template/recipe/RecipeEntry.java | 89 +++++++++++++++++ .../datagen/template/recipe/RecipeInput.java | 33 +++++++ .../feature/album/AlbumContent.java | 35 ++++++- .../copper_patina/CopperPatinaContent.java | 5 + .../feature/food/FoodContent.java | 4 +- .../feature/rose_gold/RoseGoldContent.java | 44 +++++++++ .../sniffer_plants/SnifferPlantsContent.java | 40 +++++--- .../feature/trident/TridentShardContent.java | 15 +++ .../additionaladditions/registry/AATags.java | 3 +- .../advancement/recipes/album/album_dye.json | 40 -------- .../rose_gold/rose_gold_equipment.json | 35 ------- .../recipes/rose_gold/rose_gold_ingot.json | 28 ------ .../recipe/album/album.json | 15 --- .../rose_gold/rose_gold_ingot_from_block.json | 11 --- .../recipe/trident_shard.json | 16 --- .../rose_gold/rose_gold_block.json | 32 ++++++ .../combat/rose_gold/rose_gold_axe.json | 32 ++++++ .../combat/rose_gold/rose_gold_boots.json | 32 ++++++ .../rose_gold/rose_gold_chestplate.json | 32 ++++++ .../combat/rose_gold/rose_gold_helmet.json | 32 ++++++ .../rose_gold/rose_gold_horse_armor.json | 32 ++++++ .../combat/rose_gold/rose_gold_leggings.json | 32 ++++++ .../rose_gold/rose_gold_nautilus_armor.json | 32 ++++++ .../combat/rose_gold/rose_gold_spear.json | 32 ++++++ .../combat/rose_gold/rose_gold_sword.json | 32 ++++++ .../recipes/combat/trident_shard/trident.json | 22 ++--- .../recipes/food}/fried_egg/fried_egg.json | 14 +-- .../fried_egg_from_campfire_cooking.json | 14 +-- .../fried_egg/fried_egg_from_smoking.json | 14 +-- .../advancement/recipes/misc/album/album.json | 21 +++- .../recipes/misc/album/black_album.json | 32 ++++++ .../recipes/misc/album/blue_album.json | 32 ++++++ .../recipes/misc/album/brown_album.json | 32 ++++++ .../recipes/misc/album/cyan_album.json | 32 ++++++ .../recipes/misc/album/gray_album.json | 32 ++++++ .../recipes/misc/album/green_album.json | 32 ++++++ .../recipes/misc/album/light_blue_album.json | 32 ++++++ .../recipes/misc/album/light_gray_album.json | 32 ++++++ .../recipes/misc/album/lime_album.json | 32 ++++++ .../recipes/misc/album/magenta_album.json | 32 ++++++ .../recipes/misc/album/orange_album.json | 32 ++++++ .../recipes/misc/album/pink_album.json | 32 ++++++ .../recipes/misc/album/purple_album.json | 32 ++++++ .../recipes/misc/album/red_album.json | 32 ++++++ .../recipes/misc/album/white_album.json | 32 ++++++ .../recipes/misc/album/yellow_album.json | 32 ++++++ .../recipes/misc/copper_patina/cyan_dye.json | 18 ++-- .../misc/rose_gold/rose_gold_ingot.json | 43 ++++++++ .../rose_gold/rose_gold_ingot_from_block.json | 13 ++- .../blue_dye_from_frostleaf.json | 14 +-- .../brown_dye_from_mudflower.json | 14 +-- .../green_dye_from_sawtooth_fern.json | 14 +-- .../light_blue_dye_from_wisteria.json | 22 ++--- .../sniffer_plants/lime_dye_from_bulbus.json | 14 +-- .../magenta_dye_from_snapdragon.json | 14 +-- .../pink_dye_from_lotus_lily.json | 14 +-- .../purple_dye_from_spikeblossom.json | 14 +-- .../red_dye_from_crimson_blossom.json | 14 +-- .../white_dye_from_cottonshiver.json | 14 +-- .../yellow_dye_from_amber_blossom.json | 14 +-- .../tools/rose_gold/rose_gold_hoe.json | 32 ++++++ .../tools/rose_gold/rose_gold_pickaxe.json | 32 ++++++ .../tools/rose_gold/rose_gold_shovel.json | 32 ++++++ .../recipe/album/album.json | 15 +++ .../recipe/album/black_album.json | 8 +- .../recipe/album/blue_album.json | 8 +- .../recipe/album/brown_album.json | 8 +- .../recipe/album/cyan_album.json | 8 +- .../recipe/album/gray_album.json | 8 +- .../recipe/album/green_album.json | 8 +- .../recipe/album/light_blue_album.json | 8 +- .../recipe/album/light_gray_album.json | 8 +- .../recipe/album/lime_album.json | 8 +- .../recipe/album/magenta_album.json | 8 +- .../recipe/album/orange_album.json | 8 +- .../recipe/album/pink_album.json | 8 +- .../recipe/album/purple_album.json | 8 +- .../recipe/album/red_album.json | 8 +- .../recipe/album/white_album.json | 6 +- .../recipe/album/yellow_album.json | 8 +- .../recipe/copper_patina/cyan_dye.json | 6 +- .../recipe/fried_egg/fried_egg.json | 7 +- .../fried_egg_from_campfire_cooking.json | 7 +- .../fried_egg/fried_egg_from_smoking.json | 7 +- .../recipe/rose_gold/rose_gold_axe.json | 6 +- .../recipe/rose_gold/rose_gold_block.json | 10 +- .../recipe/rose_gold/rose_gold_boots.json | 6 +- .../rose_gold/rose_gold_chestplate.json | 6 +- .../recipe/rose_gold/rose_gold_helmet.json | 6 +- .../recipe/rose_gold/rose_gold_hoe.json | 6 +- .../rose_gold/rose_gold_horse_armor.json | 6 +- .../recipe/rose_gold/rose_gold_ingot.json | 8 +- .../rose_gold/rose_gold_ingot_from_block.json | 12 +++ .../recipe/rose_gold/rose_gold_leggings.json | 6 +- .../rose_gold/rose_gold_nautilus_armor.json | 6 +- .../recipe/rose_gold/rose_gold_pickaxe.json | 6 +- .../recipe/rose_gold/rose_gold_shovel.json | 6 +- .../recipe/rose_gold/rose_gold_spear.json | 6 +- .../recipe/rose_gold/rose_gold_sword.json | 4 +- .../blue_dye_from_frostleaf.json | 1 - .../brown_dye_from_mudflower.json | 1 - .../green_dye_from_sawtooth_fern.json | 1 - .../light_blue_dye_from_wisteria.json | 1 - .../sniffer_plants/lime_dye_from_bulbus.json | 1 - .../magenta_dye_from_snapdragon.json | 1 - .../pink_dye_from_lotus_lily.json | 1 - .../purple_dye_from_spikeblossom.json | 1 - .../red_dye_from_crimson_blossom.json | 1 - .../white_dye_from_cottonshiver.json | 1 - .../yellow_dye_from_amber_blossom.json | 1 - .../recipe/trident_shard/trident.json | 16 +++ .../config_rose_gold_armor_reload.json | 7 ++ .../config_rose_gold_pickaxe_reload.json | 7 ++ .../sniffer_plants_natural_growth.json | 7 ++ .../test_instance/sniffer_plants_stages.json | 7 ++ .../watering_can_fill_water_cauldron.json | 7 ++ .../watering_can_fill_water_full.json | 7 ++ .../watering_can_fill_water_partial.json | 7 ++ .../watering_can_interact_crop.json | 7 ++ .../watering_can_interact_farmland.json | 7 ++ .../watering_can_interact_grown_crop.json | 7 ++ .../watering_can_interact_no_farmland.json | 7 ++ .../rose_gold/rose_gold_block.json | 32 ++++++ .../combat/rose_gold/rose_gold_axe.json | 32 ++++++ .../combat/rose_gold/rose_gold_boots.json | 32 ++++++ .../rose_gold/rose_gold_chestplate.json | 32 ++++++ .../combat/rose_gold/rose_gold_helmet.json | 32 ++++++ .../rose_gold/rose_gold_horse_armor.json | 32 ++++++ .../combat/rose_gold/rose_gold_leggings.json | 32 ++++++ .../rose_gold/rose_gold_nautilus_armor.json | 32 ++++++ .../combat/rose_gold/rose_gold_spear.json | 32 ++++++ .../combat/rose_gold/rose_gold_sword.json | 32 ++++++ .../recipes/combat/trident_shard/trident.json | 32 ++++++ .../recipes/food/fried_egg/fried_egg.json | 32 ++++++ .../fried_egg_from_campfire_cooking.json | 32 ++++++ .../fried_egg/fried_egg_from_smoking.json | 32 ++++++ .../advancement/recipes/misc/album/album.json | 23 +++-- .../recipes/misc/album/black_album.json | 32 ++++++ .../recipes/misc/album/blue_album.json | 32 ++++++ .../recipes/misc/album/brown_album.json | 32 ++++++ .../recipes/misc/album/cyan_album.json | 32 ++++++ .../recipes/misc/album/gray_album.json | 32 ++++++ .../recipes/misc/album/green_album.json | 32 ++++++ .../recipes/misc/album/light_blue_album.json | 32 ++++++ .../recipes/misc/album/light_gray_album.json | 32 ++++++ .../recipes/misc/album/lime_album.json | 32 ++++++ .../recipes/misc/album/magenta_album.json | 32 ++++++ .../recipes/misc/album/orange_album.json | 32 ++++++ .../recipes/misc/album/pink_album.json | 32 ++++++ .../recipes/misc/album/purple_album.json | 32 ++++++ .../recipes/misc/album/red_album.json | 32 ++++++ .../recipes/misc/album/white_album.json | 32 ++++++ .../recipes/misc/album/yellow_album.json | 32 ++++++ .../recipes/misc/copper_patina/cyan_dye.json | 32 ++++++ .../misc/rose_gold/rose_gold_ingot.json | 43 ++++++++ .../rose_gold/rose_gold_ingot_from_block.json | 32 ++++++ .../blue_dye_from_frostleaf.json | 32 ++++++ .../brown_dye_from_mudflower.json | 32 ++++++ .../green_dye_from_sawtooth_fern.json | 32 ++++++ .../light_blue_dye_from_wisteria.json | 32 ++++++ .../sniffer_plants/lime_dye_from_bulbus.json | 32 ++++++ .../magenta_dye_from_snapdragon.json | 32 ++++++ .../pink_dye_from_lotus_lily.json | 32 ++++++ .../purple_dye_from_spikeblossom.json | 32 ++++++ .../red_dye_from_crimson_blossom.json | 32 ++++++ .../white_dye_from_cottonshiver.json | 32 ++++++ .../yellow_dye_from_amber_blossom.json | 32 ++++++ .../tools/rose_gold/rose_gold_hoe.json | 32 ++++++ .../tools/rose_gold/rose_gold_pickaxe.json | 32 ++++++ .../tools/rose_gold/rose_gold_shovel.json | 32 ++++++ .../recipe/album/album.json | 15 +++ .../recipe/album/black_album.json | 10 ++ .../recipe/album/blue_album.json | 10 ++ .../recipe/album/brown_album.json | 10 ++ .../recipe/album/cyan_album.json | 10 ++ .../recipe/album/gray_album.json | 10 ++ .../recipe/album/green_album.json | 10 ++ .../recipe/album/light_blue_album.json | 10 ++ .../recipe/album/light_gray_album.json | 10 ++ .../recipe/album/lime_album.json | 10 ++ .../recipe/album/magenta_album.json | 10 ++ .../recipe/album/orange_album.json | 10 ++ .../recipe/album/pink_album.json | 10 ++ .../recipe/album/purple_album.json | 10 ++ .../recipe/album/red_album.json | 10 ++ .../recipe/album/white_album.json | 10 ++ .../recipe/album/yellow_album.json | 10 ++ .../recipe/copper_patina/cyan_dye.json | 12 +++ .../recipe/fried_egg/fried_egg.json | 10 ++ .../fried_egg_from_campfire_cooking.json | 10 ++ .../fried_egg/fried_egg_from_smoking.json | 10 ++ .../recipe/rose_gold/rose_gold_axe.json | 9 ++ .../recipe/rose_gold/rose_gold_block.json | 15 +++ .../recipe/rose_gold/rose_gold_boots.json | 9 ++ .../rose_gold/rose_gold_chestplate.json | 9 ++ .../recipe/rose_gold/rose_gold_helmet.json | 9 ++ .../recipe/rose_gold/rose_gold_hoe.json | 9 ++ .../rose_gold/rose_gold_horse_armor.json | 9 ++ .../recipe/rose_gold/rose_gold_ingot.json | 18 ++++ .../rose_gold/rose_gold_ingot_from_block.json | 12 +++ .../recipe/rose_gold/rose_gold_leggings.json | 9 ++ .../rose_gold/rose_gold_nautilus_armor.json | 9 ++ .../recipe/rose_gold/rose_gold_pickaxe.json | 9 ++ .../recipe/rose_gold/rose_gold_shovel.json | 9 ++ .../recipe/rose_gold/rose_gold_spear.json | 9 ++ .../recipe/rose_gold/rose_gold_sword.json | 9 ++ .../blue_dye_from_frostleaf.json | 11 +++ .../brown_dye_from_mudflower.json | 11 +++ .../green_dye_from_sawtooth_fern.json | 11 +++ .../light_blue_dye_from_wisteria.json | 11 +++ .../sniffer_plants/lime_dye_from_bulbus.json | 11 +++ .../magenta_dye_from_snapdragon.json | 11 +++ .../pink_dye_from_lotus_lily.json | 11 +++ .../purple_dye_from_spikeblossom.json | 11 +++ .../red_dye_from_crimson_blossom.json | 11 +++ .../white_dye_from_cottonshiver.json | 11 +++ .../yellow_dye_from_amber_blossom.json | 11 +++ .../recipe/trident_shard/trident.json | 16 +++ 222 files changed, 3800 insertions(+), 450 deletions(-) create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/datagen/template/recipe/RecipeEntry.java create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/datagen/template/recipe/RecipeInput.java delete mode 100644 common/src/main/resources/data/additionaladditions/advancement/recipes/album/album_dye.json delete mode 100644 common/src/main/resources/data/additionaladditions/advancement/recipes/rose_gold/rose_gold_equipment.json delete mode 100644 common/src/main/resources/data/additionaladditions/advancement/recipes/rose_gold/rose_gold_ingot.json delete mode 100644 common/src/main/resources/data/additionaladditions/recipe/album/album.json delete mode 100644 common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_ingot_from_block.json delete mode 100644 common/src/main/resources/data/additionaladditions/recipe/trident_shard.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/building_blocks/rose_gold/rose_gold_block.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_axe.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_boots.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_chestplate.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_helmet.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_horse_armor.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_leggings.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_nautilus_armor.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_spear.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_sword.json rename common/src/main/resources/data/additionaladditions/advancement/recipes/trident_shard.json => fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/trident_shard/trident.json (56%) rename {common/src/main/resources/data/additionaladditions/advancement/recipes => fabric/src/main/generated/data/additionaladditions/advancement/recipes/food}/fried_egg/fried_egg.json (71%) rename {common/src/main/resources/data/additionaladditions/advancement/recipes => fabric/src/main/generated/data/additionaladditions/advancement/recipes/food}/fried_egg/fried_egg_from_campfire_cooking.json (73%) rename {common/src/main/resources/data/additionaladditions/advancement/recipes => fabric/src/main/generated/data/additionaladditions/advancement/recipes/food}/fried_egg/fried_egg_from_smoking.json (72%) rename common/src/main/resources/data/additionaladditions/advancement/recipes/album/album_leather.json => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/album.json (55%) create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/black_album.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/blue_album.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/brown_album.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/cyan_album.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/gray_album.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/green_album.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/light_blue_album.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/light_gray_album.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/lime_album.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/magenta_album.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/orange_album.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/pink_album.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/purple_album.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/red_album.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/white_album.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/yellow_album.json rename common/src/main/resources/data/additionaladditions/advancement/recipes/copper_patina/patina_dye.json => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/copper_patina/cyan_dye.json (52%) create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/rose_gold/rose_gold_ingot.json rename {common/src/main/resources/data/additionaladditions/advancement/recipes => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc}/rose_gold/rose_gold_ingot_from_block.json (60%) rename common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/frostleaf.json => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/blue_dye_from_frostleaf.json (72%) rename common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/mudflower.json => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/brown_dye_from_mudflower.json (72%) rename common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/sawtooth_fern.json => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/green_dye_from_sawtooth_fern.json (72%) rename common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/wisteria.json => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/light_blue_dye_from_wisteria.json (73%) rename common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/bulbus.json => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/lime_dye_from_bulbus.json (72%) rename common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/snapdragon.json => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/magenta_dye_from_snapdragon.json (72%) rename common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/lotus_lily.json => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/pink_dye_from_lotus_lily.json (72%) rename common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/spikeblossom.json => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/purple_dye_from_spikeblossom.json (72%) rename common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/crimson_blossom.json => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/red_dye_from_crimson_blossom.json (71%) rename common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/cottonshiver.json => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/white_dye_from_cottonshiver.json (72%) rename common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/amber_blossom.json => fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/yellow_dye_from_amber_blossom.json (72%) create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_hoe.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_pickaxe.json create mode 100644 fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_shovel.json create mode 100644 fabric/src/main/generated/data/additionaladditions/recipe/album/album.json rename common/src/main/resources/data/additionaladditions/recipe/album/album_dye_black.json => fabric/src/main/generated/data/additionaladditions/recipe/album/black_album.json (61%) rename common/src/main/resources/data/additionaladditions/recipe/album/album_dye_blue.json => fabric/src/main/generated/data/additionaladditions/recipe/album/blue_album.json (61%) rename common/src/main/resources/data/additionaladditions/recipe/album/album_dye_brown.json => fabric/src/main/generated/data/additionaladditions/recipe/album/brown_album.json (61%) rename common/src/main/resources/data/additionaladditions/recipe/album/album_dye_cyan.json => fabric/src/main/generated/data/additionaladditions/recipe/album/cyan_album.json (61%) rename common/src/main/resources/data/additionaladditions/recipe/album/album_dye_gray.json => fabric/src/main/generated/data/additionaladditions/recipe/album/gray_album.json (61%) rename common/src/main/resources/data/additionaladditions/recipe/album/album_dye_green.json => fabric/src/main/generated/data/additionaladditions/recipe/album/green_album.json (61%) rename common/src/main/resources/data/additionaladditions/recipe/album/album_dye_light_blue.json => fabric/src/main/generated/data/additionaladditions/recipe/album/light_blue_album.json (60%) rename common/src/main/resources/data/additionaladditions/recipe/album/album_dye_light_gray.json => fabric/src/main/generated/data/additionaladditions/recipe/album/light_gray_album.json (60%) rename common/src/main/resources/data/additionaladditions/recipe/album/album_dye_lime.json => fabric/src/main/generated/data/additionaladditions/recipe/album/lime_album.json (61%) rename common/src/main/resources/data/additionaladditions/recipe/album/album_dye_magenta.json => fabric/src/main/generated/data/additionaladditions/recipe/album/magenta_album.json (60%) rename common/src/main/resources/data/additionaladditions/recipe/album/album_dye_orange.json => fabric/src/main/generated/data/additionaladditions/recipe/album/orange_album.json (61%) rename common/src/main/resources/data/additionaladditions/recipe/album/album_dye_pink.json => fabric/src/main/generated/data/additionaladditions/recipe/album/pink_album.json (61%) rename common/src/main/resources/data/additionaladditions/recipe/album/album_dye_purple.json => fabric/src/main/generated/data/additionaladditions/recipe/album/purple_album.json (61%) rename common/src/main/resources/data/additionaladditions/recipe/album/album_dye_red.json => fabric/src/main/generated/data/additionaladditions/recipe/album/red_album.json (61%) rename common/src/main/resources/data/additionaladditions/recipe/album/album_dye_white.json => fabric/src/main/generated/data/additionaladditions/recipe/album/white_album.json (61%) rename common/src/main/resources/data/additionaladditions/recipe/album/album_dye_yellow.json => fabric/src/main/generated/data/additionaladditions/recipe/album/yellow_album.json (61%) rename common/src/main/resources/data/additionaladditions/recipe/copper_patina/patina_cyan_dye.json => fabric/src/main/generated/data/additionaladditions/recipe/copper_patina/cyan_dye.json (57%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/fried_egg/fried_egg.json (74%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/fried_egg/fried_egg_from_campfire_cooking.json (75%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/fried_egg/fried_egg_from_smoking.json (74%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/rose_gold/rose_gold_axe.json (70%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/rose_gold/rose_gold_block.json (70%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/rose_gold/rose_gold_boots.json (70%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/rose_gold/rose_gold_chestplate.json (69%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/rose_gold/rose_gold_helmet.json (70%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/rose_gold/rose_gold_hoe.json (70%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/rose_gold/rose_gold_horse_armor.json (69%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/rose_gold/rose_gold_ingot.json (65%) create mode 100644 fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_ingot_from_block.json rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/rose_gold/rose_gold_leggings.json (69%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/rose_gold/rose_gold_nautilus_armor.json (68%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/rose_gold/rose_gold_pickaxe.json (70%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/rose_gold/rose_gold_shovel.json (70%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/rose_gold/rose_gold_spear.json (70%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/rose_gold/rose_gold_sword.json (70%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/sniffer_plants/blue_dye_from_frostleaf.json (92%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/sniffer_plants/brown_dye_from_mudflower.json (92%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/sniffer_plants/green_dye_from_sawtooth_fern.json (92%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/sniffer_plants/light_blue_dye_from_wisteria.json (92%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/sniffer_plants/lime_dye_from_bulbus.json (92%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/sniffer_plants/magenta_dye_from_snapdragon.json (92%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/sniffer_plants/pink_dye_from_lotus_lily.json (92%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/sniffer_plants/purple_dye_from_spikeblossom.json (92%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/sniffer_plants/red_dye_from_crimson_blossom.json (92%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/sniffer_plants/white_dye_from_cottonshiver.json (92%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/sniffer_plants/yellow_dye_from_amber_blossom.json (92%) create mode 100644 fabric/src/main/generated/data/additionaladditions/recipe/trident_shard/trident.json create mode 100644 fabric/src/main/generated/data/additionaladditions/test_instance/config_rose_gold_armor_reload.json create mode 100644 fabric/src/main/generated/data/additionaladditions/test_instance/config_rose_gold_pickaxe_reload.json create mode 100644 fabric/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_natural_growth.json create mode 100644 fabric/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_stages.json create mode 100644 fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_cauldron.json create mode 100644 fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_full.json create mode 100644 fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_partial.json create mode 100644 fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_crop.json create mode 100644 fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_farmland.json create mode 100644 fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_grown_crop.json create mode 100644 fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_no_farmland.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/building_blocks/rose_gold/rose_gold_block.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_axe.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_boots.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_chestplate.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_helmet.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_horse_armor.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_leggings.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_nautilus_armor.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_spear.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_sword.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/trident_shard/trident.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg_from_campfire_cooking.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg_from_smoking.json rename common/src/main/resources/data/additionaladditions/advancement/recipes/album/album_jukebox.json => neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/album.json (53%) create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/black_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/blue_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/brown_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/cyan_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/gray_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/green_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/light_blue_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/light_gray_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/lime_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/magenta_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/orange_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/pink_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/purple_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/red_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/white_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/yellow_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/copper_patina/cyan_dye.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/rose_gold/rose_gold_ingot.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/rose_gold/rose_gold_ingot_from_block.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/blue_dye_from_frostleaf.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/brown_dye_from_mudflower.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/green_dye_from_sawtooth_fern.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/light_blue_dye_from_wisteria.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/lime_dye_from_bulbus.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/magenta_dye_from_snapdragon.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/pink_dye_from_lotus_lily.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/purple_dye_from_spikeblossom.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/red_dye_from_crimson_blossom.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/white_dye_from_cottonshiver.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/yellow_dye_from_amber_blossom.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_hoe.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_pickaxe.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_shovel.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/black_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/blue_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/brown_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/cyan_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/gray_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/green_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/light_blue_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/light_gray_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/lime_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/magenta_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/orange_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/pink_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/purple_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/red_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/white_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/album/yellow_album.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/copper_patina/cyan_dye.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg_from_campfire_cooking.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg_from_smoking.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_axe.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_block.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_boots.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_chestplate.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_helmet.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_hoe.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_horse_armor.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_ingot.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_ingot_from_block.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_leggings.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_nautilus_armor.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_pickaxe.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_shovel.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_spear.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_sword.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/blue_dye_from_frostleaf.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/brown_dye_from_mudflower.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/green_dye_from_sawtooth_fern.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/light_blue_dye_from_wisteria.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/lime_dye_from_bulbus.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/magenta_dye_from_snapdragon.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/pink_dye_from_lotus_lily.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/purple_dye_from_spikeblossom.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/red_dye_from_crimson_blossom.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/white_dye_from_cottonshiver.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/yellow_dye_from_amber_blossom.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/trident_shard/trident.json diff --git a/common/src/main/java/one/dqu/additionaladditions/core/builder/AAItem.java b/common/src/main/java/one/dqu/additionaladditions/core/builder/AAItem.java index 0e4e6f16..25d9ebde 100644 --- a/common/src/main/java/one/dqu/additionaladditions/core/builder/AAItem.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/builder/AAItem.java @@ -15,7 +15,7 @@ import one.dqu.additionaladditions.config.ConfigProperty; import one.dqu.additionaladditions.config.Toggleable; import one.dqu.additionaladditions.core.datagen.AAItemDatagen; -import one.dqu.additionaladditions.core.datagen.template.Recipes; +import one.dqu.additionaladditions.core.datagen.template.recipe.RecipeEntry; import one.dqu.additionaladditions.core.material.AAMaterial; import one.dqu.additionaladditions.core.material.AnimalArmorType; import one.dqu.additionaladditions.core.material.ToolType; @@ -39,7 +39,7 @@ public class AAItem { // datagen data private final List> tags = new ArrayList<>(); private Consumer model = null; - private Recipes.RecipeEntry recipe = null; + private final List recipes = new ArrayList<>(); @SuppressWarnings("unchecked") public AAItem() { @@ -80,8 +80,24 @@ public AAItem model(Consumer model) { return this; } - public AAItem recipe(Recipes.RecipeEntry recipe) { - this.recipe = recipe; + public AAItem recipe(RecipeEntry recipe) { + this.recipes.add(recipe); + return this; + } + + public AAItem recipe(RecipeEntry... recipes) { + Collections.addAll(this.recipes, recipes); + return this; + } + + public AAItem recipe(List recipes) { + this.recipes.addAll(recipes); + return this; + } + + // recipe that produces a different item than this one + public AAItem recipeFor(ItemLike result, RecipeEntry recipe) { + this.recipes.add(recipe.result(result)); return this; } @@ -144,7 +160,7 @@ public Supplier make(String id) { } if (AdditionalAdditions.DATAGEN) { - AAItemDatagen.register(new AAItemDatagen.Entry(location, item, model, recipe, List.copyOf(tags))); + AAItemDatagen.register(new AAItemDatagen.Entry(location, item, model, List.copyOf(recipes), List.copyOf(tags))); } return item; diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemDatagen.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemDatagen.java index 6318feae..52d709a8 100644 --- a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemDatagen.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemDatagen.java @@ -8,7 +8,7 @@ import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import one.dqu.additionaladditions.AdditionalAdditions; -import one.dqu.additionaladditions.core.datagen.template.Recipes; +import one.dqu.additionaladditions.core.datagen.template.recipe.RecipeEntry; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -29,7 +29,7 @@ public record Entry( @Nullable Consumer model, // recipes are associated with item entries. used by AARecipeDatagenProvider - @Nullable Recipes.RecipeEntry recipe, + List recipes, List> tags ) { diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AARecipeDatagenProvider.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AARecipeDatagenProvider.java index adaa749e..8a0876b9 100644 --- a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AARecipeDatagenProvider.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AARecipeDatagenProvider.java @@ -8,12 +8,15 @@ import net.minecraft.data.recipes.RecipeProvider; import net.minecraft.resources.Identifier; import net.minecraft.resources.ResourceKey; +import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.level.ItemLike; import one.dqu.additionaladditions.AdditionalAdditions; -import one.dqu.additionaladditions.core.datagen.template.Recipes; +import one.dqu.additionaladditions.core.datagen.template.recipe.RecipeEntry; +import one.dqu.additionaladditions.core.datagen.template.recipe.RecipeInput; import one.dqu.additionaladditions.registry.AAItems; +import org.jetbrains.annotations.Nullable; public class AARecipeDatagenProvider extends RecipeProvider { public AARecipeDatagenProvider(HolderLookup.Provider registries, RecipeOutput output) { @@ -23,26 +26,36 @@ public AARecipeDatagenProvider(HolderLookup.Provider registries, RecipeOutput ou @Override protected void buildRecipes() { for (AAItemDatagen.Entry entry : AAItemDatagen.entries()) { - Recipes.RecipeEntry recipe = entry.recipe(); - if (recipe == null) { - continue; - } + Item owner = BuiltInRegistries.ITEM.getValue(entry.id()); + + for (RecipeEntry recipe : entry.recipes()) { + ItemLike result = recipe.result() != null ? recipe.result() : owner; - Item result = BuiltInRegistries.ITEM.getValue(entry.id()); - RecipeBuilder builder = recipe.builder(this.items, result); - for (ItemLike unlock : recipe.unlocks()) { - builder.unlockedBy(getHasName(unlock), has(unlock)); + RecipeBuilder builder = recipe.builder(this.items, result); + if (recipe.group() != null) { + builder.group(recipe.group()); + } + for (RecipeInput unlock : recipe.unlocks()) { + switch (unlock) { + case RecipeInput.OfItem(ItemLike item) -> builder.unlockedBy(getHasName(item), has(item)); + case RecipeInput.OfTag(TagKey tag) -> + builder.unlockedBy("has_" + tag.location().getPath(), has(tag)); + } + } + builder.save(this.output, recipeKey(owner, result, recipe.name())); } - builder.save(this.output, recipeKey(entry.id(), result)); } } - // need / path for RecipeManagerMixin, so that recipes can be disabled with config - private static ResourceKey> recipeKey(Identifier itemId, Item result) { - Identifier configPath = AAItems.configPathFor(result); + // need /.json path for RecipeManagerMixin, so that recipes can be disabled with config + // %s in the name is replaced with the result path (e.g. %s_smoking) + private static ResourceKey> recipeKey(Item owner, ItemLike result, @Nullable String name) { + String resultPath = BuiltInRegistries.ITEM.getKey(result.asItem()).getPath(); + String path = name != null ? name.replace("%s", resultPath) : resultPath; + Identifier configPath = AAItems.configPathFor(owner); Identifier id = configPath != null - ? Identifier.tryBuild(AdditionalAdditions.NAMESPACE, configPath.getPath().split("/")[0] + "/" + itemId.getPath()) - : itemId; + ? Identifier.tryBuild(AdditionalAdditions.NAMESPACE, configPath.getPath().split("/")[0] + "/" + path) + : Identifier.tryBuild(AdditionalAdditions.NAMESPACE, path); return ResourceKey.create(Registries.RECIPE, id); } } diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Recipes.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Recipes.java index c2baf3f1..a78bfb43 100644 --- a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Recipes.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Recipes.java @@ -1,46 +1,21 @@ package one.dqu.additionaladditions.core.datagen.template; -import net.minecraft.core.HolderGetter; -import net.minecraft.data.recipes.RecipeBuilder; -import net.minecraft.data.recipes.RecipeCategory; -import net.minecraft.data.recipes.ShapedRecipeBuilder; -import net.minecraft.data.recipes.ShapelessRecipeBuilder; +import net.minecraft.data.recipes.*; +import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.CookingBookCategory; +import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; +import one.dqu.additionaladditions.core.datagen.template.recipe.RecipeEntry; +import one.dqu.additionaladditions.core.datagen.template.recipe.RecipeInput; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.function.BiFunction; public class Recipes { private Recipes() { } - public static final class RecipeEntry { - private final BiFunction, ItemLike, RecipeBuilder> factory; - private final List unlocks = new ArrayList<>(); - - private RecipeEntry(BiFunction, ItemLike, RecipeBuilder> factory) { - this.factory = factory; - } - - // recipe book unlocks - public RecipeEntry unlockedBy(ItemLike... items) { - Collections.addAll(unlocks, items); - return this; - } - - public RecipeBuilder builder(HolderGetter registries, ItemLike result) { - return factory.apply(registries, result); - } - - public List unlocks() { - return unlocks; - } - } - // Shapeless public static RecipeEntry shapeless(List ingredients, RecipeCategory category, int count) { @@ -85,4 +60,65 @@ public static RecipeEntry shaped(String row1, String row2, Map key, RecipeCategory category) { return shaped(List.of(row1, row2), key, category, 1); } + + // Crafting Transmute + + public static RecipeEntry transmute(RecipeCategory category, RecipeInput input, ItemLike material) { + return new RecipeEntry((registries, result) -> + TransmuteRecipeBuilder.transmute(category, input.ingredient(registries), Ingredient.of(material), result.asItem())); + } + + public static RecipeEntry transmute(RecipeCategory category, ItemLike input, ItemLike material) { + return transmute(category, RecipeInput.of(input), material); + } + + public static RecipeEntry transmute(RecipeCategory category, TagKey input, ItemLike material) { + return transmute(category, RecipeInput.of(input), material); + } + + // Smelting, Blasting, Smoking, Campfire + + private static CookingBookCategory cookingBookCategory(RecipeCategory category) { + return switch (category) { + case FOOD -> CookingBookCategory.FOOD; + case BUILDING_BLOCKS, DECORATIONS -> CookingBookCategory.BLOCKS; + default -> CookingBookCategory.MISC; + }; + } + + public static RecipeEntry smelting(RecipeCategory category, RecipeInput ingredient, float experience) { + return new RecipeEntry((registries, result) -> SimpleCookingRecipeBuilder.smelting( + ingredient.ingredient(registries), category, cookingBookCategory(category), result, experience, 200)); + } + + public static RecipeEntry blasting(RecipeCategory category, RecipeInput ingredient, float experience) { + return new RecipeEntry((registries, result) -> SimpleCookingRecipeBuilder.blasting( + ingredient.ingredient(registries), category, cookingBookCategory(category), result, experience, 100)); + } + + public static RecipeEntry smoking(RecipeCategory category, RecipeInput ingredient, float experience) { + return new RecipeEntry((registries, result) -> SimpleCookingRecipeBuilder.smoking( + ingredient.ingredient(registries), category, result, experience, 100)); + } + + public static RecipeEntry campfire(RecipeCategory category, RecipeInput ingredient, float experience) { + return new RecipeEntry((registries, result) -> SimpleCookingRecipeBuilder.campfireCooking( + ingredient.ingredient(registries), category, result, experience, 600)); + } + + public static List foodCooking(RecipeInput ingredient) { + return List.of( + smelting(RecipeCategory.FOOD, ingredient, 0.35f).unlockedBy(ingredient), + smoking(RecipeCategory.FOOD, ingredient, 0.35f).named("%s_from_smoking").unlockedBy(ingredient), + campfire(RecipeCategory.FOOD, ingredient, 0.35f).named("%s_from_campfire_cooking").unlockedBy(ingredient) + ); + } + + public static List foodCooking(ItemLike ingredient) { + return foodCooking(RecipeInput.of(ingredient)); + } + + public static List foodCooking(TagKey ingredient) { + return foodCooking(RecipeInput.of(ingredient)); + } } diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/recipe/RecipeEntry.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/recipe/RecipeEntry.java new file mode 100644 index 00000000..e45fef9f --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/recipe/RecipeEntry.java @@ -0,0 +1,89 @@ +package one.dqu.additionaladditions.core.datagen.template.recipe; + +import net.minecraft.core.HolderGetter; +import net.minecraft.data.recipes.RecipeBuilder; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.ItemLike; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.function.BiFunction; + +public final class RecipeEntry { + private final BiFunction, ItemLike, RecipeBuilder> factory; + private final List unlocks = new ArrayList<>(); + + // null means the recipe id defaults to the result item path + private @Nullable String name = null; + + // null means the recipe produces the owning item entry + private @Nullable ItemLike result = null; + + // recipe book group, null means no group + private @Nullable String group = null; + + public RecipeEntry(BiFunction, ItemLike, RecipeBuilder> factory) { + this.factory = factory; + } + + // recipe book unlocks + public RecipeEntry unlockedBy(RecipeInput... inputs) { + unlocks.addAll(Arrays.asList(inputs)); + return this; + } + + public RecipeEntry unlockedBy(ItemLike... items) { + for (ItemLike item : items) unlocks.add(RecipeInput.of(item)); + return this; + } + + public RecipeEntry unlockedBy(TagKey tag) { + unlocks.add(RecipeInput.of(tag)); + return this; + } + + // recipe book group + public RecipeEntry group(String group) { + this.group = group; + return this; + } + + /** + * Determines recipe ID / path. + * + * @param name recipe ID. %s is replaced with the result's path. (e.g. "%s_from_smoking") + */ + public RecipeEntry named(String name) { + this.name = name; + return this; + } + + // produce a different item than the owning entry + public RecipeEntry result(ItemLike result) { + this.result = result; + return this; + } + + public RecipeBuilder builder(HolderGetter registries, ItemLike result) { + return factory.apply(registries, result); + } + + public List unlocks() { + return unlocks; + } + + public String name() { + return name; + } + + public ItemLike result() { + return result; + } + + public String group() { + return group; + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/recipe/RecipeInput.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/recipe/RecipeInput.java new file mode 100644 index 00000000..308aa404 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/recipe/RecipeInput.java @@ -0,0 +1,33 @@ +package one.dqu.additionaladditions.core.datagen.template.recipe; + +import net.minecraft.core.HolderGetter; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.ItemLike; + +public sealed interface RecipeInput { + Ingredient ingredient(HolderGetter registries); + + record OfItem(ItemLike item) implements RecipeInput { + @Override + public Ingredient ingredient(HolderGetter registries) { + return Ingredient.of(item); + } + } + + record OfTag(TagKey tag) implements RecipeInput { + @Override + public Ingredient ingredient(HolderGetter registries) { + return Ingredient.of(registries.getOrThrow(tag)); + } + } + + static RecipeInput of(ItemLike item) { + return new OfItem(item); + } + + static RecipeInput of(TagKey tag) { + return new OfTag(tag); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumContent.java index 0ce75d5b..2875722e 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/album/AlbumContent.java @@ -1,16 +1,21 @@ package one.dqu.additionaladditions.feature.album; +import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Items; +import net.minecraft.world.level.ItemLike; import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.core.builder.AAItem; import one.dqu.additionaladditions.core.builder.AAReg; import one.dqu.additionaladditions.core.builder.CreativePosition; import one.dqu.additionaladditions.core.datagen.template.Models; +import one.dqu.additionaladditions.core.datagen.template.Recipes; +import one.dqu.additionaladditions.registry.AAItems; import one.dqu.additionaladditions.registry.AAMisc; import one.dqu.additionaladditions.registry.AATags; +import java.util.Map; import java.util.function.Supplier; public class AlbumContent { @@ -26,10 +31,36 @@ private static AAItem album() { } public static Supplier album(String id) { - return album().make(id); + return album() + .recipe(Recipes.shaped("SS", "LL", Map.of('S', Items.STRING, 'L', Items.LEATHER), RecipeCategory.MISC).unlockedBy(Items.LEATHER, Items.JUKEBOX)) + .make(id); } public static Supplier album(String id, DyeColor color) { - return album().tags(AATags.dyed(color)).make(id); + //noinspection Convert2MethodRef - otherwise would crash - item is null at this point + ItemLike albumItem = () -> AAItems.ALBUM.get(); + ItemLike dyeItem = switch (color) { + case RED -> Items.RED_DYE; + case ORANGE -> Items.ORANGE_DYE; + case YELLOW -> Items.YELLOW_DYE; + case GREEN -> Items.GREEN_DYE; + case BLUE -> Items.BLUE_DYE; + case PURPLE -> Items.PURPLE_DYE; + case PINK -> Items.PINK_DYE; + case BROWN -> Items.BROWN_DYE; + case BLACK -> Items.BLACK_DYE; + case WHITE -> Items.WHITE_DYE; + case LIGHT_BLUE -> Items.LIGHT_BLUE_DYE; + case LIME -> Items.LIME_DYE; + case CYAN -> Items.CYAN_DYE; + case MAGENTA -> Items.MAGENTA_DYE; + case LIGHT_GRAY -> Items.LIGHT_GRAY_DYE; + case GRAY -> Items.GRAY_DYE; + }; + + return album() + .tags(AATags.dyed(color)) + .recipe(Recipes.transmute(RecipeCategory.MISC, AATags.ALBUMS, dyeItem).unlockedBy(albumItem).group("album_dye")) + .make(id); } } diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaContent.java index 1ea2d5c0..8938b957 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/copper_patina/CopperPatinaContent.java @@ -5,6 +5,7 @@ import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Items; +import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.material.MapColor; import net.minecraft.world.level.material.PushReaction; @@ -44,10 +45,14 @@ public static Supplier patinaBlock() { } public static Supplier copperPatina() { + //noinspection Convert2MethodRef - item is null at this point, would crash + ItemLike patina = () -> AAItems.COPPER_PATINA.get(); + return AAReg.item(p -> new CopperPatinaItem(AABlocks.COPPER_PATINA.get(), p)) .config(Config.COPPER_PATINA) .creative(Items.REDSTONE, CreativeModeTabs.REDSTONE_BLOCKS, CreativePosition.AFTER) .model(Models::flat) + .recipeFor(Items.CYAN_DYE, Recipes.shapeless(RecipeCategory.MISC, 2, patina).unlockedBy(patina).group("cyan_dye")) .make("copper_patina"); } diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/food/FoodContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/food/FoodContent.java index bbb2c64c..721b4c2f 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/food/FoodContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/food/FoodContent.java @@ -30,7 +30,9 @@ private static AAItem food(ConfigProperty config, Item anchor) } public static Supplier friedEgg() { - return food(Config.FRIED_EGG, Items.COOKED_RABBIT).make("fried_egg"); + return food(Config.FRIED_EGG, Items.COOKED_RABBIT) + .recipe(Recipes.foodCooking(AATags.C_EGGS)) + .make("fried_egg"); } public static Supplier berryPie() { diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/RoseGoldContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/RoseGoldContent.java index 253135ae..b210c952 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/RoseGoldContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/rose_gold/RoseGoldContent.java @@ -1,5 +1,6 @@ package one.dqu.additionaladditions.feature.rose_gold; +import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; @@ -8,6 +9,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; import net.minecraft.world.item.equipment.ArmorType; +import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.material.MapColor; @@ -15,14 +17,18 @@ import one.dqu.additionaladditions.core.builder.AAReg; import one.dqu.additionaladditions.core.builder.CreativePosition; import one.dqu.additionaladditions.core.datagen.template.Models; +import one.dqu.additionaladditions.core.datagen.template.Recipes; import one.dqu.additionaladditions.core.material.AnimalArmorType; import one.dqu.additionaladditions.core.material.ToolType; import one.dqu.additionaladditions.registry.AABlocks; +import one.dqu.additionaladditions.registry.AAItems; import one.dqu.additionaladditions.registry.AAMaterials; import one.dqu.additionaladditions.registry.AATags; +import java.util.Map; import java.util.function.Supplier; +@SuppressWarnings("Convert2MethodRef") public class RoseGoldContent { public static Supplier roseGoldBlock() { return AAReg.block(Block::new) @@ -38,23 +44,37 @@ public static Supplier roseGoldBlock() { } public static Supplier roseGoldBlockItem() { + ItemLike rosegold = () -> AAItems.ROSE_GOLD_INGOT.get(); return AAReg.blockItem(AABlocks.ROSE_GOLD_BLOCK) .config(Config.ROSE_GOLD) .creative(Items.LIGHT_WEIGHTED_PRESSURE_PLATE, CreativeModeTabs.BUILDING_BLOCKS, CreativePosition.AFTER) .tags(AATags.C_STORAGE_BLOCKS_ROSE_GOLD) + .recipe(Recipes.shaped("RRR", "RRR", "RRR", Map.of('R', rosegold), RecipeCategory.BUILDING_BLOCKS).unlockedBy(rosegold)) .make("rose_gold_block"); } public static Supplier roseGoldIngot() { + ItemLike block = () -> AAItems.ROSE_GOLD_BLOCK.get(); + ItemLike gold = Items.GOLD_INGOT; + ItemLike copper = Items.COPPER_INGOT; return AAReg.item() .config(Config.ROSE_GOLD) .creative(Items.GOLD_INGOT, CreativeModeTabs.INGREDIENTS, CreativePosition.AFTER) .model(Models::flat) .tags(AATags.C_INGOTS_ROSE_GOLD, AATags.REPAIRS_ROSE_GOLD_ARMOR) + .recipe(Recipes.shapeless( + RecipeCategory.MISC, + gold, gold, gold, gold, + copper, copper, copper, copper + ).unlockedBy(gold, copper).group("rose_gold_ingot")) + .recipe(Recipes.shapeless( + RecipeCategory.MISC, 9, block + ).unlockedBy(block).named("%s_from_block").group("rose_gold_ingot")) .make("rose_gold_ingot"); } private static Supplier armor(String id, ArmorType armorType, Item anchor) { + ItemLike rosegold = () -> AAItems.ROSE_GOLD_INGOT.get(); TagKey slotTag = switch (armorType) { case HELMET -> ItemTags.HEAD_ARMOR; case CHESTPLATE -> ItemTags.CHEST_ARMOR; @@ -62,12 +82,20 @@ private static Supplier armor(String id, ArmorType armorType, Item anchor) case BOOTS -> ItemTags.FOOT_ARMOR; default -> throw new IllegalArgumentException("Invalid armor slot: " + armorType); }; + ItemLike inputItem = switch (armorType) { + case HELMET -> Items.IRON_HELMET; + case CHESTPLATE -> Items.IRON_CHESTPLATE; + case LEGGINGS -> Items.IRON_LEGGINGS; + case BOOTS -> Items.IRON_BOOTS; + default -> throw new IllegalArgumentException("Invalid armor slot: " + armorType); + }; return AAReg.item() .config(Config.ROSE_GOLD) .material(AAMaterials.ROSE_GOLD, armorType) .creative(anchor, CreativeModeTabs.COMBAT, CreativePosition.AFTER) .model(item -> Models.armorTrim(item, AAMaterials.ROSE_GOLD.equipmentAsset(), armorType)) .tags(slotTag, ItemTags.TRIMMABLE_ARMOR) + .recipe(Recipes.transmute(RecipeCategory.COMBAT, inputItem, rosegold).unlockedBy(rosegold)) .make(id); } @@ -88,66 +116,79 @@ public static Supplier boots() { } public static Supplier horseArmor() { + ItemLike rosegold = () -> AAItems.ROSE_GOLD_INGOT.get(); return AAReg.item() .config(Config.ROSE_GOLD) .material(AAMaterials.ROSE_GOLD, AnimalArmorType.HORSE) .props(p -> p.stacksTo(1)) .creative(Items.GOLDEN_HORSE_ARMOR, CreativeModeTabs.COMBAT, CreativePosition.AFTER) .model(Models::flat) + .recipe(Recipes.transmute(RecipeCategory.COMBAT, Items.IRON_HORSE_ARMOR, rosegold).unlockedBy(rosegold)) .make("rose_gold_horse_armor"); } public static Supplier nautilusArmor() { + ItemLike rosegold = () -> AAItems.ROSE_GOLD_INGOT.get(); return AAReg.item() .config(Config.ROSE_GOLD) .material(AAMaterials.ROSE_GOLD, AnimalArmorType.NAUTILUS) .props(p -> p.stacksTo(1)) .creative(Items.GOLDEN_NAUTILUS_ARMOR, CreativeModeTabs.COMBAT, CreativePosition.AFTER) .model(Models::flat) + .recipe(Recipes.transmute(RecipeCategory.COMBAT, Items.IRON_NAUTILUS_ARMOR, rosegold).unlockedBy(rosegold)) .make("rose_gold_nautilus_armor"); } public static Supplier sword() { + ItemLike rosegold = () -> AAItems.ROSE_GOLD_INGOT.get(); return AAReg.item() .config(Config.ROSE_GOLD) .material(AAMaterials.ROSE_GOLD, ToolType.SWORD) .creative(Items.GOLDEN_SWORD, CreativeModeTabs.COMBAT, CreativePosition.AFTER) .model(Models::handheld) .tags(ItemTags.SWORDS) + .recipe(Recipes.transmute(RecipeCategory.COMBAT, Items.IRON_SWORD, rosegold).unlockedBy(rosegold)) .make("rose_gold_sword"); } public static Supplier spear() { + ItemLike rosegold = () -> AAItems.ROSE_GOLD_INGOT.get(); return AAReg.item() .config(Config.ROSE_GOLD) .material(AAMaterials.ROSE_GOLD, ToolType.SPEAR) .creative(Items.GOLDEN_SPEAR, CreativeModeTabs.COMBAT, CreativePosition.AFTER) .model(Models::spear) .tags(ItemTags.SPEARS) + .recipe(Recipes.transmute(RecipeCategory.COMBAT, Items.IRON_SPEAR, rosegold).unlockedBy(rosegold)) .make("rose_gold_spear"); } public static Supplier shovel() { + ItemLike rosegold = () -> AAItems.ROSE_GOLD_INGOT.get(); return AAReg.item(AAShovelItem::new) .config(Config.ROSE_GOLD) .material(AAMaterials.ROSE_GOLD, ToolType.SHOVEL) .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) .model(Models::handheld) .tags(ItemTags.SHOVELS) + .recipe(Recipes.transmute(RecipeCategory.TOOLS, Items.IRON_SHOVEL, rosegold).unlockedBy(rosegold)) .make("rose_gold_shovel"); } public static Supplier pickaxe() { + ItemLike rosegold = () -> AAItems.ROSE_GOLD_INGOT.get(); return AAReg.item() .config(Config.ROSE_GOLD) .material(AAMaterials.ROSE_GOLD, ToolType.PICKAXE) .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) .model(Models::handheld) .tags(ItemTags.PICKAXES) + .recipe(Recipes.transmute(RecipeCategory.TOOLS, Items.IRON_PICKAXE, rosegold).unlockedBy(rosegold)) .make("rose_gold_pickaxe"); } public static Supplier axe() { + ItemLike rosegold = () -> AAItems.ROSE_GOLD_INGOT.get(); return AAReg.item(AAAxeItem::new) .config(Config.ROSE_GOLD) .material(AAMaterials.ROSE_GOLD, ToolType.AXE) @@ -155,16 +196,19 @@ public static Supplier axe() { .creative(Items.GOLDEN_AXE, CreativeModeTabs.COMBAT, CreativePosition.AFTER) .model(Models::handheld) .tags(ItemTags.AXES) + .recipe(Recipes.transmute(RecipeCategory.COMBAT, Items.IRON_AXE, rosegold).unlockedBy(rosegold)) .make("rose_gold_axe"); } public static Supplier hoe() { + ItemLike rosegold = () -> AAItems.ROSE_GOLD_INGOT.get(); return AAReg.item(AAHoeItem::new) .config(Config.ROSE_GOLD) .material(AAMaterials.ROSE_GOLD, ToolType.HOE) .creative(Items.GOLDEN_HOE, CreativeModeTabs.TOOLS_AND_UTILITIES, CreativePosition.AFTER) .model(Models::handheld) .tags(ItemTags.HOES) + .recipe(Recipes.transmute(RecipeCategory.TOOLS, Items.IRON_HOE, rosegold).unlockedBy(rosegold)) .make("rose_gold_hoe"); } } diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java index 6aaf77a1..496dbd29 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java @@ -1,6 +1,9 @@ package one.dqu.additionaladditions.feature.sniffer_plants; import net.minecraft.core.Holder; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.resources.Identifier; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; @@ -14,11 +17,14 @@ import net.minecraft.world.level.material.PushReaction; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; +import one.dqu.additionaladditions.AdditionalAdditions; import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.core.builder.AAItem; import one.dqu.additionaladditions.core.builder.AAReg; import one.dqu.additionaladditions.core.builder.CreativePosition; import one.dqu.additionaladditions.core.datagen.template.Models; +import one.dqu.additionaladditions.core.datagen.template.Recipes; +import one.dqu.additionaladditions.core.datagen.template.recipe.RecipeEntry; import one.dqu.additionaladditions.registry.AABlocks; import one.dqu.additionaladditions.registry.AATags; @@ -64,12 +70,23 @@ private static VoxelShape[] shapes(VoxelShape... s) { return s; } - private static Supplier plantItem(String id, Supplier block, ItemLike anchor, TagKey flowerTag) { + private static Supplier plantItem(String id, Supplier block, ItemLike anchor, TagKey flowerTag, ItemLike dye) { return itemBuilder(p -> new BlockItem(block.get(), p), anchor, false) .tags(flowerTag, ItemTags.BEE_FOOD) + .recipeFor(dye, dyeRecipe(id, dye)) .make(id); } + // shapeless dye recipe with the plant flower as the single ingredient + private static RecipeEntry dyeRecipe(String id, ItemLike dye) { + ItemLike plant = () -> BuiltInRegistries.ITEM.getValue(Identifier.tryBuild(AdditionalAdditions.NAMESPACE, id)); + String dyePath = BuiltInRegistries.ITEM.getKey(dye.asItem()).getPath(); + return Recipes.shapeless(RecipeCategory.MISC, plant) + .named("%s_from_" + id) + .group(dyePath) + .unlockedBy(plant); + } + private static Supplier podItem(String id, Supplier block, ItemLike anchor) { return itemBuilder(p -> new BlockItem(block.get(), p), anchor, true) .tags(AATags.C_SEEDS) @@ -208,7 +225,7 @@ public static Supplier lotusLilyCrop() { // Items public static Supplier cottonshiverItem() { - return plantItem("cottonshiver", AABlocks.COTTONSHIVER, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM); + return plantItem("cottonshiver", AABlocks.COTTONSHIVER, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.WHITE_DYE); } public static Supplier cottonshiverPod() { @@ -216,7 +233,7 @@ public static Supplier cottonshiverPod() { } public static Supplier mudflowerItem() { - return plantItem("mudflower", AABlocks.MUDFLOWER, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM); + return plantItem("mudflower", AABlocks.MUDFLOWER, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.BROWN_DYE); } public static Supplier mudflowerSeeds() { @@ -224,7 +241,7 @@ public static Supplier mudflowerSeeds() { } public static Supplier crimsonBlossomItem() { - return plantItem("crimson_blossom", AABlocks.CRIMSON_BLOSSOM, Items.TORCHFLOWER, AATags.C_FLOWERS_SMALL_ITEM); + return plantItem("crimson_blossom", AABlocks.CRIMSON_BLOSSOM, Items.TORCHFLOWER, AATags.C_FLOWERS_SMALL_ITEM, Items.RED_DYE); } public static Supplier crimsonBlossomSeeds() { @@ -232,7 +249,7 @@ public static Supplier crimsonBlossomSeeds() { } public static Supplier amberBlossomItem() { - return plantItem("amber_blossom", AABlocks.AMBER_BLOSSOM, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM); + return plantItem("amber_blossom", AABlocks.AMBER_BLOSSOM, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.YELLOW_DYE); } public static Supplier amberBlossomSeeds() { @@ -240,7 +257,7 @@ public static Supplier amberBlossomSeeds() { } public static Supplier bulbusItem() { - return plantItem("bulbus", AABlocks.BULBUS, Items.TORCHFLOWER, AATags.C_FLOWERS_SMALL_ITEM); + return plantItem("bulbus", AABlocks.BULBUS, Items.TORCHFLOWER, AATags.C_FLOWERS_SMALL_ITEM, Items.LIME_DYE); } public static Supplier bulbusPod() { @@ -248,7 +265,7 @@ public static Supplier bulbusPod() { } public static Supplier sawtoothFernItem() { - return plantItem("sawtooth_fern", AABlocks.SAWTOOTH_FERN, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM); + return plantItem("sawtooth_fern", AABlocks.SAWTOOTH_FERN, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.GREEN_DYE); } public static Supplier sawtoothFernFiddlehead() { @@ -256,7 +273,7 @@ public static Supplier sawtoothFernFiddlehead() { } public static Supplier frostleafItem() { - return plantItem("frostleaf", AABlocks.FROSTLEAF, Items.TORCHFLOWER, AATags.C_FLOWERS_SMALL_ITEM); + return plantItem("frostleaf", AABlocks.FROSTLEAF, Items.TORCHFLOWER, AATags.C_FLOWERS_SMALL_ITEM, Items.BLUE_DYE); } public static Supplier frostleafPod() { @@ -264,7 +281,7 @@ public static Supplier frostleafPod() { } public static Supplier wisteriaItem() { - return plantItem("wisteria", AABlocks.WISTERIA, Items.TORCHFLOWER, AATags.C_FLOWERS_ITEM); + return plantItem("wisteria", AABlocks.WISTERIA, Items.TORCHFLOWER, AATags.C_FLOWERS_ITEM, Items.LIGHT_BLUE_DYE); } public static Supplier wisteriaVines() { @@ -272,7 +289,7 @@ public static Supplier wisteriaVines() { } public static Supplier spikeblossomItem() { - return plantItem("spikeblossom", AABlocks.SPIKEBLOSSOM, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM); + return plantItem("spikeblossom", AABlocks.SPIKEBLOSSOM, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.PURPLE_DYE); } public static Supplier spikeblossomSeeds() { @@ -280,7 +297,7 @@ public static Supplier spikeblossomSeeds() { } public static Supplier snapdragonItem() { - return plantItem("snapdragon", AABlocks.SNAPDRAGON, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM); + return plantItem("snapdragon", AABlocks.SNAPDRAGON, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.MAGENTA_DYE); } public static Supplier snapdragonPod() { @@ -292,6 +309,7 @@ public static Supplier lotusLilyItem() { .config(Config.SNIFFER_PLANTS) .creative(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS, CreativePosition.AFTER) .tags(AATags.C_FLOWERS_ITEM, ItemTags.BEE_FOOD) + .recipeFor(Items.PINK_DYE, dyeRecipe("lotus_lily", Items.PINK_DYE)) .make("lotus_lily"); } diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/trident/TridentShardContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/trident/TridentShardContent.java index b0e242af..443f5c8b 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/trident/TridentShardContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/trident/TridentShardContent.java @@ -1,21 +1,36 @@ package one.dqu.additionaladditions.feature.trident; +import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; +import net.minecraft.world.level.ItemLike; import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.core.builder.AAReg; import one.dqu.additionaladditions.core.builder.CreativePosition; import one.dqu.additionaladditions.core.datagen.template.Models; +import one.dqu.additionaladditions.core.datagen.template.Recipes; +import one.dqu.additionaladditions.registry.AAItems; +import java.util.Map; import java.util.function.Supplier; public class TridentShardContent { public static Supplier tridentShard() { + @SuppressWarnings("Convert2MethodRef") // would crash because AAItems.TRIDENT_SHARD is this item itself, it is null when this runs + ItemLike shard = () -> AAItems.TRIDENT_SHARD.get(); + return AAReg.item() .config(Config.TRIDENT_SHARD) .creative(Items.PRISMARINE_CRYSTALS, CreativeModeTabs.INGREDIENTS, CreativePosition.AFTER) .model(Models::flat) + .recipeFor( + Items.TRIDENT, Recipes.shaped( + " SS", " PS", "P ", + Map.of('S', shard, 'P', Items.PRISMARINE_SHARD), + RecipeCategory.COMBAT + ).unlockedBy(shard) + ) .make("trident_shard"); } } diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AATags.java b/common/src/main/java/one/dqu/additionaladditions/registry/AATags.java index 83a2474a..01d1302f 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AATags.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AATags.java @@ -37,6 +37,7 @@ public class AATags { public static final TagKey C_SEEDS = citem("seeds"); public static final TagKey C_FOODS = citem("foods"); public static final TagKey C_FOODS_PIE = citem("foods/pie"); + public static final TagKey C_EGGS = citem("eggs"); public static final TagKey C_MUSIC_DISCS = citem("music_discs"); public static final TagKey C_TOOLS_WRENCH = citem("tools/wrench"); public static final TagKey C_INGOTS_ROSE_GOLD = citem("ingots/rose_gold"); @@ -66,6 +67,6 @@ private static TagKey cblock(String tag) { } public static void registerAll() { - + } } diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/album/album_dye.json b/common/src/main/resources/data/additionaladditions/advancement/recipes/album/album_dye.json deleted file mode 100644 index 2542c98a..00000000 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/album/album_dye.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_album": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "#additionaladditions:albums" - } - ] - } - } - }, - "requirements": [ - [ - "has_album" - ] - ], - "rewards": { - "recipes": [ - "additionaladditions:album/album_dye_white", - "additionaladditions:album/album_dye_light_gray", - "additionaladditions:album/album_dye_gray", - "additionaladditions:album/album_dye_black", - "additionaladditions:album/album_dye_brown", - "additionaladditions:album/album_dye_red", - "additionaladditions:album/album_dye_orange", - "additionaladditions:album/album_dye_yellow", - "additionaladditions:album/album_dye_lime", - "additionaladditions:album/album_dye_green", - "additionaladditions:album/album_dye_cyan", - "additionaladditions:album/album_dye_light_blue", - "additionaladditions:album/album_dye_blue", - "additionaladditions:album/album_dye_purple", - "additionaladditions:album/album_dye_magenta", - "additionaladditions:album/album_dye_pink" - ] - } -} diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/rose_gold/rose_gold_equipment.json b/common/src/main/resources/data/additionaladditions/advancement/recipes/rose_gold/rose_gold_equipment.json deleted file mode 100644 index fa3e2045..00000000 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/rose_gold/rose_gold_equipment.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_rose_gold_ingot": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "additionaladditions:rose_gold_ingot" - } - ] - } - } - }, - "requirements": [ - [ - "has_rose_gold_ingot" - ] - ], - "rewards": { - "recipes": [ - "additionaladditions:rose_gold/rose_gold_sword", - "additionaladditions:rose_gold/rose_gold_shovel", - "additionaladditions:rose_gold/rose_gold_pickaxe", - "additionaladditions:rose_gold/rose_gold_axe", - "additionaladditions:rose_gold/rose_gold_hoe", - "additionaladditions:rose_gold/rose_gold_helmet", - "additionaladditions:rose_gold/rose_gold_chestplate", - "additionaladditions:rose_gold/rose_gold_leggings", - "additionaladditions:rose_gold/rose_gold_boots", - "additionaladditions:rose_gold/rose_gold_horse_armor", - "additionaladditions:rose_gold/rose_gold_block" - ] - } -} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/rose_gold/rose_gold_ingot.json b/common/src/main/resources/data/additionaladditions/advancement/recipes/rose_gold/rose_gold_ingot.json deleted file mode 100644 index 4e6f3896..00000000 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/rose_gold/rose_gold_ingot.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_ingredients": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "items": "minecraft:gold_ingot" - }, - { - "items": "minecraft:copper_ingot" - } - ] - } - } - }, - "requirements": [ - [ - "has_ingredients" - ] - ], - "rewards": { - "recipes": [ - "additionaladditions:rose_gold/rose_gold_ingot" - ] - } -} diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album.json b/common/src/main/resources/data/additionaladditions/recipe/album/album.json deleted file mode 100644 index 0d44e283..00000000 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "SS", - "LL" - ], - "key": { - "S": "minecraft:string", - "L": "minecraft:leather" - }, - "result": { - "id": "additionaladditions:album", - "count": 1 - } -} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_ingot_from_block.json b/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_ingot_from_block.json deleted file mode 100644 index 243211cc..00000000 --- a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_ingot_from_block.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "type": "crafting_shapeless", - "group": "additionaladditions:rose_gold_ingot", - "ingredients": [ - "additionaladditions:rose_gold_block" - ], - "result": { - "id": "additionaladditions:rose_gold_ingot", - "count": 9 - } -} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/trident_shard.json b/common/src/main/resources/data/additionaladditions/recipe/trident_shard.json deleted file mode 100644 index bad8ac80..00000000 --- a/common/src/main/resources/data/additionaladditions/recipe/trident_shard.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - " SS", - " PS", - "P " - ], - "key": { - "S": "additionaladditions:trident_shard", - "P": "minecraft:prismarine_shard" - }, - "result": { - "id": "minecraft:trident", - "count": 1 - } -} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/building_blocks/rose_gold/rose_gold_block.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/building_blocks/rose_gold/rose_gold_block.json new file mode 100644 index 00000000..a70d4d8c --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/building_blocks/rose_gold/rose_gold_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_block" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_axe.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_axe.json new file mode 100644 index 00000000..b796b4f6 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_axe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_axe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_axe" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_boots.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_boots.json new file mode 100644 index 00000000..0453eae8 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_boots.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_boots" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_boots" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_chestplate.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_chestplate.json new file mode 100644 index 00000000..ef6c8d44 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_chestplate.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_chestplate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_chestplate" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_helmet.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_helmet.json new file mode 100644 index 00000000..722a1f03 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_helmet.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_helmet" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_helmet" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_horse_armor.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_horse_armor.json new file mode 100644 index 00000000..cd57bc72 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_horse_armor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_horse_armor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_horse_armor" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_leggings.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_leggings.json new file mode 100644 index 00000000..3e201dd5 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_leggings.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_leggings" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_leggings" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_nautilus_armor.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_nautilus_armor.json new file mode 100644 index 00000000..deb40486 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_nautilus_armor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_nautilus_armor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_nautilus_armor" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_spear.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_spear.json new file mode 100644 index 00000000..bf80fd68 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_spear" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_spear" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_sword.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_sword.json new file mode 100644 index 00000000..da5fd742 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_sword" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_sword" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/trident_shard.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/trident_shard/trident.json similarity index 56% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/trident_shard.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/trident_shard/trident.json index e60c17ea..5c46397b 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/trident_shard.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/combat/trident_shard/trident.json @@ -1,32 +1,32 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:trident_shard/trident" + }, + "trigger": "minecraft:recipe_unlocked" + }, "has_trident_shard": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "items": "additionaladditions:trident_shard" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "additionaladditions:trident_shard" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ [ - "has_trident_shard", - "has_the_recipe" + "has_the_recipe", + "has_trident_shard" ] ], "rewards": { "recipes": [ - "additionaladditions:trident_shard" + "additionaladditions:trident_shard/trident" ] } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/fried_egg/fried_egg.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg.json similarity index 71% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/fried_egg/fried_egg.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg.json index ae9b483d..ea6ab29f 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/fried_egg/fried_egg.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg.json @@ -1,27 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_egg": { - "trigger": "minecraft:inventory_changed", + "has_eggs": { "conditions": { "items": [ { "items": "#c:eggs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:fried_egg/fried_egg" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_egg", - "has_the_recipe" + "has_the_recipe", + "has_eggs" ] ], "rewards": { diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/fried_egg/fried_egg_from_campfire_cooking.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg_from_campfire_cooking.json similarity index 73% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/fried_egg/fried_egg_from_campfire_cooking.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg_from_campfire_cooking.json index 2e0fe6b5..2994f829 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/fried_egg/fried_egg_from_campfire_cooking.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg_from_campfire_cooking.json @@ -1,27 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_egg": { - "trigger": "minecraft:inventory_changed", + "has_eggs": { "conditions": { "items": [ { "items": "#c:eggs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:fried_egg/fried_egg_from_campfire_cooking" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_egg", - "has_the_recipe" + "has_the_recipe", + "has_eggs" ] ], "rewards": { diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/fried_egg/fried_egg_from_smoking.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg_from_smoking.json similarity index 72% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/fried_egg/fried_egg_from_smoking.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg_from_smoking.json index d1596af3..72637fde 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/fried_egg/fried_egg_from_smoking.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg_from_smoking.json @@ -1,27 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_egg": { - "trigger": "minecraft:inventory_changed", + "has_eggs": { "conditions": { "items": [ { "items": "#c:eggs" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:fried_egg/fried_egg_from_smoking" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_egg", - "has_the_recipe" + "has_the_recipe", + "has_eggs" ] ], "rewards": { diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/album/album_leather.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/album.json similarity index 55% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/album/album_leather.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/album.json index 45a87752..b3d4ac97 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/album/album_leather.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/album.json @@ -1,27 +1,38 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_jukebox": { + "conditions": { + "items": [ + { + "items": "minecraft:jukebox" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_leather": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "items": "minecraft:leather" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:album/album" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ + "has_the_recipe", "has_leather", - "has_the_recipe" + "has_jukebox" ] ], "rewards": { diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/black_album.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/black_album.json new file mode 100644 index 00000000..451f77bd --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/black_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/black_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/black_album" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/blue_album.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/blue_album.json new file mode 100644 index 00000000..ff3cb89d --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/blue_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/blue_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/blue_album" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/brown_album.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/brown_album.json new file mode 100644 index 00000000..3ac69a73 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/brown_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/brown_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/brown_album" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/cyan_album.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/cyan_album.json new file mode 100644 index 00000000..90129a3f --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/cyan_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/cyan_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/cyan_album" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/gray_album.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/gray_album.json new file mode 100644 index 00000000..4b67c6e6 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/gray_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/gray_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/gray_album" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/green_album.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/green_album.json new file mode 100644 index 00000000..67aedf6b --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/green_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/green_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/green_album" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/light_blue_album.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/light_blue_album.json new file mode 100644 index 00000000..67dceafb --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/light_blue_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/light_blue_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/light_blue_album" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/light_gray_album.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/light_gray_album.json new file mode 100644 index 00000000..49f33bb5 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/light_gray_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/light_gray_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/light_gray_album" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/lime_album.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/lime_album.json new file mode 100644 index 00000000..9d24b0d7 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/lime_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/lime_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/lime_album" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/magenta_album.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/magenta_album.json new file mode 100644 index 00000000..504fc886 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/magenta_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/magenta_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/magenta_album" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/orange_album.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/orange_album.json new file mode 100644 index 00000000..5f67172e --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/orange_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/orange_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/orange_album" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/pink_album.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/pink_album.json new file mode 100644 index 00000000..31b47b22 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/pink_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/pink_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/pink_album" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/purple_album.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/purple_album.json new file mode 100644 index 00000000..42deb50e --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/purple_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/purple_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/purple_album" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/red_album.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/red_album.json new file mode 100644 index 00000000..22fd18d1 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/red_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/red_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/red_album" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/white_album.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/white_album.json new file mode 100644 index 00000000..88c58ba4 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/white_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/white_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/white_album" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/yellow_album.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/yellow_album.json new file mode 100644 index 00000000..8a8f2e87 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/yellow_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/yellow_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/yellow_album" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/copper_patina/patina_dye.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/copper_patina/cyan_dye.json similarity index 52% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/copper_patina/patina_dye.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/copper_patina/cyan_dye.json index 144567ce..1d5e9039 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/copper_patina/patina_dye.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/copper_patina/cyan_dye.json @@ -1,32 +1,32 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_patina": { - "trigger": "minecraft:inventory_changed", + "has_copper_patina": { "conditions": { "items": [ { "items": "additionaladditions:copper_patina" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "additionaladditions:copper_patina/patina_cyan_dye" - } + "recipe": "additionaladditions:copper_patina/cyan_dye" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_patina", - "has_the_recipe" + "has_the_recipe", + "has_copper_patina" ] ], "rewards": { "recipes": [ - "additionaladditions:copper_patina/patina_cyan_dye" + "additionaladditions:copper_patina/cyan_dye" ] } } \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/rose_gold/rose_gold_ingot.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/rose_gold/rose_gold_ingot.json new file mode 100644 index 00000000..9dddd674 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/rose_gold/rose_gold_ingot.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_copper_ingot": { + "conditions": { + "items": [ + { + "items": "minecraft:copper_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_gold_ingot": { + "conditions": { + "items": [ + { + "items": "minecraft:gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_ingot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_gold_ingot", + "has_copper_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_ingot" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/rose_gold/rose_gold_ingot_from_block.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/rose_gold/rose_gold_ingot_from_block.json similarity index 60% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/rose_gold/rose_gold_ingot_from_block.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/rose_gold/rose_gold_ingot_from_block.json index 2903bfcd..8e4c4221 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/rose_gold/rose_gold_ingot_from_block.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/rose_gold/rose_gold_ingot_from_block.json @@ -2,18 +2,25 @@ "parent": "minecraft:recipes/root", "criteria": { "has_rose_gold_block": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "items": "additionaladditions:rose_gold_block" } ] - } + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_ingot_from_block" + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ + "has_the_recipe", "has_rose_gold_block" ] ], @@ -22,4 +29,4 @@ "additionaladditions:rose_gold/rose_gold_ingot_from_block" ] } -} +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/frostleaf.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/blue_dye_from_frostleaf.json similarity index 72% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/frostleaf.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/blue_dye_from_frostleaf.json index cac11c4b..9a375937 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/frostleaf.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/blue_dye_from_frostleaf.json @@ -1,27 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_plant": { - "trigger": "minecraft:inventory_changed", + "has_frostleaf": { "conditions": { "items": [ { "items": "additionaladditions:frostleaf" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:sniffer_plants/blue_dye_from_frostleaf" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_plant", - "has_the_recipe" + "has_the_recipe", + "has_frostleaf" ] ], "rewards": { diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/mudflower.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/brown_dye_from_mudflower.json similarity index 72% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/mudflower.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/brown_dye_from_mudflower.json index 6dc732bc..847f050e 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/mudflower.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/brown_dye_from_mudflower.json @@ -1,27 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_plant": { - "trigger": "minecraft:inventory_changed", + "has_mudflower": { "conditions": { "items": [ { "items": "additionaladditions:mudflower" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:sniffer_plants/brown_dye_from_mudflower" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_plant", - "has_the_recipe" + "has_the_recipe", + "has_mudflower" ] ], "rewards": { diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/sawtooth_fern.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/green_dye_from_sawtooth_fern.json similarity index 72% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/sawtooth_fern.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/green_dye_from_sawtooth_fern.json index 9d339b20..82478e49 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/sawtooth_fern.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/green_dye_from_sawtooth_fern.json @@ -1,27 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_plant": { - "trigger": "minecraft:inventory_changed", + "has_sawtooth_fern": { "conditions": { "items": [ { "items": "additionaladditions:sawtooth_fern" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:sniffer_plants/green_dye_from_sawtooth_fern" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_plant", - "has_the_recipe" + "has_the_recipe", + "has_sawtooth_fern" ] ], "rewards": { diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/wisteria.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/light_blue_dye_from_wisteria.json similarity index 73% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/wisteria.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/light_blue_dye_from_wisteria.json index cb858c15..557b1ee5 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/wisteria.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/light_blue_dye_from_wisteria.json @@ -1,27 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_plant": { - "trigger": "minecraft:inventory_changed", + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:sniffer_plants/light_blue_dye_from_wisteria" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wisteria": { "conditions": { "items": [ { "items": "additionaladditions:wisteria" } ] - } - }, - "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", - "conditions": { - "recipe": "additionaladditions:sniffer_plants/light_blue_dye_from_wisteria" - } + }, + "trigger": "minecraft:inventory_changed" } }, "requirements": [ [ - "has_plant", - "has_the_recipe" + "has_the_recipe", + "has_wisteria" ] ], "rewards": { diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/bulbus.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/lime_dye_from_bulbus.json similarity index 72% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/bulbus.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/lime_dye_from_bulbus.json index 9b94d9ac..816bf373 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/bulbus.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/lime_dye_from_bulbus.json @@ -1,27 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_plant": { - "trigger": "minecraft:inventory_changed", + "has_bulbus": { "conditions": { "items": [ { "items": "additionaladditions:bulbus" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:sniffer_plants/lime_dye_from_bulbus" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_plant", - "has_the_recipe" + "has_the_recipe", + "has_bulbus" ] ], "rewards": { diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/snapdragon.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/magenta_dye_from_snapdragon.json similarity index 72% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/snapdragon.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/magenta_dye_from_snapdragon.json index 3f9c4071..dc218f30 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/snapdragon.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/magenta_dye_from_snapdragon.json @@ -1,27 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_plant": { - "trigger": "minecraft:inventory_changed", + "has_snapdragon": { "conditions": { "items": [ { "items": "additionaladditions:snapdragon" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:sniffer_plants/magenta_dye_from_snapdragon" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_plant", - "has_the_recipe" + "has_the_recipe", + "has_snapdragon" ] ], "rewards": { diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/lotus_lily.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/pink_dye_from_lotus_lily.json similarity index 72% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/lotus_lily.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/pink_dye_from_lotus_lily.json index f7415605..58ad38bc 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/lotus_lily.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/pink_dye_from_lotus_lily.json @@ -1,27 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_plant": { - "trigger": "minecraft:inventory_changed", + "has_lotus_lily": { "conditions": { "items": [ { "items": "additionaladditions:lotus_lily" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:sniffer_plants/pink_dye_from_lotus_lily" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_plant", - "has_the_recipe" + "has_the_recipe", + "has_lotus_lily" ] ], "rewards": { diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/spikeblossom.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/purple_dye_from_spikeblossom.json similarity index 72% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/spikeblossom.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/purple_dye_from_spikeblossom.json index 76d2ea5a..2aa4add8 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/spikeblossom.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/purple_dye_from_spikeblossom.json @@ -1,27 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_plant": { - "trigger": "minecraft:inventory_changed", + "has_spikeblossom": { "conditions": { "items": [ { "items": "additionaladditions:spikeblossom" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:sniffer_plants/purple_dye_from_spikeblossom" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_plant", - "has_the_recipe" + "has_the_recipe", + "has_spikeblossom" ] ], "rewards": { diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/crimson_blossom.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/red_dye_from_crimson_blossom.json similarity index 71% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/crimson_blossom.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/red_dye_from_crimson_blossom.json index e56bab56..a8e2cb6f 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/crimson_blossom.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/red_dye_from_crimson_blossom.json @@ -1,27 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_plant": { - "trigger": "minecraft:inventory_changed", + "has_crimson_blossom": { "conditions": { "items": [ { "items": "additionaladditions:crimson_blossom" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:sniffer_plants/red_dye_from_crimson_blossom" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_plant", - "has_the_recipe" + "has_the_recipe", + "has_crimson_blossom" ] ], "rewards": { diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/cottonshiver.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/white_dye_from_cottonshiver.json similarity index 72% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/cottonshiver.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/white_dye_from_cottonshiver.json index d816675f..fa6ec618 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/cottonshiver.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/white_dye_from_cottonshiver.json @@ -1,27 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_plant": { - "trigger": "minecraft:inventory_changed", + "has_cottonshiver": { "conditions": { "items": [ { "items": "additionaladditions:cottonshiver" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:sniffer_plants/white_dye_from_cottonshiver" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_plant", - "has_the_recipe" + "has_the_recipe", + "has_cottonshiver" ] ], "rewards": { diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/amber_blossom.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/yellow_dye_from_amber_blossom.json similarity index 72% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/amber_blossom.json rename to fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/yellow_dye_from_amber_blossom.json index 389c1031..92b67db7 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/sniffer_plants/amber_blossom.json +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/yellow_dye_from_amber_blossom.json @@ -1,27 +1,27 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_plant": { - "trigger": "minecraft:inventory_changed", + "has_amber_blossom": { "conditions": { "items": [ { "items": "additionaladditions:amber_blossom" } ] - } + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:sniffer_plants/yellow_dye_from_amber_blossom" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_plant", - "has_the_recipe" + "has_the_recipe", + "has_amber_blossom" ] ], "rewards": { diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_hoe.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_hoe.json new file mode 100644 index 00000000..fe683ddf --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_hoe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_hoe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_hoe" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_pickaxe.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_pickaxe.json new file mode 100644 index 00000000..e736ca5f --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_pickaxe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_pickaxe" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_shovel.json b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_shovel.json new file mode 100644 index 00000000..2baab721 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_shovel" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_shovel" + ] + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/recipe/album/album.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/album.json new file mode 100644 index 00000000..2381062b --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/album.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "L": "minecraft:leather", + "S": "minecraft:string" + }, + "pattern": [ + "SS", + "LL" + ], + "result": { + "id": "additionaladditions:album" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_black.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/black_album.json similarity index 61% rename from common/src/main/resources/data/additionaladditions/recipe/album/album_dye_black.json rename to fabric/src/main/generated/data/additionaladditions/recipe/album/black_album.json index c196a490..957aff44 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_black.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/black_album.json @@ -1,8 +1,10 @@ { "type": "minecraft:crafting_transmute", - "group": "additionaladditions:album_dye", "category": "misc", + "group": "album_dye", "input": "#additionaladditions:albums", "material": "minecraft:black_dye", - "result": "additionaladditions:black_album" -} + "result": { + "id": "additionaladditions:black_album" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_blue.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/blue_album.json similarity index 61% rename from common/src/main/resources/data/additionaladditions/recipe/album/album_dye_blue.json rename to fabric/src/main/generated/data/additionaladditions/recipe/album/blue_album.json index e267a114..136283b2 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_blue.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/blue_album.json @@ -1,8 +1,10 @@ { "type": "minecraft:crafting_transmute", - "group": "additionaladditions:album_dye", "category": "misc", + "group": "album_dye", "input": "#additionaladditions:albums", "material": "minecraft:blue_dye", - "result": "additionaladditions:blue_album" -} + "result": { + "id": "additionaladditions:blue_album" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_brown.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/brown_album.json similarity index 61% rename from common/src/main/resources/data/additionaladditions/recipe/album/album_dye_brown.json rename to fabric/src/main/generated/data/additionaladditions/recipe/album/brown_album.json index fc64881b..ec7fd35c 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_brown.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/brown_album.json @@ -1,8 +1,10 @@ { "type": "minecraft:crafting_transmute", - "group": "additionaladditions:album_dye", "category": "misc", + "group": "album_dye", "input": "#additionaladditions:albums", "material": "minecraft:brown_dye", - "result": "additionaladditions:brown_album" -} + "result": { + "id": "additionaladditions:brown_album" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_cyan.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/cyan_album.json similarity index 61% rename from common/src/main/resources/data/additionaladditions/recipe/album/album_dye_cyan.json rename to fabric/src/main/generated/data/additionaladditions/recipe/album/cyan_album.json index 22884b1e..6a01c28c 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_cyan.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/cyan_album.json @@ -1,8 +1,10 @@ { "type": "minecraft:crafting_transmute", - "group": "additionaladditions:album_dye", "category": "misc", + "group": "album_dye", "input": "#additionaladditions:albums", "material": "minecraft:cyan_dye", - "result": "additionaladditions:cyan_album" -} + "result": { + "id": "additionaladditions:cyan_album" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_gray.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/gray_album.json similarity index 61% rename from common/src/main/resources/data/additionaladditions/recipe/album/album_dye_gray.json rename to fabric/src/main/generated/data/additionaladditions/recipe/album/gray_album.json index 513bccf9..76ad47fa 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_gray.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/gray_album.json @@ -1,8 +1,10 @@ { "type": "minecraft:crafting_transmute", - "group": "additionaladditions:album_dye", "category": "misc", + "group": "album_dye", "input": "#additionaladditions:albums", "material": "minecraft:gray_dye", - "result": "additionaladditions:gray_album" -} + "result": { + "id": "additionaladditions:gray_album" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_green.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/green_album.json similarity index 61% rename from common/src/main/resources/data/additionaladditions/recipe/album/album_dye_green.json rename to fabric/src/main/generated/data/additionaladditions/recipe/album/green_album.json index ed815d4a..6a97299d 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_green.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/green_album.json @@ -1,8 +1,10 @@ { "type": "minecraft:crafting_transmute", - "group": "additionaladditions:album_dye", "category": "misc", + "group": "album_dye", "input": "#additionaladditions:albums", "material": "minecraft:green_dye", - "result": "additionaladditions:green_album" -} + "result": { + "id": "additionaladditions:green_album" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_light_blue.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/light_blue_album.json similarity index 60% rename from common/src/main/resources/data/additionaladditions/recipe/album/album_dye_light_blue.json rename to fabric/src/main/generated/data/additionaladditions/recipe/album/light_blue_album.json index e462f2f7..6a1ee06a 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_light_blue.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/light_blue_album.json @@ -1,8 +1,10 @@ { "type": "minecraft:crafting_transmute", - "group": "additionaladditions:album_dye", "category": "misc", + "group": "album_dye", "input": "#additionaladditions:albums", "material": "minecraft:light_blue_dye", - "result": "additionaladditions:light_blue_album" -} + "result": { + "id": "additionaladditions:light_blue_album" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_light_gray.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/light_gray_album.json similarity index 60% rename from common/src/main/resources/data/additionaladditions/recipe/album/album_dye_light_gray.json rename to fabric/src/main/generated/data/additionaladditions/recipe/album/light_gray_album.json index 8a82ee61..950dc131 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_light_gray.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/light_gray_album.json @@ -1,8 +1,10 @@ { "type": "minecraft:crafting_transmute", - "group": "additionaladditions:album_dye", "category": "misc", + "group": "album_dye", "input": "#additionaladditions:albums", "material": "minecraft:light_gray_dye", - "result": "additionaladditions:light_gray_album" -} + "result": { + "id": "additionaladditions:light_gray_album" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_lime.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/lime_album.json similarity index 61% rename from common/src/main/resources/data/additionaladditions/recipe/album/album_dye_lime.json rename to fabric/src/main/generated/data/additionaladditions/recipe/album/lime_album.json index 5aae950d..9765fe2c 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_lime.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/lime_album.json @@ -1,8 +1,10 @@ { "type": "minecraft:crafting_transmute", - "group": "additionaladditions:album_dye", "category": "misc", + "group": "album_dye", "input": "#additionaladditions:albums", "material": "minecraft:lime_dye", - "result": "additionaladditions:lime_album" -} + "result": { + "id": "additionaladditions:lime_album" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_magenta.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/magenta_album.json similarity index 60% rename from common/src/main/resources/data/additionaladditions/recipe/album/album_dye_magenta.json rename to fabric/src/main/generated/data/additionaladditions/recipe/album/magenta_album.json index 118939d6..b0717d31 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_magenta.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/magenta_album.json @@ -1,8 +1,10 @@ { "type": "minecraft:crafting_transmute", - "group": "additionaladditions:album_dye", "category": "misc", + "group": "album_dye", "input": "#additionaladditions:albums", "material": "minecraft:magenta_dye", - "result": "additionaladditions:magenta_album" -} + "result": { + "id": "additionaladditions:magenta_album" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_orange.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/orange_album.json similarity index 61% rename from common/src/main/resources/data/additionaladditions/recipe/album/album_dye_orange.json rename to fabric/src/main/generated/data/additionaladditions/recipe/album/orange_album.json index bef10bd0..d5a9b793 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_orange.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/orange_album.json @@ -1,8 +1,10 @@ { "type": "minecraft:crafting_transmute", - "group": "additionaladditions:album_dye", "category": "misc", + "group": "album_dye", "input": "#additionaladditions:albums", "material": "minecraft:orange_dye", - "result": "additionaladditions:orange_album" -} + "result": { + "id": "additionaladditions:orange_album" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_pink.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/pink_album.json similarity index 61% rename from common/src/main/resources/data/additionaladditions/recipe/album/album_dye_pink.json rename to fabric/src/main/generated/data/additionaladditions/recipe/album/pink_album.json index 9439dbe9..6c0c9e21 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_pink.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/pink_album.json @@ -1,8 +1,10 @@ { "type": "minecraft:crafting_transmute", - "group": "additionaladditions:album_dye", "category": "misc", + "group": "album_dye", "input": "#additionaladditions:albums", "material": "minecraft:pink_dye", - "result": "additionaladditions:pink_album" -} + "result": { + "id": "additionaladditions:pink_album" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_purple.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/purple_album.json similarity index 61% rename from common/src/main/resources/data/additionaladditions/recipe/album/album_dye_purple.json rename to fabric/src/main/generated/data/additionaladditions/recipe/album/purple_album.json index e956dc09..c32a28a4 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_purple.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/purple_album.json @@ -1,8 +1,10 @@ { "type": "minecraft:crafting_transmute", - "group": "additionaladditions:album_dye", "category": "misc", + "group": "album_dye", "input": "#additionaladditions:albums", "material": "minecraft:purple_dye", - "result": "additionaladditions:purple_album" -} + "result": { + "id": "additionaladditions:purple_album" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_red.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/red_album.json similarity index 61% rename from common/src/main/resources/data/additionaladditions/recipe/album/album_dye_red.json rename to fabric/src/main/generated/data/additionaladditions/recipe/album/red_album.json index 724cfddc..4de0d2a8 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_red.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/red_album.json @@ -1,8 +1,10 @@ { "type": "minecraft:crafting_transmute", - "group": "additionaladditions:album_dye", "category": "misc", + "group": "album_dye", "input": "#additionaladditions:albums", "material": "minecraft:red_dye", - "result": "additionaladditions:red_album" -} + "result": { + "id": "additionaladditions:red_album" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_white.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/white_album.json similarity index 61% rename from common/src/main/resources/data/additionaladditions/recipe/album/album_dye_white.json rename to fabric/src/main/generated/data/additionaladditions/recipe/album/white_album.json index 5ca8e5fc..55f95bd3 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_white.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/white_album.json @@ -1,8 +1,10 @@ { "type": "minecraft:crafting_transmute", - "group": "additionaladditions:album_dye", "category": "misc", + "group": "album_dye", "input": "#additionaladditions:albums", "material": "minecraft:white_dye", - "result": "additionaladditions:white_album" + "result": { + "id": "additionaladditions:white_album" + } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_yellow.json b/fabric/src/main/generated/data/additionaladditions/recipe/album/yellow_album.json similarity index 61% rename from common/src/main/resources/data/additionaladditions/recipe/album/album_dye_yellow.json rename to fabric/src/main/generated/data/additionaladditions/recipe/album/yellow_album.json index 37518c98..b4569e63 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/album/album_dye_yellow.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/album/yellow_album.json @@ -1,8 +1,10 @@ { "type": "minecraft:crafting_transmute", - "group": "additionaladditions:album_dye", "category": "misc", + "group": "album_dye", "input": "#additionaladditions:albums", "material": "minecraft:yellow_dye", - "result": "additionaladditions:yellow_album" -} + "result": { + "id": "additionaladditions:yellow_album" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/copper_patina/patina_cyan_dye.json b/fabric/src/main/generated/data/additionaladditions/recipe/copper_patina/cyan_dye.json similarity index 57% rename from common/src/main/resources/data/additionaladditions/recipe/copper_patina/patina_cyan_dye.json rename to fabric/src/main/generated/data/additionaladditions/recipe/copper_patina/cyan_dye.json index 78e63260..d7c057ca 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/copper_patina/patina_cyan_dye.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/copper_patina/cyan_dye.json @@ -1,10 +1,12 @@ { "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "cyan_dye", "ingredients": [ "additionaladditions:copper_patina" ], "result": { - "id": "minecraft:cyan_dye", - "count": 2 + "count": 2, + "id": "minecraft:cyan_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/fried_egg/fried_egg.json b/fabric/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg.json similarity index 74% rename from common/src/main/resources/data/additionaladditions/recipe/fried_egg/fried_egg.json rename to fabric/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg.json index bd8a3401..5731544d 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/fried_egg/fried_egg.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg.json @@ -1,9 +1,10 @@ { "type": "minecraft:smelting", + "category": "food", + "cookingtime": 200, + "experience": 0.35, "ingredient": "#c:eggs", "result": { "id": "additionaladditions:fried_egg" - }, - "cookingtime": 200, - "experience": 0.35 + } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/fried_egg/fried_egg_from_campfire_cooking.json b/fabric/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg_from_campfire_cooking.json similarity index 75% rename from common/src/main/resources/data/additionaladditions/recipe/fried_egg/fried_egg_from_campfire_cooking.json rename to fabric/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg_from_campfire_cooking.json index f2c94898..ce5047d4 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/fried_egg/fried_egg_from_campfire_cooking.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg_from_campfire_cooking.json @@ -1,9 +1,10 @@ { "type": "minecraft:campfire_cooking", + "category": "food", + "cookingtime": 600, + "experience": 0.35, "ingredient": "#c:eggs", "result": { "id": "additionaladditions:fried_egg" - }, - "cookingtime": 600, - "experience": 0.35 + } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/fried_egg/fried_egg_from_smoking.json b/fabric/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg_from_smoking.json similarity index 74% rename from common/src/main/resources/data/additionaladditions/recipe/fried_egg/fried_egg_from_smoking.json rename to fabric/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg_from_smoking.json index 4d3f185e..6c25ab3e 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/fried_egg/fried_egg_from_smoking.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg_from_smoking.json @@ -1,9 +1,10 @@ { "type": "minecraft:smoking", + "category": "food", + "cookingtime": 100, + "experience": 0.35, "ingredient": "#c:eggs", "result": { "id": "additionaladditions:fried_egg" - }, - "cookingtime": 100, - "experience": 0.35 + } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_axe.json b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_axe.json similarity index 70% rename from common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_axe.json rename to fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_axe.json index e37c9125..c0d73d94 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_axe.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_axe.json @@ -3,5 +3,7 @@ "category": "equipment", "input": "minecraft:iron_axe", "material": "additionaladditions:rose_gold_ingot", - "result": "additionaladditions:rose_gold_axe" -} + "result": { + "id": "additionaladditions:rose_gold_axe" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_block.json b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_block.json similarity index 70% rename from common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_block.json rename to fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_block.json index dd04a379..77f69949 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_block.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_block.json @@ -1,15 +1,15 @@ { "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "R": "additionaladditions:rose_gold_ingot" + }, "pattern": [ "RRR", "RRR", "RRR" ], - "key": { - "R": "additionaladditions:rose_gold_ingot" - }, "result": { - "id": "additionaladditions:rose_gold_block", - "count": 1 + "id": "additionaladditions:rose_gold_block" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_boots.json b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_boots.json similarity index 70% rename from common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_boots.json rename to fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_boots.json index 517b3a71..1b8485a8 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_boots.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_boots.json @@ -3,5 +3,7 @@ "category": "equipment", "input": "minecraft:iron_boots", "material": "additionaladditions:rose_gold_ingot", - "result": "additionaladditions:rose_gold_boots" -} + "result": { + "id": "additionaladditions:rose_gold_boots" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_chestplate.json b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_chestplate.json similarity index 69% rename from common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_chestplate.json rename to fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_chestplate.json index d2ecad58..6121d410 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_chestplate.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_chestplate.json @@ -3,5 +3,7 @@ "category": "equipment", "input": "minecraft:iron_chestplate", "material": "additionaladditions:rose_gold_ingot", - "result": "additionaladditions:rose_gold_chestplate" -} + "result": { + "id": "additionaladditions:rose_gold_chestplate" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_helmet.json b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_helmet.json similarity index 70% rename from common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_helmet.json rename to fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_helmet.json index 7d3ec038..0a35315a 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_helmet.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_helmet.json @@ -3,5 +3,7 @@ "category": "equipment", "input": "minecraft:iron_helmet", "material": "additionaladditions:rose_gold_ingot", - "result": "additionaladditions:rose_gold_helmet" -} + "result": { + "id": "additionaladditions:rose_gold_helmet" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_hoe.json b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_hoe.json similarity index 70% rename from common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_hoe.json rename to fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_hoe.json index 1fc49810..d099f15f 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_hoe.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_hoe.json @@ -3,5 +3,7 @@ "category": "equipment", "input": "minecraft:iron_hoe", "material": "additionaladditions:rose_gold_ingot", - "result": "additionaladditions:rose_gold_hoe" -} + "result": { + "id": "additionaladditions:rose_gold_hoe" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_horse_armor.json b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_horse_armor.json similarity index 69% rename from common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_horse_armor.json rename to fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_horse_armor.json index 73ab1f90..17c190ea 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_horse_armor.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_horse_armor.json @@ -3,5 +3,7 @@ "category": "equipment", "input": "minecraft:iron_horse_armor", "material": "additionaladditions:rose_gold_ingot", - "result": "additionaladditions:rose_gold_horse_armor" -} + "result": { + "id": "additionaladditions:rose_gold_horse_armor" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_ingot.json b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_ingot.json similarity index 65% rename from common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_ingot.json rename to fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_ingot.json index 7bb43224..d080c3ef 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_ingot.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_ingot.json @@ -1,6 +1,7 @@ { - "type": "crafting_shapeless", - "group": "additionaladditions:rose_gold_ingot", + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "rose_gold_ingot", "ingredients": [ "minecraft:gold_ingot", "minecraft:gold_ingot", @@ -12,7 +13,6 @@ "minecraft:copper_ingot" ], "result": { - "id": "additionaladditions:rose_gold_ingot", - "count": 1 + "id": "additionaladditions:rose_gold_ingot" } } \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_ingot_from_block.json b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_ingot_from_block.json new file mode 100644 index 00000000..2634ccbe --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "rose_gold_ingot", + "ingredients": [ + "additionaladditions:rose_gold_block" + ], + "result": { + "count": 9, + "id": "additionaladditions:rose_gold_ingot" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_leggings.json b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_leggings.json similarity index 69% rename from common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_leggings.json rename to fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_leggings.json index f0d55999..ee15e3e7 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_leggings.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_leggings.json @@ -3,5 +3,7 @@ "category": "equipment", "input": "minecraft:iron_leggings", "material": "additionaladditions:rose_gold_ingot", - "result": "additionaladditions:rose_gold_leggings" -} + "result": { + "id": "additionaladditions:rose_gold_leggings" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_nautilus_armor.json b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_nautilus_armor.json similarity index 68% rename from common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_nautilus_armor.json rename to fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_nautilus_armor.json index 772a1017..a24cc209 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_nautilus_armor.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_nautilus_armor.json @@ -3,5 +3,7 @@ "category": "equipment", "input": "minecraft:iron_nautilus_armor", "material": "additionaladditions:rose_gold_ingot", - "result": "additionaladditions:rose_gold_nautilus_armor" -} + "result": { + "id": "additionaladditions:rose_gold_nautilus_armor" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_pickaxe.json b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_pickaxe.json similarity index 70% rename from common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_pickaxe.json rename to fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_pickaxe.json index c67f004d..9ee78fe4 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_pickaxe.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_pickaxe.json @@ -3,5 +3,7 @@ "category": "equipment", "input": "minecraft:iron_pickaxe", "material": "additionaladditions:rose_gold_ingot", - "result": "additionaladditions:rose_gold_pickaxe" -} + "result": { + "id": "additionaladditions:rose_gold_pickaxe" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_shovel.json b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_shovel.json similarity index 70% rename from common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_shovel.json rename to fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_shovel.json index 36a209ec..940b54d7 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_shovel.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_shovel.json @@ -3,5 +3,7 @@ "category": "equipment", "input": "minecraft:iron_shovel", "material": "additionaladditions:rose_gold_ingot", - "result": "additionaladditions:rose_gold_shovel" -} + "result": { + "id": "additionaladditions:rose_gold_shovel" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_spear.json b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_spear.json similarity index 70% rename from common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_spear.json rename to fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_spear.json index e7ea72bb..e1926f40 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_spear.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_spear.json @@ -3,5 +3,7 @@ "category": "equipment", "input": "minecraft:iron_spear", "material": "additionaladditions:rose_gold_ingot", - "result": "additionaladditions:rose_gold_spear" -} + "result": { + "id": "additionaladditions:rose_gold_spear" + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_sword.json b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_sword.json similarity index 70% rename from common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_sword.json rename to fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_sword.json index 9d50af10..cbc7c5b4 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/rose_gold/rose_gold_sword.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_sword.json @@ -3,5 +3,7 @@ "category": "equipment", "input": "minecraft:iron_sword", "material": "additionaladditions:rose_gold_ingot", - "result": "additionaladditions:rose_gold_sword" + "result": { + "id": "additionaladditions:rose_gold_sword" + } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/blue_dye_from_frostleaf.json b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/blue_dye_from_frostleaf.json similarity index 92% rename from common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/blue_dye_from_frostleaf.json rename to fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/blue_dye_from_frostleaf.json index a600b86e..84e25ae0 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/blue_dye_from_frostleaf.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/blue_dye_from_frostleaf.json @@ -6,7 +6,6 @@ "additionaladditions:frostleaf" ], "result": { - "count": 1, "id": "minecraft:blue_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/brown_dye_from_mudflower.json b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/brown_dye_from_mudflower.json similarity index 92% rename from common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/brown_dye_from_mudflower.json rename to fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/brown_dye_from_mudflower.json index 3da319ab..ee91a654 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/brown_dye_from_mudflower.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/brown_dye_from_mudflower.json @@ -6,7 +6,6 @@ "additionaladditions:mudflower" ], "result": { - "count": 1, "id": "minecraft:brown_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/green_dye_from_sawtooth_fern.json b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/green_dye_from_sawtooth_fern.json similarity index 92% rename from common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/green_dye_from_sawtooth_fern.json rename to fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/green_dye_from_sawtooth_fern.json index 6a209299..aac221cc 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/green_dye_from_sawtooth_fern.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/green_dye_from_sawtooth_fern.json @@ -6,7 +6,6 @@ "additionaladditions:sawtooth_fern" ], "result": { - "count": 1, "id": "minecraft:green_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/light_blue_dye_from_wisteria.json b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/light_blue_dye_from_wisteria.json similarity index 92% rename from common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/light_blue_dye_from_wisteria.json rename to fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/light_blue_dye_from_wisteria.json index 2c43789a..7c8a38ec 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/light_blue_dye_from_wisteria.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/light_blue_dye_from_wisteria.json @@ -6,7 +6,6 @@ "additionaladditions:wisteria" ], "result": { - "count": 1, "id": "minecraft:light_blue_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/lime_dye_from_bulbus.json b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/lime_dye_from_bulbus.json similarity index 92% rename from common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/lime_dye_from_bulbus.json rename to fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/lime_dye_from_bulbus.json index acdb2eb1..8a3b0b74 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/lime_dye_from_bulbus.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/lime_dye_from_bulbus.json @@ -6,7 +6,6 @@ "additionaladditions:bulbus" ], "result": { - "count": 1, "id": "minecraft:lime_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/magenta_dye_from_snapdragon.json b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/magenta_dye_from_snapdragon.json similarity index 92% rename from common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/magenta_dye_from_snapdragon.json rename to fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/magenta_dye_from_snapdragon.json index c72f4d36..6459fa6c 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/magenta_dye_from_snapdragon.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/magenta_dye_from_snapdragon.json @@ -6,7 +6,6 @@ "additionaladditions:snapdragon" ], "result": { - "count": 1, "id": "minecraft:magenta_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/pink_dye_from_lotus_lily.json b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/pink_dye_from_lotus_lily.json similarity index 92% rename from common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/pink_dye_from_lotus_lily.json rename to fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/pink_dye_from_lotus_lily.json index ad93b7ab..ed840a8f 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/pink_dye_from_lotus_lily.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/pink_dye_from_lotus_lily.json @@ -6,7 +6,6 @@ "additionaladditions:lotus_lily" ], "result": { - "count": 1, "id": "minecraft:pink_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/purple_dye_from_spikeblossom.json b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/purple_dye_from_spikeblossom.json similarity index 92% rename from common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/purple_dye_from_spikeblossom.json rename to fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/purple_dye_from_spikeblossom.json index 3d5c789c..4f421851 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/purple_dye_from_spikeblossom.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/purple_dye_from_spikeblossom.json @@ -6,7 +6,6 @@ "additionaladditions:spikeblossom" ], "result": { - "count": 1, "id": "minecraft:purple_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/red_dye_from_crimson_blossom.json b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/red_dye_from_crimson_blossom.json similarity index 92% rename from common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/red_dye_from_crimson_blossom.json rename to fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/red_dye_from_crimson_blossom.json index 4e9d47d7..a3cd7ef1 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/red_dye_from_crimson_blossom.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/red_dye_from_crimson_blossom.json @@ -6,7 +6,6 @@ "additionaladditions:crimson_blossom" ], "result": { - "count": 1, "id": "minecraft:red_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/white_dye_from_cottonshiver.json b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/white_dye_from_cottonshiver.json similarity index 92% rename from common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/white_dye_from_cottonshiver.json rename to fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/white_dye_from_cottonshiver.json index 9c1b9150..8e47564d 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/white_dye_from_cottonshiver.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/white_dye_from_cottonshiver.json @@ -6,7 +6,6 @@ "additionaladditions:cottonshiver" ], "result": { - "count": 1, "id": "minecraft:white_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/yellow_dye_from_amber_blossom.json b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/yellow_dye_from_amber_blossom.json similarity index 92% rename from common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/yellow_dye_from_amber_blossom.json rename to fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/yellow_dye_from_amber_blossom.json index db666abb..0b87039c 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/sniffer_plants/yellow_dye_from_amber_blossom.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/sniffer_plants/yellow_dye_from_amber_blossom.json @@ -6,7 +6,6 @@ "additionaladditions:amber_blossom" ], "result": { - "count": 1, "id": "minecraft:yellow_dye" } } \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/recipe/trident_shard/trident.json b/fabric/src/main/generated/data/additionaladditions/recipe/trident_shard/trident.json new file mode 100644 index 00000000..fbe0a7ba --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/recipe/trident_shard/trident.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "P": "minecraft:prismarine_shard", + "S": "additionaladditions:trident_shard" + }, + "pattern": [ + " SS", + " PS", + "P " + ], + "result": { + "id": "minecraft:trident" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/test_instance/config_rose_gold_armor_reload.json b/fabric/src/main/generated/data/additionaladditions/test_instance/config_rose_gold_armor_reload.json new file mode 100644 index 00000000..819fe521 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/test_instance/config_rose_gold_armor_reload.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:config_rose_gold_armor_reload", + "max_ticks": 100, + "structure": "additionaladditions:empty" +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/test_instance/config_rose_gold_pickaxe_reload.json b/fabric/src/main/generated/data/additionaladditions/test_instance/config_rose_gold_pickaxe_reload.json new file mode 100644 index 00000000..d58e7f92 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/test_instance/config_rose_gold_pickaxe_reload.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:config_rose_gold_pickaxe_reload", + "max_ticks": 100, + "structure": "additionaladditions:empty" +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_natural_growth.json b/fabric/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_natural_growth.json new file mode 100644 index 00000000..497edfc5 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_natural_growth.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "additionaladditions:fast_growth", + "function": "additionaladditions:sniffer_plants_natural_growth", + "max_ticks": 2000, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_stages.json b/fabric/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_stages.json new file mode 100644 index 00000000..bea231e7 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_stages.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:sniffer_plants_stages", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_cauldron.json b/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_cauldron.json new file mode 100644 index 00000000..866af74f --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_cauldron.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:watering_can_fill_water_cauldron", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_full.json b/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_full.json new file mode 100644 index 00000000..03190fa3 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_full.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:watering_can_fill_water_full", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_partial.json b/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_partial.json new file mode 100644 index 00000000..2c4e7529 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_fill_water_partial.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:watering_can_fill_water_partial", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_crop.json b/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_crop.json new file mode 100644 index 00000000..9e5c274b --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_crop.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:watering_can_interact_crop", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_farmland.json b/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_farmland.json new file mode 100644 index 00000000..9156ddce --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_farmland.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:watering_can_interact_farmland", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_grown_crop.json b/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_grown_crop.json new file mode 100644 index 00000000..1ac83c49 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_grown_crop.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:watering_can_interact_grown_crop", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_no_farmland.json b/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_no_farmland.json new file mode 100644 index 00000000..a5d4b6c6 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/test_instance/watering_can_interact_no_farmland.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:watering_can_interact_no_farmland", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/building_blocks/rose_gold/rose_gold_block.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/building_blocks/rose_gold/rose_gold_block.json new file mode 100644 index 00000000..a70d4d8c --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/building_blocks/rose_gold/rose_gold_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_block" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_axe.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_axe.json new file mode 100644 index 00000000..b796b4f6 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_axe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_axe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_axe" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_boots.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_boots.json new file mode 100644 index 00000000..0453eae8 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_boots.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_boots" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_boots" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_chestplate.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_chestplate.json new file mode 100644 index 00000000..ef6c8d44 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_chestplate.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_chestplate" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_chestplate" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_helmet.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_helmet.json new file mode 100644 index 00000000..722a1f03 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_helmet.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_helmet" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_helmet" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_horse_armor.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_horse_armor.json new file mode 100644 index 00000000..cd57bc72 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_horse_armor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_horse_armor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_horse_armor" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_leggings.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_leggings.json new file mode 100644 index 00000000..3e201dd5 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_leggings.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_leggings" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_leggings" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_nautilus_armor.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_nautilus_armor.json new file mode 100644 index 00000000..deb40486 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_nautilus_armor.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_nautilus_armor" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_nautilus_armor" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_spear.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_spear.json new file mode 100644 index 00000000..bf80fd68 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_spear" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_spear" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_sword.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_sword.json new file mode 100644 index 00000000..da5fd742 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/rose_gold/rose_gold_sword.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_sword" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_sword" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/trident_shard/trident.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/trident_shard/trident.json new file mode 100644 index 00000000..5c46397b --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/combat/trident_shard/trident.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:trident_shard/trident" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_trident_shard": { + "conditions": { + "items": [ + { + "items": "additionaladditions:trident_shard" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_trident_shard" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:trident_shard/trident" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg.json new file mode 100644 index 00000000..ea6ab29f --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_eggs": { + "conditions": { + "items": [ + { + "items": "#c:eggs" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:fried_egg/fried_egg" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_eggs" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:fried_egg/fried_egg" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg_from_campfire_cooking.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg_from_campfire_cooking.json new file mode 100644 index 00000000..2994f829 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg_from_campfire_cooking.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_eggs": { + "conditions": { + "items": [ + { + "items": "#c:eggs" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:fried_egg/fried_egg_from_campfire_cooking" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_eggs" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:fried_egg/fried_egg_from_campfire_cooking" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg_from_smoking.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg_from_smoking.json new file mode 100644 index 00000000..72637fde --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/food/fried_egg/fried_egg_from_smoking.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_eggs": { + "conditions": { + "items": [ + { + "items": "#c:eggs" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:fried_egg/fried_egg_from_smoking" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_eggs" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:fried_egg/fried_egg_from_smoking" + ] + } +} \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/advancement/recipes/album/album_jukebox.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/album.json similarity index 53% rename from common/src/main/resources/data/additionaladditions/advancement/recipes/album/album_jukebox.json rename to neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/album.json index 920405b9..b3d4ac97 100644 --- a/common/src/main/resources/data/additionaladditions/advancement/recipes/album/album_jukebox.json +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/album.json @@ -2,26 +2,37 @@ "parent": "minecraft:recipes/root", "criteria": { "has_jukebox": { - "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { "items": "minecraft:jukebox" } ] - } + }, + "trigger": "minecraft:inventory_changed" + }, + "has_leather": { + "conditions": { + "items": [ + { + "items": "minecraft:leather" + } + ] + }, + "trigger": "minecraft:inventory_changed" }, "has_the_recipe": { - "trigger": "minecraft:recipe_unlocked", "conditions": { "recipe": "additionaladditions:album/album" - } + }, + "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_jukebox", - "has_the_recipe" + "has_the_recipe", + "has_leather", + "has_jukebox" ] ], "rewards": { diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/black_album.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/black_album.json new file mode 100644 index 00000000..451f77bd --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/black_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/black_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/black_album" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/blue_album.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/blue_album.json new file mode 100644 index 00000000..ff3cb89d --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/blue_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/blue_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/blue_album" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/brown_album.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/brown_album.json new file mode 100644 index 00000000..3ac69a73 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/brown_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/brown_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/brown_album" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/cyan_album.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/cyan_album.json new file mode 100644 index 00000000..90129a3f --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/cyan_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/cyan_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/cyan_album" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/gray_album.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/gray_album.json new file mode 100644 index 00000000..4b67c6e6 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/gray_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/gray_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/gray_album" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/green_album.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/green_album.json new file mode 100644 index 00000000..67aedf6b --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/green_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/green_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/green_album" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/light_blue_album.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/light_blue_album.json new file mode 100644 index 00000000..67dceafb --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/light_blue_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/light_blue_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/light_blue_album" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/light_gray_album.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/light_gray_album.json new file mode 100644 index 00000000..49f33bb5 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/light_gray_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/light_gray_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/light_gray_album" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/lime_album.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/lime_album.json new file mode 100644 index 00000000..9d24b0d7 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/lime_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/lime_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/lime_album" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/magenta_album.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/magenta_album.json new file mode 100644 index 00000000..504fc886 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/magenta_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/magenta_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/magenta_album" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/orange_album.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/orange_album.json new file mode 100644 index 00000000..5f67172e --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/orange_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/orange_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/orange_album" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/pink_album.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/pink_album.json new file mode 100644 index 00000000..31b47b22 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/pink_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/pink_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/pink_album" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/purple_album.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/purple_album.json new file mode 100644 index 00000000..42deb50e --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/purple_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/purple_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/purple_album" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/red_album.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/red_album.json new file mode 100644 index 00000000..22fd18d1 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/red_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/red_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/red_album" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/white_album.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/white_album.json new file mode 100644 index 00000000..88c58ba4 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/white_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/white_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/white_album" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/yellow_album.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/yellow_album.json new file mode 100644 index 00000000..8a8f2e87 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/album/yellow_album.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_album": { + "conditions": { + "items": [ + { + "items": "additionaladditions:album" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:album/yellow_album" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_album" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:album/yellow_album" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/copper_patina/cyan_dye.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/copper_patina/cyan_dye.json new file mode 100644 index 00000000..1d5e9039 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/copper_patina/cyan_dye.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_copper_patina": { + "conditions": { + "items": [ + { + "items": "additionaladditions:copper_patina" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:copper_patina/cyan_dye" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_copper_patina" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:copper_patina/cyan_dye" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/rose_gold/rose_gold_ingot.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/rose_gold/rose_gold_ingot.json new file mode 100644 index 00000000..9dddd674 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/rose_gold/rose_gold_ingot.json @@ -0,0 +1,43 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_copper_ingot": { + "conditions": { + "items": [ + { + "items": "minecraft:copper_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_gold_ingot": { + "conditions": { + "items": [ + { + "items": "minecraft:gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_ingot" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_gold_ingot", + "has_copper_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_ingot" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/rose_gold/rose_gold_ingot_from_block.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/rose_gold/rose_gold_ingot_from_block.json new file mode 100644 index 00000000..8e4c4221 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/rose_gold/rose_gold_ingot_from_block.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_block": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_ingot_from_block" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_block" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_ingot_from_block" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/blue_dye_from_frostleaf.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/blue_dye_from_frostleaf.json new file mode 100644 index 00000000..9a375937 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/blue_dye_from_frostleaf.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_frostleaf": { + "conditions": { + "items": [ + { + "items": "additionaladditions:frostleaf" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:sniffer_plants/blue_dye_from_frostleaf" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_frostleaf" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:sniffer_plants/blue_dye_from_frostleaf" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/brown_dye_from_mudflower.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/brown_dye_from_mudflower.json new file mode 100644 index 00000000..847f050e --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/brown_dye_from_mudflower.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_mudflower": { + "conditions": { + "items": [ + { + "items": "additionaladditions:mudflower" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:sniffer_plants/brown_dye_from_mudflower" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_mudflower" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:sniffer_plants/brown_dye_from_mudflower" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/green_dye_from_sawtooth_fern.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/green_dye_from_sawtooth_fern.json new file mode 100644 index 00000000..82478e49 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/green_dye_from_sawtooth_fern.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_sawtooth_fern": { + "conditions": { + "items": [ + { + "items": "additionaladditions:sawtooth_fern" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:sniffer_plants/green_dye_from_sawtooth_fern" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_sawtooth_fern" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:sniffer_plants/green_dye_from_sawtooth_fern" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/light_blue_dye_from_wisteria.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/light_blue_dye_from_wisteria.json new file mode 100644 index 00000000..557b1ee5 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/light_blue_dye_from_wisteria.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:sniffer_plants/light_blue_dye_from_wisteria" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wisteria": { + "conditions": { + "items": [ + { + "items": "additionaladditions:wisteria" + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_wisteria" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:sniffer_plants/light_blue_dye_from_wisteria" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/lime_dye_from_bulbus.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/lime_dye_from_bulbus.json new file mode 100644 index 00000000..816bf373 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/lime_dye_from_bulbus.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bulbus": { + "conditions": { + "items": [ + { + "items": "additionaladditions:bulbus" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:sniffer_plants/lime_dye_from_bulbus" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_bulbus" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:sniffer_plants/lime_dye_from_bulbus" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/magenta_dye_from_snapdragon.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/magenta_dye_from_snapdragon.json new file mode 100644 index 00000000..dc218f30 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/magenta_dye_from_snapdragon.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_snapdragon": { + "conditions": { + "items": [ + { + "items": "additionaladditions:snapdragon" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:sniffer_plants/magenta_dye_from_snapdragon" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_snapdragon" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:sniffer_plants/magenta_dye_from_snapdragon" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/pink_dye_from_lotus_lily.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/pink_dye_from_lotus_lily.json new file mode 100644 index 00000000..58ad38bc --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/pink_dye_from_lotus_lily.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_lotus_lily": { + "conditions": { + "items": [ + { + "items": "additionaladditions:lotus_lily" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:sniffer_plants/pink_dye_from_lotus_lily" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_lotus_lily" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:sniffer_plants/pink_dye_from_lotus_lily" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/purple_dye_from_spikeblossom.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/purple_dye_from_spikeblossom.json new file mode 100644 index 00000000..2aa4add8 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/purple_dye_from_spikeblossom.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_spikeblossom": { + "conditions": { + "items": [ + { + "items": "additionaladditions:spikeblossom" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:sniffer_plants/purple_dye_from_spikeblossom" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_spikeblossom" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:sniffer_plants/purple_dye_from_spikeblossom" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/red_dye_from_crimson_blossom.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/red_dye_from_crimson_blossom.json new file mode 100644 index 00000000..a8e2cb6f --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/red_dye_from_crimson_blossom.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_crimson_blossom": { + "conditions": { + "items": [ + { + "items": "additionaladditions:crimson_blossom" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:sniffer_plants/red_dye_from_crimson_blossom" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_crimson_blossom" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:sniffer_plants/red_dye_from_crimson_blossom" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/white_dye_from_cottonshiver.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/white_dye_from_cottonshiver.json new file mode 100644 index 00000000..fa6ec618 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/white_dye_from_cottonshiver.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cottonshiver": { + "conditions": { + "items": [ + { + "items": "additionaladditions:cottonshiver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:sniffer_plants/white_dye_from_cottonshiver" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_cottonshiver" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:sniffer_plants/white_dye_from_cottonshiver" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/yellow_dye_from_amber_blossom.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/yellow_dye_from_amber_blossom.json new file mode 100644 index 00000000..92b67db7 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/misc/sniffer_plants/yellow_dye_from_amber_blossom.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_amber_blossom": { + "conditions": { + "items": [ + { + "items": "additionaladditions:amber_blossom" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:sniffer_plants/yellow_dye_from_amber_blossom" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_amber_blossom" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:sniffer_plants/yellow_dye_from_amber_blossom" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_hoe.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_hoe.json new file mode 100644 index 00000000..fe683ddf --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_hoe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_hoe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_hoe" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_pickaxe.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_pickaxe.json new file mode 100644 index 00000000..e736ca5f --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_pickaxe.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_pickaxe" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_pickaxe" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_shovel.json b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_shovel.json new file mode 100644 index 00000000..2baab721 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/advancement/recipes/tools/rose_gold/rose_gold_shovel.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_rose_gold_ingot": { + "conditions": { + "items": [ + { + "items": "additionaladditions:rose_gold_ingot" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "additionaladditions:rose_gold/rose_gold_shovel" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_rose_gold_ingot" + ] + ], + "rewards": { + "recipes": [ + "additionaladditions:rose_gold/rose_gold_shovel" + ] + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/album.json new file mode 100644 index 00000000..2381062b --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/album.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "L": "minecraft:leather", + "S": "minecraft:string" + }, + "pattern": [ + "SS", + "LL" + ], + "result": { + "id": "additionaladditions:album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/black_album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/black_album.json new file mode 100644 index 00000000..957aff44 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/black_album.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "misc", + "group": "album_dye", + "input": "#additionaladditions:albums", + "material": "minecraft:black_dye", + "result": { + "id": "additionaladditions:black_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/blue_album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/blue_album.json new file mode 100644 index 00000000..136283b2 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/blue_album.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "misc", + "group": "album_dye", + "input": "#additionaladditions:albums", + "material": "minecraft:blue_dye", + "result": { + "id": "additionaladditions:blue_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/brown_album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/brown_album.json new file mode 100644 index 00000000..ec7fd35c --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/brown_album.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "misc", + "group": "album_dye", + "input": "#additionaladditions:albums", + "material": "minecraft:brown_dye", + "result": { + "id": "additionaladditions:brown_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/cyan_album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/cyan_album.json new file mode 100644 index 00000000..6a01c28c --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/cyan_album.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "misc", + "group": "album_dye", + "input": "#additionaladditions:albums", + "material": "minecraft:cyan_dye", + "result": { + "id": "additionaladditions:cyan_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/gray_album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/gray_album.json new file mode 100644 index 00000000..76ad47fa --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/gray_album.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "misc", + "group": "album_dye", + "input": "#additionaladditions:albums", + "material": "minecraft:gray_dye", + "result": { + "id": "additionaladditions:gray_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/green_album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/green_album.json new file mode 100644 index 00000000..6a97299d --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/green_album.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "misc", + "group": "album_dye", + "input": "#additionaladditions:albums", + "material": "minecraft:green_dye", + "result": { + "id": "additionaladditions:green_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/light_blue_album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/light_blue_album.json new file mode 100644 index 00000000..6a1ee06a --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/light_blue_album.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "misc", + "group": "album_dye", + "input": "#additionaladditions:albums", + "material": "minecraft:light_blue_dye", + "result": { + "id": "additionaladditions:light_blue_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/light_gray_album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/light_gray_album.json new file mode 100644 index 00000000..950dc131 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/light_gray_album.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "misc", + "group": "album_dye", + "input": "#additionaladditions:albums", + "material": "minecraft:light_gray_dye", + "result": { + "id": "additionaladditions:light_gray_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/lime_album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/lime_album.json new file mode 100644 index 00000000..9765fe2c --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/lime_album.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "misc", + "group": "album_dye", + "input": "#additionaladditions:albums", + "material": "minecraft:lime_dye", + "result": { + "id": "additionaladditions:lime_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/magenta_album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/magenta_album.json new file mode 100644 index 00000000..b0717d31 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/magenta_album.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "misc", + "group": "album_dye", + "input": "#additionaladditions:albums", + "material": "minecraft:magenta_dye", + "result": { + "id": "additionaladditions:magenta_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/orange_album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/orange_album.json new file mode 100644 index 00000000..d5a9b793 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/orange_album.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "misc", + "group": "album_dye", + "input": "#additionaladditions:albums", + "material": "minecraft:orange_dye", + "result": { + "id": "additionaladditions:orange_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/pink_album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/pink_album.json new file mode 100644 index 00000000..6c0c9e21 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/pink_album.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "misc", + "group": "album_dye", + "input": "#additionaladditions:albums", + "material": "minecraft:pink_dye", + "result": { + "id": "additionaladditions:pink_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/purple_album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/purple_album.json new file mode 100644 index 00000000..c32a28a4 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/purple_album.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "misc", + "group": "album_dye", + "input": "#additionaladditions:albums", + "material": "minecraft:purple_dye", + "result": { + "id": "additionaladditions:purple_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/red_album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/red_album.json new file mode 100644 index 00000000..4de0d2a8 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/red_album.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "misc", + "group": "album_dye", + "input": "#additionaladditions:albums", + "material": "minecraft:red_dye", + "result": { + "id": "additionaladditions:red_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/white_album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/white_album.json new file mode 100644 index 00000000..55f95bd3 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/white_album.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "misc", + "group": "album_dye", + "input": "#additionaladditions:albums", + "material": "minecraft:white_dye", + "result": { + "id": "additionaladditions:white_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/album/yellow_album.json b/neoforge/src/main/generated/data/additionaladditions/recipe/album/yellow_album.json new file mode 100644 index 00000000..b4569e63 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/album/yellow_album.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "misc", + "group": "album_dye", + "input": "#additionaladditions:albums", + "material": "minecraft:yellow_dye", + "result": { + "id": "additionaladditions:yellow_album" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/copper_patina/cyan_dye.json b/neoforge/src/main/generated/data/additionaladditions/recipe/copper_patina/cyan_dye.json new file mode 100644 index 00000000..d7c057ca --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/copper_patina/cyan_dye.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "cyan_dye", + "ingredients": [ + "additionaladditions:copper_patina" + ], + "result": { + "count": 2, + "id": "minecraft:cyan_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg.json b/neoforge/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg.json new file mode 100644 index 00000000..5731544d --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "food", + "cookingtime": 200, + "experience": 0.35, + "ingredient": "#c:eggs", + "result": { + "id": "additionaladditions:fried_egg" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg_from_campfire_cooking.json b/neoforge/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg_from_campfire_cooking.json new file mode 100644 index 00000000..ce5047d4 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg_from_campfire_cooking.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:campfire_cooking", + "category": "food", + "cookingtime": 600, + "experience": 0.35, + "ingredient": "#c:eggs", + "result": { + "id": "additionaladditions:fried_egg" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg_from_smoking.json b/neoforge/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg_from_smoking.json new file mode 100644 index 00000000..6c25ab3e --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/fried_egg/fried_egg_from_smoking.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smoking", + "category": "food", + "cookingtime": 100, + "experience": 0.35, + "ingredient": "#c:eggs", + "result": { + "id": "additionaladditions:fried_egg" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_axe.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_axe.json new file mode 100644 index 00000000..c0d73d94 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_axe.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "equipment", + "input": "minecraft:iron_axe", + "material": "additionaladditions:rose_gold_ingot", + "result": { + "id": "additionaladditions:rose_gold_axe" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_block.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_block.json new file mode 100644 index 00000000..77f69949 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_block.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "R": "additionaladditions:rose_gold_ingot" + }, + "pattern": [ + "RRR", + "RRR", + "RRR" + ], + "result": { + "id": "additionaladditions:rose_gold_block" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_boots.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_boots.json new file mode 100644 index 00000000..1b8485a8 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_boots.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "equipment", + "input": "minecraft:iron_boots", + "material": "additionaladditions:rose_gold_ingot", + "result": { + "id": "additionaladditions:rose_gold_boots" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_chestplate.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_chestplate.json new file mode 100644 index 00000000..6121d410 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_chestplate.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "equipment", + "input": "minecraft:iron_chestplate", + "material": "additionaladditions:rose_gold_ingot", + "result": { + "id": "additionaladditions:rose_gold_chestplate" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_helmet.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_helmet.json new file mode 100644 index 00000000..0a35315a --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_helmet.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "equipment", + "input": "minecraft:iron_helmet", + "material": "additionaladditions:rose_gold_ingot", + "result": { + "id": "additionaladditions:rose_gold_helmet" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_hoe.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_hoe.json new file mode 100644 index 00000000..d099f15f --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_hoe.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "equipment", + "input": "minecraft:iron_hoe", + "material": "additionaladditions:rose_gold_ingot", + "result": { + "id": "additionaladditions:rose_gold_hoe" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_horse_armor.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_horse_armor.json new file mode 100644 index 00000000..17c190ea --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_horse_armor.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "equipment", + "input": "minecraft:iron_horse_armor", + "material": "additionaladditions:rose_gold_ingot", + "result": { + "id": "additionaladditions:rose_gold_horse_armor" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_ingot.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_ingot.json new file mode 100644 index 00000000..d080c3ef --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_ingot.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "rose_gold_ingot", + "ingredients": [ + "minecraft:gold_ingot", + "minecraft:gold_ingot", + "minecraft:gold_ingot", + "minecraft:gold_ingot", + "minecraft:copper_ingot", + "minecraft:copper_ingot", + "minecraft:copper_ingot", + "minecraft:copper_ingot" + ], + "result": { + "id": "additionaladditions:rose_gold_ingot" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_ingot_from_block.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_ingot_from_block.json new file mode 100644 index 00000000..2634ccbe --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_ingot_from_block.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "rose_gold_ingot", + "ingredients": [ + "additionaladditions:rose_gold_block" + ], + "result": { + "count": 9, + "id": "additionaladditions:rose_gold_ingot" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_leggings.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_leggings.json new file mode 100644 index 00000000..ee15e3e7 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_leggings.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "equipment", + "input": "minecraft:iron_leggings", + "material": "additionaladditions:rose_gold_ingot", + "result": { + "id": "additionaladditions:rose_gold_leggings" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_nautilus_armor.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_nautilus_armor.json new file mode 100644 index 00000000..a24cc209 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_nautilus_armor.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "equipment", + "input": "minecraft:iron_nautilus_armor", + "material": "additionaladditions:rose_gold_ingot", + "result": { + "id": "additionaladditions:rose_gold_nautilus_armor" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_pickaxe.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_pickaxe.json new file mode 100644 index 00000000..9ee78fe4 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_pickaxe.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "equipment", + "input": "minecraft:iron_pickaxe", + "material": "additionaladditions:rose_gold_ingot", + "result": { + "id": "additionaladditions:rose_gold_pickaxe" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_shovel.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_shovel.json new file mode 100644 index 00000000..940b54d7 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_shovel.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "equipment", + "input": "minecraft:iron_shovel", + "material": "additionaladditions:rose_gold_ingot", + "result": { + "id": "additionaladditions:rose_gold_shovel" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_spear.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_spear.json new file mode 100644 index 00000000..e1926f40 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_spear.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "equipment", + "input": "minecraft:iron_spear", + "material": "additionaladditions:rose_gold_ingot", + "result": { + "id": "additionaladditions:rose_gold_spear" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_sword.json b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_sword.json new file mode 100644 index 00000000..cbc7c5b4 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/rose_gold/rose_gold_sword.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:crafting_transmute", + "category": "equipment", + "input": "minecraft:iron_sword", + "material": "additionaladditions:rose_gold_ingot", + "result": { + "id": "additionaladditions:rose_gold_sword" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/blue_dye_from_frostleaf.json b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/blue_dye_from_frostleaf.json new file mode 100644 index 00000000..84e25ae0 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/blue_dye_from_frostleaf.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "blue_dye", + "ingredients": [ + "additionaladditions:frostleaf" + ], + "result": { + "id": "minecraft:blue_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/brown_dye_from_mudflower.json b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/brown_dye_from_mudflower.json new file mode 100644 index 00000000..ee91a654 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/brown_dye_from_mudflower.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "brown_dye", + "ingredients": [ + "additionaladditions:mudflower" + ], + "result": { + "id": "minecraft:brown_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/green_dye_from_sawtooth_fern.json b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/green_dye_from_sawtooth_fern.json new file mode 100644 index 00000000..aac221cc --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/green_dye_from_sawtooth_fern.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "green_dye", + "ingredients": [ + "additionaladditions:sawtooth_fern" + ], + "result": { + "id": "minecraft:green_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/light_blue_dye_from_wisteria.json b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/light_blue_dye_from_wisteria.json new file mode 100644 index 00000000..7c8a38ec --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/light_blue_dye_from_wisteria.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "light_blue_dye", + "ingredients": [ + "additionaladditions:wisteria" + ], + "result": { + "id": "minecraft:light_blue_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/lime_dye_from_bulbus.json b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/lime_dye_from_bulbus.json new file mode 100644 index 00000000..8a3b0b74 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/lime_dye_from_bulbus.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "lime_dye", + "ingredients": [ + "additionaladditions:bulbus" + ], + "result": { + "id": "minecraft:lime_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/magenta_dye_from_snapdragon.json b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/magenta_dye_from_snapdragon.json new file mode 100644 index 00000000..6459fa6c --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/magenta_dye_from_snapdragon.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "magenta_dye", + "ingredients": [ + "additionaladditions:snapdragon" + ], + "result": { + "id": "minecraft:magenta_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/pink_dye_from_lotus_lily.json b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/pink_dye_from_lotus_lily.json new file mode 100644 index 00000000..ed840a8f --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/pink_dye_from_lotus_lily.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "pink_dye", + "ingredients": [ + "additionaladditions:lotus_lily" + ], + "result": { + "id": "minecraft:pink_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/purple_dye_from_spikeblossom.json b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/purple_dye_from_spikeblossom.json new file mode 100644 index 00000000..4f421851 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/purple_dye_from_spikeblossom.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "purple_dye", + "ingredients": [ + "additionaladditions:spikeblossom" + ], + "result": { + "id": "minecraft:purple_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/red_dye_from_crimson_blossom.json b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/red_dye_from_crimson_blossom.json new file mode 100644 index 00000000..a3cd7ef1 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/red_dye_from_crimson_blossom.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "red_dye", + "ingredients": [ + "additionaladditions:crimson_blossom" + ], + "result": { + "id": "minecraft:red_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/white_dye_from_cottonshiver.json b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/white_dye_from_cottonshiver.json new file mode 100644 index 00000000..8e47564d --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/white_dye_from_cottonshiver.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "white_dye", + "ingredients": [ + "additionaladditions:cottonshiver" + ], + "result": { + "id": "minecraft:white_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/yellow_dye_from_amber_blossom.json b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/yellow_dye_from_amber_blossom.json new file mode 100644 index 00000000..0b87039c --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/sniffer_plants/yellow_dye_from_amber_blossom.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "yellow_dye", + "ingredients": [ + "additionaladditions:amber_blossom" + ], + "result": { + "id": "minecraft:yellow_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/trident_shard/trident.json b/neoforge/src/main/generated/data/additionaladditions/recipe/trident_shard/trident.json new file mode 100644 index 00000000..fbe0a7ba --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/trident_shard/trident.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "P": "minecraft:prismarine_shard", + "S": "additionaladditions:trident_shard" + }, + "pattern": [ + " SS", + " PS", + "P " + ], + "result": { + "id": "minecraft:trident" + } +} \ No newline at end of file From 0ad8d2ba0515ff86903737cf4d84734205d51411 Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Sat, 20 Jun 2026 21:34:52 +0100 Subject: [PATCH 21/27] 26.1: datagen brewing recipes --- .../core/datagen/template/Recipes.java | 20 ++++++++++ .../template/recipe/SpecialRecipeBuilder.java | 39 +++++++++++++++++++ .../suspicious_dye/SuspiciousDyeContent.java | 23 +++++++++++ .../suspicious_dye/blue_suspicious_dye.json | 5 +-- .../suspicious_dye/brown_suspicious_dye.json | 5 +-- .../suspicious_dye/cyan_suspicious_dye.json | 5 +-- .../suspicious_dye/green_suspicious_dye.json | 5 +-- .../light_blue_suspicious_dye.json | 5 +-- .../suspicious_dye/lime_suspicious_dye.json | 5 +-- .../magenta_suspicious_dye.json | 5 +-- .../suspicious_dye/orange_suspicious_dye.json | 5 +-- .../suspicious_dye/pink_suspicious_dye.json | 5 +-- .../suspicious_dye/purple_suspicious_dye.json | 5 +-- .../suspicious_dye/red_suspicious_dye.json | 5 +-- .../suspicious_dye/white_suspicious_dye.json | 5 +-- .../suspicious_dye/yellow_suspicious_dye.json | 5 +-- .../suspicious_dye/blue_suspicious_dye.json | 8 ++++ .../suspicious_dye/brown_suspicious_dye.json | 8 ++++ .../suspicious_dye/cyan_suspicious_dye.json | 8 ++++ .../suspicious_dye/green_suspicious_dye.json | 8 ++++ .../light_blue_suspicious_dye.json | 8 ++++ .../suspicious_dye/lime_suspicious_dye.json | 8 ++++ .../magenta_suspicious_dye.json | 8 ++++ .../suspicious_dye/orange_suspicious_dye.json | 8 ++++ .../suspicious_dye/pink_suspicious_dye.json | 8 ++++ .../suspicious_dye/purple_suspicious_dye.json | 8 ++++ .../suspicious_dye/red_suspicious_dye.json | 8 ++++ .../suspicious_dye/white_suspicious_dye.json | 8 ++++ .../suspicious_dye/yellow_suspicious_dye.json | 8 ++++ 29 files changed, 212 insertions(+), 39 deletions(-) create mode 100644 common/src/main/java/one/dqu/additionaladditions/core/datagen/template/recipe/SpecialRecipeBuilder.java rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/suspicious_dye/blue_suspicious_dye.json (67%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/suspicious_dye/brown_suspicious_dye.json (67%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/suspicious_dye/cyan_suspicious_dye.json (66%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/suspicious_dye/green_suspicious_dye.json (67%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/suspicious_dye/light_blue_suspicious_dye.json (65%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/suspicious_dye/lime_suspicious_dye.json (67%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/suspicious_dye/magenta_suspicious_dye.json (66%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/suspicious_dye/orange_suspicious_dye.json (65%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/suspicious_dye/pink_suspicious_dye.json (67%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/suspicious_dye/purple_suspicious_dye.json (67%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/suspicious_dye/red_suspicious_dye.json (68%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/suspicious_dye/white_suspicious_dye.json (67%) rename {common/src/main/resources => fabric/src/main/generated}/data/additionaladditions/recipe/suspicious_dye/yellow_suspicious_dye.json (67%) create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/blue_suspicious_dye.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/brown_suspicious_dye.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/cyan_suspicious_dye.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/green_suspicious_dye.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/light_blue_suspicious_dye.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/lime_suspicious_dye.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/magenta_suspicious_dye.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/orange_suspicious_dye.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/pink_suspicious_dye.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/purple_suspicious_dye.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/red_suspicious_dye.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/white_suspicious_dye.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/yellow_suspicious_dye.json diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Recipes.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Recipes.java index a78bfb43..afd9fdd8 100644 --- a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Recipes.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Recipes.java @@ -1,13 +1,18 @@ package one.dqu.additionaladditions.core.datagen.template; +import net.minecraft.core.Holder; import net.minecraft.data.recipes.*; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStackTemplate; +import net.minecraft.world.item.alchemy.Potion; import net.minecraft.world.item.crafting.CookingBookCategory; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; import one.dqu.additionaladditions.core.datagen.template.recipe.RecipeEntry; import one.dqu.additionaladditions.core.datagen.template.recipe.RecipeInput; +import one.dqu.additionaladditions.core.datagen.template.recipe.SpecialRecipeBuilder; +import one.dqu.additionaladditions.recipe.BrewingRecipe; import java.util.List; import java.util.Map; @@ -121,4 +126,19 @@ public static List foodCooking(ItemLike ingredient) { public static List foodCooking(TagKey ingredient) { return foodCooking(RecipeInput.of(ingredient)); } + + // Brewing + + public static RecipeEntry brewing(Holder potion, RecipeInput ingredient, int count) { + return new RecipeEntry((registries, result) -> new SpecialRecipeBuilder( + new BrewingRecipe(potion, ingredient.ingredient(registries), new ItemStackTemplate(result.asItem(), count)))); + } + + public static RecipeEntry brewing(Holder potion, ItemLike ingredient) { + return brewing(potion, RecipeInput.of(ingredient), 1); + } + + public static RecipeEntry brewing(Holder potion, TagKey ingredient) { + return brewing(potion, RecipeInput.of(ingredient), 1); + } } diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/recipe/SpecialRecipeBuilder.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/recipe/SpecialRecipeBuilder.java new file mode 100644 index 00000000..8ef96232 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/recipe/SpecialRecipeBuilder.java @@ -0,0 +1,39 @@ +package one.dqu.additionaladditions.core.datagen.template.recipe; + +import net.minecraft.advancements.Criterion; +import net.minecraft.data.recipes.RecipeBuilder; +import net.minecraft.data.recipes.RecipeOutput; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.crafting.Recipe; + +/** + * Special recipe types don't have recipe book (so no unlocking / groups), so a builder is not needed. + * This class wraps a recipe in a builder so it can be used in datagen. + */ +public final class SpecialRecipeBuilder implements RecipeBuilder { + private final Recipe recipe; + + public SpecialRecipeBuilder(Recipe recipe) { + this.recipe = recipe; + } + + @Override + public RecipeBuilder unlockedBy(String name, Criterion criterion) { + return this; + } + + @Override + public RecipeBuilder group(String group) { + return this; + } + + @Override + public ResourceKey> defaultId() { + throw new UnsupportedOperationException(); + } + + @Override + public void save(RecipeOutput output, ResourceKey> key) { + output.accept(key, recipe, null); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/SuspiciousDyeContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/SuspiciousDyeContent.java index 1a941a4f..a528351f 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/SuspiciousDyeContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/suspicious_dye/SuspiciousDyeContent.java @@ -4,11 +4,15 @@ import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Items; +import net.minecraft.world.item.alchemy.Potions; +import net.minecraft.world.level.ItemLike; import one.dqu.additionaladditions.config.Config; import one.dqu.additionaladditions.core.builder.AAReg; import one.dqu.additionaladditions.core.builder.CreativePosition; import one.dqu.additionaladditions.core.datagen.template.Models; +import one.dqu.additionaladditions.core.datagen.template.Recipes; import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintColor; +import one.dqu.additionaladditions.registry.AAItems; import one.dqu.additionaladditions.registry.AAMisc; import one.dqu.additionaladditions.registry.AATags; @@ -16,6 +20,24 @@ public class SuspiciousDyeContent { public static Supplier suspiciousDye(DyeColor color) { + @SuppressWarnings("Convert2MethodRef") // the mod flowers are null at this point, would crash + ItemLike ingredient = switch (color) { + case WHITE -> () -> AAItems.COTTONSHIVER.get(); + case BROWN -> () -> AAItems.MUDFLOWER.get(); + case RED -> () -> AAItems.CRIMSON_BLOSSOM.get(); + case ORANGE -> Items.TORCHFLOWER; + case YELLOW -> () -> AAItems.AMBER_BLOSSOM.get(); + case LIME -> () -> AAItems.BULBUS.get(); + case GREEN -> () -> AAItems.SAWTOOTH_FERN.get(); + case CYAN -> Items.PITCHER_PLANT; + case LIGHT_BLUE -> () -> AAItems.WISTERIA.get(); + case BLUE -> () -> AAItems.FROSTLEAF.get(); + case PURPLE -> () -> AAItems.SPIKEBLOSSOM.get(); + case MAGENTA -> () -> AAItems.SNAPDRAGON.get(); + case PINK -> () -> AAItems.LOTUS_LILY.get(); + default -> throw new IllegalArgumentException("No suspicious dye ingredient for color: " + color); + }; + return AAReg.item(p -> new SuspiciousDyeItem(color, p)) .config(Config.SUSPICIOUS_DYE) .props(p -> p @@ -25,6 +47,7 @@ public static Supplier suspiciousDye(DyeColor color) { .creative(Items.EXPERIENCE_BOTTLE, CreativeModeTabs.INGREDIENTS, CreativePosition.BEFORE) .model(Models::flat) .tags(AATags.SUSPICIOUS_DYES) + .recipe(Recipes.brewing(Potions.WATER, ingredient)) .make(color.getName() + "_suspicious_dye"); } } diff --git a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/blue_suspicious_dye.json b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/blue_suspicious_dye.json similarity index 67% rename from common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/blue_suspicious_dye.json rename to fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/blue_suspicious_dye.json index cfc205fa..6d855f87 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/blue_suspicious_dye.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/blue_suspicious_dye.json @@ -1,9 +1,8 @@ { "type": "additionaladditions:brewing", - "potion": "minecraft:water", "ingredient": "additionaladditions:frostleaf", + "potion": "minecraft:water", "result": { - "id": "additionaladditions:blue_suspicious_dye", - "count": 1 + "id": "additionaladditions:blue_suspicious_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/brown_suspicious_dye.json b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/brown_suspicious_dye.json similarity index 67% rename from common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/brown_suspicious_dye.json rename to fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/brown_suspicious_dye.json index ee25a67b..ddaf9730 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/brown_suspicious_dye.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/brown_suspicious_dye.json @@ -1,9 +1,8 @@ { "type": "additionaladditions:brewing", - "potion": "minecraft:water", "ingredient": "additionaladditions:mudflower", + "potion": "minecraft:water", "result": { - "id": "additionaladditions:brown_suspicious_dye", - "count": 1 + "id": "additionaladditions:brown_suspicious_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/cyan_suspicious_dye.json b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/cyan_suspicious_dye.json similarity index 66% rename from common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/cyan_suspicious_dye.json rename to fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/cyan_suspicious_dye.json index 40765542..1205abd9 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/cyan_suspicious_dye.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/cyan_suspicious_dye.json @@ -1,9 +1,8 @@ { "type": "additionaladditions:brewing", - "potion": "minecraft:water", "ingredient": "minecraft:pitcher_plant", + "potion": "minecraft:water", "result": { - "id": "additionaladditions:cyan_suspicious_dye", - "count": 1 + "id": "additionaladditions:cyan_suspicious_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/green_suspicious_dye.json b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/green_suspicious_dye.json similarity index 67% rename from common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/green_suspicious_dye.json rename to fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/green_suspicious_dye.json index 1a3cd7da..f65e609a 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/green_suspicious_dye.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/green_suspicious_dye.json @@ -1,9 +1,8 @@ { "type": "additionaladditions:brewing", - "potion": "minecraft:water", "ingredient": "additionaladditions:sawtooth_fern", + "potion": "minecraft:water", "result": { - "id": "additionaladditions:green_suspicious_dye", - "count": 1 + "id": "additionaladditions:green_suspicious_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/light_blue_suspicious_dye.json b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/light_blue_suspicious_dye.json similarity index 65% rename from common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/light_blue_suspicious_dye.json rename to fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/light_blue_suspicious_dye.json index 02fba620..fb73cfe3 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/light_blue_suspicious_dye.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/light_blue_suspicious_dye.json @@ -1,9 +1,8 @@ { "type": "additionaladditions:brewing", - "potion": "minecraft:water", "ingredient": "additionaladditions:wisteria", + "potion": "minecraft:water", "result": { - "id": "additionaladditions:light_blue_suspicious_dye", - "count": 1 + "id": "additionaladditions:light_blue_suspicious_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/lime_suspicious_dye.json b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/lime_suspicious_dye.json similarity index 67% rename from common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/lime_suspicious_dye.json rename to fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/lime_suspicious_dye.json index ceb96714..8de45323 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/lime_suspicious_dye.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/lime_suspicious_dye.json @@ -1,9 +1,8 @@ { "type": "additionaladditions:brewing", - "potion": "minecraft:water", "ingredient": "additionaladditions:bulbus", + "potion": "minecraft:water", "result": { - "id": "additionaladditions:lime_suspicious_dye", - "count": 1 + "id": "additionaladditions:lime_suspicious_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/magenta_suspicious_dye.json b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/magenta_suspicious_dye.json similarity index 66% rename from common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/magenta_suspicious_dye.json rename to fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/magenta_suspicious_dye.json index 88b84d59..b22db14b 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/magenta_suspicious_dye.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/magenta_suspicious_dye.json @@ -1,9 +1,8 @@ { "type": "additionaladditions:brewing", - "potion": "minecraft:water", "ingredient": "additionaladditions:snapdragon", + "potion": "minecraft:water", "result": { - "id": "additionaladditions:magenta_suspicious_dye", - "count": 1 + "id": "additionaladditions:magenta_suspicious_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/orange_suspicious_dye.json b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/orange_suspicious_dye.json similarity index 65% rename from common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/orange_suspicious_dye.json rename to fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/orange_suspicious_dye.json index eef9d4e8..e68775ab 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/orange_suspicious_dye.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/orange_suspicious_dye.json @@ -1,9 +1,8 @@ { "type": "additionaladditions:brewing", - "potion": "minecraft:water", "ingredient": "minecraft:torchflower", + "potion": "minecraft:water", "result": { - "id": "additionaladditions:orange_suspicious_dye", - "count": 1 + "id": "additionaladditions:orange_suspicious_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/pink_suspicious_dye.json b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/pink_suspicious_dye.json similarity index 67% rename from common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/pink_suspicious_dye.json rename to fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/pink_suspicious_dye.json index 25b3bea3..d7a89955 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/pink_suspicious_dye.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/pink_suspicious_dye.json @@ -1,9 +1,8 @@ { "type": "additionaladditions:brewing", - "potion": "minecraft:water", "ingredient": "additionaladditions:lotus_lily", + "potion": "minecraft:water", "result": { - "id": "additionaladditions:pink_suspicious_dye", - "count": 1 + "id": "additionaladditions:pink_suspicious_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/purple_suspicious_dye.json b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/purple_suspicious_dye.json similarity index 67% rename from common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/purple_suspicious_dye.json rename to fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/purple_suspicious_dye.json index 49cd015d..807d4ba5 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/purple_suspicious_dye.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/purple_suspicious_dye.json @@ -1,9 +1,8 @@ { "type": "additionaladditions:brewing", - "potion": "minecraft:water", "ingredient": "additionaladditions:spikeblossom", + "potion": "minecraft:water", "result": { - "id": "additionaladditions:purple_suspicious_dye", - "count": 1 + "id": "additionaladditions:purple_suspicious_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/red_suspicious_dye.json b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/red_suspicious_dye.json similarity index 68% rename from common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/red_suspicious_dye.json rename to fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/red_suspicious_dye.json index cdd57c49..abc0822c 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/red_suspicious_dye.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/red_suspicious_dye.json @@ -1,9 +1,8 @@ { "type": "additionaladditions:brewing", - "potion": "minecraft:water", "ingredient": "additionaladditions:crimson_blossom", + "potion": "minecraft:water", "result": { - "id": "additionaladditions:red_suspicious_dye", - "count": 1 + "id": "additionaladditions:red_suspicious_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/white_suspicious_dye.json b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/white_suspicious_dye.json similarity index 67% rename from common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/white_suspicious_dye.json rename to fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/white_suspicious_dye.json index 9577c12a..a1c3bfa2 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/white_suspicious_dye.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/white_suspicious_dye.json @@ -1,9 +1,8 @@ { "type": "additionaladditions:brewing", - "potion": "minecraft:water", "ingredient": "additionaladditions:cottonshiver", + "potion": "minecraft:water", "result": { - "id": "additionaladditions:white_suspicious_dye", - "count": 1 + "id": "additionaladditions:white_suspicious_dye" } } \ No newline at end of file diff --git a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/yellow_suspicious_dye.json b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/yellow_suspicious_dye.json similarity index 67% rename from common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/yellow_suspicious_dye.json rename to fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/yellow_suspicious_dye.json index c812f9fd..1441c6af 100644 --- a/common/src/main/resources/data/additionaladditions/recipe/suspicious_dye/yellow_suspicious_dye.json +++ b/fabric/src/main/generated/data/additionaladditions/recipe/suspicious_dye/yellow_suspicious_dye.json @@ -1,9 +1,8 @@ { "type": "additionaladditions:brewing", - "potion": "minecraft:water", "ingredient": "additionaladditions:amber_blossom", + "potion": "minecraft:water", "result": { - "id": "additionaladditions:yellow_suspicious_dye", - "count": 1 + "id": "additionaladditions:yellow_suspicious_dye" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/blue_suspicious_dye.json b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/blue_suspicious_dye.json new file mode 100644 index 00000000..6d855f87 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/blue_suspicious_dye.json @@ -0,0 +1,8 @@ +{ + "type": "additionaladditions:brewing", + "ingredient": "additionaladditions:frostleaf", + "potion": "minecraft:water", + "result": { + "id": "additionaladditions:blue_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/brown_suspicious_dye.json b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/brown_suspicious_dye.json new file mode 100644 index 00000000..ddaf9730 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/brown_suspicious_dye.json @@ -0,0 +1,8 @@ +{ + "type": "additionaladditions:brewing", + "ingredient": "additionaladditions:mudflower", + "potion": "minecraft:water", + "result": { + "id": "additionaladditions:brown_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/cyan_suspicious_dye.json b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/cyan_suspicious_dye.json new file mode 100644 index 00000000..1205abd9 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/cyan_suspicious_dye.json @@ -0,0 +1,8 @@ +{ + "type": "additionaladditions:brewing", + "ingredient": "minecraft:pitcher_plant", + "potion": "minecraft:water", + "result": { + "id": "additionaladditions:cyan_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/green_suspicious_dye.json b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/green_suspicious_dye.json new file mode 100644 index 00000000..f65e609a --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/green_suspicious_dye.json @@ -0,0 +1,8 @@ +{ + "type": "additionaladditions:brewing", + "ingredient": "additionaladditions:sawtooth_fern", + "potion": "minecraft:water", + "result": { + "id": "additionaladditions:green_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/light_blue_suspicious_dye.json b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/light_blue_suspicious_dye.json new file mode 100644 index 00000000..fb73cfe3 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/light_blue_suspicious_dye.json @@ -0,0 +1,8 @@ +{ + "type": "additionaladditions:brewing", + "ingredient": "additionaladditions:wisteria", + "potion": "minecraft:water", + "result": { + "id": "additionaladditions:light_blue_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/lime_suspicious_dye.json b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/lime_suspicious_dye.json new file mode 100644 index 00000000..8de45323 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/lime_suspicious_dye.json @@ -0,0 +1,8 @@ +{ + "type": "additionaladditions:brewing", + "ingredient": "additionaladditions:bulbus", + "potion": "minecraft:water", + "result": { + "id": "additionaladditions:lime_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/magenta_suspicious_dye.json b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/magenta_suspicious_dye.json new file mode 100644 index 00000000..b22db14b --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/magenta_suspicious_dye.json @@ -0,0 +1,8 @@ +{ + "type": "additionaladditions:brewing", + "ingredient": "additionaladditions:snapdragon", + "potion": "minecraft:water", + "result": { + "id": "additionaladditions:magenta_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/orange_suspicious_dye.json b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/orange_suspicious_dye.json new file mode 100644 index 00000000..e68775ab --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/orange_suspicious_dye.json @@ -0,0 +1,8 @@ +{ + "type": "additionaladditions:brewing", + "ingredient": "minecraft:torchflower", + "potion": "minecraft:water", + "result": { + "id": "additionaladditions:orange_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/pink_suspicious_dye.json b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/pink_suspicious_dye.json new file mode 100644 index 00000000..d7a89955 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/pink_suspicious_dye.json @@ -0,0 +1,8 @@ +{ + "type": "additionaladditions:brewing", + "ingredient": "additionaladditions:lotus_lily", + "potion": "minecraft:water", + "result": { + "id": "additionaladditions:pink_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/purple_suspicious_dye.json b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/purple_suspicious_dye.json new file mode 100644 index 00000000..807d4ba5 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/purple_suspicious_dye.json @@ -0,0 +1,8 @@ +{ + "type": "additionaladditions:brewing", + "ingredient": "additionaladditions:spikeblossom", + "potion": "minecraft:water", + "result": { + "id": "additionaladditions:purple_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/red_suspicious_dye.json b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/red_suspicious_dye.json new file mode 100644 index 00000000..abc0822c --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/red_suspicious_dye.json @@ -0,0 +1,8 @@ +{ + "type": "additionaladditions:brewing", + "ingredient": "additionaladditions:crimson_blossom", + "potion": "minecraft:water", + "result": { + "id": "additionaladditions:red_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/white_suspicious_dye.json b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/white_suspicious_dye.json new file mode 100644 index 00000000..a1c3bfa2 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/white_suspicious_dye.json @@ -0,0 +1,8 @@ +{ + "type": "additionaladditions:brewing", + "ingredient": "additionaladditions:cottonshiver", + "potion": "minecraft:water", + "result": { + "id": "additionaladditions:white_suspicious_dye" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/yellow_suspicious_dye.json b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/yellow_suspicious_dye.json new file mode 100644 index 00000000..1441c6af --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/recipe/suspicious_dye/yellow_suspicious_dye.json @@ -0,0 +1,8 @@ +{ + "type": "additionaladditions:brewing", + "ingredient": "additionaladditions:amber_blossom", + "potion": "minecraft:water", + "result": { + "id": "additionaladditions:yellow_suspicious_dye" + } +} \ No newline at end of file From 59c528c73c5fa030eb1edb36dab85ff15b34d4d5 Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Sun, 21 Jun 2026 11:51:07 +0100 Subject: [PATCH 22/27] 26.1: fix sniffer plants item models --- .../core/datagen/template/Models.java | 28 +++++++++++++++++++ .../sniffer_plants/SnifferPlantsContent.java | 24 ++++++++++------ .../items/amber_blossom.json | 2 +- .../additionaladditions/items/bulbus.json | 2 +- .../items/cottonshiver.json | 2 +- .../items/crimson_blossom.json | 2 +- .../additionaladditions/items/frostleaf.json | 2 +- .../additionaladditions/items/lotus_lily.json | 6 ++++ .../additionaladditions/items/mudflower.json | 2 +- .../items/sawtooth_fern.json | 2 +- .../additionaladditions/items/snapdragon.json | 2 +- .../items/spikeblossom.json | 2 +- .../additionaladditions/items/wisteria.json | 6 ++++ .../items/wisteria_vines.json | 6 ++++ .../models/item/amber_blossom.json | 6 ++++ .../models/item/bulbus.json | 6 ++++ .../models/item/cottonshiver.json | 6 ++++ .../models/item/crimson_blossom.json | 6 ++++ .../models/item/frostleaf.json | 6 ++++ .../models/item/lotus_lily.json | 6 ++++ .../models/item/mudflower.json | 6 ++++ .../models/item/sawtooth_fern.json | 6 ++++ .../models/item/snapdragon.json | 6 ++++ .../models/item/spikeblossom.json | 6 ++++ .../models/item/wisteria.json | 6 ++++ .../models/item/wisteria_vines.json | 6 ++++ .../items/amber_blossom.json | 2 +- .../additionaladditions/items/bulbus.json | 2 +- .../items/cottonshiver.json | 2 +- .../items/crimson_blossom.json | 2 +- .../additionaladditions/items/frostleaf.json | 2 +- .../additionaladditions/items/lotus_lily.json | 2 +- .../additionaladditions/items/mudflower.json | 2 +- .../items/sawtooth_fern.json | 2 +- .../additionaladditions/items/snapdragon.json | 2 +- .../items/spikeblossom.json | 2 +- .../additionaladditions/items/wisteria.json | 2 +- .../items/wisteria_vines.json | 2 +- .../models/item/amber_blossom.json | 6 ++++ .../models/item/bulbus.json | 6 ++++ .../models/item/cottonshiver.json | 6 ++++ .../models/item/crimson_blossom.json | 6 ++++ .../models/item/frostleaf.json | 6 ++++ .../models/item/lotus_lily.json | 6 ++++ .../models/item/mudflower.json | 6 ++++ .../models/item/sawtooth_fern.json | 6 ++++ .../models/item/snapdragon.json | 6 ++++ .../models/item/spikeblossom.json | 6 ++++ .../models/item/wisteria.json | 6 ++++ .../models/item/wisteria_vines.json | 6 ++++ 50 files changed, 226 insertions(+), 30 deletions(-) create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/lotus_lily.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/wisteria.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/items/wisteria_vines.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/models/item/amber_blossom.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/models/item/bulbus.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/models/item/cottonshiver.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/models/item/crimson_blossom.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/models/item/frostleaf.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/models/item/lotus_lily.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/models/item/mudflower.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/models/item/sawtooth_fern.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/models/item/snapdragon.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/models/item/spikeblossom.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/models/item/wisteria.json create mode 100644 fabric/src/main/generated/assets/additionaladditions/models/item/wisteria_vines.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/amber_blossom.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/bulbus.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/cottonshiver.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/crimson_blossom.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/frostleaf.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/lotus_lily.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/mudflower.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/sawtooth_fern.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/snapdragon.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/spikeblossom.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/wisteria.json create mode 100644 neoforge/src/main/generated/assets/additionaladditions/models/item/wisteria_vines.json diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java index 2fd2ad93..10389e73 100644 --- a/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/template/Models.java @@ -2,19 +2,27 @@ import net.minecraft.client.data.models.BlockModelGenerators; import net.minecraft.client.data.models.ItemModelGenerators; +import net.minecraft.client.data.models.model.ItemModelUtils; +import net.minecraft.client.data.models.model.ModelLocationUtils; import net.minecraft.client.data.models.model.ModelTemplates; +import net.minecraft.client.data.models.model.TextureMapping; +import net.minecraft.client.resources.model.sprite.Material; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.Identifier; import net.minecraft.resources.ResourceKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.equipment.ArmorType; import net.minecraft.world.item.equipment.EquipmentAsset; import net.minecraft.world.level.block.Block; +import one.dqu.additionaladditions.AdditionalAdditions; import one.dqu.additionaladditions.core.datagen.AABlockDatagen; import one.dqu.additionaladditions.core.datagen.AAItemDatagen; import one.dqu.additionaladditions.core.datagen.template.model.AlbumModelTemplate; import one.dqu.additionaladditions.core.datagen.template.model.BarometerModelTemplate; import one.dqu.additionaladditions.core.datagen.template.model.TallCrossModelTemplate; +import java.util.function.Consumer; + /** * Datagen template presets for blocks and items. * To be used with with block/item builders. Generated in AABlockDatagen / AAItemDatagen. @@ -47,6 +55,26 @@ public static void flat(Item item) { AAItemDatagen.currentGen().generateFlatItem(item, ModelTemplates.FLAT_ITEM); } + /** + * Flat item model that uses a block texture. + * + * @param format Texture path, %s is replaced with the item identifier. + */ + public static Consumer flatBlock(String format) { + return item -> { + ItemModelGenerators gen = AAItemDatagen.currentGen(); + String texture = format.formatted(BuiltInRegistries.ITEM.getKey(item).getPath()); + Material mat = new Material(Identifier.fromNamespaceAndPath(AdditionalAdditions.NAMESPACE, "block/" + texture)); + Identifier model = ModelLocationUtils.getModelLocation(item); + ModelTemplates.FLAT_ITEM.create(model, TextureMapping.layer0(mat), gen.modelOutput); + gen.itemModelOutput.accept(item, ItemModelUtils.plainModel(model)); + }; + } + + public static void flatBlock(Item item) { + flatBlock("%s").accept(item); + } + public static void handheld(Item item) { AAItemDatagen.currentGen().generateFlatItem(item, ModelTemplates.FLAT_HANDHELD_ITEM); } diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java index 496dbd29..acdc2716 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java @@ -71,8 +71,13 @@ private static VoxelShape[] shapes(VoxelShape... s) { } private static Supplier plantItem(String id, Supplier block, ItemLike anchor, TagKey flowerTag, ItemLike dye) { + return plantItem(id, block, anchor, flowerTag, dye, "%s"); + } + + private static Supplier plantItem(String id, Supplier block, ItemLike anchor, TagKey flowerTag, ItemLike dye, String textureFormat) { return itemBuilder(p -> new BlockItem(block.get(), p), anchor, false) .tags(flowerTag, ItemTags.BEE_FOOD) + .model(Models.flatBlock(textureFormat)) .recipeFor(dye, dyeRecipe(id, dye)) .make(id); } @@ -225,7 +230,7 @@ public static Supplier lotusLilyCrop() { // Items public static Supplier cottonshiverItem() { - return plantItem("cottonshiver", AABlocks.COTTONSHIVER, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.WHITE_DYE); + return plantItem("cottonshiver", AABlocks.COTTONSHIVER, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.WHITE_DYE, "%s_top"); } public static Supplier cottonshiverPod() { @@ -233,7 +238,7 @@ public static Supplier cottonshiverPod() { } public static Supplier mudflowerItem() { - return plantItem("mudflower", AABlocks.MUDFLOWER, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.BROWN_DYE); + return plantItem("mudflower", AABlocks.MUDFLOWER, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.BROWN_DYE, "%s_top"); } public static Supplier mudflowerSeeds() { @@ -249,7 +254,7 @@ public static Supplier crimsonBlossomSeeds() { } public static Supplier amberBlossomItem() { - return plantItem("amber_blossom", AABlocks.AMBER_BLOSSOM, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.YELLOW_DYE); + return plantItem("amber_blossom", AABlocks.AMBER_BLOSSOM, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.YELLOW_DYE, "%s_bottom"); } public static Supplier amberBlossomSeeds() { @@ -257,7 +262,7 @@ public static Supplier amberBlossomSeeds() { } public static Supplier bulbusItem() { - return plantItem("bulbus", AABlocks.BULBUS, Items.TORCHFLOWER, AATags.C_FLOWERS_SMALL_ITEM, Items.LIME_DYE); + return plantItem("bulbus", AABlocks.BULBUS, Items.TORCHFLOWER, AATags.C_FLOWERS_SMALL_ITEM, Items.LIME_DYE, "%s_bottom"); } public static Supplier bulbusPod() { @@ -265,7 +270,7 @@ public static Supplier bulbusPod() { } public static Supplier sawtoothFernItem() { - return plantItem("sawtooth_fern", AABlocks.SAWTOOTH_FERN, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.GREEN_DYE); + return plantItem("sawtooth_fern", AABlocks.SAWTOOTH_FERN, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.GREEN_DYE, "%s_bottom"); } public static Supplier sawtoothFernFiddlehead() { @@ -281,15 +286,15 @@ public static Supplier frostleafPod() { } public static Supplier wisteriaItem() { - return plantItem("wisteria", AABlocks.WISTERIA, Items.TORCHFLOWER, AATags.C_FLOWERS_ITEM, Items.LIGHT_BLUE_DYE); + return plantItem("wisteria", AABlocks.WISTERIA, Items.TORCHFLOWER, AATags.C_FLOWERS_ITEM, Items.LIGHT_BLUE_DYE, "%s_crop_stage1"); } public static Supplier wisteriaVines() { - return vineItem("wisteria_vines", AABlocks.WISTERIA_CROP, Items.PITCHER_POD, null); + return vineItem("wisteria_vines", AABlocks.WISTERIA_CROP, Items.PITCHER_POD, Models.flatBlock("wisteria_crop_stage0")); } public static Supplier spikeblossomItem() { - return plantItem("spikeblossom", AABlocks.SPIKEBLOSSOM, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.PURPLE_DYE); + return plantItem("spikeblossom", AABlocks.SPIKEBLOSSOM, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.PURPLE_DYE, "%s_bottom"); } public static Supplier spikeblossomSeeds() { @@ -297,7 +302,7 @@ public static Supplier spikeblossomSeeds() { } public static Supplier snapdragonItem() { - return plantItem("snapdragon", AABlocks.SNAPDRAGON, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.MAGENTA_DYE); + return plantItem("snapdragon", AABlocks.SNAPDRAGON, Items.PITCHER_PLANT, AATags.C_FLOWERS_TALL_ITEM, Items.MAGENTA_DYE, "%s_bottom"); } public static Supplier snapdragonPod() { @@ -309,6 +314,7 @@ public static Supplier lotusLilyItem() { .config(Config.SNIFFER_PLANTS) .creative(Items.TORCHFLOWER, CreativeModeTabs.NATURAL_BLOCKS, CreativePosition.AFTER) .tags(AATags.C_FLOWERS_ITEM, ItemTags.BEE_FOOD) + .model(Models::flatBlock) .recipeFor(Items.PINK_DYE, dyeRecipe("lotus_lily", Items.PINK_DYE)) .make("lotus_lily"); } diff --git a/fabric/src/main/generated/assets/additionaladditions/items/amber_blossom.json b/fabric/src/main/generated/assets/additionaladditions/items/amber_blossom.json index b22451c9..1591fc0b 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/amber_blossom.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/amber_blossom.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/amber_blossom" + "model": "additionaladditions:item/amber_blossom" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/bulbus.json b/fabric/src/main/generated/assets/additionaladditions/items/bulbus.json index ea935723..54cc6345 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/bulbus.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/bulbus.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/bulbus" + "model": "additionaladditions:item/bulbus" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/cottonshiver.json b/fabric/src/main/generated/assets/additionaladditions/items/cottonshiver.json index 6d48341d..7492e291 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/cottonshiver.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/cottonshiver.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/cottonshiver" + "model": "additionaladditions:item/cottonshiver" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/crimson_blossom.json b/fabric/src/main/generated/assets/additionaladditions/items/crimson_blossom.json index 7a31cce5..66f98f89 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/crimson_blossom.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/crimson_blossom.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/crimson_blossom" + "model": "additionaladditions:item/crimson_blossom" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/frostleaf.json b/fabric/src/main/generated/assets/additionaladditions/items/frostleaf.json index 1276c59f..d3d7f57d 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/frostleaf.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/frostleaf.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/frostleaf" + "model": "additionaladditions:item/frostleaf" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/lotus_lily.json b/fabric/src/main/generated/assets/additionaladditions/items/lotus_lily.json new file mode 100644 index 00000000..54125254 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/lotus_lily.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/lotus_lily" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/mudflower.json b/fabric/src/main/generated/assets/additionaladditions/items/mudflower.json index d9f4e559..7fbe0458 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/mudflower.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/mudflower.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/mudflower" + "model": "additionaladditions:item/mudflower" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json b/fabric/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json index ef785665..f4a24798 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/sawtooth_fern" + "model": "additionaladditions:item/sawtooth_fern" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/snapdragon.json b/fabric/src/main/generated/assets/additionaladditions/items/snapdragon.json index ef971705..dd7f1087 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/snapdragon.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/snapdragon.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/snapdragon" + "model": "additionaladditions:item/snapdragon" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/spikeblossom.json b/fabric/src/main/generated/assets/additionaladditions/items/spikeblossom.json index 15988ee4..5d6b4280 100644 --- a/fabric/src/main/generated/assets/additionaladditions/items/spikeblossom.json +++ b/fabric/src/main/generated/assets/additionaladditions/items/spikeblossom.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/spikeblossom" + "model": "additionaladditions:item/spikeblossom" } } \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/wisteria.json b/fabric/src/main/generated/assets/additionaladditions/items/wisteria.json new file mode 100644 index 00000000..f57c395b --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/wisteria.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/wisteria" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/items/wisteria_vines.json b/fabric/src/main/generated/assets/additionaladditions/items/wisteria_vines.json new file mode 100644 index 00000000..c01ce420 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/items/wisteria_vines.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "additionaladditions:item/wisteria_vines" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/models/item/amber_blossom.json b/fabric/src/main/generated/assets/additionaladditions/models/item/amber_blossom.json new file mode 100644 index 00000000..9dc6c1b8 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/amber_blossom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/amber_blossom_bottom" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/models/item/bulbus.json b/fabric/src/main/generated/assets/additionaladditions/models/item/bulbus.json new file mode 100644 index 00000000..d81ce21c --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/bulbus.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/bulbus_bottom" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/models/item/cottonshiver.json b/fabric/src/main/generated/assets/additionaladditions/models/item/cottonshiver.json new file mode 100644 index 00000000..d8835da9 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/cottonshiver.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/cottonshiver_top" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/models/item/crimson_blossom.json b/fabric/src/main/generated/assets/additionaladditions/models/item/crimson_blossom.json new file mode 100644 index 00000000..3476bec9 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/crimson_blossom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/crimson_blossom" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/models/item/frostleaf.json b/fabric/src/main/generated/assets/additionaladditions/models/item/frostleaf.json new file mode 100644 index 00000000..599a15f1 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/frostleaf.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/frostleaf" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/models/item/lotus_lily.json b/fabric/src/main/generated/assets/additionaladditions/models/item/lotus_lily.json new file mode 100644 index 00000000..bb1c90ec --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/lotus_lily.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/lotus_lily" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/models/item/mudflower.json b/fabric/src/main/generated/assets/additionaladditions/models/item/mudflower.json new file mode 100644 index 00000000..7c4cea34 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/mudflower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/mudflower_top" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/models/item/sawtooth_fern.json b/fabric/src/main/generated/assets/additionaladditions/models/item/sawtooth_fern.json new file mode 100644 index 00000000..4a5df997 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/sawtooth_fern.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/sawtooth_fern_bottom" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/models/item/snapdragon.json b/fabric/src/main/generated/assets/additionaladditions/models/item/snapdragon.json new file mode 100644 index 00000000..9fe69194 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/snapdragon.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/snapdragon_bottom" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/models/item/spikeblossom.json b/fabric/src/main/generated/assets/additionaladditions/models/item/spikeblossom.json new file mode 100644 index 00000000..27bce10d --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/spikeblossom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/spikeblossom_bottom" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/models/item/wisteria.json b/fabric/src/main/generated/assets/additionaladditions/models/item/wisteria.json new file mode 100644 index 00000000..78195bf0 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/wisteria.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/wisteria_crop_stage1" + } +} \ No newline at end of file diff --git a/fabric/src/main/generated/assets/additionaladditions/models/item/wisteria_vines.json b/fabric/src/main/generated/assets/additionaladditions/models/item/wisteria_vines.json new file mode 100644 index 00000000..7fa2e0a8 --- /dev/null +++ b/fabric/src/main/generated/assets/additionaladditions/models/item/wisteria_vines.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/wisteria_crop_stage0" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/amber_blossom.json b/neoforge/src/main/generated/assets/additionaladditions/items/amber_blossom.json index b22451c9..1591fc0b 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/amber_blossom.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/amber_blossom.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/amber_blossom" + "model": "additionaladditions:item/amber_blossom" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/bulbus.json b/neoforge/src/main/generated/assets/additionaladditions/items/bulbus.json index ea935723..54cc6345 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/bulbus.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/bulbus.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/bulbus" + "model": "additionaladditions:item/bulbus" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/cottonshiver.json b/neoforge/src/main/generated/assets/additionaladditions/items/cottonshiver.json index 6d48341d..7492e291 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/cottonshiver.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/cottonshiver.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/cottonshiver" + "model": "additionaladditions:item/cottonshiver" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/crimson_blossom.json b/neoforge/src/main/generated/assets/additionaladditions/items/crimson_blossom.json index 7a31cce5..66f98f89 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/crimson_blossom.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/crimson_blossom.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/crimson_blossom" + "model": "additionaladditions:item/crimson_blossom" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/frostleaf.json b/neoforge/src/main/generated/assets/additionaladditions/items/frostleaf.json index 1276c59f..d3d7f57d 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/frostleaf.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/frostleaf.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/frostleaf" + "model": "additionaladditions:item/frostleaf" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/lotus_lily.json b/neoforge/src/main/generated/assets/additionaladditions/items/lotus_lily.json index 55a77a4f..54125254 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/lotus_lily.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/lotus_lily.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/lotus_lily" + "model": "additionaladditions:item/lotus_lily" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/mudflower.json b/neoforge/src/main/generated/assets/additionaladditions/items/mudflower.json index d9f4e559..7fbe0458 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/mudflower.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/mudflower.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/mudflower" + "model": "additionaladditions:item/mudflower" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json b/neoforge/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json index ef785665..f4a24798 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/sawtooth_fern.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/sawtooth_fern" + "model": "additionaladditions:item/sawtooth_fern" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/snapdragon.json b/neoforge/src/main/generated/assets/additionaladditions/items/snapdragon.json index ef971705..dd7f1087 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/snapdragon.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/snapdragon.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/snapdragon" + "model": "additionaladditions:item/snapdragon" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/spikeblossom.json b/neoforge/src/main/generated/assets/additionaladditions/items/spikeblossom.json index 15988ee4..5d6b4280 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/spikeblossom.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/spikeblossom.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/spikeblossom" + "model": "additionaladditions:item/spikeblossom" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/wisteria.json b/neoforge/src/main/generated/assets/additionaladditions/items/wisteria.json index 318f5c05..f57c395b 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/wisteria.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/wisteria.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/wisteria" + "model": "additionaladditions:item/wisteria" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/wisteria_vines.json b/neoforge/src/main/generated/assets/additionaladditions/items/wisteria_vines.json index 31f8aba3..c01ce420 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/wisteria_vines.json +++ b/neoforge/src/main/generated/assets/additionaladditions/items/wisteria_vines.json @@ -1,6 +1,6 @@ { "model": { "type": "minecraft:model", - "model": "additionaladditions:block/wisteria_crop" + "model": "additionaladditions:item/wisteria_vines" } } \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/amber_blossom.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/amber_blossom.json new file mode 100644 index 00000000..9dc6c1b8 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/amber_blossom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/amber_blossom_bottom" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/bulbus.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/bulbus.json new file mode 100644 index 00000000..d81ce21c --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/bulbus.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/bulbus_bottom" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/cottonshiver.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/cottonshiver.json new file mode 100644 index 00000000..d8835da9 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/cottonshiver.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/cottonshiver_top" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/crimson_blossom.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/crimson_blossom.json new file mode 100644 index 00000000..3476bec9 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/crimson_blossom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/crimson_blossom" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/frostleaf.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/frostleaf.json new file mode 100644 index 00000000..599a15f1 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/frostleaf.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/frostleaf" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/lotus_lily.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/lotus_lily.json new file mode 100644 index 00000000..bb1c90ec --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/lotus_lily.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/lotus_lily" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/mudflower.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/mudflower.json new file mode 100644 index 00000000..7c4cea34 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/mudflower.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/mudflower_top" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/sawtooth_fern.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/sawtooth_fern.json new file mode 100644 index 00000000..4a5df997 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/sawtooth_fern.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/sawtooth_fern_bottom" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/snapdragon.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/snapdragon.json new file mode 100644 index 00000000..9fe69194 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/snapdragon.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/snapdragon_bottom" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/spikeblossom.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/spikeblossom.json new file mode 100644 index 00000000..27bce10d --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/spikeblossom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/spikeblossom_bottom" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/wisteria.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/wisteria.json new file mode 100644 index 00000000..78195bf0 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/wisteria.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/wisteria_crop_stage1" + } +} \ No newline at end of file diff --git a/neoforge/src/main/generated/assets/additionaladditions/models/item/wisteria_vines.json b/neoforge/src/main/generated/assets/additionaladditions/models/item/wisteria_vines.json new file mode 100644 index 00000000..7fa2e0a8 --- /dev/null +++ b/neoforge/src/main/generated/assets/additionaladditions/models/item/wisteria_vines.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "additionaladditions:block/wisteria_crop_stage0" + } +} \ No newline at end of file From bc3944d3d0067acd52c4d32993bd2fd9bb4a343a Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Sun, 21 Jun 2026 12:08:56 +0100 Subject: [PATCH 23/27] 26.1: fix: lotus lily pod not placing crop, add gametest --- .../sniffer_plants/SnifferPlantsContent.java | 4 +- .../gametest/SnifferPlantsTests.java | 64 ++++++++++++++++--- .../registry/AAGameTests.java | 1 + .../sniffer_plants_planting.json | 7 ++ .../sniffer_plants_planting.json | 7 ++ 5 files changed, 72 insertions(+), 11 deletions(-) create mode 100644 fabric/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_planting.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_planting.json diff --git a/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java index acdc2716..3bfe2c00 100644 --- a/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java +++ b/common/src/main/java/one/dqu/additionaladditions/feature/sniffer_plants/SnifferPlantsContent.java @@ -320,6 +320,8 @@ public static Supplier lotusLilyItem() { } public static Supplier lotusLilyPod() { - return vineItem("lotus_lily_pod", AABlocks.LOTUS_LILY_CROP, Items.PITCHER_POD, Models::flat); + return itemBuilder(p -> new PlaceOnWaterBlockItem(AABlocks.LOTUS_LILY_CROP.get(), p), Items.PITCHER_POD, true) + .model(Models::flat) + .make("lotus_lily_pod"); } } diff --git a/common/src/main/java/one/dqu/additionaladditions/gametest/SnifferPlantsTests.java b/common/src/main/java/one/dqu/additionaladditions/gametest/SnifferPlantsTests.java index 790e9a41..b2b61fb8 100644 --- a/common/src/main/java/one/dqu/additionaladditions/gametest/SnifferPlantsTests.java +++ b/common/src/main/java/one/dqu/additionaladditions/gametest/SnifferPlantsTests.java @@ -1,8 +1,14 @@ package one.dqu.additionaladditions.gametest; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; import net.minecraft.gametest.framework.GameTestHelper; import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.GameType; import net.minecraft.world.level.block.*; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; @@ -11,24 +17,25 @@ import one.dqu.additionaladditions.feature.sniffer_plants.LotusLilyCropBlock; import one.dqu.additionaladditions.feature.sniffer_plants.WisteriaCropBlock; import one.dqu.additionaladditions.registry.AABlocks; +import one.dqu.additionaladditions.registry.AAItems; import java.util.List; import java.util.function.Supplier; public class SnifferPlantsTests { - private record CropDef(Supplier crop, Supplier grown, int maxAge, BlockPos pos) { + private record CropDef(Supplier crop, Supplier grown, int maxAge, BlockPos pos, Supplier seed) { } private static final List FLOWER_CROPS = List.of( - new CropDef(AABlocks.COTTONSHIVER_CROP, AABlocks.COTTONSHIVER, 2, new BlockPos(1, 2, 1)), - new CropDef(AABlocks.MUDFLOWER_CROP, AABlocks.MUDFLOWER, 2, new BlockPos(2, 2, 1)), - new CropDef(AABlocks.CRIMSON_BLOSSOM_CROP, AABlocks.CRIMSON_BLOSSOM, 2, new BlockPos(3, 2, 1)), - new CropDef(AABlocks.AMBER_BLOSSOM_CROP, AABlocks.AMBER_BLOSSOM, 2, new BlockPos(1, 2, 2)), - new CropDef(AABlocks.BULBUS_CROP, AABlocks.BULBUS, 2, new BlockPos(2, 2, 2)), - new CropDef(AABlocks.SAWTOOTH_FERN_CROP, AABlocks.SAWTOOTH_FERN, 3, new BlockPos(3, 2, 2)), - new CropDef(AABlocks.FROSTLEAF_CROP, AABlocks.FROSTLEAF, 2, new BlockPos(1, 2, 3)), - new CropDef(AABlocks.SPIKEBLOSSOM_CROP, AABlocks.SPIKEBLOSSOM, 2, new BlockPos(2, 2, 3)), - new CropDef(AABlocks.SNAPDRAGON_CROP, AABlocks.SNAPDRAGON, 2, new BlockPos(3, 2, 3)) + new CropDef(AABlocks.COTTONSHIVER_CROP, AABlocks.COTTONSHIVER, 2, new BlockPos(1, 2, 1), AAItems.COTTONSHIVER_POD), + new CropDef(AABlocks.MUDFLOWER_CROP, AABlocks.MUDFLOWER, 2, new BlockPos(2, 2, 1), AAItems.MUDFLOWER_SEEDS), + new CropDef(AABlocks.CRIMSON_BLOSSOM_CROP, AABlocks.CRIMSON_BLOSSOM, 2, new BlockPos(3, 2, 1), AAItems.CRIMSON_BLOSSOM_SEEDS), + new CropDef(AABlocks.AMBER_BLOSSOM_CROP, AABlocks.AMBER_BLOSSOM, 2, new BlockPos(1, 2, 2), AAItems.AMBER_BLOSSOM_SEEDS), + new CropDef(AABlocks.BULBUS_CROP, AABlocks.BULBUS, 2, new BlockPos(2, 2, 2), AAItems.BULBUS_POD), + new CropDef(AABlocks.SAWTOOTH_FERN_CROP, AABlocks.SAWTOOTH_FERN, 3, new BlockPos(3, 2, 2), AAItems.SAWTOOTH_FERN_FIDDLEHEAD), + new CropDef(AABlocks.FROSTLEAF_CROP, AABlocks.FROSTLEAF, 2, new BlockPos(1, 2, 3), AAItems.FROSTLEAF_POD), + new CropDef(AABlocks.SPIKEBLOSSOM_CROP, AABlocks.SPIKEBLOSSOM, 2, new BlockPos(2, 2, 3), AAItems.SPIKEBLOSSOM_SEEDS), + new CropDef(AABlocks.SNAPDRAGON_CROP, AABlocks.SNAPDRAGON, 2, new BlockPos(3, 2, 3), AAItems.SNAPDRAGON_POD) ); private static final BlockPos WISTERIA_POS = new BlockPos(6, 2, 1); private static final BlockPos LOTUS_POS = new BlockPos(8, 2, 2); @@ -138,4 +145,41 @@ public static void naturalGrowth(GameTestHelper ctx) { }) .thenSucceed(); } + + // places a block item from a mock player onto the face of the block at pos + private static void placeOn(GameTestHelper ctx, Player player, Supplier item, BlockPos pos, Direction face) { + ItemStack stack = item.get().getDefaultInstance(); + player.setItemInHand(InteractionHand.MAIN_HAND, stack); + ctx.placeAt(player, stack, pos, face); + } + + // tests every plant can be planted from its seed item + public static void planting(GameTestHelper ctx) { + buildField(ctx); + + Player player = ctx.makeMockPlayer(GameType.CREATIVE); + player.setXRot(0f); + player.setYRot(0f); + + // flower crops + for (CropDef def : FLOWER_CROPS) { + placeOn(ctx, player, def.seed(), def.pos().below(), Direction.UP); + ctx.assertBlockPresent(def.crop().get(), def.pos()); + } + + // wisteria + placeOn(ctx, player, AAItems.WISTERIA_VINES, new BlockPos(6, 2, 2), Direction.NORTH); + ctx.assertBlockPresent(AABlocks.WISTERIA_CROP.get(), WISTERIA_POS); + + // lotus lily + BlockPos water = ctx.absolutePos(new BlockPos(8, 1, 2)); + player.setItemInHand(InteractionHand.MAIN_HAND, AAItems.LOTUS_LILY_POD.get().getDefaultInstance()); + player.snapTo(water.getX() + 0.5, water.getY() + 1.0, water.getZ() + 0.5); + player.setXRot(90f); + player.setYRot(0f); + AAItems.LOTUS_LILY_POD.get().use(ctx.getLevel(), player, InteractionHand.MAIN_HAND); + ctx.assertBlockPresent(AABlocks.LOTUS_LILY_CROP.get(), LOTUS_POS); + + ctx.succeed(); + } } diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java b/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java index 2b75235a..a407d70c 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java @@ -46,6 +46,7 @@ public static void registerAll() { // sniffer plants new AAGameTest().structure("empty_big").function(SnifferPlantsTests::stages).create("sniffer_plants_stages"); + new AAGameTest().structure("empty_big").function(SnifferPlantsTests::planting).create("sniffer_plants_planting"); new AAGameTest().structure("empty_big").maxTicks(2000).environment(FAST_GROWTH) .function(SnifferPlantsTests::naturalGrowth).create("sniffer_plants_natural_growth"); diff --git a/fabric/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_planting.json b/fabric/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_planting.json new file mode 100644 index 00000000..94a49be4 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_planting.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:sniffer_plants_planting", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_planting.json b/neoforge/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_planting.json new file mode 100644 index 00000000..94a49be4 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/test_instance/sniffer_plants_planting.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:sniffer_plants_planting", + "max_ticks": 100, + "structure": "additionaladditions:empty_big" +} \ No newline at end of file From 647a39ce60406ba4ba8692f395b4838ce5c265d2 Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Sun, 21 Jun 2026 12:28:38 +0100 Subject: [PATCH 24/27] 26.1: gametests for recipes --- .../gametest/CustomRecipeTests.java | 100 ++++++++++++++++++ .../registry/AAGameTests.java | 4 + .../test_instance/brewing_recipe.json | 7 ++ .../test_instance/suspicious_dye_recipe.json | 7 ++ .../test_instance/brewing_recipe.json | 7 ++ .../test_instance/suspicious_dye_recipe.json | 7 ++ 6 files changed, 132 insertions(+) create mode 100644 common/src/main/java/one/dqu/additionaladditions/gametest/CustomRecipeTests.java create mode 100644 fabric/src/main/generated/data/additionaladditions/test_instance/brewing_recipe.json create mode 100644 fabric/src/main/generated/data/additionaladditions/test_instance/suspicious_dye_recipe.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/test_instance/brewing_recipe.json create mode 100644 neoforge/src/main/generated/data/additionaladditions/test_instance/suspicious_dye_recipe.json diff --git a/common/src/main/java/one/dqu/additionaladditions/gametest/CustomRecipeTests.java b/common/src/main/java/one/dqu/additionaladditions/gametest/CustomRecipeTests.java new file mode 100644 index 00000000..f332b941 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/gametest/CustomRecipeTests.java @@ -0,0 +1,100 @@ +package one.dqu.additionaladditions.gametest; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.Holder; +import net.minecraft.core.registries.Registries; +import net.minecraft.gametest.framework.GameTestHelper; +import net.minecraft.network.chat.Component; +import net.minecraft.world.Container; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.alchemy.PotionContents; +import net.minecraft.world.item.alchemy.Potions; +import net.minecraft.world.item.crafting.CraftingInput; +import net.minecraft.world.item.crafting.CraftingRecipe; +import net.minecraft.world.item.crafting.RecipeHolder; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.item.enchantment.Enchantment; +import net.minecraft.world.item.enchantment.Enchantments; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.HopperBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.HopperBlockEntity; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintColor; +import one.dqu.additionaladditions.registry.AAItems; +import one.dqu.additionaladditions.registry.AAMisc; + +import java.util.List; +import java.util.Optional; + +public class CustomRecipeTests { + private static boolean containerHas(GameTestHelper ctx, BlockPos relPos, Item item) { + BlockEntity be = ctx.getLevel().getBlockEntity(ctx.absolutePos(relPos)); + if (!(be instanceof Container container)) return false; + for (int i = 0; i < container.getContainerSize(); i++) { + if (container.getItem(i).is(item)) return true; + } + return false; + } + + // brews a water bottle + cottonshiver into white suspicious dye + public static void brewing(GameTestHelper ctx) { + BlockPos floor = new BlockPos(2, 1, 2); + BlockPos bottomHopper = new BlockPos(2, 2, 2); + BlockPos stand = new BlockPos(2, 3, 2); + BlockPos topHopper = new BlockPos(2, 4, 2); + BlockPos sideHopper = new BlockPos(3, 3, 2); + BlockPos redstone = new BlockPos(1, 2, 2); + + // brewing setup with hoppers + ctx.setBlock(floor, Blocks.STONE); + ctx.setBlock(bottomHopper, Blocks.HOPPER.defaultBlockState().setValue(HopperBlock.FACING, Direction.DOWN)); + ctx.setBlock(stand, Blocks.BREWING_STAND); + ctx.setBlock(topHopper, Blocks.HOPPER.defaultBlockState().setValue(HopperBlock.FACING, Direction.DOWN)); + ctx.setBlock(sideHopper, Blocks.HOPPER.defaultBlockState().setValue(HopperBlock.FACING, Direction.WEST)); + ctx.setBlock(redstone, Blocks.REDSTONE_BLOCK); // lock the bottom hopper so it cant pull the bottle out of the stand + + HopperBlockEntity top = ctx.getBlockEntity(topHopper, HopperBlockEntity.class); + top.setItem(0, new ItemStack(AAItems.COTTONSHIVER.get())); + top.setChanged(); + + HopperBlockEntity side = ctx.getBlockEntity(sideHopper, HopperBlockEntity.class); + side.setItem(0, new ItemStack(Items.BLAZE_POWDER)); + side.setItem(1, PotionContents.createItemStack(Items.POTION, Potions.WATER)); + side.setChanged(); + + Item dye = AAItems.WHITE_SUSPICIOUS_DYE.get(); + + ctx.startSequence() + .thenWaitUntil(() -> ctx.assertTrue(containerHas(ctx, stand, dye), Component.literal("brewing did not produce white suspicious dye"))) + .thenExecute(() -> ctx.setBlock(redstone, Blocks.AIR)) + .thenWaitUntil(() -> ctx.assertTrue(containerHas(ctx, bottomHopper, dye), Component.literal("bottom hopper did not receive the dye"))) + .thenSucceed(); + } + + // dyes an enchanted item with suspicious dye, adding a glint_color component + public static void suspiciousDyeing(GameTestHelper ctx) { + ItemStack stack = new ItemStack(Items.NETHERITE_CHESTPLATE); + Holder enchantment = ctx.getLevel().registryAccess() + .lookupOrThrow(Registries.ENCHANTMENT).getOrThrow(Enchantments.UNBREAKING); + stack.enchant(enchantment, 1); + + ItemStack dye = AAItems.WHITE_SUSPICIOUS_DYE.get().getDefaultInstance(); + + CraftingInput input = CraftingInput.of(2, 1, List.of(stack, dye)); + Optional> recipe = ctx.getLevel().recipeAccess() + .getRecipeFor(RecipeType.CRAFTING, input, ctx.getLevel()); + ctx.assertTrue(recipe.isPresent(), Component.literal("no crafting recipe matched suspicious dye + enchanted gear")); + + ItemStack result = recipe.get().value().assemble(input); + ctx.assertTrue(result.is(Items.NETHERITE_CHESTPLATE), Component.literal("result is not the same equipment item")); + + GlintColor glint = result.get(AAMisc.GLINT_COLOR_COMPONENT.get()); + ctx.assertTrue(glint != null && glint.color() == DyeColor.WHITE, Component.literal("result is missing the white glint_color component")); + + ctx.succeed(); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java b/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java index a407d70c..a74db49a 100644 --- a/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java +++ b/common/src/main/java/one/dqu/additionaladditions/registry/AAGameTests.java @@ -50,6 +50,10 @@ public static void registerAll() { new AAGameTest().structure("empty_big").maxTicks(2000).environment(FAST_GROWTH) .function(SnifferPlantsTests::naturalGrowth).create("sniffer_plants_natural_growth"); + // custom recipes + new AAGameTest().maxTicks(600).function(CustomRecipeTests::brewing).create("brewing_recipe"); + new AAGameTest().function(CustomRecipeTests::suspiciousDyeing).create("suspicious_dye_recipe"); + // config new AAGameTest().function(ConfigTests::roseGoldPickaxeReload).create("config_rose_gold_pickaxe_reload"); new AAGameTest().function(ConfigTests::roseGoldArmorReload).create("config_rose_gold_armor_reload"); diff --git a/fabric/src/main/generated/data/additionaladditions/test_instance/brewing_recipe.json b/fabric/src/main/generated/data/additionaladditions/test_instance/brewing_recipe.json new file mode 100644 index 00000000..1786a6db --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/test_instance/brewing_recipe.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:brewing_recipe", + "max_ticks": 600, + "structure": "additionaladditions:empty" +} \ No newline at end of file diff --git a/fabric/src/main/generated/data/additionaladditions/test_instance/suspicious_dye_recipe.json b/fabric/src/main/generated/data/additionaladditions/test_instance/suspicious_dye_recipe.json new file mode 100644 index 00000000..575005e9 --- /dev/null +++ b/fabric/src/main/generated/data/additionaladditions/test_instance/suspicious_dye_recipe.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:suspicious_dye_recipe", + "max_ticks": 100, + "structure": "additionaladditions:empty" +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/test_instance/brewing_recipe.json b/neoforge/src/main/generated/data/additionaladditions/test_instance/brewing_recipe.json new file mode 100644 index 00000000..1786a6db --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/test_instance/brewing_recipe.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:brewing_recipe", + "max_ticks": 600, + "structure": "additionaladditions:empty" +} \ No newline at end of file diff --git a/neoforge/src/main/generated/data/additionaladditions/test_instance/suspicious_dye_recipe.json b/neoforge/src/main/generated/data/additionaladditions/test_instance/suspicious_dye_recipe.json new file mode 100644 index 00000000..575005e9 --- /dev/null +++ b/neoforge/src/main/generated/data/additionaladditions/test_instance/suspicious_dye_recipe.json @@ -0,0 +1,7 @@ +{ + "type": "minecraft:function", + "environment": "minecraft:default", + "function": "additionaladditions:suspicious_dye_recipe", + "max_ticks": 100, + "structure": "additionaladditions:empty" +} \ No newline at end of file From 20b5447c8b297b7b478bbbdc9621bb909bfede1e Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Sun, 21 Jun 2026 12:50:46 +0100 Subject: [PATCH 25/27] 26.1: readd REI compat --- common/build.gradle | 2 + .../recipe/REICommonCompat.java | 25 +++ .../additionaladditions/recipe/REICompat.java | 183 ++++++++++++++++++ fabric/src/main/resources/fabric.mod.json | 6 + gradle.properties | 23 +-- neoforge/build.gradle | 6 + .../neoforge/REINeoforgeCommonCompat.java | 8 + .../recipe/neoforge/REINeoforgeCompat.java | 8 + 8 files changed, 248 insertions(+), 13 deletions(-) create mode 100644 common/src/main/java/one/dqu/additionaladditions/recipe/REICommonCompat.java create mode 100644 common/src/main/java/one/dqu/additionaladditions/recipe/REICompat.java create mode 100644 neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/REINeoforgeCommonCompat.java create mode 100644 neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/REINeoforgeCompat.java diff --git a/common/build.gradle b/common/build.gradle index 45bb8e1f..36e41235 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -13,6 +13,8 @@ dependencies { implementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version" compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_api_version}" + compileOnly "me.shedaniel:RoughlyEnoughItems-api:${rei_api_version}" + compileOnly "me.shedaniel:RoughlyEnoughItems-default-plugin:${rei_api_version}" } loom { diff --git a/common/src/main/java/one/dqu/additionaladditions/recipe/REICommonCompat.java b/common/src/main/java/one/dqu/additionaladditions/recipe/REICommonCompat.java new file mode 100644 index 00000000..7138c38b --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/recipe/REICommonCompat.java @@ -0,0 +1,25 @@ +package one.dqu.additionaladditions.recipe; + +import me.shedaniel.rei.api.common.plugins.REICommonPlugin; +import me.shedaniel.rei.api.common.registry.display.ServerDisplayRegistry; +import me.shedaniel.rei.api.common.util.EntryIngredients; +import me.shedaniel.rei.plugin.common.displays.brewing.DefaultBrewingDisplay; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.alchemy.PotionContents; +import one.dqu.additionaladditions.registry.AAMisc; + +public class REICommonCompat implements REICommonPlugin { + @Override + public void registerDisplays(ServerDisplayRegistry registry) { + registry.beginRecipeFiller(BrewingRecipe.class) + .filterType(AAMisc.BREWING_RECIPE_TYPE.get()) + .fill(holder -> { + BrewingRecipe recipe = holder.value(); + return new DefaultBrewingDisplay( + EntryIngredients.of(PotionContents.createItemStack(Items.POTION, recipe.getPotion())), + EntryIngredients.ofIngredient(recipe.getIngredient()), + EntryIngredients.of(recipe.getResult().create()) + ); + }); + } +} diff --git a/common/src/main/java/one/dqu/additionaladditions/recipe/REICompat.java b/common/src/main/java/one/dqu/additionaladditions/recipe/REICompat.java new file mode 100644 index 00000000..8e6e35a3 --- /dev/null +++ b/common/src/main/java/one/dqu/additionaladditions/recipe/REICompat.java @@ -0,0 +1,183 @@ +package one.dqu.additionaladditions.recipe; + +import me.shedaniel.rei.api.client.entry.filtering.base.BasicFilteringRule; +import me.shedaniel.rei.api.client.plugins.REIClientPlugin; +import me.shedaniel.rei.api.client.registry.display.DisplayRegistry; +import me.shedaniel.rei.api.client.registry.display.DynamicDisplayGenerator; +import me.shedaniel.rei.api.common.entry.EntryIngredient; +import me.shedaniel.rei.api.common.entry.EntryStack; +import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes; +import me.shedaniel.rei.api.common.util.EntryIngredients; +import me.shedaniel.rei.plugin.common.BuiltinPlugin; +import me.shedaniel.rei.api.common.display.Display; +import me.shedaniel.rei.api.common.display.DisplaySerializer; +import me.shedaniel.rei.plugin.common.displays.crafting.CraftingDisplay; +import me.shedaniel.rei.plugin.common.displays.crafting.DefaultCraftingDisplay; +import net.minecraft.core.component.DataComponents; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.world.item.*; +import one.dqu.additionaladditions.config.Config; +import one.dqu.additionaladditions.config.ConfigProperty; +import one.dqu.additionaladditions.config.Toggleable; +import one.dqu.additionaladditions.feature.suspicious_dye.SuspiciousDyeItem; +import one.dqu.additionaladditions.feature.suspicious_dye.glint.GlintColor; +import one.dqu.additionaladditions.registry.AAItems; +import one.dqu.additionaladditions.registry.AAMisc; +import one.dqu.additionaladditions.registry.AATags; + +import java.util.*; +import java.util.function.Supplier; + +public class REICompat implements REIClientPlugin { + @Override + public void registerDisplays(DisplayRegistry registry) { + if (Config.SUSPICIOUS_DYE.get().enabled()) { + registry.registerDisplayGenerator(BuiltinPlugin.CRAFTING, new SuspiciousDyeDisplayGenerator()); + } + } + + @Override + public void registerBasicEntryFiltering(BasicFilteringRule rule) { + List> toHide = ConfigProperty.getAll() + .stream() + .filter(property -> property.get() instanceof Toggleable toggleable && !toggleable.enabled()) + .map(AAItems::fromConfigProperty) + .flatMap(Collection::stream) + .map(Supplier::get) + .map(ItemStack::new) + .map(s -> EntryStack.of(VanillaEntryTypes.ITEM, s)) + .toList(); + rule.hide(toHide); + } + + private static class SuspiciousDyeDisplayGenerator implements DynamicDisplayGenerator { + + private List getValidFoilItems() { + List items = new ArrayList<>(); + for (var holder : BuiltInRegistries.ITEM.getTagOrEmpty(AATags.C_ENCHANTABLE)) { + ItemStack stack = new ItemStack(holder); + if (!stack.is(AATags.SUSPICIOUS_DYES)) { + stack.set(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true); + items.add(stack); + } + } + return items; + } + + private List getAllDyes() { + List dyes = new ArrayList<>(); + for (var holder : BuiltInRegistries.ITEM.getTagOrEmpty(AATags.SUSPICIOUS_DYES)) { + dyes.add(new ItemStack(holder)); + } + return dyes; + } + + @Override + public Optional> getRecipeFor(EntryStack entry) { + if (!(entry.getValue() instanceof ItemStack output)) return Optional.empty(); + if (output.getItem() instanceof SuspiciousDyeItem) return Optional.empty(); + + // check if the output has a glint color component. if so, this is a suspicious dye result + GlintColor glintColor = output.get(AAMisc.GLINT_COLOR_COMPONENT.get()); + if (glintColor == null) return Optional.empty(); + + DyeColor color = glintColor.color(); + + // find the matching dye + ItemStack dyeStack = null; + for (ItemStack dye : getAllDyes()) { + if (dye.getItem() instanceof SuspiciousDyeItem dyeItem && dyeItem.getDyeColor() == color) { + dyeStack = dye; + break; + } + } + if (dyeStack == null) return Optional.empty(); + + // the focused item is the output, so fix the foil item to match + ItemStack baseItem = output.copy(); + baseItem.remove(AAMisc.GLINT_COLOR_COMPONENT.get()); + + EntryIngredient slot1 = EntryIngredients.of(baseItem); + EntryIngredient slot2 = EntryIngredients.of(dyeStack); + EntryIngredient outputSlot = EntryIngredients.of(output); + + List inputs = List.of(slot1, slot2); + List outputs = List.of(outputSlot); + + return Optional.of(List.of(createDisplay(inputs, outputs))); + } + + @Override + public Optional> getUsageFor(EntryStack entry) { + if (!(entry.getValue() instanceof ItemStack stack)) return Optional.empty(); + + // looking up usage of a suspicious dye + if (stack.getItem() instanceof SuspiciousDyeItem dyeItem) { + DyeColor color = dyeItem.getDyeColor(); + List validItems = getValidFoilItems(); + + List results = new ArrayList<>(); + for (ItemStack item : validItems) { + ItemStack result = item.copy(); + result.set(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(color)); + results.add(result); + } + + EntryIngredient slot1 = EntryIngredients.ofItemStacks(validItems); + EntryIngredient slot2 = EntryIngredients.of(stack); + EntryIngredient outputSlot = EntryIngredients.ofItemStacks(results); + + return Optional.of(List.of(createDisplay(List.of(slot1, slot2), List.of(outputSlot)))); + } + + // looking up usage of an enchantable item + if (stack.is(AATags.C_ENCHANTABLE) && !stack.is(AATags.SUSPICIOUS_DYES)) { + List dyes = getAllDyes(); + + ItemStack foilStack = stack.copy(); + foilStack.set(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true); + + List results = new ArrayList<>(); + for (ItemStack dye : dyes) { + if (dye.getItem() instanceof SuspiciousDyeItem dyeItem) { + ItemStack result = foilStack.copy(); + result.set(AAMisc.GLINT_COLOR_COMPONENT.get(), new GlintColor(dyeItem.getDyeColor())); + results.add(result); + } + } + + EntryIngredient slot1 = EntryIngredients.of(foilStack); + EntryIngredient slot2 = EntryIngredients.ofItemStacks(dyes); + EntryIngredient outputSlot = EntryIngredients.ofItemStacks(results); + + return Optional.of(List.of(createDisplay(List.of(slot1, slot2), List.of(outputSlot)))); + } + + return Optional.empty(); + } + + private CraftingDisplay createDisplay(List inputs, List outputs) { + return new DefaultCraftingDisplay(inputs, outputs, Optional.empty()) { + @Override + public int getWidth() { + return 2; + } + + @Override + public int getHeight() { + return 1; + } + + @Override + public boolean isShapeless() { + return true; + } + + @Override + public DisplaySerializer getSerializer() { + return null; + } + }; + } + } +} diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 12aafdf4..58885bc5 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -48,6 +48,12 @@ "jei_mod_plugin": [ "one.dqu.additionaladditions.recipe.JEICompat" ], + "rei_client": [ + "one.dqu.additionaladditions.recipe.REICompat" + ], + "rei_common": [ + "one.dqu.additionaladditions.recipe.REICommonCompat" + ], "fabric-datagen": [ "one.dqu.additionaladditions.fabric.AdditionalAdditionsDatagenFabric" ] diff --git a/gradle.properties b/gradle.properties index cb9c3583..0289b880 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,12 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true - -mod_version = 10.0.8 -maven_group = one.dqu.additionaladditions -archives_name = additionaladditions -enabled_platforms = fabric,neoforge - -minecraft_version = 26.1.2 - -fabric_loader_version = 0.19.1 -fabric_api_version = 0.145.4+26.1.2 -neoforge_version = 26.1.2.10-beta - -jei_api_version = 29.5.0.26 +mod_version=10.0.8 +maven_group=one.dqu.additionaladditions +archives_name=additionaladditions +enabled_platforms=fabric,neoforge +minecraft_version=26.1.2 +fabric_loader_version=0.19.1 +fabric_api_version=0.145.4+26.1.2 +neoforge_version=26.1.2.21-beta +jei_api_version=29.5.0.26 +rei_api_version=26.1.819 diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 8de82164..15ed5b15 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -82,11 +82,17 @@ repositories { name = 'NeoForged' url = 'https://maven.neoforged.net/releases' } + maven { + name = "JEI" + url = "https://maven.blamejared.com/" + } } dependencies { neoForge "net.neoforged:neoforge:$rootProject.neoforge_version" + compileOnly "me.shedaniel:RoughlyEnoughItems-api-neoforge:${rootProject.rei_api_version}" + common(project(path: ":common")) { transitive false } shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge') } diff --git a/neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/REINeoforgeCommonCompat.java b/neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/REINeoforgeCommonCompat.java new file mode 100644 index 00000000..3e8c4178 --- /dev/null +++ b/neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/REINeoforgeCommonCompat.java @@ -0,0 +1,8 @@ +package one.dqu.additionaladditions.recipe.neoforge; + +import me.shedaniel.rei.forge.REIPluginCommon; +import one.dqu.additionaladditions.recipe.REICommonCompat; + +@REIPluginCommon +public class REINeoforgeCommonCompat extends REICommonCompat { +} diff --git a/neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/REINeoforgeCompat.java b/neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/REINeoforgeCompat.java new file mode 100644 index 00000000..193ba79e --- /dev/null +++ b/neoforge/src/main/java/one/dqu/additionaladditions/recipe/neoforge/REINeoforgeCompat.java @@ -0,0 +1,8 @@ +package one.dqu.additionaladditions.recipe.neoforge; + +import me.shedaniel.rei.forge.REIPluginClient; +import one.dqu.additionaladditions.recipe.REICompat; + +@REIPluginClient +public class REINeoforgeCompat extends REICompat { +} From 93363c852e717553b0dbeedf28898f1a64f0d8dd Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Sun, 21 Jun 2026 12:53:54 +0100 Subject: [PATCH 26/27] 26.1: cleanup todo list --- .../one/dqu/additionaladditions/AdditionalAdditions.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/common/src/main/java/one/dqu/additionaladditions/AdditionalAdditions.java b/common/src/main/java/one/dqu/additionaladditions/AdditionalAdditions.java index c7860976..5e06d6e3 100644 --- a/common/src/main/java/one/dqu/additionaladditions/AdditionalAdditions.java +++ b/common/src/main/java/one/dqu/additionaladditions/AdditionalAdditions.java @@ -7,15 +7,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/* -TODOs: -- make sure datagen generates stuff properly -- make sure All old manual data that datagen handles is removed -- maybe loottable datagen -- maybe furnace/cooking recipes datagen - -- test for any remaining issues on 26.1 port - */ public final class AdditionalAdditions { public static final String NAMESPACE = "additionaladditions"; public static final Logger LOGGER = LoggerFactory.getLogger(NAMESPACE); From b5ff092c03bb4e80eb71aaedf0e05d7101a52598 Mon Sep 17 00:00:00 2001 From: Dqu1J Date: Sun, 21 Jun 2026 13:18:17 +0100 Subject: [PATCH 27/27] 26.1: fix: tinted redstone lamp item model on fabric --- .../dqu/additionaladditions/core/datagen/AABlockDatagen.java | 5 +++++ .../dqu/additionaladditions/core/datagen/AAItemDatagen.java | 3 ++- .../additionaladditions/items/tinted_redstone_lamp.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) rename {neoforge/src/main/generated => common/src/main/resources}/assets/additionaladditions/items/tinted_redstone_lamp.json (98%) diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AABlockDatagen.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AABlockDatagen.java index e9f7113d..d5e747e1 100644 --- a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AABlockDatagen.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AABlockDatagen.java @@ -35,6 +35,11 @@ public static List entries() { return entries == null ? List.of() : entries; } + public static boolean isManuallyModeled(Identifier id) { + if (entries == null) return false; + return entries.stream().anyMatch(e -> e.id().equals(id) && e.model() == null); + } + public static BlockModelGenerators currentGen() { return currentGen; } diff --git a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemDatagen.java b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemDatagen.java index 52d709a8..f83d977c 100644 --- a/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemDatagen.java +++ b/common/src/main/java/one/dqu/additionaladditions/core/datagen/AAItemDatagen.java @@ -53,7 +53,8 @@ public static Stream> knownItems() { if (entries == null) return Stream.empty(); return entries.stream() // keep block items so that ModelProvider handles them in finalizeAndValidate - .filter(e -> e.model() != null || BuiltInRegistries.ITEM.getValue(e.id()) instanceof BlockItem) + .filter(e -> e.model() != null + || (BuiltInRegistries.ITEM.getValue(e.id()) instanceof BlockItem && !AABlockDatagen.isManuallyModeled(e.id()))) .map(e -> BuiltInRegistries.ITEM.getValue(e.id()).builtInRegistryHolder()); } diff --git a/neoforge/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json b/common/src/main/resources/assets/additionaladditions/items/tinted_redstone_lamp.json similarity index 98% rename from neoforge/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json rename to common/src/main/resources/assets/additionaladditions/items/tinted_redstone_lamp.json index b27cf37d..e11c94ee 100644 --- a/neoforge/src/main/generated/assets/additionaladditions/items/tinted_redstone_lamp.json +++ b/common/src/main/resources/assets/additionaladditions/items/tinted_redstone_lamp.json @@ -3,4 +3,4 @@ "type": "minecraft:model", "model": "additionaladditions:block/tinted_redstone_lamp" } -} \ No newline at end of file +}