From a85c6b20a024647ee4031076ab3eed6042a4a85b Mon Sep 17 00:00:00 2001 From: EmmaTheMartian Date: Mon, 10 Jun 2024 16:01:51 -0400 Subject: [PATCH] Redo textures for machine blocks --- .../resources/assets/arcane/lang/en_us.json | 5 +- .../arcane/models/block/aqua_collector.json | 6 +- .../arcane/models/block/heat_collector.json | 6 +- .../arcane/recipes/shaped/aura_basin.json | 2 +- .../arcane/recipes/shaped/aura_connector.json | 10 +- .../arcane/recipes/shaped/aura_infuser.json | 2 +- .../data/arcane/recipes/shaped/pedestal.json | 2 +- .../recipes/shapeless/arcane_bleach.json | 6 +- .../recipes/shapeless/raw_aurachalcum.json | 4 +- .../arcane/common/item/ItemAuraWrench.java | 7 +- .../arcane/common/registry/ArcaneItems.java | 2 +- .../martian/arcane/datagen/ArcaneDatagen.java | 2 - .../client/ArcaneBlockStateProvider.java | 17 +- .../lang/ArcaneLanguageEnUsProvider.java | 5 +- .../datagen/server/ArcaneRecipeProvider.java | 113 ++++------ .../arcane/models/block/aura_basin.json | 4 +- .../arcane/models/block/aura_connector.json | 35 ++- .../assets/arcane/models/block/aura_nodi.json | 207 ------------------ .../block/machines/aqua_collector.png | Bin 0 -> 435 bytes .../textures/block/machines/aura_basin.png | Bin 0 -> 1560 bytes .../block/machines/aura_basin_aurachalcum.png | Bin 1011 -> 0 bytes .../block/machines/aura_basin_copper.png | Bin 1043 -> 0 bytes .../block/machines/aura_basin_larimar.png | Bin 1057 -> 0 bytes .../block/machines/aura_connector.png | Bin 0 -> 812 bytes .../block/machines/aura_connectors/copper.png | Bin 501 -> 0 bytes .../textures/block/machines/aura_infuser.png | Bin 943 -> 1329 bytes .../block/machines/collectors/aqua_sides.png | Bin 271 -> 0 bytes .../block/machines/collectors/ignis_sides.png | Bin 277 -> 0 bytes .../block/machines/collectors/side_blank.png | Bin 196 -> 0 bytes .../machines/collectors/top_and_bottom.png | Bin 203 -> 0 bytes .../block/machines/ignis_collector.png | Bin 0 -> 454 bytes .../textures/block/machines/pedestal.png | Bin 963 -> 1353 bytes .../textures/block/machines/side_blank.png | Bin 0 -> 365 bytes 33 files changed, 111 insertions(+), 324 deletions(-) delete mode 100644 src/main/resources/assets/arcane/models/block/aura_nodi.json create mode 100644 src/main/resources/assets/arcane/textures/block/machines/aqua_collector.png create mode 100644 src/main/resources/assets/arcane/textures/block/machines/aura_basin.png delete mode 100644 src/main/resources/assets/arcane/textures/block/machines/aura_basin_aurachalcum.png delete mode 100644 src/main/resources/assets/arcane/textures/block/machines/aura_basin_copper.png delete mode 100644 src/main/resources/assets/arcane/textures/block/machines/aura_basin_larimar.png create mode 100644 src/main/resources/assets/arcane/textures/block/machines/aura_connector.png delete mode 100644 src/main/resources/assets/arcane/textures/block/machines/aura_connectors/copper.png delete mode 100644 src/main/resources/assets/arcane/textures/block/machines/collectors/aqua_sides.png delete mode 100644 src/main/resources/assets/arcane/textures/block/machines/collectors/ignis_sides.png delete mode 100644 src/main/resources/assets/arcane/textures/block/machines/collectors/side_blank.png delete mode 100644 src/main/resources/assets/arcane/textures/block/machines/collectors/top_and_bottom.png create mode 100644 src/main/resources/assets/arcane/textures/block/machines/ignis_collector.png create mode 100644 src/main/resources/assets/arcane/textures/block/machines/side_blank.png diff --git a/src/generated/resources/assets/arcane/lang/en_us.json b/src/generated/resources/assets/arcane/lang/en_us.json index add2cd1..4d6b820 100644 --- a/src/generated/resources/assets/arcane/lang/en_us.json +++ b/src/generated/resources/assets/arcane/lang/en_us.json @@ -75,10 +75,11 @@ "gui.arcane.jei.purifying": "Purifying", "item.arcane.arcane_bleach": "Arcane Bleach", "item.arcane.aura_configurator": "Configaurator", - "item.arcane.aura_configurator.tooltip.1": "Used to configure and pair machinery.", + "item.arcane.aura_configurator.tooltip.1": "Used to configure machinery.", "item.arcane.aura_configurator.tooltip.2": "Pronounced config-aura-tor.", "item.arcane.aura_wrench": "Aurawrench", - "item.arcane.aura_wrench.tooltip": "Use while sneaking to quickly break machinery.", + "item.arcane.aura_wrench.tooltip.1": "Used to pair machinery.", + "item.arcane.aura_wrench.tooltip.2": "Use while sneaking to quickly break machinery.", "item.arcane.aurachalcum": "Aurachalcum", "item.arcane.aurachalcum_core": "Aurachalcum Focus", "item.arcane.auraglass_bottle": "Auraglass Bottle", diff --git a/src/generated/resources/assets/arcane/models/block/aqua_collector.json b/src/generated/resources/assets/arcane/models/block/aqua_collector.json index be80c86..181a98a 100644 --- a/src/generated/resources/assets/arcane/models/block/aqua_collector.json +++ b/src/generated/resources/assets/arcane/models/block/aqua_collector.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "arcane:block/machines/collectors/top_and_bottom", - "side": "arcane:block/machines/collectors/aqua_sides", - "top": "arcane:block/machines/collectors/top_and_bottom" + "bottom": "minecraft:block/polished_deepslate", + "side": "arcane:block/machines/aqua_collector", + "top": "minecraft:block/polished_deepslate" } } \ No newline at end of file diff --git a/src/generated/resources/assets/arcane/models/block/heat_collector.json b/src/generated/resources/assets/arcane/models/block/heat_collector.json index b8687b0..e81d779 100644 --- a/src/generated/resources/assets/arcane/models/block/heat_collector.json +++ b/src/generated/resources/assets/arcane/models/block/heat_collector.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "arcane:block/machines/collectors/top_and_bottom", - "side": "arcane:block/machines/collectors/ignis_sides", - "top": "arcane:block/machines/collectors/top_and_bottom" + "bottom": "minecraft:block/polished_deepslate", + "side": "arcane:block/machines/ignis_collector", + "top": "minecraft:block/polished_deepslate" } } \ No newline at end of file diff --git a/src/generated/resources/data/arcane/recipes/shaped/aura_basin.json b/src/generated/resources/data/arcane/recipes/shaped/aura_basin.json index b8ee9fc..3e9fa5d 100644 --- a/src/generated/resources/data/arcane/recipes/shaped/aura_basin.json +++ b/src/generated/resources/data/arcane/recipes/shaped/aura_basin.json @@ -3,7 +3,7 @@ "category": "redstone", "key": { "B": { - "tag": "c:ingots/copper" + "item": "minecraft:deepslate_bricks" }, "C": { "item": "arcane:copper_core" diff --git a/src/generated/resources/data/arcane/recipes/shaped/aura_connector.json b/src/generated/resources/data/arcane/recipes/shaped/aura_connector.json index 6320180..8549aff 100644 --- a/src/generated/resources/data/arcane/recipes/shaped/aura_connector.json +++ b/src/generated/resources/data/arcane/recipes/shaped/aura_connector.json @@ -2,16 +2,16 @@ "type": "minecraft:crafting_shaped", "category": "redstone", "key": { - "B": { + "A": { "item": "arcane:copper_core" }, - "S": { - "tag": "c:stones" + "D": { + "item": "minecraft:deepslate_bricks" } }, "pattern": [ - "SSS", - " B " + " A ", + "DDD" ], "result": { "count": 1, diff --git a/src/generated/resources/data/arcane/recipes/shaped/aura_infuser.json b/src/generated/resources/data/arcane/recipes/shaped/aura_infuser.json index 927369c..e0d46fc 100644 --- a/src/generated/resources/data/arcane/recipes/shaped/aura_infuser.json +++ b/src/generated/resources/data/arcane/recipes/shaped/aura_infuser.json @@ -9,7 +9,7 @@ "item": "arcane:copper_core" }, "O": { - "tag": "c:obsidians" + "item": "minecraft:deepslate_bricks" } }, "pattern": [ diff --git a/src/generated/resources/data/arcane/recipes/shaped/pedestal.json b/src/generated/resources/data/arcane/recipes/shaped/pedestal.json index 8014859..f5181a3 100644 --- a/src/generated/resources/data/arcane/recipes/shaped/pedestal.json +++ b/src/generated/resources/data/arcane/recipes/shaped/pedestal.json @@ -9,7 +9,7 @@ "tag": "c:ingots/copper" }, "S": { - "tag": "c:stones" + "item": "minecraft:deepslate_bricks" } }, "pattern": [ diff --git a/src/generated/resources/data/arcane/recipes/shapeless/arcane_bleach.json b/src/generated/resources/data/arcane/recipes/shapeless/arcane_bleach.json index 4a2ee89..367ca88 100644 --- a/src/generated/resources/data/arcane/recipes/shapeless/arcane_bleach.json +++ b/src/generated/resources/data/arcane/recipes/shapeless/arcane_bleach.json @@ -2,14 +2,14 @@ "type": "minecraft:crafting_shapeless", "category": "equipment", "ingredients": [ - { - "item": "arcane:auraglass_dust" - }, { "item": "minecraft:glass_bottle" }, { "item": "minecraft:bone_meal" + }, + { + "item": "arcane:auraglass_dust" } ], "result": { diff --git a/src/generated/resources/data/arcane/recipes/shapeless/raw_aurachalcum.json b/src/generated/resources/data/arcane/recipes/shapeless/raw_aurachalcum.json index fd0a8a7..f4629b1 100644 --- a/src/generated/resources/data/arcane/recipes/shapeless/raw_aurachalcum.json +++ b/src/generated/resources/data/arcane/recipes/shapeless/raw_aurachalcum.json @@ -3,13 +3,13 @@ "category": "misc", "ingredients": [ { - "tag": "c:obsidians" + "item": "arcane:polished_idocrase" }, { "tag": "c:obsidians" }, { - "item": "arcane:polished_idocrase" + "tag": "c:obsidians" } ], "result": { diff --git a/src/main/java/martian/arcane/common/item/ItemAuraWrench.java b/src/main/java/martian/arcane/common/item/ItemAuraWrench.java index b39d5b6..8e630f7 100644 --- a/src/main/java/martian/arcane/common/item/ItemAuraWrench.java +++ b/src/main/java/martian/arcane/common/item/ItemAuraWrench.java @@ -47,10 +47,6 @@ public InteractionResultHolder use(@NotNull Level level, @NotNull Pla if (hitState.is(ArcaneTags.AURA_WRENCH_BREAKABLE)) { level.destroyBlock(hit.getBlockPos(), true); } - -// BlockEntity l = level.getBlockEntity(hit.getBlockPos()); -// if (l instanceof BlockEntityAuraConnector connector) -// connector.removeTarget(); } return InteractionResultHolder.success(stack); @@ -102,7 +98,8 @@ public InteractionResultHolder use(@NotNull Level level, @NotNull Pla @ParametersAreNonnullByDefault public void appendHoverText(ItemStack stack, TooltipContext context, List text, TooltipFlag flag) { super.appendHoverText(stack, context, text, flag); - text.add(Component.translatable("item.arcane.aura_wrench.tooltip")); + text.add(Component.translatable("item.arcane.aura_wrench.tooltip.1")); + text.add(Component.translatable("item.arcane.aura_wrench.tooltip.2")); if (stack.has(ArcaneDataComponents.TARGET_POS)) { text.add(Component .translatable("messages.arcane.linking_from") diff --git a/src/main/java/martian/arcane/common/registry/ArcaneItems.java b/src/main/java/martian/arcane/common/registry/ArcaneItems.java index d39b7d6..6192515 100644 --- a/src/main/java/martian/arcane/common/registry/ArcaneItems.java +++ b/src/main/java/martian/arcane/common/registry/ArcaneItems.java @@ -55,13 +55,13 @@ public class ArcaneItems extends ArcaneRegistry { AURAOMETER = register("auraometer", ItemAuraometer::new), AURA_WRENCH = register("aura_wrench", ItemAuraWrench::new), AURA_CONFIGURATOR = register("aura_configurator", ItemAuraConfigurator::new), + GEM_SAW = register("gem_saw", ItemGemSaw::new), SPELL_TABLET = register("spell_tablet", ItemSpellTablet::new), ARCANE_BLEACH = basicItem("arcane_bleach"), SPELL_CHALK = register("spell_chalk", ItemSpellChalk::new), ENDERPACK = register("enderpack", ItemEnderpack::new), AXOBOTTLE = basicItem("axobottle"), GUIDEBOOK = register("guidebook", ItemGuidebook::new), - GEM_SAW = register("gem_saw", ItemGemSaw::new), UPGRADE_KIT_COPPER = register("upgrade_kit_copper", () -> new ItemUpgradeKit(MachineTier.COPPER)), UPGRADE_KIT_LARIMAR = register("upgrade_kit_larimar", () -> new ItemUpgradeKit(MachineTier.LARIMAR)), diff --git a/src/main/java/martian/arcane/datagen/ArcaneDatagen.java b/src/main/java/martian/arcane/datagen/ArcaneDatagen.java index a91c42c..aee5ad3 100644 --- a/src/main/java/martian/arcane/datagen/ArcaneDatagen.java +++ b/src/main/java/martian/arcane/datagen/ArcaneDatagen.java @@ -12,9 +12,7 @@ import martian.arcane.datagen.server.book.ArcaneBookProvider; import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; -import net.minecraft.data.DataProvider; import net.minecraft.data.PackOutput; -import net.neoforged.bus.api.SubscribeEvent; import net.neoforged.neoforge.common.data.BlockTagsProvider; import net.neoforged.neoforge.common.data.ExistingFileHelper; import net.neoforged.neoforge.data.event.GatherDataEvent; diff --git a/src/main/java/martian/arcane/datagen/client/ArcaneBlockStateProvider.java b/src/main/java/martian/arcane/datagen/client/ArcaneBlockStateProvider.java index 0637c5d..609c7f2 100644 --- a/src/main/java/martian/arcane/datagen/client/ArcaneBlockStateProvider.java +++ b/src/main/java/martian/arcane/datagen/client/ArcaneBlockStateProvider.java @@ -30,22 +30,9 @@ public ArcaneBlockStateProvider(PackOutput output, ExistingFileHelper existingFi protected void registerStatesAndModels() { // Models { - // Machines -// withExistingParent(ArcaneBlocks.AURA_CONNECTOR.get(), ArcaneMod.id("block/")) -// .texture("0", ArcaneMod.id("block/machines/aura_extractors/copper")); - -// withExistingParent(ArcaneBlocks.AURA_BASIN.get(), ArcaneMod.id("block/aura_basin")) -// .texture("0", ArcaneMod.id("block/machines/aura_basin_copper")); -// withExistingParent(ArcaneBlocks.LARIMAR_AURA_BASIN.get(), ArcaneMod.id("block/base/aura_basin")) -// .texture("0", ArcaneMod.id("block/machines/aura_basin_larimar")); -// withExistingParent(ArcaneBlocks.AURACHALCUM_AURA_BASIN.get(), ArcaneMod.id("block/base/aura_basin")) -// .texture("0", ArcaneMod.id("block/machines/aura_basin_aurachalcum")); -// withExistingParent(ArcaneBlocks.CREATIVE_AURA_BASIN.get(), ArcaneMod.id("block/base/aura_basin")) -// .texture("0", ArcaneMod.id("block/machines/aura_basin_copper")); - // Generators - topBottom(ArcaneBlocks.HEAT_COLLECTOR.get(), texture("machines/collectors/ignis_sides"), texture("machines/collectors/top_and_bottom")); - topBottom(ArcaneBlocks.AQUA_COLLECTOR.get(), texture("machines/collectors/aqua_sides"), texture("machines/collectors/top_and_bottom")); + topBottom(ArcaneBlocks.HEAT_COLLECTOR.get(), texture("machines/ignis_collector"), new ResourceLocation("minecraft", "block/polished_deepslate")); + topBottom(ArcaneBlocks.AQUA_COLLECTOR.get(), texture("machines/aqua_collector"), new ResourceLocation("minecraft", "block/polished_deepslate")); // General Blocks simpleTranslucent(ArcaneBlocks.AURAGLASS.get()); diff --git a/src/main/java/martian/arcane/datagen/client/lang/ArcaneLanguageEnUsProvider.java b/src/main/java/martian/arcane/datagen/client/lang/ArcaneLanguageEnUsProvider.java index d85bb2f..75d6384 100644 --- a/src/main/java/martian/arcane/datagen/client/lang/ArcaneLanguageEnUsProvider.java +++ b/src/main/java/martian/arcane/datagen/client/lang/ArcaneLanguageEnUsProvider.java @@ -91,8 +91,9 @@ protected void addTranslations() { // Item Tooltips add("item.arcane.auraometer.tooltip", "Shows information about blocks that possess Aura when held."); - add("item.arcane.aura_wrench.tooltip", "Use while sneaking to quickly break machinery."); - add("item.arcane.aura_configurator.tooltip.1", "Used to configure and pair machinery."); + add("item.arcane.aura_wrench.tooltip.1", "Used to pair machinery."); + add("item.arcane.aura_wrench.tooltip.2", "Use while sneaking to quickly break machinery."); + add("item.arcane.aura_configurator.tooltip.1", "Used to configure machinery."); add("item.arcane.aura_configurator.tooltip.2", "Pronounced config-aura-tor."); add("item.arcane.spell_tablet.tooltip", "Stores the spell inscribed upon it."); } diff --git a/src/main/java/martian/arcane/datagen/server/ArcaneRecipeProvider.java b/src/main/java/martian/arcane/datagen/server/ArcaneRecipeProvider.java index f5dec0b..5125caf 100644 --- a/src/main/java/martian/arcane/datagen/server/ArcaneRecipeProvider.java +++ b/src/main/java/martian/arcane/datagen/server/ArcaneRecipeProvider.java @@ -2,7 +2,6 @@ import martian.arcane.ArcaneMod; import martian.arcane.ArcaneTags; -import martian.arcane.api.NBTHelpers; import martian.arcane.common.registry.ArcaneBlocks; import martian.arcane.common.registry.ArcaneDataComponents; import martian.arcane.common.registry.ArcaneItems; @@ -14,7 +13,6 @@ import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.*; -import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; @@ -22,6 +20,8 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; +import net.minecraft.world.level.ItemLike; +import net.minecraft.world.level.block.Blocks; import net.neoforged.neoforge.common.Tags; import java.util.HashMap; @@ -50,17 +50,18 @@ protected void build() { ; final Ingredient - AURAGLASS = ingOf(ArcaneBlocks.AURAGLASS.get().asItem()), - AURAGLASS_DUST = ingOf(ArcaneItems.AURAGLASS_DUST.get()), - COPPER_CORE = ingOf(ArcaneItems.COPPER_CORE.get()), - LARIMAR_CORE = ingOf(ArcaneItems.LARIMAR_CORE.get()), - AURACHALCUM_CORE = ingOf(ArcaneItems.AURACHALCUM_CORE.get()), - ELDRITCH_CORE = ingOf(ArcaneItems.ELDRITCH_CORE.get()), - SPELL_CIRCLE_CORE = ingOf(ArcaneItems.SPELL_CIRCLE_CORE.get()), - POLISHED_LARIMAR = ingOf(ArcaneItems.POLISHED_LARIMAR.get()), - FADED_LARIMAR = ingOf(ArcaneItems.FADED_POLISHED_LARIMAR.get()), - AURACHALCUM = ingOf(ArcaneItems.AURACHALCUM.get()), - ELDRITCH_ALLOY = ingOf(ArcaneItems.ELDRITCH_ALLOY.get()) + DEEPSLATE = ingOf(Blocks.DEEPSLATE_BRICKS.asItem()), + AURAGLASS = ingOf(ArcaneBlocks.AURAGLASS.asItem()), + AURAGLASS_DUST = ingOf(ArcaneItems.AURAGLASS_DUST), + COPPER_CORE = ingOf(ArcaneItems.COPPER_CORE), + LARIMAR_CORE = ingOf(ArcaneItems.LARIMAR_CORE), + AURACHALCUM_CORE = ingOf(ArcaneItems.AURACHALCUM_CORE), + ELDRITCH_CORE = ingOf(ArcaneItems.ELDRITCH_CORE), + SPELL_CIRCLE_CORE = ingOf(ArcaneItems.SPELL_CIRCLE_CORE), + POLISHED_LARIMAR = ingOf(ArcaneItems.POLISHED_LARIMAR), + FADED_LARIMAR = ingOf(ArcaneItems.FADED_POLISHED_LARIMAR), + AURACHALCUM = ingOf(ArcaneItems.AURACHALCUM), + ELDRITCH_ALLOY = ingOf(ArcaneItems.ELDRITCH_ALLOY) ; // Materials @@ -142,6 +143,37 @@ protected void build() { { helper.defaultCategory = RecipeCategory.REDSTONE; + // Machines + shaped(ArcaneBlocks.PEDESTAL.get().asItem()) + .pattern("CBC", " S ", "SSS") + .define('C', COPPER) + .define('S', DEEPSLATE) + .define('B', COPPER_CORE) + .unlockedWith(ArcaneItems.COPPER_CORE.get()) + .save(); + + shaped(ArcaneBlocks.AURA_INFUSER.asItem()) + .pattern("BCB", " O ", "OOO") + .define('B', COPPER) + .define('C', COPPER_CORE) + .define('O', DEEPSLATE) + .unlockedWith(ArcaneItems.COPPER_CORE.get()) + .save(); + + shaped(ArcaneBlocks.AURA_BASIN.asItem()) + .pattern("B B", "B B", "BCB") + .define('B', DEEPSLATE) + .define('C', COPPER_CORE) + .unlockedWith(ArcaneItems.COPPER_CORE.get()) + .save(); + + shaped(ArcaneBlocks.AURA_CONNECTOR.asItem()) + .pattern(" A ", "DDD") + .define('A', COPPER_CORE) + .define('D', DEEPSLATE) + .unlockedWith(ArcaneItems.COPPER_CORE.get()) + .save(); + shaped(ArcaneBlocks.HEAT_COLLECTOR.get().asItem()) .pattern("GIG", "FCF", "GIG") .define('G', GLASS) @@ -159,32 +191,6 @@ protected void build() { .define('C', COPPER_CORE) .unlockedWith(ArcaneItems.COPPER_CORE.get()) .save(); - - shaped(ArcaneBlocks.PEDESTAL.get().asItem()) - .pattern("CBC", " S ", "SSS") - .define('C', COPPER) - .define('S', STONE) - .define('B', COPPER_CORE) - .unlockedWith(ArcaneItems.COPPER_CORE.get()) - .save(); - - // Machines - { - shaped(ArcaneBlocks.AURA_INFUSER.get().asItem()) - .pattern("BCB", " O ", "OOO") - .define('B', COPPER) - .define('C', COPPER_CORE) - .define('O', OBSIDIAN) - .unlockedWith(ArcaneItems.COPPER_CORE.get()) - .save(); - - makeBasin(ArcaneBlocks.AURA_BASIN.asItem(), COPPER_CORE, Ingredient.of(COPPER)); - makeExtractor(ArcaneBlocks.AURA_CONNECTOR.asItem(), COPPER_CORE, Ingredient.of(STONE)); - -// makeBasin(ArcaneBlocks.COPPER_AURA_BASIN.get().asItem(), COPPER_CORE, Ingredient.of(COPPER)); -// makeBasin(ArcaneBlocks.LARIMAR_AURA_BASIN.get().asItem(), LARIMAR_CORE, POLISHED_LARIMAR); -// makeBasin(ArcaneBlocks.AURACHALCUM_AURA_BASIN.get().asItem(), AURACHALCUM_CORE, AURACHALCUM); - } } // Tools @@ -382,33 +388,6 @@ private void cutAndPolish(Item raw, Item cut, Item polished) { .save(); } - private void makeBasin(Item result, Ingredient core, Ingredient base) { - shaped(result) - .pattern("B B", "B B", "BCB") - .define('B', base) - .define('C', core) - .unlockedWith(core.getItems()[0].getItem()) - .save(); - } - - private void makeInserter(Item result, Ingredient core, Ingredient base) { - shaped(result) - .pattern(" B ", "SSS") - .define('B', core) - .define('S', base) - .unlockedWith(core.getItems()[0].getItem()) - .save(); - } - - private void makeExtractor(Item result, Ingredient core, Ingredient base) { - shaped(result) - .pattern("SSS", " B ") - .define('B', core) - .define('S', base) - .unlockedWith(core.getItems()[0].getItem()) - .save(); - } - private void oreProcessingLine(Item raw, Item crushed, Item purified, Item ingot) { SpellRecipeBuilder.hammering() .setInput(raw) @@ -431,7 +410,7 @@ private ResourceLocation itemKey(Item item) { return BuiltInRegistries.ITEM.getKey(item); } - private Ingredient ingOf(Item item) { + private Ingredient ingOf(ItemLike item) { return Ingredient.of(item); } diff --git a/src/main/resources/assets/arcane/models/block/aura_basin.json b/src/main/resources/assets/arcane/models/block/aura_basin.json index 2ed4d38..b6db3dd 100644 --- a/src/main/resources/assets/arcane/models/block/aura_basin.json +++ b/src/main/resources/assets/arcane/models/block/aura_basin.json @@ -3,8 +3,8 @@ "render_type": "minecraft:translucent", "texture_size": [64, 64], "textures": { - "0": "arcane:block/machines/aura_basin_copper", - "particle": "arcane:block/machines/aura_basin_copper" + "0": "arcane:block/machines/aura_basin", + "particle": "arcane:block/machines/aura_basin" }, "elements": [ { diff --git a/src/main/resources/assets/arcane/models/block/aura_connector.json b/src/main/resources/assets/arcane/models/block/aura_connector.json index b5ab5db..9514b2b 100644 --- a/src/main/resources/assets/arcane/models/block/aura_connector.json +++ b/src/main/resources/assets/arcane/models/block/aura_connector.json @@ -2,8 +2,8 @@ "credit": "Made with Blockbench", "texture_size": [64, 64], "textures": { - "0": "arcane:block/machines/aura_connectors/copper", - "particle": "arcane:block/machines/aura_connectors/copper" + "0": "arcane:block/machines/aura_connector", + "particle": "arcane:block/machines/aura_connector" }, "elements": [ { @@ -63,6 +63,37 @@ } } ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + }, "groups": [ { "name": "VoxelShapes", diff --git a/src/main/resources/assets/arcane/models/block/aura_nodi.json b/src/main/resources/assets/arcane/models/block/aura_nodi.json deleted file mode 100644 index ff6a8dc..0000000 --- a/src/main/resources/assets/arcane/models/block/aura_nodi.json +++ /dev/null @@ -1,207 +0,0 @@ -{ - "credit": "Made with Blockbench", - "render_type": "minecraft:translucent", - "texture_size": [32, 32], - "textures": { - "0": "arcane:block/aura_nodi", - "particle": "arcane:block/aura_nodi" - }, - "elements": [ - { - "from": [4, 4, 4], - "to": [12, 12, 12], - "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#0"}, - "east": {"uv": [0, 4, 4, 8], "texture": "#0"}, - "south": {"uv": [4, 0, 8, 4], "texture": "#0"}, - "west": {"uv": [4, 4, 8, 8], "texture": "#0"}, - "up": {"uv": [4, 12, 0, 8], "texture": "#0"}, - "down": {"uv": [12, 0, 8, 4], "texture": "#0"} - } - }, - { - "from": [3, 3, 3], - "to": [13, 4, 4], - "faces": { - "north": {"uv": [4, 8, 9, 8.5], "texture": "#0"}, - "east": {"uv": [12, 10, 12.5, 10.5], "texture": "#0"}, - "south": {"uv": [8, 4, 13, 4.5], "texture": "#0"}, - "west": {"uv": [11.5, 12, 12, 12.5], "texture": "#0"}, - "up": {"uv": [13, 5, 8, 4.5], "texture": "#0"}, - "down": {"uv": [13, 5, 8, 5.5], "texture": "#0"} - } - }, - { - "from": [3, 3, 12], - "to": [13, 4, 13], - "faces": { - "north": {"uv": [8, 5.5, 13, 6], "texture": "#0"}, - "east": {"uv": [12, 12, 12.5, 12.5], "texture": "#0"}, - "south": {"uv": [8, 6, 13, 6.5], "texture": "#0"}, - "west": {"uv": [12.5, 0, 13, 0.5], "texture": "#0"}, - "up": {"uv": [13, 7, 8, 6.5], "texture": "#0"}, - "down": {"uv": [13, 7, 8, 7.5], "texture": "#0"} - } - }, - { - "from": [3, 12, 12], - "to": [13, 13, 13], - "faces": { - "north": {"uv": [8, 7.5, 13, 8], "texture": "#0"}, - "east": {"uv": [12.5, 0.5, 13, 1], "texture": "#0"}, - "south": {"uv": [4, 8.5, 9, 9], "texture": "#0"}, - "west": {"uv": [12.5, 1, 13, 1.5], "texture": "#0"}, - "up": {"uv": [9, 9.5, 4, 9], "texture": "#0"}, - "down": {"uv": [14, 8, 9, 8.5], "texture": "#0"} - } - }, - { - "from": [3, 12, 3], - "to": [13, 13, 4], - "faces": { - "north": {"uv": [9, 8.5, 14, 9], "texture": "#0"}, - "east": {"uv": [12.5, 1.5, 13, 2], "texture": "#0"}, - "south": {"uv": [9, 9, 14, 9.5], "texture": "#0"}, - "west": {"uv": [12.5, 2, 13, 2.5], "texture": "#0"}, - "up": {"uv": [9, 10, 4, 9.5], "texture": "#0"}, - "down": {"uv": [14, 9.5, 9, 10], "texture": "#0"} - } - }, - { - "from": [12, 12, 4], - "to": [13, 13, 12], - "faces": { - "north": {"uv": [12.5, 2.5, 13, 3], "texture": "#0"}, - "east": {"uv": [4, 10, 8, 10.5], "texture": "#0"}, - "south": {"uv": [12.5, 3, 13, 3.5], "texture": "#0"}, - "west": {"uv": [8, 10, 12, 10.5], "texture": "#0"}, - "up": {"uv": [4.5, 14.5, 4, 10.5], "texture": "#0"}, - "down": {"uv": [5, 10.5, 4.5, 14.5], "texture": "#0"} - } - }, - { - "from": [3, 12, 4], - "to": [4, 13, 12], - "faces": { - "north": {"uv": [12.5, 3.5, 13, 4], "texture": "#0"}, - "east": {"uv": [5, 10.5, 9, 11], "texture": "#0"}, - "south": {"uv": [12.5, 10, 13, 10.5], "texture": "#0"}, - "west": {"uv": [9, 10.5, 13, 11], "texture": "#0"}, - "up": {"uv": [5.5, 15, 5, 11], "texture": "#0"}, - "down": {"uv": [6, 11, 5.5, 15], "texture": "#0"} - } - }, - { - "from": [12, 3, 4], - "to": [13, 4, 12], - "faces": { - "north": {"uv": [11.5, 12.5, 12, 13], "texture": "#0"}, - "east": {"uv": [6, 11, 10, 11.5], "texture": "#0"}, - "south": {"uv": [12, 12.5, 12.5, 13], "texture": "#0"}, - "west": {"uv": [10, 11, 14, 11.5], "texture": "#0"}, - "up": {"uv": [6.5, 15.5, 6, 11.5], "texture": "#0"}, - "down": {"uv": [7, 11.5, 6.5, 15.5], "texture": "#0"} - } - }, - { - "from": [3, 3, 4], - "to": [4, 4, 12], - "faces": { - "north": {"uv": [12.5, 12, 13, 12.5], "texture": "#0"}, - "east": {"uv": [7, 11.5, 11, 12], "texture": "#0"}, - "south": {"uv": [12.5, 12.5, 13, 13], "texture": "#0"}, - "west": {"uv": [11, 11.5, 15, 12], "texture": "#0"}, - "up": {"uv": [0.5, 16, 0, 12], "texture": "#0"}, - "down": {"uv": [12.5, 0, 12, 4], "texture": "#0"} - } - }, - { - "from": [3, 4, 12], - "to": [4, 12, 13], - "faces": { - "north": {"uv": [0.5, 12, 1, 16], "texture": "#0"}, - "east": {"uv": [1, 12, 1.5, 16], "texture": "#0"}, - "south": {"uv": [1.5, 12, 2, 16], "texture": "#0"}, - "west": {"uv": [2, 12, 2.5, 16], "texture": "#0"}, - "up": {"uv": [13.5, 0.5, 13, 0], "texture": "#0"}, - "down": {"uv": [13.5, 0.5, 13, 1], "texture": "#0"} - } - }, - { - "from": [3, 4, 3], - "to": [4, 12, 4], - "faces": { - "north": {"uv": [2.5, 12, 3, 16], "texture": "#0"}, - "east": {"uv": [3, 12, 3.5, 16], "texture": "#0"}, - "south": {"uv": [3.5, 12, 4, 16], "texture": "#0"}, - "west": {"uv": [7, 12, 7.5, 16], "texture": "#0"}, - "up": {"uv": [13.5, 1.5, 13, 1], "texture": "#0"}, - "down": {"uv": [13.5, 1.5, 13, 2], "texture": "#0"} - } - }, - { - "from": [12, 4, 12], - "to": [13, 12, 13], - "faces": { - "north": {"uv": [7.5, 12, 8, 16], "texture": "#0"}, - "east": {"uv": [8, 12, 8.5, 16], "texture": "#0"}, - "south": {"uv": [8.5, 12, 9, 16], "texture": "#0"}, - "west": {"uv": [9, 12, 9.5, 16], "texture": "#0"}, - "up": {"uv": [13.5, 2.5, 13, 2], "texture": "#0"}, - "down": {"uv": [13.5, 2.5, 13, 3], "texture": "#0"} - } - }, - { - "from": [12, 4, 3], - "to": [13, 12, 4], - "faces": { - "north": {"uv": [9.5, 12, 10, 16], "texture": "#0"}, - "east": {"uv": [10, 12, 10.5, 16], "texture": "#0"}, - "south": {"uv": [10.5, 12, 11, 16], "texture": "#0"}, - "west": {"uv": [11, 12, 11.5, 16], "texture": "#0"}, - "up": {"uv": [13.5, 3.5, 13, 3], "texture": "#0"}, - "down": {"uv": [13.5, 3.5, 13, 4], "texture": "#0"} - } - } - ], - "display": { - "thirdperson_righthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "thirdperson_lefthand": { - "rotation": [75, 45, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "firstperson_righthand": { - "rotation": [0, 45, 0], - "scale": [0.4, 0.4, 0.4] - }, - "firstperson_lefthand": { - "rotation": [0, 225, 0], - "scale": [0.4, 0.4, 0.4] - }, - "ground": { - "translation": [0, 3, 0], - "scale": [0.25, 0.25, 0.25] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - }, - "groups": [ - 0, - { - "name": "border_thingy", - "origin": [0, 0, 0], - "color": 0, - "children": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/arcane/textures/block/machines/aqua_collector.png b/src/main/resources/assets/arcane/textures/block/machines/aqua_collector.png new file mode 100644 index 0000000000000000000000000000000000000000..b2f4bd111d4a876ce9de333b80a577162039cec1 GIT binary patch literal 435 zcmV;k0ZjghP)65|1H80 z%CZqqN)bjwPk6Y$`D1%sTb9culgWfI8e%qIdk5ASk|gm$0Pnq5w62Kb5hO6EUjPWB zA?4>s;{fRAdCvIqidCBWy#R8R^S#}YuCkUJH@PT^Mqrhul%F4+0m`Jgj@FeA(i+3Y z7^0nnV6&TQ?Lj!ZX00pkZm-e0@*Kyr)*^%;m`N+h9FNet;(NRG>Ca}fmdn63 zcHKK&Wkh1os=13eZr?Q@!-Xdk$=P5pqLgY4>K`^aA?M2NAIBrl38P_a&0t;I)?FPQ z#TzIX)E3Hp{dmp5ozNQNMHY+2pOp?>y0>69U-X`zo_002ovPDHLkV1iEP$Tt80 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/arcane/textures/block/machines/aura_basin.png b/src/main/resources/assets/arcane/textures/block/machines/aura_basin.png new file mode 100644 index 0000000000000000000000000000000000000000..8ac1d580877811c21422b0bf9cc9d469c836879b GIT binary patch literal 1560 zcmV+z2Iu*SP)oD5W8Lm)5E$@mPHW{3xf3KK|FX9yzR*a!OM!?JglIe zilESww*{#^Sj|OpG>}LYJF`hCO)|rpVmz4d@n$mb&7b$OO*OwuGVh!3{eR!@ecv~k z?d|PRxm-qEIF17Vux%TMhlj8%3%$O_w6O&vuzum>oU1JIQ7Ykg&gaAn2fJGt*$N@VTIIzVj(A7m7Hk;-7dNh zkN*8XhC4WA9XIofK3!f0KuPz*x8Fpk+f6fOAF>#)C=HBOg>S6a_k63ucdm44h3y9F zc%@QdWnnTMy1J01hKhw8Y}-cn;Sp<)pBQ&=3fs0}<`>yJ7_TDVS$Z!@rmCw8hT}LW zU0OlA)dI#_o1b}V+;d&zOq1=5PNy?bSx_&oERC*??GFG34LsOb@OQvm;YQ2zyooxK>T)a)F+@2G>I79x4bwAUHgH{5PMzG^+5$LwBuaH0$M-)d ztJmvFy1HP;Kqe91MvLJ!?tbT-QdEr0RKQMTP);!RL9GR9>X~KLb3qA)d>6wJC4IH zM`1U^^I`$Zva}dOgWqa&-hy{{(2!w4l zz9Ihqf5sV-Z9{NpO|&I3C1)rInM?&nwOW<(d=SBSz~!|ozJZweMHCA;v|BBh`9*fL zf-;PqA(1Y)V;LsXHUX;f0GSPmvM+J$k4UDC1w?~J%y>Ysvm)rGL2bSO#w$u&j5kdD zZI7PmRz~kkiv~q<-bc{^1LGO4R4Qz1=S-7bc*u~^7NmFpoy}=ELnIf;-n)HM&jhH( z1E%Q=(IqTQwp=P{u>%W*eEtK^?X!Zj;gJ2F4TtdDKF)?i3|tqPaXG~UT+c&s@oD_| z$L|3C#$YhO2n$$RdI~2eCs=smNuexC*Y!O7_2`jMW{%rGK0dyyG69*5jg1jv#sk92 z^Bj-!oF3doL0PBU#d4_>OD>cBcyOQ=7FUf2{B&^O>zoMFaEAB^Obg|BzdI>D zLCRo25Dx$_!SfhXChrRCa)zSxNaw|uZ~NYRwB(I|77evzh(~sKx{Gl0p0GOG$$=J+cAK<~?cMG8mWF zuCRwB7Ch=InwADddSOnGit!^Dsv#*|&QO$|?u-z@M}tW$I6;>)1c>z-jYi}VN{g&& ze!kcD&~CLDd-VFA?~Wjn1?4im$HD?hEjU5u&_vadh6QByAq^X_BcNizb<`1;1)jBD z5!R804MJ%!js+*^c7~!@;FlkE0a=(nAq-L2DawM&vNp2M-*$F(-r+lN?b@~b{Bu}5 zLN?$=qoEcLkcFKfvEV8hpIJgStp(>HN_z+8)5z?of_){1g!y@u&);SVN-Us~@reVO zq0^NgP-X#@SRVq;RGe~f4w{M=NHBihy@j){m+{uG$HJG0dMF+B$?`XFZhblNUffvU zEP)*X8e|a7W;3(CzCIB%kY#OT4$`b4G&#!S#`PN`0Ql~;SMfbpE~C#l4$`cEO@Qb; zt*)%H)u(UsZytR-YPVXcK7Y$(GN1GHZ`Nw}CtH<6$Jr-D?ts1hy$k>p_V-xXgO&F) zo3+|#+AQ!m5IF%+P-OvKA3CH(>Isl#ZIZBnWm$>aZZ?~Vbwo%#0jf?2LH9R5Ns&F* z)@J}&0Ls~wi;VyM4p3$RRa{sW(1l>?P4$b9Ip&ySjydLtkADE=&+k6eK4e7z0000< KMNUMnLSTY11L%4H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/arcane/textures/block/machines/aura_basin_aurachalcum.png b/src/main/resources/assets/arcane/textures/block/machines/aura_basin_aurachalcum.png deleted file mode 100644 index f7a4c2e83ecb6317c86e3f51363676a058bcf68f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1011 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 VukdLxG9~~3002ovPDHLkV1h|ra)|%{ delta 922 zcmV;L17-ZN3aRUV^`rZ8x&l}$D75w zB%c@0pBW?vBBooev??bOLZOo9!xf3RylW4x zXO9(1;M^pjD9%j+#QHvX`89j2vInSaXk~T+%WWEFaE!ofM}gOl%-|T7+f)`y6@V5{ zS;33DJl_EM2bi%90&!r|cK5u37Zn}_F$t#$Au7hs`hTs6`5`{mZU8vF#qr=xJS8#=)dt~1O$O?u3R z>-gvdq<=?H#!MfDWoX%5c+AGluoqwG^(NY19({XkDJg;U%!_!;#@2F(PB0`rmkQ=| zlgWIpE=k!X$r_Pf;$@+nfJVJBb>=gDj{LdItSmFH02L@*plC`-06^~oMNvuu&QcdB zM{F7X%t0iC2;P$z%2aNU4Sdkw14>G@;fcNch(UxKg8pA?P8>`s$+l9 zPZS=-2cyy+limPXe&@x^DSRdOoIk9y2jL1_=5Dmhi< zmw!iq(@;`^R3)dX{2KMf#7`b5cLA!BleJf=<@Zzv0p$`X(te(h6F^mR{1+tvr2HP< zUx`G&q7)!Uxdc@E_*v=y9C8BGej5~jtNInmOj202PtT*j%R)}TJa_3?c6V7!U|iv8 wG#ZUYqtR$I8jVJy(P%UpjYgx<{Hy!{_!F+}brd0}mjD0&07*qoM6N<$g5IdOB>(^b diff --git a/src/main/resources/assets/arcane/textures/block/machines/collectors/aqua_sides.png b/src/main/resources/assets/arcane/textures/block/machines/collectors/aqua_sides.png deleted file mode 100644 index 00c351252d5b8908872b121a2194007cecf2e351..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 271 zcmV+q0r38bP)A4tqW>s_0x56LwLYk@S0-7Qc7Ap{N(zzPt;p}?G_LEE&Wey8>@$D2ClNH+Za8(&i6 VMc#U|SF8X4002ovPDHLkV1m4lZZ-e_ diff --git a/src/main/resources/assets/arcane/textures/block/machines/collectors/ignis_sides.png b/src/main/resources/assets/arcane/textures/block/machines/collectors/ignis_sides.png deleted file mode 100644 index 717abb6b63d7935043afe8671c02864021695201..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmV+w0qXvVP)L$g6a`ZV<*WL(>MK9&?bmTAR^(k>p1}qq-jcKb{K6q zF7`+%tvv4xCaWcnbLpe_3tSFIZ!$not;&Wl4jXoR4k8kM1xA}rk&XhTlywULk8{av zvxd{#U)+lZPv3O^A@$9{TVOmN^|#;(NGXwQ;R;~CfscafEGrcEqS0^LuIB`8hmGXJ b-@ow%UVld#$S;8I00000NkvXXu0mjfUT14N diff --git a/src/main/resources/assets/arcane/textures/block/machines/collectors/side_blank.png b/src/main/resources/assets/arcane/textures/block/machines/collectors/side_blank.png deleted file mode 100644 index 2f41fbc5f487ada90129da40468efe986c57e77b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`-JULvAr`%7gAVdGCbZH# z^4pI33f>CdTInsYa2H%`(d=t(N3u7iq8U8znGvOjh&kw z9O=J*p*)D?k(^_nUW?8$c~k#L{v{3Xym_h%nBuKWMP>_}4F|f8!PC{xWt~$(695Nj BOtJs~ diff --git a/src/main/resources/assets/arcane/textures/block/machines/ignis_collector.png b/src/main/resources/assets/arcane/textures/block/machines/ignis_collector.png new file mode 100644 index 0000000000000000000000000000000000000000..955c571aa929c882d762a88ac93e6fe40ab9e405 GIT binary patch literal 454 zcmV;%0XhDOP)BXI4nMTk{4cDv02pJKPNzg#>k!Y_^|~TGYlpb+TogsE;AJv7 zXyBiR-}Ss&1tY~dmd=sHF(N{={MS`v!yG`YpmfuH5ea!Bf>Mg8-|q*byrBTq>ne0V zxw>S2Ul$Grg9d5j3%B>3eM>Q;iqrmAX89P5`=0RR9107*qoM6N<$f=tTKfB*mh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/arcane/textures/block/machines/pedestal.png b/src/main/resources/assets/arcane/textures/block/machines/pedestal.png index 4709747f0b2d4191f9c7c0220f7201a1125545b2..67130b238b50fe5c6a32916ee6cf53af24e59be8 100644 GIT binary patch delta 1335 zcmV-71<3lt2gwSMBYy=DNkli&ak{C5QZ3kU9#Dt~~B6e-*}U;@jn9Vf7owP5U(ra4fG)th}9kA8aPGs%3w zSUWQ-&6_v#eeY>|qtPe@0Nb`9gaBOwc=Vat>Wsa(xagqz^-)`# zB!%}oIyy>+!(p9A0RX}<1ONmXI7y^2uH(oy`b=#E{~XQd zwI@WV#`88>Tph#VP#UGDw{vYl5XgI5)VT9%R}Oqw2<&9-NqjFSL*D=9&6`IL z;p3W6cc(PrVSlk)u+6^x$aw0r9S4}tu|Zzu1L-=6@8P&x@H{VflOPD>jkxhNjvtxl zKsO(n6SYx4*+gsr%hf0{YO`-62m$~roe)VP+vm440D$9e$#G>{whPMU!wnCD0FJvQ z#{hsulXcuJc@vQ&upK97RGb|FA_xL_o|ijMUxF|Uv48Vw7gy6M0BFTDiSMONR z0Av~vMG*$sK-DP6-O6nz{t$JsXxwui0WzGB!m0d^*`mZr0@raMgjk6n4OWff$dH%y z^M_E|a}z6(LJiBjjqhR-bW8P?=Xvtn%x`CMA>1q;6K%uRx*3nh09Nsxa)K}naejV| z{r!EE<$nnlu#DlP;B@B6`&=|=)%Z%5t@v|5hEu!`!!UP*b$J5M4df9}&k~75eEmr# zIXnX-blw(1!1w)hJRTQ%=DT-4mKyf+$DeBF2ee}ed2}@i8HqPx0oCV-JWudzU6x3h zU>Jslo&kWbyj`t9{{%B_dlmGo&Ay!rb-a%v8-Fc=rOWqK)IQ4HN%=*ls=5hr$~@DS zhlP+@MewAKoRGx#+RU(3EkMS|u$T1kWES<9VJGR`s=2 zmo%;g?oQ59Yv5sVdYSg$zwO=q@@EPF{lmT9;`B15G4DQpSbn!g9#Ho^L>E{9N`KW_ zqrNF^dorG``-gkWc10U>c|hCu5bMSQs;joPROJCpwWkX#pn26sTfKj{Cy&53I|84h zr7>kYi!#chcY5>NS*P)z$mIcbsWs*S?k-N~7Z{hy;i8ybP)JU}FgHuZkaA6Oox z!YaT1as9~C#BTt8`1b3y=h?|*(wj^sPrdb%v8so(r)p=t1Ug%QE`Im#f{p4S|84&F3sCC_)G$$dgTY`h t7z_r3!C){L3c^Dj71`qDq^f`b46002ovPDHLkV1kRXkWv5u delta 942 zcmV;f15y0R3d0AGBYy*mNklJ+{`b%GHl9zPL z(vJ5zy}b8J@_xVfd%xfBC5g?YoTaHLY){+*p-pN40R2dJ`hS*B_o16@=epdU1z z1OPn$R7W#Fp6D9 zBP97EmzyLT;D308ksTM3KrqEfhVrr>L1ab+i5mKm9w-e0z`U`?EnLP0Y58;?Gm4Ct z$2VM!K*~S6@(cA=2SGQ%*2Nusa z*Xq+4c|l26U1bWI2>`e@ebsgR&%xg?I-Cg!u*=(Jb$=g#J?TcX;Rw)VgD6jwI~f#U zI@eS=vdOpuqGcD(T6-j5H^)Rd=J zEj(DT0Dn6R>1I2+FG9oI#QHm0i5iSzrLWpcZ!9LN z-8NeZ`qcq`aiyfIksDzs45WClU3qmt>>fZVDaeORHhrZx z789*f?LQ9~^a>s$;{g=31}8LF3LC|WB~4AERe!2kN+Fjp-hQ(HKv|u23}O^3)~okV z0k|v28Zved7>w3~FI|84r7!wEc?65xo|LDyvN~(`hwy@t@PMdRfL905J7VoprWAn%M#;hX>p`KsVda&9-kk)y?Ss2oa6}f}Ywa&`}U1w|8PfcWi5A&Wdwo zgMTvgVaRQtd+q&fCd>Vs6c^nz$dA@6l;@3N#mW6AhX;N6pBVY?0X%{7*PosdeFs4P z?#;3I2k3Q(QML?(s_cT&dvDEkyz1I}{>1t{U=)bV z08!`f^FsU_je7!d6KD(gMSFojAP@)y0w;k$AP@)y0)apv5C{YUfnYrN2ZD~b#_+VF QW&i*H07*qoM6N<$f7xl5QIOFn>&LW9Fs0m@(`q@C6Utlxp*#GY9rBb#@FDVEuF$SgUOj>s=L+h?Cj1? z(ll+8B;miv^Be$U49DYl01%87`Tp~n>fcIhu(l&G#-PKf zPk4KM`6auog#CU`9LMM|qNy)e1=2Jum&=|AV7uK;Zb?2qzghqtM%eSIQvgi!JZJIr z%puGAxgNoFE{dX4aLBShi`@K9ZQV44S|cI^^-ouko8^o^MEX1tK`BMBUax_nzdpF_ zZ#J7jJaC0RzkP6yxZLS2`+s1J88n*uWInn~9Y%vOgR+u=uMTONwmx`VgvGy00000 LNkvXXu0mjf*IK2# literal 0 HcmV?d00001