From 045c1f4e924a3c8898dadecaaf3a19ca065c9c71 Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sun, 17 Nov 2024 13:51:50 +0100 Subject: [PATCH 01/14] entity detector -> creature detector --- .../spectrum/registries/SpectrumBlocks.java | 8 ++--- .../registries/SpectrumItemGroups.java | 2 +- .../spectrum/registries/SpectrumItems.java | 13 ++++---- .../blockstates/creature_detector.json | 10 +++++++ .../spectrum/blockstates/entity_detector.json | 10 ------- .../resources/assets/spectrum/lang/de_de.json | 2 +- .../resources/assets/spectrum/lang/en_us.json | 8 ++--- .../resources/assets/spectrum/lang/pt_br.json | 8 ++--- .../resources/assets/spectrum/lang/ru_ru.json | 8 ++--- .../resources/assets/spectrum/lang/zh_cn.json | 8 ++--- ...y_detector.json => creature_detector.json} | 2 +- ...d.json => creature_detector_inverted.json} | 2 +- .../models/item/creature_detector.json | 3 ++ .../spectrum/models/item/entity_detector.json | 3 -- ...png => creature_detector_inverted_top.png} | Bin ...ctor_top.png => creature_detector_top.png} | Bin ...y_detector.json => creature_detector.json} | 4 +-- ...y_detector.json => creature_detector.json} | 2 +- .../magical_blocks/creature_detector.json | 28 ++++++++++++++++++ .../magical_blocks/entity_detector.json | 28 ------------------ ...y_detector.json => creature_detector.json} | 4 +-- .../data/spectrum/tags/block/detectors.json | 2 +- 22 files changed, 76 insertions(+), 79 deletions(-) create mode 100644 src/main/resources/assets/spectrum/blockstates/creature_detector.json delete mode 100644 src/main/resources/assets/spectrum/blockstates/entity_detector.json rename src/main/resources/assets/spectrum/models/block/{entity_detector.json => creature_detector.json} (72%) rename src/main/resources/assets/spectrum/models/block/{entity_detector_inverted.json => creature_detector_inverted.json} (69%) create mode 100644 src/main/resources/assets/spectrum/models/item/creature_detector.json delete mode 100644 src/main/resources/assets/spectrum/models/item/entity_detector.json rename src/main/resources/assets/spectrum/textures/block/{entity_detector_inverted_top.png => creature_detector_inverted_top.png} (100%) rename src/main/resources/assets/spectrum/textures/block/{entity_detector_top.png => creature_detector_top.png} (100%) rename src/main/resources/data/spectrum/advancement/unlocks/redstone/{entity_detector.json => creature_detector.json} (83%) rename src/main/resources/data/spectrum/loot_table/blocks/{entity_detector.json => creature_detector.json} (85%) create mode 100644 src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/magical_blocks/creature_detector.json delete mode 100644 src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/magical_blocks/entity_detector.json rename src/main/resources/data/spectrum/recipe/pedestal/tier1/detectors/{entity_detector.json => creature_detector.json} (80%) diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java index 3a543e5ef2..d55ae63ff8 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java @@ -60,7 +60,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.type.*; import net.minecraft.block.*; import net.minecraft.block.AbstractBlock.*; -import net.minecraft.block.enums.NoteBlockInstrument; +import net.minecraft.block.enums.*; import net.minecraft.block.piston.*; import net.minecraft.client.render.*; import net.minecraft.entity.*; @@ -85,7 +85,7 @@ import java.util.function.*; import static de.dafuqs.spectrum.SpectrumCommon.*; -import static de.dafuqs.spectrum.registries.DeferredRegistrar.defer; +import static de.dafuqs.spectrum.registries.DeferredRegistrar.*; import static de.dafuqs.spectrum.registries.SpectrumItems.*; import static net.minecraft.block.Blocks.*; @@ -963,7 +963,7 @@ private static Settings gravityBlock(MapColor mapColor) { public static final Block WEATHER_DETECTOR = new WeatherDetectorBlock(AbstractBlock.Settings.copy(Blocks.DAYLIGHT_DETECTOR)); public static final Block ITEM_DETECTOR = new ItemDetectorBlock(AbstractBlock.Settings.copy(Blocks.DAYLIGHT_DETECTOR)); public static final Block PLAYER_DETECTOR = new PlayerDetectorBlock(AbstractBlock.Settings.copy(Blocks.DAYLIGHT_DETECTOR)); - public static final Block ENTITY_DETECTOR = new EntityDetectorBlock(AbstractBlock.Settings.copy(Blocks.DAYLIGHT_DETECTOR)); + public static final Block CREATURE_DETECTOR = new EntityDetectorBlock(AbstractBlock.Settings.copy(Blocks.DAYLIGHT_DETECTOR)); public static final Block REDSTONE_CALCULATOR = new RedstoneCalculatorBlock(AbstractBlock.Settings.copy(Blocks.REPEATER)); public static final Block REDSTONE_TIMER = new RedstoneTimerBlock(AbstractBlock.Settings.copy(Blocks.REPEATER)); public static final Block REDSTONE_TRANSCEIVER = new RedstoneTransceiverBlock(AbstractBlock.Settings.copy(Blocks.REPEATER)); @@ -1894,7 +1894,7 @@ private static void registerRedstone(Item.Settings settings) { registerBlockWithItem("weather_detector", WEATHER_DETECTOR, settings, DyeColor.RED); registerBlockWithItem("item_detector", ITEM_DETECTOR, settings, DyeColor.RED); registerBlockWithItem("player_detector", PLAYER_DETECTOR, settings, DyeColor.RED); - registerBlockWithItem("entity_detector", ENTITY_DETECTOR, settings, DyeColor.RED); + registerBlockWithItem("creature_detector", CREATURE_DETECTOR, settings, DyeColor.RED); registerBlockWithItem("redstone_timer", REDSTONE_TIMER, settings, DyeColor.RED); registerBlockWithItem("redstone_calculator", REDSTONE_CALCULATOR, settings, DyeColor.RED); diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java index 6952ff31dd..0abf1b2bba 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java @@ -236,7 +236,7 @@ public static void register() { entries.add(SpectrumBlocks.WEATHER_DETECTOR); entries.add(SpectrumBlocks.ITEM_DETECTOR); entries.add(SpectrumBlocks.PLAYER_DETECTOR); - entries.add(SpectrumBlocks.ENTITY_DETECTOR); + entries.add(SpectrumBlocks.CREATURE_DETECTOR); entries.add(SpectrumBlocks.REDSTONE_TIMER); entries.add(SpectrumBlocks.REDSTONE_CALCULATOR); entries.add(SpectrumBlocks.REDSTONE_TRANSCEIVER); diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java index 0a1ca6f819..b0444aca17 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java @@ -29,10 +29,8 @@ import de.dafuqs.spectrum.recipe.pedestal.*; import net.fabricmc.fabric.api.registry.*; import net.fabricmc.fabric.api.transfer.v1.fluid.*; -import net.minecraft.component.DataComponentTypes; -import net.minecraft.component.type.FoodComponents; -import net.minecraft.component.type.ItemEnchantmentsComponent; -import net.minecraft.component.type.UnbreakableComponent; +import net.minecraft.component.*; +import net.minecraft.component.type.*; import net.minecraft.enchantment.*; import net.minecraft.fluid.*; import net.minecraft.item.*; @@ -42,10 +40,9 @@ import net.minecraft.util.*; import java.util.*; -import java.util.function.Supplier; -import static de.dafuqs.spectrum.SpectrumCommon.locate; -import static de.dafuqs.spectrum.registries.DeferredRegistrar.defer; +import static de.dafuqs.spectrum.SpectrumCommon.*; +import static de.dafuqs.spectrum.registries.DeferredRegistrar.*; import static de.dafuqs.spectrum.registries.SpectrumFluids.*; public class SpectrumItems { @@ -1014,7 +1011,7 @@ public static void registerFuelRegistry() { FuelRegistry.INSTANCE.add(SpectrumBlocks.WEATHER_DETECTOR.asItem(), 300); FuelRegistry.INSTANCE.add(SpectrumBlocks.ITEM_DETECTOR.asItem(), 300); FuelRegistry.INSTANCE.add(SpectrumBlocks.PLAYER_DETECTOR.asItem(), 300); - FuelRegistry.INSTANCE.add(SpectrumBlocks.ENTITY_DETECTOR.asItem(), 300); + FuelRegistry.INSTANCE.add(SpectrumBlocks.CREATURE_DETECTOR.asItem(), 300); FuelRegistry.INSTANCE.add(SpectrumItems.PURE_COAL, 3200); FuelRegistry.INSTANCE.add(SpectrumBlocks.PURE_COAL_BLOCK, 32000); diff --git a/src/main/resources/assets/spectrum/blockstates/creature_detector.json b/src/main/resources/assets/spectrum/blockstates/creature_detector.json new file mode 100644 index 0000000000..94d7e16ede --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/creature_detector.json @@ -0,0 +1,10 @@ +{ + "variants": { + "inverted=false": { + "model": "spectrum:block/creature_detector" + }, + "inverted=true": { + "model": "spectrum:block/creature_detector_inverted" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/entity_detector.json b/src/main/resources/assets/spectrum/blockstates/entity_detector.json deleted file mode 100644 index 393dbca70e..0000000000 --- a/src/main/resources/assets/spectrum/blockstates/entity_detector.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "inverted=false": { - "model": "spectrum:block/entity_detector" - }, - "inverted=true": { - "model": "spectrum:block/entity_detector_inverted" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/lang/de_de.json b/src/main/resources/assets/spectrum/lang/de_de.json index 371f8b33c7..1c83f24a97 100644 --- a/src/main/resources/assets/spectrum/lang/de_de.json +++ b/src/main/resources/assets/spectrum/lang/de_de.json @@ -218,7 +218,7 @@ "block.spectrum.item_detector": "Item Detektor", "block.spectrum.weather_detector": "Wetter Detektor", "block.spectrum.light_level_detector": "Block Licht Detektor", - "block.spectrum.entity_detector": "Kreaturen Detektor", + "block.spectrum.creature_detector": "Kreaturen Detektor", "block.spectrum.block_placer": "Block Plazierer", "block.spectrum.redstone_transceiver": "Kabelloses Redstone", diff --git a/src/main/resources/assets/spectrum/lang/en_us.json b/src/main/resources/assets/spectrum/lang/en_us.json index 98d1d7d257..688de36714 100644 --- a/src/main/resources/assets/spectrum/lang/en_us.json +++ b/src/main/resources/assets/spectrum/lang/en_us.json @@ -1202,7 +1202,7 @@ "block.spectrum.enderman_idol": "Otherworldly Idol", "block.spectrum.endermite_head": "Endermite Head", "block.spectrum.endermite_idol": "Jagged Idol", - "block.spectrum.entity_detector": "Creature Detector", + "block.spectrum.creature_detector": "Creature Detector", "block.spectrum.entity_summoning_idol.tooltip": "§7Summons a %s", "block.spectrum.eraser_head": "Eraser Husk", "block.spectrum.ethereal_platform": "Ethereal Platform", @@ -2569,9 +2569,9 @@ "book.spectrum.guidebook.ender_splice.page2.text": "Reduces the chance of it breaking on use.", "book.spectrum.guidebook.ender_splice.page3.text": "Allows for inter-dimensional teleportation.", "book.spectrum.guidebook.enemy_tears": "The classic. The only thing that would make this one even more delicious would be the tears of my enemies.", - "book.spectrum.guidebook.entity_detector.name": "Creature Detector", - "book.spectrum.guidebook.entity_detector.page0.text": "The gem built into the Creature Detector reacts to micro-vibrations in the ground.\\\nThis gives it the ability to measure the number of creatures in its vicinity.", - "book.spectrum.guidebook.entity_detector.page1.text": "Outputs a cumulative strength of 1 for every creature within a 10 block radius.", + "book.spectrum.guidebook.creature_detector.name": "Creature Detector", + "book.spectrum.guidebook.creature_detector.page0.text": "The gem built into the Creature Detector reacts to micro-vibrations in the ground.\\\nThis gives it the ability to measure the number of creatures in its vicinity.", + "book.spectrum.guidebook.creature_detector.page1.text": "Outputs a cumulative strength of 1 for every creature within a 10 block radius.", "book.spectrum.guidebook.erasers.name": "Erasers", "book.spectrum.guidebook.erasers.page0.text": "*Note from me to me: Don't let them overwhelm you!*", "book.spectrum.guidebook.erasers.page1.text": "Tiny, hard-to-hit, pack-hunting spiders that inflict a variety of nasty effects when they bite me.\\\n\\\nThe damn things are a real nuisance down here. I wouldn't be surprised if THEY were responsible for the downfall of civilizations.\\\n\\\nMy usual approach of sword or bow doesn't help much against them, since they're too fast for that. Something that does area damage is more likely to.", diff --git a/src/main/resources/assets/spectrum/lang/pt_br.json b/src/main/resources/assets/spectrum/lang/pt_br.json index 0081966192..37b1ea0759 100644 --- a/src/main/resources/assets/spectrum/lang/pt_br.json +++ b/src/main/resources/assets/spectrum/lang/pt_br.json @@ -353,7 +353,7 @@ "block.spectrum.item_detector": "Detector de Item", "block.spectrum.weather_detector": "Detector de Clima", "block.spectrum.light_level_detector": "Detector de Luz de Blocos", - "block.spectrum.entity_detector": "Detector de Criaturas", + "block.spectrum.creature_detector": "Detector de Criaturas", "block.spectrum.block_placer": "Colocador de Blocos", "block.spectrum.redstone_transceiver": "Redstone Sem Fio", @@ -3392,9 +3392,9 @@ "book.spectrum.guidebook.ender_splice.page1.text": "- When I first use it, it binds to my current position, the second use will teleport me back.\n- Can even be used on other players\n- Cannot teleport across dimensions", "book.spectrum.guidebook.ender_splice.page2.text": "Unbreaking reduces the chance of it breaking on use.", "book.spectrum.guidebook.ender_splice.page3.text": "Resonance will allow for inter-dimensional teleportation.", - "book.spectrum.guidebook.entity_detector.name": "Creature Detector", - "book.spectrum.guidebook.entity_detector.page0.text": "The gem built into the Creature Detector reacts to micro-vibrations in the ground. This gives it the ability to measure the number of creatures in its vicinity.", - "book.spectrum.guidebook.entity_detector.page1.text": "Outputs a cumulative strength of 1 for every creature within a 10 block radius.", + "book.spectrum.guidebook.creature_detector.name": "Creature Detector", + "book.spectrum.guidebook.creature_detector.page0.text": "The gem built into the Creature Detector reacts to micro-vibrations in the ground. This gives it the ability to measure the number of creatures in its vicinity.", + "book.spectrum.guidebook.creature_detector.page1.text": "Outputs a cumulative strength of 1 for every creature within a 10 block radius.", "book.spectrum.guidebook.everpromise_ribbon.page0.text": "A ribbon given to pets as an everlasting promise to watch over and care for them.\\\nI can name it and pin it on a creature. Should it ever die it will drop a [#](bb00bb)Broken Promise[#]().", "book.spectrum.guidebook.everpromise_ribbon.page1.text": "My pet will immediately trust me, if it does not already. After naming it, I can use a [#](bb00bb)Crafting Table[#]() to add [Pigment](entry://general/pigment) to the [#](bb00bb)Ribbon[#]() to color the pets name.", "book.spectrum.guidebook.exchanging_staff.page0.text": "For those of you who don't live in a simple [#](bb00bb)Cobblestone[#]() house, or live without walls entirely - I'm not writing about me, of course - I've come up with the Exchanging Staff, which can swap a whole bunch of connected blocks in the blink of an eye. Perfect for redecorating!", diff --git a/src/main/resources/assets/spectrum/lang/ru_ru.json b/src/main/resources/assets/spectrum/lang/ru_ru.json index 56aa9a0dd2..0befc184d9 100644 --- a/src/main/resources/assets/spectrum/lang/ru_ru.json +++ b/src/main/resources/assets/spectrum/lang/ru_ru.json @@ -879,7 +879,7 @@ "block.spectrum.item_detector": "Датчик Предметов", "block.spectrum.weather_detector": "Датчик Погоды", "block.spectrum.light_level_detector": "Датчик Уровня Света", - "block.spectrum.entity_detector": "Creature Detector", + "block.spectrum.creature_detector": "Creature Detector", "block.spectrum.block_placer": "Разместитель", "block.spectrum.block_detector": "Датчик Блоков", "block.spectrum.block_breaker": "Разрушитель", @@ -3827,9 +3827,9 @@ "book.spectrum.guidebook.ender_splice.page2.text": "Снижает вероятность его поломки при использовании.", "book.spectrum.guidebook.ender_splice.page3.text": "Позволяет осуществлять межпространственную телепортацию.", "book.spectrum.guidebook.enemy_tears": "Классика. Единственное, что сделало бы это блюдо еще более вкусным, - это слезы моих врагов.", - "book.spectrum.guidebook.entity_detector.name": "Детектор сущностей", - "book.spectrum.guidebook.entity_detector.page0.text": "Драгоценный камень, встроенный в детектор сущностей, реагирует на микровибрации земли.\\\nЭто дает ему возможность измерять количество существ поблизости.", - "book.spectrum.guidebook.entity_detector.page1.text": "Увеличивает суммарную силу на 1 для каждого существа в радиусе 10 блоков.", + "book.spectrum.guidebook.creature_detector.name": "Детектор сущностей", + "book.spectrum.guidebook.creature_detector.page0.text": "Драгоценный камень, встроенный в детектор сущностей, реагирует на микровибрации земли.\\\nЭто дает ему возможность измерять количество существ поблизости.", + "book.spectrum.guidebook.creature_detector.page1.text": "Увеличивает суммарную силу на 1 для каждого существа в радиусе 10 блоков.", "book.spectrum.guidebook.erasers.name": "Cтиратели", "book.spectrum.guidebook.erasers.page0.text": "*Записка от меня для себя: не позволяй им подавлять тебя!*", "book.spectrum.guidebook.erasers.page1.text": "Крошечные, неприступные паучки, которые охотятся стаями и причиняют множество неприятных последствий, когда кусают меня.\\\n\\\nП Эти чертовы твари - настоящая помеха здесь, внизу. Я бы не удивился, если бы оказалось, что ОНИ ответственны за гибель цивилизаций.\\\n\\\n Мой обычный прием - меч или лук - не очень помогает против них, так как они слишком быстры для этого. То, что наносит урон по площади, скорее всего, поможет.", diff --git a/src/main/resources/assets/spectrum/lang/zh_cn.json b/src/main/resources/assets/spectrum/lang/zh_cn.json index 7bab32e5ab..4cfad13a8a 100644 --- a/src/main/resources/assets/spectrum/lang/zh_cn.json +++ b/src/main/resources/assets/spectrum/lang/zh_cn.json @@ -1170,7 +1170,7 @@ "block.spectrum.item_detector": "物品探测器", "block.spectrum.weather_detector": "天气探测器", "block.spectrum.light_level_detector": "光照探测器", - "block.spectrum.entity_detector": "生物探测器", + "block.spectrum.creature_detector": "生物探测器", "block.spectrum.block_placer": "方块放置器", "block.spectrum.block_detector": "方块探测器", "block.spectrum.block_breaker": "方块破坏器", @@ -4127,9 +4127,9 @@ "book.spectrum.guidebook.enemy_tears": "经典之作.唯一能让它更美味的就是敌人的眼泪.", - "book.spectrum.guidebook.entity_detector.name": "生物探测器", - "book.spectrum.guidebook.entity_detector.page0.text": "生物探测器内置的宝石对地面的微振动做出反应.\\\n这使生物探测器能够测量附近实体的数量.", - "book.spectrum.guidebook.entity_detector.page1.text": "对于半径为10方块的每个实体,生物探测器会额外输出1的强度.", + "book.spectrum.guidebook.creature_detector.name": "生物探测器", + "book.spectrum.guidebook.creature_detector.page0.text": "生物探测器内置的宝石对地面的微振动做出反应.\\\n这使生物探测器能够测量附近实体的数量.", + "book.spectrum.guidebook.creature_detector.page1.text": "对于半径为10方块的每个实体,生物探测器会额外输出1的强度.", "book.spectrum.guidebook.erasers.name": "幽影蜘蛛", "book.spectrum.guidebook.erasers.page0.text": "*给自己的备注:不要让它们压倒你!*", diff --git a/src/main/resources/assets/spectrum/models/block/entity_detector.json b/src/main/resources/assets/spectrum/models/block/creature_detector.json similarity index 72% rename from src/main/resources/assets/spectrum/models/block/entity_detector.json rename to src/main/resources/assets/spectrum/models/block/creature_detector.json index 506af35aec..4745220d10 100644 --- a/src/main/resources/assets/spectrum/models/block/entity_detector.json +++ b/src/main/resources/assets/spectrum/models/block/creature_detector.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_daylight_detector", "textures": { - "top": "spectrum:block/entity_detector_top", + "top": "spectrum:block/creature_detector_top", "side": "minecraft:block/daylight_detector_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/entity_detector_inverted.json b/src/main/resources/assets/spectrum/models/block/creature_detector_inverted.json similarity index 69% rename from src/main/resources/assets/spectrum/models/block/entity_detector_inverted.json rename to src/main/resources/assets/spectrum/models/block/creature_detector_inverted.json index ded50bd1f2..c72014e10c 100644 --- a/src/main/resources/assets/spectrum/models/block/entity_detector_inverted.json +++ b/src/main/resources/assets/spectrum/models/block/creature_detector_inverted.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/template_daylight_detector", "textures": { - "top": "spectrum:block/entity_detector_inverted_top", + "top": "spectrum:block/creature_detector_inverted_top", "side": "minecraft:block/daylight_detector_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/creature_detector.json b/src/main/resources/assets/spectrum/models/item/creature_detector.json new file mode 100644 index 0000000000..29e603dc39 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/item/creature_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "spectrum:block/creature_detector" +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/entity_detector.json b/src/main/resources/assets/spectrum/models/item/entity_detector.json deleted file mode 100644 index e626aee097..0000000000 --- a/src/main/resources/assets/spectrum/models/item/entity_detector.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "spectrum:block/entity_detector" -} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/textures/block/entity_detector_inverted_top.png b/src/main/resources/assets/spectrum/textures/block/creature_detector_inverted_top.png similarity index 100% rename from src/main/resources/assets/spectrum/textures/block/entity_detector_inverted_top.png rename to src/main/resources/assets/spectrum/textures/block/creature_detector_inverted_top.png diff --git a/src/main/resources/assets/spectrum/textures/block/entity_detector_top.png b/src/main/resources/assets/spectrum/textures/block/creature_detector_top.png similarity index 100% rename from src/main/resources/assets/spectrum/textures/block/entity_detector_top.png rename to src/main/resources/assets/spectrum/textures/block/creature_detector_top.png diff --git a/src/main/resources/data/spectrum/advancement/unlocks/redstone/entity_detector.json b/src/main/resources/data/spectrum/advancement/unlocks/redstone/creature_detector.json similarity index 83% rename from src/main/resources/data/spectrum/advancement/unlocks/redstone/entity_detector.json rename to src/main/resources/data/spectrum/advancement/unlocks/redstone/creature_detector.json index e1d558804c..f361873a0a 100644 --- a/src/main/resources/data/spectrum/advancement/unlocks/redstone/entity_detector.json +++ b/src/main/resources/data/spectrum/advancement/unlocks/redstone/creature_detector.json @@ -7,13 +7,13 @@ } }, "has_quartz": { - "trigger":"revelationary:advancement_gotten", + "trigger": "revelationary:advancement_gotten", "conditions": { "advancement_identifier": "spectrum:hidden/collect_vanilla/quartz" } }, "collected_corresponding_shard": { - "trigger":"revelationary:advancement_gotten", + "trigger": "revelationary:advancement_gotten", "conditions": { "advancement_identifier": "spectrum:lategame/collect_moonstone" } diff --git a/src/main/resources/data/spectrum/loot_table/blocks/entity_detector.json b/src/main/resources/data/spectrum/loot_table/blocks/creature_detector.json similarity index 85% rename from src/main/resources/data/spectrum/loot_table/blocks/entity_detector.json rename to src/main/resources/data/spectrum/loot_table/blocks/creature_detector.json index abb1e50ba6..ef4c07cff0 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/entity_detector.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/creature_detector.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "spectrum:entity_detector" + "name": "spectrum:creature_detector" } ], "conditions": [ diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/magical_blocks/creature_detector.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/magical_blocks/creature_detector.json new file mode 100644 index 0000000000..9d2b430411 --- /dev/null +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/magical_blocks/creature_detector.json @@ -0,0 +1,28 @@ +{ + "name": "book.spectrum.guidebook.creature_detector.name", + "condition": { + "type": "modonomicon:advancement", + "advancement_id": "spectrum:unlocks/redstone/creature_detector" + }, + "icon": "spectrum:creature_detector", + "category": "spectrum:magical_blocks", + "hide_while_locked": true, + "parents": [], + "background_u_index": 0, + "background_v_index": 0, + "x": 7, + "y": 4, + "pages": [ + { + "type": "modonomicon:text", + "title": "block.spectrum.creature_detector", + "text": "book.spectrum.guidebook.creature_detector.page0.text" + }, + { + "type": "spectrum:pedestal_crafting", + "title": "container.spectrum.rei.pedestal_recipe", + "recipe_id": "spectrum:pedestal/tier1/detectors/creature_detector", + "text": "book.spectrum.guidebook.creature_detector.page1.text" + } + ] +} diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/magical_blocks/entity_detector.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/magical_blocks/entity_detector.json deleted file mode 100644 index 6613dccea6..0000000000 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/magical_blocks/entity_detector.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "book.spectrum.guidebook.entity_detector.name", - "condition": { - "type": "modonomicon:advancement", - "advancement_id": "spectrum:unlocks/redstone/entity_detector" - }, - "icon": "spectrum:entity_detector", - "category": "spectrum:magical_blocks", - "hide_while_locked": true, - "parents": [], - "background_u_index": 0, - "background_v_index": 0, - "x": 7, - "y": 4, - "pages": [ - { - "type": "modonomicon:text", - "title": "block.spectrum.entity_detector", - "text": "book.spectrum.guidebook.entity_detector.page0.text" - }, - { - "type": "spectrum:pedestal_crafting", - "title": "container.spectrum.rei.pedestal_recipe", - "recipe_id": "spectrum:pedestal/tier1/detectors/entity_detector", - "text": "book.spectrum.guidebook.entity_detector.page1.text" - } - ] -} diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/detectors/entity_detector.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/detectors/creature_detector.json similarity index 80% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/detectors/entity_detector.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier1/detectors/creature_detector.json index fd667e3910..5bf924947b 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/detectors/entity_detector.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier1/detectors/creature_detector.json @@ -28,8 +28,8 @@ } }, "result": { - "item": "spectrum:entity_detector", + "item": "spectrum:creature_detector", "count": 1 }, - "required_advancement": "spectrum:unlocks/redstone/entity_detector" + "required_advancement": "spectrum:unlocks/redstone/creature_detector" } \ No newline at end of file diff --git a/src/main/resources/data/spectrum/tags/block/detectors.json b/src/main/resources/data/spectrum/tags/block/detectors.json index 902bd1eb77..f68fa4a208 100644 --- a/src/main/resources/data/spectrum/tags/block/detectors.json +++ b/src/main/resources/data/spectrum/tags/block/detectors.json @@ -5,6 +5,6 @@ "spectrum:weather_detector", "spectrum:item_detector", "spectrum:player_detector", - "spectrum:entity_detector" + "spectrum:creature_detector" ] } \ No newline at end of file From 346a36c3c7ef46f02e90e688882e1d9714436391 Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sun, 17 Nov 2024 13:55:17 +0100 Subject: [PATCH 02/14] restocking chest -> fabrication chest --- ...tBlock.java => FabricationChestBlock.java} | 11 +- ....java => FabricationChestBlockEntity.java} | 30 ++--- ... FabricationChestBlockEntityRenderer.java} | 14 +- .../chests/SpectrumChestBlockEntity.java | 6 +- .../compat/REI/REIClientIntegration.java | 2 +- .../compat/emi/SpectrumEmiPlugin.java | 2 +- ...creen.java => FabricationChestScreen.java} | 6 +- ...ava => FabricationChestScreenHandler.java} | 30 ++--- .../inventories/SpectrumScreenHandlerIDs.java | 2 +- .../SpectrumScreenHandlerTypes.java | 12 +- .../networking/SpectrumS2CPacketReceiver.java | 6 +- .../networking/SpectrumS2CPacketSender.java | 6 +- .../networking/SpectrumS2CPackets.java | 2 +- .../registries/SpectrumBlockEntities.java | 6 +- .../spectrum/registries/SpectrumBlocks.java | 6 +- .../registries/SpectrumItemGroups.java | 2 +- .../blockstates/restocking_chest.json | 19 --- .../resources/assets/spectrum/lang/de_de.json | 2 +- .../resources/assets/spectrum/lang/en_us.json | 2 +- .../resources/assets/spectrum/lang/pt_br.json | 2 +- .../resources/assets/spectrum/lang/ru_ru.json | 2 +- .../resources/assets/spectrum/lang/zh_cn.json | 2 +- .../models/block/restocking_chest.json | 84 ------------ .../models/item/restocking_chest.json | 127 ------------------ .../gui/container/restocking_chest.png | Bin 8167 -> 0 bytes .../resources/data/c/tags/blocks/chest.json | 2 +- .../tags/block/mineable/pickaxe.json | 4 +- .../unlocks/blocks/restocking_chest.json | 8 -- .../loot_table/blocks/restocking_chest.json | 19 --- .../magical_blocks/fabrication_chest.json | 12 +- .../pedestal/tier3/restocking_chest.json | 38 ------ 31 files changed, 85 insertions(+), 381 deletions(-) rename src/main/java/de/dafuqs/spectrum/blocks/chests/{RestockingChestBlock.java => FabricationChestBlock.java} (79%) rename src/main/java/de/dafuqs/spectrum/blocks/chests/{RestockingChestBlockEntity.java => FabricationChestBlockEntity.java} (89%) rename src/main/java/de/dafuqs/spectrum/blocks/chests/{RestockingChestBlockEntityRenderer.java => FabricationChestBlockEntityRenderer.java} (92%) rename src/main/java/de/dafuqs/spectrum/inventories/{RestockingChestScreen.java => FabricationChestScreen.java} (85%) rename src/main/java/de/dafuqs/spectrum/inventories/{RestockingChestScreenHandler.java => FabricationChestScreenHandler.java} (63%) delete mode 100644 src/main/resources/assets/spectrum/blockstates/restocking_chest.json delete mode 100755 src/main/resources/assets/spectrum/models/block/restocking_chest.json delete mode 100755 src/main/resources/assets/spectrum/models/item/restocking_chest.json delete mode 100644 src/main/resources/assets/spectrum/textures/gui/container/restocking_chest.png delete mode 100644 src/main/resources/data/spectrum/advancement/unlocks/blocks/restocking_chest.json delete mode 100644 src/main/resources/data/spectrum/loot_table/blocks/restocking_chest.json delete mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier3/restocking_chest.json diff --git a/src/main/java/de/dafuqs/spectrum/blocks/chests/RestockingChestBlock.java b/src/main/java/de/dafuqs/spectrum/blocks/chests/FabricationChestBlock.java similarity index 79% rename from src/main/java/de/dafuqs/spectrum/blocks/chests/RestockingChestBlock.java rename to src/main/java/de/dafuqs/spectrum/blocks/chests/FabricationChestBlock.java index bb02821d99..a2a51c38ed 100644 --- a/src/main/java/de/dafuqs/spectrum/blocks/chests/RestockingChestBlock.java +++ b/src/main/java/de/dafuqs/spectrum/blocks/chests/FabricationChestBlock.java @@ -1,6 +1,5 @@ package de.dafuqs.spectrum.blocks.chests; -import com.mojang.serialization.MapCodec; import de.dafuqs.spectrum.registries.*; import net.minecraft.block.*; import net.minecraft.block.entity.*; @@ -11,13 +10,13 @@ import net.minecraft.world.*; import org.jetbrains.annotations.*; -public class RestockingChestBlock extends SpectrumChestBlock { +public class FabricationChestBlock extends SpectrumChestBlock { public static final MapCodec CODEC = createCodec(RestockingChestBlock::new); protected static final VoxelShape CHEST_SHAPE = Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 12.0D, 16.0D); - public RestockingChestBlock(Settings settings) { + public FabricationChestBlock(Settings settings) { super(settings); } @@ -29,19 +28,19 @@ protected MapCodec getCodec() { @Override @Nullable public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { - return new RestockingChestBlockEntity(pos, state); + return new FabricationChestBlockEntity(pos, state); } @Override @Nullable public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { - return validateTicker(type, SpectrumBlockEntities.RESTOCKING_CHEST, RestockingChestBlockEntity::tick); + return validateTicker(type, SpectrumBlockEntities.FABRICATION_CHEST, RestockingChestBlockEntity::tick); } @Override public void openScreen(World world, BlockPos pos, PlayerEntity player) { BlockEntity blockEntity = world.getBlockEntity(pos); - if (blockEntity instanceof RestockingChestBlockEntity) { + if (blockEntity instanceof FabricationChestBlockEntity) { if (!isChestBlocked(world, pos)) { player.openHandledScreen((NamedScreenHandlerFactory) blockEntity); } diff --git a/src/main/java/de/dafuqs/spectrum/blocks/chests/RestockingChestBlockEntity.java b/src/main/java/de/dafuqs/spectrum/blocks/chests/FabricationChestBlockEntity.java similarity index 89% rename from src/main/java/de/dafuqs/spectrum/blocks/chests/RestockingChestBlockEntity.java rename to src/main/java/de/dafuqs/spectrum/blocks/chests/FabricationChestBlockEntity.java index 9d1e5f5ab6..5a8e004e70 100644 --- a/src/main/java/de/dafuqs/spectrum/blocks/chests/RestockingChestBlockEntity.java +++ b/src/main/java/de/dafuqs/spectrum/blocks/chests/FabricationChestBlockEntity.java @@ -11,7 +11,7 @@ import net.minecraft.item.*; import net.minecraft.nbt.*; import net.minecraft.recipe.*; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.*; import net.minecraft.screen.*; import net.minecraft.text.*; import net.minecraft.util.collection.*; @@ -22,7 +22,7 @@ import java.util.*; import java.util.stream.*; -public class RestockingChestBlockEntity extends SpectrumChestBlockEntity implements SidedInventory { +public class FabricationChestBlockEntity extends SpectrumChestBlockEntity implements SidedInventory { public static final int INVENTORY_SIZE = 27 + 4 + 4; // 27 items, 4 crafting tablets, 4 result slots public static final int[] CHEST_SLOTS = IntStream.rangeClosed(0, 26).toArray(); @@ -35,11 +35,11 @@ public class RestockingChestBlockEntity extends SpectrumChestBlockEntity impleme float rimTarget, rimPos, lastRimTarget, tabletTarget, tabletPos, lastTabletTarget,assemblyTarget, assemblyPos, lastAssemblyTarget, ringTarget, ringPos, lastRingTarget, itemTarget, itemPos, lastItemTarget, alphaTarget, alphaValue, lastAlphaTarget, yawModTarget, yawMod, lastYawModTarget, yaw, lastYaw; long interpTicks, interpLength = 1, age; - public RestockingChestBlockEntity(BlockPos blockPos, BlockState blockState) { - super(SpectrumBlockEntities.RESTOCKING_CHEST, blockPos, blockState); + public FabricationChestBlockEntity(BlockPos blockPos, BlockState blockState) { + super(SpectrumBlockEntities.FABRICATION_CHEST, blockPos, blockState); } - public static void tick(World world, BlockPos pos, BlockState state, RestockingChestBlockEntity chest) { + public static void tick(World world, BlockPos pos, BlockState state, FabricationChestBlockEntity chest) { chest.age++; if (world.isClient) { @@ -119,12 +119,12 @@ public boolean onSyncedBlockEvent(int type, int data) { return super.onSyncedBlockEvent(type, data); } - private static boolean tickCooldown(RestockingChestBlockEntity restockingChestBlockEntity) { - restockingChestBlockEntity.coolDownTicks--; - if (restockingChestBlockEntity.coolDownTicks > 0) { + private static boolean tickCooldown(FabricationChestBlockEntity fabricationChestBlockEntity) { + fabricationChestBlockEntity.coolDownTicks--; + if (fabricationChestBlockEntity.coolDownTicks > 0) { return false; } else { - restockingChestBlockEntity.coolDownTicks = 0; + fabricationChestBlockEntity.coolDownTicks = 0; } return true; } @@ -180,19 +180,19 @@ public boolean hasValidRecipes() { @Override protected Text getContainerName() { - return Text.translatable("block.spectrum.restocking_chest"); + return Text.translatable("block.spectrum.fabrication_chest"); } @Override protected ScreenHandler createScreenHandler(int syncId, PlayerInventory playerInventory) { - return new RestockingChestScreenHandler(syncId, playerInventory, this); + return new FabricationChestScreenHandler(syncId, playerInventory, this); } - private void setCooldown(RestockingChestBlockEntity restockingChestBlockEntity, int cooldownTicks) { - restockingChestBlockEntity.coolDownTicks = cooldownTicks; + private void setCooldown(FabricationChestBlockEntity fabricationChestBlockEntity, int cooldownTicks) { + fabricationChestBlockEntity.coolDownTicks = cooldownTicks; } - private boolean tryCraft(RestockingChestBlockEntity chest, int index) { + private boolean tryCraft(FabricationChestBlockEntity chest, int index) { ItemStack craftingTabletItemStack = chest.inventory.get(RECIPE_SLOTS[index]); if (craftingTabletItemStack.isOf(SpectrumItems.CRAFTING_TABLET)) { var recipe = CraftingTabletItem.getStoredRecipe(world, craftingTabletItemStack); @@ -295,7 +295,7 @@ public void updateFullState() { if (world != null && !world.isClient()) { isFull = isFull(); hasValidRecipes = hasValidRecipes(); - SpectrumS2CPacketSender.sendRestockingChestStatusUpdate(this); + SpectrumS2CPacketSender.sendFabricationChestStatusUpdate(this); } } diff --git a/src/main/java/de/dafuqs/spectrum/blocks/chests/RestockingChestBlockEntityRenderer.java b/src/main/java/de/dafuqs/spectrum/blocks/chests/FabricationChestBlockEntityRenderer.java similarity index 92% rename from src/main/java/de/dafuqs/spectrum/blocks/chests/RestockingChestBlockEntityRenderer.java rename to src/main/java/de/dafuqs/spectrum/blocks/chests/FabricationChestBlockEntityRenderer.java index 42584d2384..6de64a5252 100644 --- a/src/main/java/de/dafuqs/spectrum/blocks/chests/RestockingChestBlockEntityRenderer.java +++ b/src/main/java/de/dafuqs/spectrum/blocks/chests/FabricationChestBlockEntityRenderer.java @@ -4,21 +4,21 @@ import de.dafuqs.spectrum.registries.*; import net.fabricmc.api.*; import net.minecraft.block.*; -import net.minecraft.client.MinecraftClient; +import net.minecraft.client.*; import net.minecraft.client.model.*; import net.minecraft.client.render.*; import net.minecraft.client.render.block.entity.*; -import net.minecraft.client.render.model.json.ModelTransformationMode; +import net.minecraft.client.render.model.json.*; import net.minecraft.client.util.*; import net.minecraft.client.util.math.*; -import net.minecraft.item.ItemStack; +import net.minecraft.item.*; import net.minecraft.screen.*; import net.minecraft.util.math.*; import net.minecraft.world.*; import org.jetbrains.annotations.*; @Environment(EnvType.CLIENT) -public class RestockingChestBlockEntityRenderer implements BlockEntityRenderer { +public class FabricationChestBlockEntityRenderer implements BlockEntityRenderer { private static final SpriteIdentifier spriteIdentifier = new SpriteIdentifier(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE, SpectrumCommon.locate("block/fabrication_chest")); private final ModelPart rootNode; @@ -28,7 +28,7 @@ public class RestockingChestBlockEntityRenderer implements BlockEntityRenderer { +public class FabricationChestScreen extends HandledScreen { - public static final Identifier BACKGROUND = SpectrumCommon.locate("textures/gui/container/restocking_chest.png"); + public static final Identifier BACKGROUND = SpectrumCommon.locate("textures/gui/container/fabrication_chest.png"); - public RestockingChestScreen(RestockingChestScreenHandler handler, PlayerInventory playerInventory, Text title) { + public FabricationChestScreen(FabricationChestScreenHandler handler, PlayerInventory playerInventory, Text title) { super(handler, playerInventory, title); this.backgroundHeight = 219; } diff --git a/src/main/java/de/dafuqs/spectrum/inventories/RestockingChestScreenHandler.java b/src/main/java/de/dafuqs/spectrum/inventories/FabricationChestScreenHandler.java similarity index 63% rename from src/main/java/de/dafuqs/spectrum/inventories/RestockingChestScreenHandler.java rename to src/main/java/de/dafuqs/spectrum/inventories/FabricationChestScreenHandler.java index 10264b803c..2e5ff7a556 100644 --- a/src/main/java/de/dafuqs/spectrum/inventories/RestockingChestScreenHandler.java +++ b/src/main/java/de/dafuqs/spectrum/inventories/FabricationChestScreenHandler.java @@ -10,29 +10,29 @@ import net.minecraft.screen.slot.*; import net.minecraft.world.*; -public class RestockingChestScreenHandler extends ScreenHandler { +public class FabricationChestScreenHandler extends ScreenHandler { protected final World world; private final Inventory inventory; - public RestockingChestScreenHandler(int syncId, PlayerInventory playerInventory) { - this(SpectrumScreenHandlerTypes.RESTOCKING_CHEST, syncId, playerInventory); + public FabricationChestScreenHandler(int syncId, PlayerInventory playerInventory) { + this(SpectrumScreenHandlerTypes.FABRICATION_CHEST, syncId, playerInventory); } - protected RestockingChestScreenHandler(ScreenHandlerType type, int i, PlayerInventory playerInventory) { - this(type, i, playerInventory, new SimpleInventory(RestockingChestBlockEntity.INVENTORY_SIZE)); + protected FabricationChestScreenHandler(ScreenHandlerType type, int i, PlayerInventory playerInventory) { + this(type, i, playerInventory, new SimpleInventory(FabricationChestBlockEntity.INVENTORY_SIZE)); } - public RestockingChestScreenHandler(int syncId, PlayerInventory playerInventory, Inventory inventory) { - this(SpectrumScreenHandlerTypes.RESTOCKING_CHEST, syncId, playerInventory, inventory); + public FabricationChestScreenHandler(int syncId, PlayerInventory playerInventory, Inventory inventory) { + this(SpectrumScreenHandlerTypes.FABRICATION_CHEST, syncId, playerInventory, inventory); } - protected RestockingChestScreenHandler(ScreenHandlerType type, int syncId, PlayerInventory playerInventory, Inventory inventory) { + protected FabricationChestScreenHandler(ScreenHandlerType type, int syncId, PlayerInventory playerInventory, Inventory inventory) { super(type, syncId); this.inventory = inventory; this.world = playerInventory.player.getWorld(); - checkSize(inventory, RestockingChestBlockEntity.INVENTORY_SIZE); + checkSize(inventory, FabricationChestBlockEntity.INVENTORY_SIZE); inventory.onOpen(playerInventory.player); // chest inventory @@ -45,13 +45,13 @@ protected RestockingChestScreenHandler(ScreenHandlerType type, int syncId, Pl // crafting tablet slots for (int j = 0; j < 4; j++) { - int slotId = RestockingChestBlockEntity.RECIPE_SLOTS[j]; + int slotId = FabricationChestBlockEntity.RECIPE_SLOTS[j]; this.addSlot(new StackFilterSlot(inventory, slotId, 26 + j * 36, 18, SpectrumItems.CRAFTING_TABLET)); } // crafting result slots for (int j = 0; j < 4; j++) { - int slotId = RestockingChestBlockEntity.RESULT_SLOTS[j]; + int slotId = FabricationChestBlockEntity.RESULT_SLOTS[j]; this.addSlot(new ExtractOnlySlot(inventory, slotId, 26 + j * 36, 42)); } @@ -82,19 +82,19 @@ public ItemStack quickMove(PlayerEntity player, int index) { ItemStack clickedStack = slot.getStack(); clickedStackCopy = clickedStack.copy(); - if (index < RestockingChestBlockEntity.INVENTORY_SIZE) { + if (index < FabricationChestBlockEntity.INVENTORY_SIZE) { // => player inv if (!this.insertItem(clickedStack, 35, 71, false)) { return ItemStack.EMPTY; } - } else if (index > RestockingChestBlockEntity.INVENTORY_SIZE && clickedStackCopy.isOf(SpectrumItems.CRAFTING_TABLET)) { - if (!this.insertItem(clickedStack, RestockingChestBlockEntity.RECIPE_SLOTS[0], RestockingChestBlockEntity.RECIPE_SLOTS[RestockingChestBlockEntity.RECIPE_SLOTS.length - 1] + 1, false)) { + } else if (index > FabricationChestBlockEntity.INVENTORY_SIZE && clickedStackCopy.isOf(SpectrumItems.CRAFTING_TABLET)) { + if (!this.insertItem(clickedStack, FabricationChestBlockEntity.RECIPE_SLOTS[0], FabricationChestBlockEntity.RECIPE_SLOTS[FabricationChestBlockEntity.RECIPE_SLOTS.length - 1] + 1, false)) { return ItemStack.EMPTY; } } // chest => inventory - if (!this.insertItem(clickedStack, 0, RestockingChestBlockEntity.CHEST_SLOTS.length - 1, false)) { + if (!this.insertItem(clickedStack, 0, FabricationChestBlockEntity.CHEST_SLOTS.length - 1, false)) { return ItemStack.EMPTY; } diff --git a/src/main/java/de/dafuqs/spectrum/inventories/SpectrumScreenHandlerIDs.java b/src/main/java/de/dafuqs/spectrum/inventories/SpectrumScreenHandlerIDs.java index 81cd81efd0..18b09f566a 100644 --- a/src/main/java/de/dafuqs/spectrum/inventories/SpectrumScreenHandlerIDs.java +++ b/src/main/java/de/dafuqs/spectrum/inventories/SpectrumScreenHandlerIDs.java @@ -10,7 +10,7 @@ public class SpectrumScreenHandlerIDs { public static final Identifier PEDESTAL = SpectrumCommon.locate("pedestal"); public static final Identifier CRAFTING_TABLET = SpectrumCommon.locate("crafting_tablet"); - public static final Identifier RESTOCKING_CHEST = SpectrumCommon.locate("restocking_chest"); + public static final Identifier FABRICATION_CHEST = SpectrumCommon.locate("fabrication_chest"); public static final Identifier BEDROCK_ANVIL = SpectrumCommon.locate("bedrock_anvil"); public static final Identifier PARTICLE_SPAWNER = SpectrumCommon.locate("particle_spawner"); public static final Identifier COMPACTING_CHEST = SpectrumCommon.locate("compacting_chest"); diff --git a/src/main/java/de/dafuqs/spectrum/inventories/SpectrumScreenHandlerTypes.java b/src/main/java/de/dafuqs/spectrum/inventories/SpectrumScreenHandlerTypes.java index 47ea07bbf6..7a152d681e 100644 --- a/src/main/java/de/dafuqs/spectrum/inventories/SpectrumScreenHandlerTypes.java +++ b/src/main/java/de/dafuqs/spectrum/inventories/SpectrumScreenHandlerTypes.java @@ -1,14 +1,14 @@ package de.dafuqs.spectrum.inventories; -import io.netty.buffer.ByteBuf; +import io.netty.buffer.*; import net.fabricmc.fabric.api.screenhandler.v1.*; import net.minecraft.client.gui.screen.ingame.*; -import net.minecraft.network.codec.PacketCodec; +import net.minecraft.network.codec.*; import net.minecraft.registry.*; import net.minecraft.resource.featuretoggle.*; import net.minecraft.screen.*; import net.minecraft.util.*; -import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.*; public class SpectrumScreenHandlerTypes { @@ -17,7 +17,7 @@ public class SpectrumScreenHandlerTypes { public static ScreenHandlerType PEDESTAL; public static ScreenHandlerType CRAFTING_TABLET; - public static ScreenHandlerType RESTOCKING_CHEST; + public static ScreenHandlerType FABRICATION_CHEST; public static ScreenHandlerType BEDROCK_ANVIL; public static ScreenHandlerType PARTICLE_SPAWNER; public static ScreenHandlerType COMPACTING_CHEST; @@ -63,7 +63,7 @@ public static void register() { BAG_OF_HOLDING = registerSimple(SpectrumScreenHandlerIDs.BAG_OF_HOLDING, BagOfHoldingScreenHandler::new); CRAFTING_TABLET = registerSimple(SpectrumScreenHandlerIDs.CRAFTING_TABLET, CraftingTabletScreenHandler::new); - RESTOCKING_CHEST = registerSimple(SpectrumScreenHandlerIDs.RESTOCKING_CHEST, RestockingChestScreenHandler::new); + FABRICATION_CHEST = registerSimple(SpectrumScreenHandlerIDs.FABRICATION_CHEST, FabricationChestScreenHandler::new); BEDROCK_ANVIL = registerSimple(SpectrumScreenHandlerIDs.BEDROCK_ANVIL, BedrockAnvilScreenHandler::new); POTION_WORKSHOP = registerSimple(SpectrumScreenHandlerIDs.POTION_WORKSHOP, PotionWorkshopScreenHandler::new); @@ -86,7 +86,7 @@ public static void registerClient() { HandledScreens.register(SpectrumScreenHandlerTypes.PEDESTAL, PedestalScreen::new); HandledScreens.register(SpectrumScreenHandlerTypes.CRAFTING_TABLET, CraftingTabletScreen::new); - HandledScreens.register(SpectrumScreenHandlerTypes.RESTOCKING_CHEST, RestockingChestScreen::new); + HandledScreens.register(SpectrumScreenHandlerTypes.FABRICATION_CHEST, FabricationChestScreen::new); HandledScreens.register(SpectrumScreenHandlerTypes.BEDROCK_ANVIL, BedrockAnvilScreen::new); HandledScreens.register(SpectrumScreenHandlerTypes.PARTICLE_SPAWNER, ParticleSpawnerScreen::new); HandledScreens.register(SpectrumScreenHandlerTypes.COMPACTING_CHEST, CompactingChestScreen::new); diff --git a/src/main/java/de/dafuqs/spectrum/networking/SpectrumS2CPacketReceiver.java b/src/main/java/de/dafuqs/spectrum/networking/SpectrumS2CPacketReceiver.java index 97181a899a..9ef69d759c 100644 --- a/src/main/java/de/dafuqs/spectrum/networking/SpectrumS2CPacketReceiver.java +++ b/src/main/java/de/dafuqs/spectrum/networking/SpectrumS2CPacketReceiver.java @@ -479,8 +479,8 @@ public static void registerS2CReceivers() { entity.get().shouldCraft(hasToCraft); }); }))); - - ClientPlayNetworking.registerGlobalReceiver(SpectrumS2CPackets.RESTOCKING_CHEST_STATUS_UPDATE, (((client, handler, buf, responseSender) -> { + + ClientPlayNetworking.registerGlobalReceiver(SpectrumS2CPackets.FABRICATION_CHEST_STATUS_UPDATE, (((client, handler, buf, responseSender) -> { var pos = buf.readBlockPos(); var isFull = buf.readBoolean(); var hasValidRecipes = buf.readBoolean(); @@ -491,7 +491,7 @@ public static void registerS2CReceivers() { } client.execute(() -> { - var entity = client.world.getBlockEntity(pos, SpectrumBlockEntities.RESTOCKING_CHEST); + var entity = client.world.getBlockEntity(pos, SpectrumBlockEntities.FABRICATION_CHEST); if (entity.isEmpty()) return; diff --git a/src/main/java/de/dafuqs/spectrum/networking/SpectrumS2CPacketSender.java b/src/main/java/de/dafuqs/spectrum/networking/SpectrumS2CPacketSender.java index ca7f2d01ca..e0bd135095 100644 --- a/src/main/java/de/dafuqs/spectrum/networking/SpectrumS2CPacketSender.java +++ b/src/main/java/de/dafuqs/spectrum/networking/SpectrumS2CPacketSender.java @@ -430,8 +430,8 @@ public static void sendCompactingChestStatusUpdate(CompactingChestBlockEntity ch ServerPlayNetworking.send(player, SpectrumS2CPackets.COMPACTING_CHEST_STATUS_UPDATE, buf); } } - - public static void sendRestockingChestStatusUpdate(RestockingChestBlockEntity chest) { + + public static void sendFabricationChestStatusUpdate(FabricationChestBlockEntity chest) { PacketByteBuf buf = PacketByteBufs.create(); buf.writeBlockPos(chest.getPos()); buf.writeBoolean(chest.isFullServer()); @@ -442,7 +442,7 @@ public static void sendRestockingChestStatusUpdate(RestockingChestBlockEntity ch } for (ServerPlayerEntity player : PlayerLookup.tracking(chest)) { - ServerPlayNetworking.send(player, SpectrumS2CPackets.RESTOCKING_CHEST_STATUS_UPDATE, buf); + ServerPlayNetworking.send(player, SpectrumS2CPackets.FABRICATION_CHEST_STATUS_UPDATE, buf); } } diff --git a/src/main/java/de/dafuqs/spectrum/networking/SpectrumS2CPackets.java b/src/main/java/de/dafuqs/spectrum/networking/SpectrumS2CPackets.java index 06af40064e..df0c6ec693 100644 --- a/src/main/java/de/dafuqs/spectrum/networking/SpectrumS2CPackets.java +++ b/src/main/java/de/dafuqs/spectrum/networking/SpectrumS2CPackets.java @@ -47,7 +47,7 @@ public class SpectrumS2CPackets { // Logic public static final Identifier COMPACTING_CHEST_STATUS_UPDATE = SpectrumCommon.locate("compacting_chest_status"); public static final Identifier BLACK_HOLE_CHEST_STATUS_UPDATE = SpectrumCommon.locate("black_hole_chest_status"); - public static final Identifier RESTOCKING_CHEST_STATUS_UPDATE = SpectrumCommon.locate("restocking_chest_status"); + public static final Identifier FABRICATION_CHEST_STATUS_UPDATE = SpectrumCommon.locate("fabrication_chest_status"); public static final Identifier PASTEL_NODE_STATUS_UPDATE = SpectrumCommon.locate("pastel_node_status"); } diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlockEntities.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlockEntities.java index c5e5fdf2e8..36c92eb9ec 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlockEntities.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlockEntities.java @@ -61,7 +61,7 @@ public class SpectrumBlockEntities { public static BlockEntityType COLOR_PICKER; public static BlockEntityType COMPACTING_CHEST; - public static BlockEntityType RESTOCKING_CHEST; + public static BlockEntityType FABRICATION_CHEST; public static BlockEntityType HEARTBOUND_CHEST; public static BlockEntityType BLACK_HOLE_CHEST; public static BlockEntityType PRESERVATION_CHEST; @@ -105,7 +105,7 @@ public static void register() { ENDER_HOPPER = register("ender_hopper", EnderHopperBlockEntity::new, SpectrumBlocks.ENDER_HOPPER); PARTICLE_SPAWNER = register("particle_spawner", ParticleSpawnerBlockEntity::new, SpectrumBlocks.PARTICLE_SPAWNER, SpectrumBlocks.CREATIVE_PARTICLE_SPAWNER); COMPACTING_CHEST = register("compacting_chest", CompactingChestBlockEntity::new, SpectrumBlocks.COMPACTING_CHEST); - RESTOCKING_CHEST = register("restocking_chest", RestockingChestBlockEntity::new, SpectrumBlocks.RESTOCKING_CHEST); + FABRICATION_CHEST = register("fabrication_chest", FabricationChestBlockEntity::new, SpectrumBlocks.FABRICATION_CHEST); HEARTBOUND_CHEST = register("heartbound_chest", HeartboundChestBlockEntity::new, SpectrumBlocks.HEARTBOUND_CHEST); BLACK_HOLE_CHEST = register("black_hole_chest", BlackHoleChestBlockEntity::new, SpectrumBlocks.BLACK_HOLE_CHEST); PRESERVATION_CHEST = register("preservation_chest", TreasureChestBlockEntity::new, SpectrumBlocks.PRESERVATION_CHEST); @@ -157,7 +157,7 @@ public static void registerClient() { BlockEntityRendererFactories.register(SpectrumBlockEntities.PEDESTAL, PedestalBlockEntityRenderer::new); BlockEntityRendererFactories.register(SpectrumBlockEntities.HEARTBOUND_CHEST, HeartboundChestBlockEntityRenderer::new); BlockEntityRendererFactories.register(SpectrumBlockEntities.COMPACTING_CHEST, CompactingChestBlockEntityRenderer::new); - BlockEntityRendererFactories.register(SpectrumBlockEntities.RESTOCKING_CHEST, RestockingChestBlockEntityRenderer::new); + BlockEntityRendererFactories.register(SpectrumBlockEntities.FABRICATION_CHEST, FabricationChestBlockEntityRenderer::new); BlockEntityRendererFactories.register(SpectrumBlockEntities.PRESERVATION_CHEST, SpectrumChestBlockEntityRenderer::new); BlockEntityRendererFactories.register(SpectrumBlockEntities.BLACK_HOLE_CHEST, BlackHoleChestBlockEntityRenderer::new); BlockEntityRendererFactories.register(SpectrumBlockEntities.UPGRADE_BLOCK, UpgradeBlockBlockEntityRenderer::new); diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java index d55ae63ff8..4870cbe651 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java @@ -937,7 +937,7 @@ private static Settings gravityBlock(MapColor mapColor) { // FUNCTIONAL BLOCKS public static final Block HEARTBOUND_CHEST = new HeartboundChestBlock(settings(MapColor.TERRACOTTA_WHITE, BlockSoundGroup.STONE, -1.0F, 3600000.0F).requiresTool().nonOpaque()); public static final Block COMPACTING_CHEST = new CompactingChestBlock(settings(MapColor.TERRACOTTA_WHITE, BlockSoundGroup.STONE, 4.0F, 4.0F).requiresTool().nonOpaque()); - public static final Block RESTOCKING_CHEST = new RestockingChestBlock(settings(MapColor.ORANGE, BlockSoundGroup.STONE, 4.0F, 4.0F).requiresTool().nonOpaque()); + public static final Block FABRICATION_CHEST = new FabricationChestBlock(settings(MapColor.ORANGE, BlockSoundGroup.STONE, 4.0F, 4.0F).requiresTool().nonOpaque()); public static final Block BLACK_HOLE_CHEST = new BlackHoleChestBlock(settings(MapColor.BLACK, BlockSoundGroup.STONE, 4.0F, 4.0F).requiresTool().nonOpaque()); public static final Block PARTICLE_SPAWNER = new ParticleSpawnerBlock(settings(MapColor.TERRACOTTA_WHITE, BlockSoundGroup.AMETHYST_BLOCK, 5.0F, 6.0F).requiresTool().nonOpaque()); public static final Block CREATIVE_PARTICLE_SPAWNER = new CreativeParticleSpawnerBlock(AbstractBlock.Settings.copy(SpectrumBlocks.PARTICLE_SPAWNER).strength(-1.0F, 3600000.8F).dropsNothing()); @@ -1911,7 +1911,7 @@ private static void registerRedstone(Item.Settings settings) { private static void registerMagicalBlocks(Item.Settings settings) { registerBlockWithItem("heartbound_chest", HEARTBOUND_CHEST, settings, DyeColor.BLUE); registerBlockWithItem("compacting_chest", COMPACTING_CHEST, settings, DyeColor.YELLOW); - registerBlockWithItem("restocking_chest", RESTOCKING_CHEST, settings, DyeColor.YELLOW); + registerBlockWithItem("fabrication_chest", FABRICATION_CHEST, settings, DyeColor.YELLOW); registerBlockWithItem("black_hole_chest", BLACK_HOLE_CHEST, settings, DyeColor.LIGHT_GRAY); registerBlockWithItem("ender_hopper", ENDER_HOPPER, settings, DyeColor.PURPLE); @@ -3092,7 +3092,7 @@ public static void registerClient() { BlockRenderLayerMap.INSTANCE.putBlock(SpectrumBlocks.REDSTONE_CALCULATOR, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(SpectrumBlocks.BLACK_HOLE_CHEST, RenderLayer.getTranslucent()); - BlockRenderLayerMap.INSTANCE.putBlock(SpectrumBlocks.RESTOCKING_CHEST, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(SpectrumBlocks.FABRICATION_CHEST, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(SpectrumBlocks.QUITOXIC_REEDS, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(SpectrumBlocks.MERMAIDS_BRUSH, RenderLayer.getCutout()); diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java index 0abf1b2bba..f42b225c8c 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java @@ -248,7 +248,7 @@ public static void register() { entries.add(SpectrumBlocks.HEARTBOUND_CHEST); entries.add(SpectrumBlocks.COMPACTING_CHEST); - entries.add(SpectrumBlocks.RESTOCKING_CHEST); + entries.add(SpectrumBlocks.FABRICATION_CHEST); entries.add(SpectrumBlocks.BLACK_HOLE_CHEST); entries.add(SpectrumBlocks.ENDER_HOPPER); diff --git a/src/main/resources/assets/spectrum/blockstates/restocking_chest.json b/src/main/resources/assets/spectrum/blockstates/restocking_chest.json deleted file mode 100644 index 9bd68be41f..0000000000 --- a/src/main/resources/assets/spectrum/blockstates/restocking_chest.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "variants": { - "facing=north": { - "model": "spectrum:block/restocking_chest" - }, - "facing=east": { - "model": "spectrum:block/restocking_chest", - "y": 90 - }, - "facing=south": { - "model": "spectrum:block/restocking_chest", - "y": 180 - }, - "facing=west": { - "model": "spectrum:block/restocking_chest", - "y": 270 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/lang/de_de.json b/src/main/resources/assets/spectrum/lang/de_de.json index 1c83f24a97..c377229682 100644 --- a/src/main/resources/assets/spectrum/lang/de_de.json +++ b/src/main/resources/assets/spectrum/lang/de_de.json @@ -205,7 +205,7 @@ "block.spectrum.ender_dropper": "Ender Spender", "block.spectrum.ender_hopper": "Ender Trichter", "block.spectrum.compacting_chest": "Verdichtungs-Truhe", - "block.spectrum.restocking_chest": "Fabrikations-Truhe", + "block.spectrum.fabrication_chest": "Fabrikations-Truhe", "block.spectrum.black_hole_chest": "Schwarzloch-Truhe", "block.spectrum.heartbound_chest": "Herzensbindung-Truhe", "block.spectrum.ominous_sapling": "Ominöser Setzling", diff --git a/src/main/resources/assets/spectrum/lang/en_us.json b/src/main/resources/assets/spectrum/lang/en_us.json index 688de36714..cc3c31b879 100644 --- a/src/main/resources/assets/spectrum/lang/en_us.json +++ b/src/main/resources/assets/spectrum/lang/en_us.json @@ -1806,7 +1806,7 @@ "block.spectrum.redstone_timer.setting.ten_seconds": "10 seconds", "block.spectrum.redstone_transceiver": "Redstone Transceiver", "block.spectrum.resonant_lily": "Resonant Lily", - "block.spectrum.restocking_chest": "Fabrication Chest", + "block.spectrum.fabrication_chest": "Fabrication Chest", "block.spectrum.rock_crystal": "Rock Crystal", "block.spectrum.rotten_ground": "Rotten Ground", "block.spectrum.ruin": "Ruin", diff --git a/src/main/resources/assets/spectrum/lang/pt_br.json b/src/main/resources/assets/spectrum/lang/pt_br.json index 37b1ea0759..6782cfd819 100644 --- a/src/main/resources/assets/spectrum/lang/pt_br.json +++ b/src/main/resources/assets/spectrum/lang/pt_br.json @@ -340,7 +340,7 @@ "block.spectrum.ender_hopper": "Funil Ender", "block.spectrum.compacting_chest": "Baú Compactador", "block.spectrum.compacting_chest.toggle_crafting_mode": "Alterna Modo de Fabricação", - "block.spectrum.restocking_chest": "Baú de Fabricação", + "block.spectrum.fabrication_chest": "Baú de Fabricação", "block.spectrum.black_hole_chest": "Baú de Buraco Negro", "block.spectrum.heartbound_chest": "Baú Vinculado ao Coração", "block.spectrum.ominous_sapling": "Muda Sinistra", diff --git a/src/main/resources/assets/spectrum/lang/ru_ru.json b/src/main/resources/assets/spectrum/lang/ru_ru.json index 0befc184d9..6b729781fb 100644 --- a/src/main/resources/assets/spectrum/lang/ru_ru.json +++ b/src/main/resources/assets/spectrum/lang/ru_ru.json @@ -863,7 +863,7 @@ "block.spectrum.ender_hopper.owner": "Эндер-Воронка %s", "block.spectrum.compacting_chest": "Компактный Сундук", "block.spectrum.compacting_chest.toggle_crafting_mode": "Переключить режим создания", - "block.spectrum.restocking_chest": "Сундук Изготовления", + "block.spectrum.fabrication_chest": "Сундук Изготовления", "block.spectrum.black_hole_chest": "Сундук Чёрной Дыры", "block.spectrum.heartbound_chest": "Сердечный Сундук", "block.spectrum.heartbound_chest.owner": "Сердечный Сундук %s", diff --git a/src/main/resources/assets/spectrum/lang/zh_cn.json b/src/main/resources/assets/spectrum/lang/zh_cn.json index 4cfad13a8a..09932e4824 100644 --- a/src/main/resources/assets/spectrum/lang/zh_cn.json +++ b/src/main/resources/assets/spectrum/lang/zh_cn.json @@ -1154,7 +1154,7 @@ "block.spectrum.ender_hopper.owner": "%s的末影漏斗", "block.spectrum.compacting_chest": "压缩箱", "block.spectrum.compacting_chest.toggle_crafting_mode": "切换合成方式", - "block.spectrum.restocking_chest": "装配箱", + "block.spectrum.fabrication_chest": "装配箱", "block.spectrum.black_hole_chest": "黑洞箱", "block.spectrum.heartbound_chest": "心灵结印箱", "block.spectrum.heartbound_chest.owner": "%s的心灵结印箱", diff --git a/src/main/resources/assets/spectrum/models/block/restocking_chest.json b/src/main/resources/assets/spectrum/models/block/restocking_chest.json deleted file mode 100755 index bba94e1538..0000000000 --- a/src/main/resources/assets/spectrum/models/block/restocking_chest.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "credit": "~ XOXO Azzyypaaras ~", - "parent": "block/block", - "texture_size": [128, 128], - "textures": { - "1": "spectrum:block/fabrication_chest", - "particle": "spectrum:block/fabrication_chest_particle" - }, - "elements": [ - { - "name": "b-foot", - "from": [0, 0, 0], - "to": [16, 2, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, - "faces": { - "north": {"uv": [2, 7.25, 4, 7.5], "texture": "#1"}, - "east": {"uv": [0, 7.25, 2, 7.5], "texture": "#1"}, - "south": {"uv": [6, 7.25, 8, 7.5], "texture": "#1"}, - "west": {"uv": [4, 7.25, 6, 7.5], "texture": "#1"}, - "up": {"uv": [4, 7.25, 2, 5.25], "texture": "#1"}, - "down": {"uv": [6, 5.25, 4, 7.25], "texture": "#1"} - } - }, - { - "name": "b-out", - "from": [0.5, 2, 0.5], - "to": [15.5, 9, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 2, 7.5]}, - "faces": { - "north": {"uv": [1.875, 4.375, 3.75, 5.25], "texture": "#1"}, - "east": {"uv": [0, 4.375, 1.875, 5.25], "texture": "#1"}, - "south": {"uv": [5.625, 4.375, 7.5, 5.25], "texture": "#1"}, - "west": {"uv": [3.75, 4.375, 5.625, 5.25], "texture": "#1"}, - "up": {"uv": [3.75, 4.375, 1.875, 2.5], "texture": "#1"}, - "down": {"uv": [5.625, 2.5, 3.75, 4.375], "texture": "#1"} - } - }, - { - "name": "b-in", - "from": [14.5, 9, 14.5], - "to": [1.5, 2, 1.5], - "rotation": {"angle": 0, "axis": "y", "origin": [21.5, 9, 20.5]}, - "faces": { - "north": {"uv": [9.25, 6.125, 7.625, 5.25], "texture": "#1"}, - "east": {"uv": [9.25, 6.125, 7.625, 5.25], "texture": "#1"}, - "south": {"uv": [9.25, 6.125, 7.625, 5.25], "texture": "#1"}, - "west": {"uv": [9.25, 6.125, 7.625, 5.25], "texture": "#1"}, - "up": {"uv": [9.25, 3.625, 10.875, 5.25], "texture": "#1"}, - "down": {"uv": [10.875, 5.25, 12.5, 3.625], "texture": "#1"} - } - }, - { - "name": "b-rod", - "from": [7, 2, 7], - "to": [9, 10, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 2, 9]}, - "faces": { - "north": {"uv": [0.25, 2.75, 0.5, 3.75], "texture": "#1"}, - "east": {"uv": [0, 2.75, 0.25, 3.75], "texture": "#1"}, - "south": {"uv": [0.75, 2.75, 1, 3.75], "texture": "#1"}, - "west": {"uv": [0.5, 2.75, 0.75, 3.75], "texture": "#1"}, - "up": {"uv": [0.5, 2.75, 0.25, 2.5], "texture": "#1"}, - "down": {"uv": [0.75, 2.5, 0.5, 2.75], "texture": "#1"} - } - } - ], - "groups": [ - { - "name": "root", - "origin": [8, 0, 8], - "color": 0, - "nbt": "{}", - "children": [ - { - "name": "body", - "origin": [8, 0, 8], - "color": 0, - "nbt": "{}", - "children": [0, 1, 2, 3] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/restocking_chest.json b/src/main/resources/assets/spectrum/models/item/restocking_chest.json deleted file mode 100755 index 0327d11598..0000000000 --- a/src/main/resources/assets/spectrum/models/item/restocking_chest.json +++ /dev/null @@ -1,127 +0,0 @@ -{ - "credit": "~ XOXO Azzyypaaras ~", - "texture_size": [128, 128], - "textures": { - "1": "spectrum:block/fabrication_chest" - }, - "elements": [ - { - "name": "b-foot", - "from": [0, 0, 0], - "to": [16, 2, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, - "faces": { - "north": {"uv": [2, 7.25, 4, 7.5], "texture": "#1"}, - "east": {"uv": [0, 7.25, 2, 7.5], "texture": "#1"}, - "south": {"uv": [6, 7.25, 8, 7.5], "texture": "#1"}, - "west": {"uv": [4, 7.25, 6, 7.5], "texture": "#1"}, - "up": {"uv": [4, 7.25, 2, 5.25], "texture": "#1"}, - "down": {"uv": [6, 5.25, 4, 7.25], "texture": "#1"} - } - }, - { - "name": "b-out", - "from": [0.5, 2, 0.5], - "to": [15.5, 9, 15.5], - "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 2, 7.5]}, - "faces": { - "north": {"uv": [1.875, 4.375, 3.75, 5.25], "texture": "#1"}, - "east": {"uv": [0, 4.375, 1.875, 5.25], "texture": "#1"}, - "south": {"uv": [5.625, 4.375, 7.5, 5.25], "texture": "#1"}, - "west": {"uv": [3.75, 4.375, 5.625, 5.25], "texture": "#1"}, - "up": {"uv": [3.75, 4.375, 1.875, 2.5], "texture": "#1"}, - "down": {"uv": [5.625, 2.5, 3.75, 4.375], "texture": "#1"} - } - }, - { - "name": "r-out", - "from": [0, 8, 0], - "to": [16, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 9, 8]}, - "faces": { - "north": {"uv": [2, 2, 4, 2.5], "texture": "#1"}, - "east": {"uv": [0, 2, 2, 2.5], "texture": "#1"}, - "south": {"uv": [6, 2, 8, 2.5], "texture": "#1"}, - "west": {"uv": [4, 2, 6, 2.5], "texture": "#1"}, - "up": {"uv": [4, 2, 2, 0], "texture": "#1"}, - "down": {"uv": [6, 0, 4, 2], "texture": "#1"} - } - }, - { - "name": "c-out", - "from": [1.5, 11, 1.5], - "to": [14.5, 14, 14.5], - "rotation": {"angle": 0, "axis": "y", "origin": [7.5, 11, 7.5]}, - "faces": { - "north": {"uv": [7.625, 1.625, 9.25, 2], "texture": "#1"}, - "east": {"uv": [6, 1.625, 7.625, 2], "texture": "#1"}, - "south": {"uv": [10.875, 1.625, 12.5, 2], "texture": "#1"}, - "west": {"uv": [9.25, 1.625, 10.875, 2], "texture": "#1"}, - "up": {"uv": [9.25, 1.625, 7.625, 0], "texture": "#1"}, - "down": {"uv": [10.875, 0, 9.25, 1.625], "texture": "#1"} - } - } - ], - "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": "root", - "origin": [8, 0, 8], - "color": 0, - "nbt": "{}", - "children": [ - { - "name": "body", - "origin": [8, 0, 8], - "color": 0, - "nbt": "{}", - "children": [0, 1] - }, - { - "name": "rim", - "origin": [8, 9, 8], - "color": 0, - "nbt": "{}", - "children": [2] - }, - { - "name": "crafting_tablet", - "origin": [8, 15, 10], - "color": 0, - "nbt": "{}", - "children": [3] - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/textures/gui/container/restocking_chest.png b/src/main/resources/assets/spectrum/textures/gui/container/restocking_chest.png deleted file mode 100644 index 9029a7c1c6764fc554d1c01316fb2640c28ccc97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8167 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 J1(&QI{T~2jp!xs+ diff --git a/src/main/resources/data/c/tags/blocks/chest.json b/src/main/resources/data/c/tags/blocks/chest.json index 6b9d9d850a..844a88947e 100644 --- a/src/main/resources/data/c/tags/blocks/chest.json +++ b/src/main/resources/data/c/tags/blocks/chest.json @@ -4,7 +4,7 @@ "spectrum:preservation_chest", "spectrum:heartbound_chest", "spectrum:compacting_chest", - "spectrum:restocking_chest", + "spectrum:fabrication_chest", "spectrum:black_hole_chest" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json index a82052b79c..3d452a47f3 100644 --- a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -75,7 +75,7 @@ "spectrum:particle_spawner", "spectrum:compacting_chest", "spectrum:heartbound_chest", - "spectrum:restocking_chest", + "spectrum:fabrication_chest", "spectrum:ender_dropper", "spectrum:ender_hopper", "spectrum:radiating_ender", @@ -102,7 +102,7 @@ "spectrum:particle_spawner", "spectrum:compacting_chest", "spectrum:heartbound_chest", - "spectrum:restocking_chest", + "spectrum:fabrication_chest", "spectrum:ender_dropper", "spectrum:ender_hopper", "spectrum:shimmerstone_block", diff --git a/src/main/resources/data/spectrum/advancement/unlocks/blocks/restocking_chest.json b/src/main/resources/data/spectrum/advancement/unlocks/blocks/restocking_chest.json deleted file mode 100644 index eac97b8088..0000000000 --- a/src/main/resources/data/spectrum/advancement/unlocks/blocks/restocking_chest.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "criteria": { - "collected_stratine": { - "trigger":"revelationary:advancement_gotten", - "conditions": { "advancement_identifier": "spectrum:midgame/collect_stratine" } - } - } -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/loot_table/blocks/restocking_chest.json b/src/main/resources/data/spectrum/loot_table/blocks/restocking_chest.json deleted file mode 100644 index 55247dd3e0..0000000000 --- a/src/main/resources/data/spectrum/loot_table/blocks/restocking_chest.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "spectrum:restocking_chest" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/magical_blocks/fabrication_chest.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/magical_blocks/fabrication_chest.json index bd1e6ad429..cdbe778141 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/magical_blocks/fabrication_chest.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/magical_blocks/fabrication_chest.json @@ -1,10 +1,10 @@ { - "name": "block.spectrum.restocking_chest", + "name": "block.spectrum.fabrication_chest", "condition": { "type": "modonomicon:advancement", - "advancement_id": "spectrum:unlocks/blocks/restocking_chest" + "advancement_id": "spectrum:unlocks/blocks/fabrication_chest" }, - "icon": "spectrum:restocking_chest", + "icon": "spectrum:fabrication_chest", "category": "spectrum:magical_blocks", "hide_while_locked": true, "parents": [], @@ -16,16 +16,16 @@ { "type": "modonomicon:spotlight", "item": { - "item": "spectrum:restocking_chest" + "item": "spectrum:fabrication_chest" }, "text": "book.spectrum.guidebook.fabrication_chest.page0.text", - "title": "block.spectrum.restocking_chest" + "title": "block.spectrum.fabrication_chest" }, { "type": "spectrum:pedestal_crafting", "text": "book.spectrum.guidebook.fabrication_chest.page1.text", "title": "container.spectrum.rei.pedestal_recipe", - "recipe_id": "spectrum:pedestal/tier3/restocking_chest" + "recipe_id": "spectrum:pedestal/tier3/fabrication_chest" } ] } diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier3/restocking_chest.json b/src/main/resources/data/spectrum/recipe/pedestal/tier3/restocking_chest.json deleted file mode 100644 index b10eec1e59..0000000000 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier3/restocking_chest.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "type": "spectrum:pedestal", - "time": 1600, - "tier": "advanced", - "cyan": 4, - "magenta": 0, - "yellow": 2, - "black": 1, - "white": 0, - "experience": 2.0, - "pattern": [ - "CTC", - "PGP", - "BBB" - ], - "key": { - "B": { - "item": "spectrum:polished_basalt" - }, - "P": { - "item": "spectrum:polished_calcite" - }, - "C": { - "item": "minecraft:copper_ingot" - }, - "G": { - "item": "spectrum:stratine_fragments" - }, - "T": { - "item": "spectrum:red_pigment" - } - }, - "result": { - "item": "spectrum:restocking_chest", - "count": 1 - }, - "required_advancement": "spectrum:unlocks/blocks/restocking_chest" -} \ No newline at end of file From afb13d1eb2df823c722d520f3bc5e33742a19e4b Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sun, 17 Nov 2024 13:58:37 +0100 Subject: [PATCH 03/14] restocking chest -> fabrication chest --- .../blockstates/fabrication_chest.json | 19 + .../models/block/fabrication_chest.json | 356 +++++++++++++ .../models/item/fabrication_chest.json | 469 ++++++++++++++++++ .../gui/container/fabrication_chest.png | Bin 0 -> 8167 bytes .../unlocks/blocks/fabrication_chest.json | 10 + .../pedestal/tier3/fabrication_chest.json | 38 ++ 6 files changed, 892 insertions(+) create mode 100644 src/main/resources/assets/spectrum/blockstates/fabrication_chest.json create mode 100644 src/main/resources/assets/spectrum/models/block/fabrication_chest.json create mode 100644 src/main/resources/assets/spectrum/models/item/fabrication_chest.json create mode 100644 src/main/resources/assets/spectrum/textures/gui/container/fabrication_chest.png create mode 100644 src/main/resources/data/spectrum/advancement/unlocks/blocks/fabrication_chest.json create mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier3/fabrication_chest.json diff --git a/src/main/resources/assets/spectrum/blockstates/fabrication_chest.json b/src/main/resources/assets/spectrum/blockstates/fabrication_chest.json new file mode 100644 index 0000000000..c47148068f --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/fabrication_chest.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=north": { + "model": "spectrum:block/fabrication_chest" + }, + "facing=east": { + "model": "spectrum:block/fabrication_chest", + "y": 90 + }, + "facing=south": { + "model": "spectrum:block/fabrication_chest", + "y": 180 + }, + "facing=west": { + "model": "spectrum:block/fabrication_chest", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/fabrication_chest.json b/src/main/resources/assets/spectrum/models/block/fabrication_chest.json new file mode 100644 index 0000000000..a15172a7f5 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/fabrication_chest.json @@ -0,0 +1,356 @@ +{ + "credit": "~ XOXO Azzyypaaras ~", + "parent": "block/block", + "texture_size": [ + 128, + 128 + ], + "textures": { + "1": "spectrum:block/fabrication_chest", + "particle": "spectrum:block/fabrication_chest_particle" + }, + "elements": [ + { + "name": "b-foot", + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 2, + 16 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 0, + 8 + ] + }, + "faces": { + "north": { + "uv": [ + 2, + 7.25, + 4, + 7.5 + ], + "texture": "#1" + }, + "east": { + "uv": [ + 0, + 7.25, + 2, + 7.5 + ], + "texture": "#1" + }, + "south": { + "uv": [ + 6, + 7.25, + 8, + 7.5 + ], + "texture": "#1" + }, + "west": { + "uv": [ + 4, + 7.25, + 6, + 7.5 + ], + "texture": "#1" + }, + "up": { + "uv": [ + 4, + 7.25, + 2, + 5.25 + ], + "texture": "#1" + }, + "down": { + "uv": [ + 6, + 5.25, + 4, + 7.25 + ], + "texture": "#1" + } + } + }, + { + "name": "b-out", + "from": [ + 0.5, + 2, + 0.5 + ], + "to": [ + 15.5, + 9, + 15.5 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8.5, + 2, + 7.5 + ] + }, + "faces": { + "north": { + "uv": [ + 1.875, + 4.375, + 3.75, + 5.25 + ], + "texture": "#1" + }, + "east": { + "uv": [ + 0, + 4.375, + 1.875, + 5.25 + ], + "texture": "#1" + }, + "south": { + "uv": [ + 5.625, + 4.375, + 7.5, + 5.25 + ], + "texture": "#1" + }, + "west": { + "uv": [ + 3.75, + 4.375, + 5.625, + 5.25 + ], + "texture": "#1" + }, + "up": { + "uv": [ + 3.75, + 4.375, + 1.875, + 2.5 + ], + "texture": "#1" + }, + "down": { + "uv": [ + 5.625, + 2.5, + 3.75, + 4.375 + ], + "texture": "#1" + } + } + }, + { + "name": "b-in", + "from": [ + 14.5, + 9, + 14.5 + ], + "to": [ + 1.5, + 2, + 1.5 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 21.5, + 9, + 20.5 + ] + }, + "faces": { + "north": { + "uv": [ + 9.25, + 6.125, + 7.625, + 5.25 + ], + "texture": "#1" + }, + "east": { + "uv": [ + 9.25, + 6.125, + 7.625, + 5.25 + ], + "texture": "#1" + }, + "south": { + "uv": [ + 9.25, + 6.125, + 7.625, + 5.25 + ], + "texture": "#1" + }, + "west": { + "uv": [ + 9.25, + 6.125, + 7.625, + 5.25 + ], + "texture": "#1" + }, + "up": { + "uv": [ + 9.25, + 3.625, + 10.875, + 5.25 + ], + "texture": "#1" + }, + "down": { + "uv": [ + 10.875, + 5.25, + 12.5, + 3.625 + ], + "texture": "#1" + } + } + }, + { + "name": "b-rod", + "from": [ + 7, + 2, + 7 + ], + "to": [ + 9, + 10, + 9 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 2, + 9 + ] + }, + "faces": { + "north": { + "uv": [ + 0.25, + 2.75, + 0.5, + 3.75 + ], + "texture": "#1" + }, + "east": { + "uv": [ + 0, + 2.75, + 0.25, + 3.75 + ], + "texture": "#1" + }, + "south": { + "uv": [ + 0.75, + 2.75, + 1, + 3.75 + ], + "texture": "#1" + }, + "west": { + "uv": [ + 0.5, + 2.75, + 0.75, + 3.75 + ], + "texture": "#1" + }, + "up": { + "uv": [ + 0.5, + 2.75, + 0.25, + 2.5 + ], + "texture": "#1" + }, + "down": { + "uv": [ + 0.75, + 2.5, + 0.5, + 2.75 + ], + "texture": "#1" + } + } + } + ], + "groups": [ + { + "name": "root", + "origin": [ + 8, + 0, + 8 + ], + "color": 0, + "nbt": "{}", + "children": [ + { + "name": "body", + "origin": [ + 8, + 0, + 8 + ], + "color": 0, + "nbt": "{}", + "children": [ + 0, + 1, + 2, + 3 + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/fabrication_chest.json b/src/main/resources/assets/spectrum/models/item/fabrication_chest.json new file mode 100644 index 0000000000..09ac195cca --- /dev/null +++ b/src/main/resources/assets/spectrum/models/item/fabrication_chest.json @@ -0,0 +1,469 @@ +{ + "credit": "~ XOXO Azzyypaaras ~", + "texture_size": [ + 128, + 128 + ], + "textures": { + "1": "spectrum:block/fabrication_chest" + }, + "elements": [ + { + "name": "b-foot", + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 2, + 16 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 0, + 8 + ] + }, + "faces": { + "north": { + "uv": [ + 2, + 7.25, + 4, + 7.5 + ], + "texture": "#1" + }, + "east": { + "uv": [ + 0, + 7.25, + 2, + 7.5 + ], + "texture": "#1" + }, + "south": { + "uv": [ + 6, + 7.25, + 8, + 7.5 + ], + "texture": "#1" + }, + "west": { + "uv": [ + 4, + 7.25, + 6, + 7.5 + ], + "texture": "#1" + }, + "up": { + "uv": [ + 4, + 7.25, + 2, + 5.25 + ], + "texture": "#1" + }, + "down": { + "uv": [ + 6, + 5.25, + 4, + 7.25 + ], + "texture": "#1" + } + } + }, + { + "name": "b-out", + "from": [ + 0.5, + 2, + 0.5 + ], + "to": [ + 15.5, + 9, + 15.5 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8.5, + 2, + 7.5 + ] + }, + "faces": { + "north": { + "uv": [ + 1.875, + 4.375, + 3.75, + 5.25 + ], + "texture": "#1" + }, + "east": { + "uv": [ + 0, + 4.375, + 1.875, + 5.25 + ], + "texture": "#1" + }, + "south": { + "uv": [ + 5.625, + 4.375, + 7.5, + 5.25 + ], + "texture": "#1" + }, + "west": { + "uv": [ + 3.75, + 4.375, + 5.625, + 5.25 + ], + "texture": "#1" + }, + "up": { + "uv": [ + 3.75, + 4.375, + 1.875, + 2.5 + ], + "texture": "#1" + }, + "down": { + "uv": [ + 5.625, + 2.5, + 3.75, + 4.375 + ], + "texture": "#1" + } + } + }, + { + "name": "r-out", + "from": [ + 0, + 8, + 0 + ], + "to": [ + 16, + 12, + 16 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 8, + 9, + 8 + ] + }, + "faces": { + "north": { + "uv": [ + 2, + 2, + 4, + 2.5 + ], + "texture": "#1" + }, + "east": { + "uv": [ + 0, + 2, + 2, + 2.5 + ], + "texture": "#1" + }, + "south": { + "uv": [ + 6, + 2, + 8, + 2.5 + ], + "texture": "#1" + }, + "west": { + "uv": [ + 4, + 2, + 6, + 2.5 + ], + "texture": "#1" + }, + "up": { + "uv": [ + 4, + 2, + 2, + 0 + ], + "texture": "#1" + }, + "down": { + "uv": [ + 6, + 0, + 4, + 2 + ], + "texture": "#1" + } + } + }, + { + "name": "c-out", + "from": [ + 1.5, + 11, + 1.5 + ], + "to": [ + 14.5, + 14, + 14.5 + ], + "rotation": { + "angle": 0, + "axis": "y", + "origin": [ + 7.5, + 11, + 7.5 + ] + }, + "faces": { + "north": { + "uv": [ + 7.625, + 1.625, + 9.25, + 2 + ], + "texture": "#1" + }, + "east": { + "uv": [ + 6, + 1.625, + 7.625, + 2 + ], + "texture": "#1" + }, + "south": { + "uv": [ + 10.875, + 1.625, + 12.5, + 2 + ], + "texture": "#1" + }, + "west": { + "uv": [ + 9.25, + 1.625, + 10.875, + 2 + ], + "texture": "#1" + }, + "up": { + "uv": [ + 9.25, + 1.625, + 7.625, + 0 + ], + "texture": "#1" + }, + "down": { + "uv": [ + 10.875, + 0, + 9.25, + 1.625 + ], + "texture": "#1" + } + } + } + ], + "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": "root", + "origin": [ + 8, + 0, + 8 + ], + "color": 0, + "nbt": "{}", + "children": [ + { + "name": "body", + "origin": [ + 8, + 0, + 8 + ], + "color": 0, + "nbt": "{}", + "children": [ + 0, + 1 + ] + }, + { + "name": "rim", + "origin": [ + 8, + 9, + 8 + ], + "color": 0, + "nbt": "{}", + "children": [ + 2 + ] + }, + { + "name": "crafting_tablet", + "origin": [ + 8, + 15, + 10 + ], + "color": 0, + "nbt": "{}", + "children": [ + 3 + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/textures/gui/container/fabrication_chest.png b/src/main/resources/assets/spectrum/textures/gui/container/fabrication_chest.png new file mode 100644 index 0000000000000000000000000000000000000000..9029a7c1c6764fc554d1c01316fb2640c28ccc97 GIT binary patch literal 8167 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 J1(&QI{T~2jp!xs+ literal 0 HcmV?d00001 diff --git a/src/main/resources/data/spectrum/advancement/unlocks/blocks/fabrication_chest.json b/src/main/resources/data/spectrum/advancement/unlocks/blocks/fabrication_chest.json new file mode 100644 index 0000000000..488c8897cc --- /dev/null +++ b/src/main/resources/data/spectrum/advancement/unlocks/blocks/fabrication_chest.json @@ -0,0 +1,10 @@ +{ + "criteria": { + "collected_stratine": { + "trigger": "revelationary:advancement_gotten", + "conditions": { + "advancement_identifier": "spectrum:midgame/collect_stratine" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier3/fabrication_chest.json b/src/main/resources/data/spectrum/recipe/pedestal/tier3/fabrication_chest.json new file mode 100644 index 0000000000..bad180b548 --- /dev/null +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier3/fabrication_chest.json @@ -0,0 +1,38 @@ +{ + "type": "spectrum:pedestal", + "time": 1600, + "tier": "advanced", + "cyan": 4, + "magenta": 0, + "yellow": 2, + "black": 1, + "white": 0, + "experience": 2.0, + "pattern": [ + "CTC", + "PGP", + "BBB" + ], + "key": { + "B": { + "item": "spectrum:polished_basalt" + }, + "P": { + "item": "spectrum:polished_calcite" + }, + "C": { + "item": "minecraft:copper_ingot" + }, + "G": { + "item": "spectrum:stratine_fragments" + }, + "T": { + "item": "spectrum:red_pigment" + } + }, + "result": { + "item": "spectrum:fabrication_chest", + "count": 1 + }, + "required_advancement": "spectrum:unlocks/blocks/fabrication_chest" +} \ No newline at end of file From 69f1356955592ec9064239c474c0482046b9c96c Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sun, 17 Nov 2024 13:58:58 +0100 Subject: [PATCH 04/14] gravity block -> float block --- .../compat/REI/REIClientIntegration.java | 2 +- .../compat/emi/SpectrumEmiPlugin.java | 4 ++-- .../spectrum/entity/SpectrumEntityTypes.java | 2 +- .../entity/entity/FloatBlockEntity.java | 6 +++--- .../spectrum/registries/SpectrumBlocks.java | 10 ++++----- .../registries/SpectrumItemGroups.java | 4 ++-- .../blockstates/paltaeria_floatblock.json | 7 +++++++ .../blockstates/paltaeria_fragment_block.json | 7 ------- .../blockstates/stratine_floatblock.json | 7 +++++++ .../blockstates/stratine_fragment_block.json | 7 ------- .../resources/assets/spectrum/lang/de_de.json | 4 ++-- .../resources/assets/spectrum/lang/en_us.json | 4 ++-- .../resources/assets/spectrum/lang/pt_br.json | 4 ++-- .../resources/assets/spectrum/lang/ru_ru.json | 4 ++-- .../resources/assets/spectrum/lang/zh_cn.json | 4 ++-- .../models/block/paltaeria_floatblock.json | 12 +++++++++++ .../block/paltaeria_fragment_block.json | 12 ----------- .../models/block/stratine_floatblock.json | 12 +++++++++++ .../models/block/stratine_fragment_block.json | 12 ----------- .../models/item/paltaeria_floatblock.json | 3 +++ .../models/item/paltaeria_fragment_block.json | 3 --- .../models/item/stratine_floatblock.json | 3 +++ .../models/item/stratine_fragment_block.json | 3 --- ...side.png => paltaeria_floatblock_side.png} | Bin ....png => paltaeria_floatblock_vertical.png} | Bin ..._side.png => stratine_floatblock_side.png} | Bin ...l.png => stratine_floatblock_vertical.png} | Bin .../tags/block/mineable/pickaxe.json | 8 ++++---- .../carry_too_many_low_gravity_blocks.json | 2 +- .../carry_too_many_heavy_gravity_blocks.json | 2 +- ...ment_block.json => fabrication_chest.json} | 2 +- ...t_block.json => paltaeria_floatblock.json} | 2 +- .../blocks/stratine_floatblock.json | 19 ++++++++++++++++++ .../guidebook/entries/general/paltaeria.json | 6 +++--- .../guidebook/entries/general/stratine.json | 6 +++--- ...t_block.json => paltaeria_floatblock.json} | 2 +- ..._fragments_from_paltaeria_floatblock.json} | 2 +- ...nt_block.json => stratine_floatblock.json} | 2 +- ...e_fragments_from_stratine_floatblock.json} | 2 +- 39 files changed, 105 insertions(+), 86 deletions(-) create mode 100644 src/main/resources/assets/spectrum/blockstates/paltaeria_floatblock.json delete mode 100644 src/main/resources/assets/spectrum/blockstates/paltaeria_fragment_block.json create mode 100644 src/main/resources/assets/spectrum/blockstates/stratine_floatblock.json delete mode 100644 src/main/resources/assets/spectrum/blockstates/stratine_fragment_block.json create mode 100644 src/main/resources/assets/spectrum/models/block/paltaeria_floatblock.json delete mode 100644 src/main/resources/assets/spectrum/models/block/paltaeria_fragment_block.json create mode 100644 src/main/resources/assets/spectrum/models/block/stratine_floatblock.json delete mode 100644 src/main/resources/assets/spectrum/models/block/stratine_fragment_block.json create mode 100644 src/main/resources/assets/spectrum/models/item/paltaeria_floatblock.json delete mode 100644 src/main/resources/assets/spectrum/models/item/paltaeria_fragment_block.json create mode 100644 src/main/resources/assets/spectrum/models/item/stratine_floatblock.json delete mode 100644 src/main/resources/assets/spectrum/models/item/stratine_fragment_block.json rename src/main/resources/assets/spectrum/textures/block/{paltaeria_fragment_block_side.png => paltaeria_floatblock_side.png} (100%) rename src/main/resources/assets/spectrum/textures/block/{paltaeria_fragment_block_vertical.png => paltaeria_floatblock_vertical.png} (100%) rename src/main/resources/assets/spectrum/textures/block/{stratine_fragment_block_side.png => stratine_floatblock_side.png} (100%) rename src/main/resources/assets/spectrum/textures/block/{stratine_fragment_block_vertical.png => stratine_floatblock_vertical.png} (100%) rename src/main/resources/data/spectrum/loot_table/blocks/{stratine_fragment_block.json => fabrication_chest.json} (83%) rename src/main/resources/data/spectrum/loot_table/blocks/{paltaeria_fragment_block.json => paltaeria_floatblock.json} (83%) create mode 100644 src/main/resources/data/spectrum/loot_table/blocks/stratine_floatblock.json rename src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/{paltaeria_fragment_block.json => paltaeria_floatblock.json} (90%) rename src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/{paltaeria_fragments_from_paltaeria_fragment_block.json => paltaeria_fragments_from_paltaeria_floatblock.json} (89%) rename src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/{stratine_fragment_block.json => stratine_floatblock.json} (90%) rename src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/{stratine_fragments_from_stratine_fragment_block.json => stratine_fragments_from_stratine_floatblock.json} (89%) diff --git a/src/main/java/de/dafuqs/spectrum/compat/REI/REIClientIntegration.java b/src/main/java/de/dafuqs/spectrum/compat/REI/REIClientIntegration.java index 46d810d488..abe3beb072 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/REI/REIClientIntegration.java +++ b/src/main/java/de/dafuqs/spectrum/compat/REI/REIClientIntegration.java @@ -84,7 +84,7 @@ public void registerCategories(CategoryRegistry registry) { registry.addWorkstations(BuiltinPlugin.CRAFTING, EntryStacks.of(SpectrumBlocks.FABRICATION_CHEST)); registry.addWorkstations(BuiltinPlugin.BLASTING, EntryStacks.of(SpectrumBlocks.CINDERHEARTH)); - registry.addWorkstations(SpectrumPlugins.ANVIL_CRUSHING, EntryStacks.of(Blocks.ANVIL), EntryStacks.of(SpectrumBlocks.BEDROCK_ANVIL), EntryStacks.of(SpectrumBlocks.STRATINE_FRAGMENT_BLOCK), EntryStacks.of(SpectrumBlocks.PALTAERIA_FRAGMENT_BLOCK)); + registry.addWorkstations(SpectrumPlugins.ANVIL_CRUSHING, EntryStacks.of(Blocks.ANVIL), EntryStacks.of(SpectrumBlocks.BEDROCK_ANVIL), EntryStacks.of(SpectrumBlocks.STRATINE_FLOATBLOCK), EntryStacks.of(SpectrumBlocks.PALTAERIA_FLOATBLOCK)); registry.addWorkstations(SpectrumPlugins.FUSION_SHRINE, EntryIngredient.of(EntryStacks.of(SpectrumBlocks.FUSION_SHRINE_BASALT), EntryStacks.of(SpectrumBlocks.FUSION_SHRINE_CALCITE))); registry.addWorkstations(SpectrumPlugins.NATURES_STAFF, EntryStacks.of(SpectrumItems.NATURES_STAFF)); registry.addWorkstations(SpectrumPlugins.HEATING, EntryStacks.of(SpectrumBlocks.BLAZE_IDOL)); diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/SpectrumEmiPlugin.java b/src/main/java/de/dafuqs/spectrum/compat/emi/SpectrumEmiPlugin.java index 76ea6aa51f..1c234ea83a 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/SpectrumEmiPlugin.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/SpectrumEmiPlugin.java @@ -92,8 +92,8 @@ public void registerCategories(EmiRegistry registry) { registry.addWorkstation(SpectrumEmiRecipeCategories.ANVIL_CRUSHING, EmiStack.of(Blocks.ANVIL)); registry.addWorkstation(SpectrumEmiRecipeCategories.ANVIL_CRUSHING, EmiStack.of(SpectrumBlocks.BEDROCK_ANVIL)); - registry.addWorkstation(SpectrumEmiRecipeCategories.ANVIL_CRUSHING, EmiStack.of(SpectrumBlocks.STRATINE_FRAGMENT_BLOCK)); - registry.addWorkstation(SpectrumEmiRecipeCategories.ANVIL_CRUSHING, EmiStack.of(SpectrumBlocks.PALTAERIA_FRAGMENT_BLOCK)); + registry.addWorkstation(SpectrumEmiRecipeCategories.ANVIL_CRUSHING, EmiStack.of(SpectrumBlocks.STRATINE_FLOATBLOCK)); + registry.addWorkstation(SpectrumEmiRecipeCategories.ANVIL_CRUSHING, EmiStack.of(SpectrumBlocks.PALTAERIA_FLOATBLOCK)); registry.addWorkstation(SpectrumEmiRecipeCategories.FUSION_SHRINE, EmiStack.of(SpectrumBlocks.FUSION_SHRINE_BASALT)); registry.addWorkstation(SpectrumEmiRecipeCategories.FUSION_SHRINE, EmiStack.of(SpectrumBlocks.FUSION_SHRINE_CALCITE)); registry.addWorkstation(SpectrumEmiRecipeCategories.NATURES_STAFF, EmiStack.of(SpectrumItems.NATURES_STAFF)); diff --git a/src/main/java/de/dafuqs/spectrum/entity/SpectrumEntityTypes.java b/src/main/java/de/dafuqs/spectrum/entity/SpectrumEntityTypes.java index 4570d203ed..86848cfd4d 100644 --- a/src/main/java/de/dafuqs/spectrum/entity/SpectrumEntityTypes.java +++ b/src/main/java/de/dafuqs/spectrum/entity/SpectrumEntityTypes.java @@ -12,7 +12,7 @@ public class SpectrumEntityTypes { public static final EntityType LIVING_MARKER = register("living_marker", 0, 2147483647, false, EntityDimensions.changing(0F, 0F), true, LivingMarkerEntity::new); public static final EntityType SHOOTING_STAR = register("shooting_star", 15, 20, true, EntityDimensions.changing(0.8F, 0.8F), true, ShootingStarEntity::new); public static final EntityType SEAT = register("seat", 8, 10, false, EntityDimensions.changing(0.01F, 0.01F), true, SeatEntity::new); - public static final EntityType FLOAT_BLOCK = register("gravity_block", 10, 20, true, EntityDimensions.changing(0.98F, 0.98F), true, FloatBlockEntity::new); + public static final EntityType FLOAT_BLOCK = register("float_block", 10, 20, true, EntityDimensions.changing(0.98F, 0.98F), true, FloatBlockEntity::new); public static final EntityType PHANTOM_FRAME = register("phantom_frame", 10, 2147483647, false, EntityDimensions.changing(0.5F, 0.5F), false, PhantomFrameEntity::new); public static final EntityType GLOW_PHANTOM_FRAME = register("glow_phantom_frame", 10, 2147483647, false, EntityDimensions.changing(0.5F, 0.5F), false, PhantomGlowFrameEntity::new); public static final EntityType BLOCK_FLOODER_PROJECTILE = register("block_flooder_projectile", 4, 10, true, EntityDimensions.changing(0.25F, 0.25F), true, BlockFlooderProjectile::new); diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/FloatBlockEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/FloatBlockEntity.java index 2f01486f87..63b8c9e5f6 100644 --- a/src/main/java/de/dafuqs/spectrum/entity/entity/FloatBlockEntity.java +++ b/src/main/java/de/dafuqs/spectrum/entity/entity/FloatBlockEntity.java @@ -19,7 +19,7 @@ import net.minecraft.predicate.entity.*; import net.minecraft.registry.*; import net.minecraft.registry.tag.*; -import net.minecraft.server.network.EntityTrackerEntry; +import net.minecraft.server.network.*; import net.minecraft.state.property.*; import net.minecraft.util.*; import net.minecraft.util.crash.*; @@ -364,8 +364,8 @@ public void moveEntities() { public boolean isPaltaeriaStratineCollision(FloatBlockEntity other) { Block thisBlock = this.blockState.getBlock(); Block otherBlock = other.getBlockState().getBlock(); - return thisBlock == SpectrumBlocks.PALTAERIA_FRAGMENT_BLOCK && otherBlock == SpectrumBlocks.STRATINE_FRAGMENT_BLOCK - || thisBlock == SpectrumBlocks.STRATINE_FRAGMENT_BLOCK && otherBlock == SpectrumBlocks.PALTAERIA_FRAGMENT_BLOCK; + return thisBlock == SpectrumBlocks.PALTAERIA_FLOATBLOCK && otherBlock == SpectrumBlocks.STRATINE_FLOATBLOCK + || thisBlock == SpectrumBlocks.STRATINE_FLOATBLOCK && otherBlock == SpectrumBlocks.PALTAERIA_FLOATBLOCK; } /** diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java index 4870cbe651..20b6ef77c5 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java @@ -920,9 +920,9 @@ private static Settings endstoneOre() { private static Settings gravityBlock(MapColor mapColor) { return settings(mapColor, BlockSoundGroup.METAL, 4.0F, 6.0F).instrument(NoteBlockInstrument.BASEDRUM).requiresTool(); } - - public static final FloatBlock PALTAERIA_FRAGMENT_BLOCK = new FloatBlock(gravityBlock(MapColor.LIGHT_BLUE), 0.2F); - public static final FloatBlock STRATINE_FRAGMENT_BLOCK = new FloatBlock(gravityBlock(MapColor.DARK_RED), -0.2F); + + public static final FloatBlock PALTAERIA_FLOATBLOCK = new FloatBlock(gravityBlock(MapColor.LIGHT_BLUE), 0.2F); + public static final FloatBlock STRATINE_FLOATBLOCK = new FloatBlock(gravityBlock(MapColor.DARK_RED), -0.2F); public static final FloatBlock HOVER_BLOCK = new FloatBlock(gravityBlock(MapColor.DIAMOND_BLUE), 0.0F); public static final Block BLACKSLAG_COAL_ORE = new ExperienceDroppingBlock(UniformIntProvider.create(0, 2), blackslagOre()); @@ -2043,8 +2043,8 @@ private static void registerOreStorageBlocks(Item.Settings settings, Item.Settin registerBlockWithItem("azurite_block", AZURITE_BLOCK, IS.of(), DyeColor.BLUE); registerBlockWithItem("shimmerstone_block", SHIMMERSTONE_BLOCK, IS.of(), DyeColor.YELLOW); - registerBlockWithItem("stratine_fragment_block", STRATINE_FRAGMENT_BLOCK, new FloatBlockItem(STRATINE_FRAGMENT_BLOCK, settingsFireproof, -0.02F), DyeColor.RED); - registerBlockWithItem("paltaeria_fragment_block", PALTAERIA_FRAGMENT_BLOCK, new FloatBlockItem(PALTAERIA_FRAGMENT_BLOCK, settings, 0.02F), DyeColor.CYAN); + registerBlockWithItem("stratine_floatblock", STRATINE_FLOATBLOCK, new FloatBlockItem(STRATINE_FLOATBLOCK, settingsFireproof, -0.02F), DyeColor.RED); + registerBlockWithItem("paltaeria_floatblock", PALTAERIA_FLOATBLOCK, new FloatBlockItem(PALTAERIA_FLOATBLOCK, settings, 0.02F), DyeColor.CYAN); registerBlockWithItem("hover_block", HOVER_BLOCK, new FloatBlockItem(HOVER_BLOCK, settings, 0F) { @Override public double applyGravity(ItemStack stack, World world, Entity entity) { diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java index f42b225c8c..3e375e8a17 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java @@ -1090,8 +1090,8 @@ public static void register() { entries.add(SpectrumBlocks.BLOODSTONE_BLOCK); entries.add(SpectrumBlocks.BISMUTH_BLOCK); - entries.add(SpectrumBlocks.STRATINE_FRAGMENT_BLOCK); - entries.add(SpectrumBlocks.PALTAERIA_FRAGMENT_BLOCK); + entries.add(SpectrumBlocks.STRATINE_FLOATBLOCK); + entries.add(SpectrumBlocks.PALTAERIA_FLOATBLOCK); entries.add(SpectrumBlocks.HOVER_BLOCK); entries.add(SpectrumBlocks.TOPAZ_CALCITE_LIGHT); diff --git a/src/main/resources/assets/spectrum/blockstates/paltaeria_floatblock.json b/src/main/resources/assets/spectrum/blockstates/paltaeria_floatblock.json new file mode 100644 index 0000000000..16a61c5c86 --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/paltaeria_floatblock.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/paltaeria_floatblock" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/paltaeria_fragment_block.json b/src/main/resources/assets/spectrum/blockstates/paltaeria_fragment_block.json deleted file mode 100644 index b046d29b4b..0000000000 --- a/src/main/resources/assets/spectrum/blockstates/paltaeria_fragment_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "spectrum:block/paltaeria_fragment_block" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/stratine_floatblock.json b/src/main/resources/assets/spectrum/blockstates/stratine_floatblock.json new file mode 100644 index 0000000000..6c53b02ecc --- /dev/null +++ b/src/main/resources/assets/spectrum/blockstates/stratine_floatblock.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "spectrum:block/stratine_floatblock" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/blockstates/stratine_fragment_block.json b/src/main/resources/assets/spectrum/blockstates/stratine_fragment_block.json deleted file mode 100644 index b2ac62a1d6..0000000000 --- a/src/main/resources/assets/spectrum/blockstates/stratine_fragment_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "spectrum:block/stratine_fragment_block" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/lang/de_de.json b/src/main/resources/assets/spectrum/lang/de_de.json index c377229682..89157a67a5 100644 --- a/src/main/resources/assets/spectrum/lang/de_de.json +++ b/src/main/resources/assets/spectrum/lang/de_de.json @@ -520,9 +520,9 @@ "block.spectrum.flowing_liquid_crystal": "Flüssigkristall", "block.spectrum.paltaeria_ore": "Paltaeria Erz", - "block.spectrum.paltaeria_fragment_block": "Paltaeria Schwebeblock", + "block.spectrum.paltaeria_floatblock": "Paltaeria Schwebeblock", "block.spectrum.stratine_ore": "Scharlach Erz", - "block.spectrum.stratine_fragment_block": "Scharlach Schwebeblock", + "block.spectrum.stratine_floatblock": "Scharlach Schwebeblock", "block.spectrum.glistering_melon": "Glänzende Melone", "block.spectrum.glistering_melon_stem": "Glänzender Melonenstiel", diff --git a/src/main/resources/assets/spectrum/lang/en_us.json b/src/main/resources/assets/spectrum/lang/en_us.json index cc3c31b879..37733200b1 100644 --- a/src/main/resources/assets/spectrum/lang/en_us.json +++ b/src/main/resources/assets/spectrum/lang/en_us.json @@ -1551,7 +1551,7 @@ "block.spectrum.orange_wood": "Orange Wood", "block.spectrum.overgrown_blackslag": "Overgrown Blackslag", "block.spectrum.overgrown_slush": "Overgrown Slush", - "block.spectrum.paltaeria_fragment_block": "Paltaeria Floatblock", + "block.spectrum.paltaeria_floatblock": "Paltaeria Floatblock", "block.spectrum.paltaeria_ore": "Paltaeria Ore", "block.spectrum.panda_head": "Panda Head", "block.spectrum.parametric_mining_device": "Parametric Mining Device", @@ -1934,7 +1934,7 @@ "block.spectrum.stone_shimmerstone_light": "Stone Shimmerstone Light", "block.spectrum.storage_node": "§bPastel Network Storage Node", "block.spectrum.storage_node.tooltip": "Serves as storage for Sender and Gather Nodes", - "block.spectrum.stratine_fragment_block": "Stratine Floatblock", + "block.spectrum.stratine_floatblock": "Stratine Floatblock", "block.spectrum.stratine_ore": "Stratine Ore", "block.spectrum.stray_head": "Stray Head", "block.spectrum.stray_idol": "Forgotten Idol", diff --git a/src/main/resources/assets/spectrum/lang/pt_br.json b/src/main/resources/assets/spectrum/lang/pt_br.json index 6782cfd819..80875cc75d 100644 --- a/src/main/resources/assets/spectrum/lang/pt_br.json +++ b/src/main/resources/assets/spectrum/lang/pt_br.json @@ -659,9 +659,9 @@ "block.spectrum.flowing_midnight_solution": "Solução da Meia Noite", "block.spectrum.paltaeria_ore": "Minério de Turpálido", - "block.spectrum.paltaeria_fragment_block": "Bloco Flutuante de Turpálido", + "block.spectrum.paltaeria_floatblock": "Bloco Flutuante de Turpálido", "block.spectrum.stratine_ore": "Minério de Carmesim", - "block.spectrum.stratine_fragment_block": "Bloco Flutuante de Carmesim", + "block.spectrum.stratine_floatblock": "Bloco Flutuante de Carmesim", "block.spectrum.hover_block": "Bloco Flutuante", "block.spectrum.glistering_shooting_star": "Estrela Cadente Reluzente", diff --git a/src/main/resources/assets/spectrum/lang/ru_ru.json b/src/main/resources/assets/spectrum/lang/ru_ru.json index 6b729781fb..912917c6fb 100644 --- a/src/main/resources/assets/spectrum/lang/ru_ru.json +++ b/src/main/resources/assets/spectrum/lang/ru_ru.json @@ -1213,9 +1213,9 @@ "item.spectrum.dragonrot_bucket": "Ведро с Дракогнилью", "block.spectrum.dragonrot": "Дракогниль", "block.spectrum.paltaeria_ore": "Платериевая Руда", - "block.spectrum.paltaeria_fragment_block": "Платериевый Лётоблок", + "block.spectrum.paltaeria_floatblock": "Платериевый Лётоблок", "block.spectrum.stratine_ore": "Стратиновая Руда", - "block.spectrum.stratine_fragment_block": "Стратиновый Лётоблок", + "block.spectrum.stratine_floatblock": "Стратиновый Лётоблок", "block.spectrum.hover_block": "Лётоблок", "block.spectrum.glistering_shooting_star": "Сверкающая Упавшая Звезда", "block.spectrum.fiery_shooting_star": "Пламенная Упавшая Звезда", diff --git a/src/main/resources/assets/spectrum/lang/zh_cn.json b/src/main/resources/assets/spectrum/lang/zh_cn.json index 09932e4824..c656881813 100644 --- a/src/main/resources/assets/spectrum/lang/zh_cn.json +++ b/src/main/resources/assets/spectrum/lang/zh_cn.json @@ -1519,9 +1519,9 @@ "block.spectrum.dragonrot": "龙腐脓浆", "block.spectrum.paltaeria_ore": "苍绿矿石", - "block.spectrum.paltaeria_fragment_block": "苍绿悬浮方块", + "block.spectrum.paltaeria_floatblock": "苍绿悬浮方块", "block.spectrum.stratine_ore": "绯红矿石", - "block.spectrum.stratine_fragment_block": "绯红悬浮方块", + "block.spectrum.stratine_floatblock": "绯红悬浮方块", "block.spectrum.hover_block": "悬浮方块", "block.spectrum.glistering_shooting_star": "闪亮流星", diff --git a/src/main/resources/assets/spectrum/models/block/paltaeria_floatblock.json b/src/main/resources/assets/spectrum/models/block/paltaeria_floatblock.json new file mode 100644 index 0000000000..e0bff81e6a --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/paltaeria_floatblock.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "particle": "spectrum:block/paltaeria_floatblock_side", + "north": "spectrum:block/paltaeria_floatblock_side", + "east": "spectrum:block/paltaeria_floatblock_side", + "south": "spectrum:block/paltaeria_floatblock_side", + "west": "spectrum:block/paltaeria_floatblock_side", + "up": "spectrum:block/paltaeria_floatblock_vertical", + "down": "spectrum:block/paltaeria_floatblock_vertical" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/paltaeria_fragment_block.json b/src/main/resources/assets/spectrum/models/block/paltaeria_fragment_block.json deleted file mode 100644 index 21bd65f21f..0000000000 --- a/src/main/resources/assets/spectrum/models/block/paltaeria_fragment_block.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "particle": "spectrum:block/paltaeria_fragment_block_side", - "north": "spectrum:block/paltaeria_fragment_block_side", - "east": "spectrum:block/paltaeria_fragment_block_side", - "south": "spectrum:block/paltaeria_fragment_block_side", - "west": "spectrum:block/paltaeria_fragment_block_side", - "up": "spectrum:block/paltaeria_fragment_block_vertical", - "down": "spectrum:block/paltaeria_fragment_block_vertical" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/stratine_floatblock.json b/src/main/resources/assets/spectrum/models/block/stratine_floatblock.json new file mode 100644 index 0000000000..d1ac81bdcd --- /dev/null +++ b/src/main/resources/assets/spectrum/models/block/stratine_floatblock.json @@ -0,0 +1,12 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "particle": "spectrum:block/stratine_floatblock_side", + "north": "spectrum:block/stratine_floatblock_side", + "east": "spectrum:block/stratine_floatblock_side", + "south": "spectrum:block/stratine_floatblock_side", + "west": "spectrum:block/stratine_floatblock_side", + "up": "spectrum:block/stratine_floatblock_vertical", + "down": "spectrum:block/stratine_floatblock_vertical" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/block/stratine_fragment_block.json b/src/main/resources/assets/spectrum/models/block/stratine_fragment_block.json deleted file mode 100644 index a7ad9f589f..0000000000 --- a/src/main/resources/assets/spectrum/models/block/stratine_fragment_block.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "particle": "spectrum:block/stratine_fragment_block_side", - "north": "spectrum:block/stratine_fragment_block_side", - "east": "spectrum:block/stratine_fragment_block_side", - "south": "spectrum:block/stratine_fragment_block_side", - "west": "spectrum:block/stratine_fragment_block_side", - "up": "spectrum:block/stratine_fragment_block_vertical", - "down": "spectrum:block/stratine_fragment_block_vertical" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/paltaeria_floatblock.json b/src/main/resources/assets/spectrum/models/item/paltaeria_floatblock.json new file mode 100644 index 0000000000..abfacdb1dd --- /dev/null +++ b/src/main/resources/assets/spectrum/models/item/paltaeria_floatblock.json @@ -0,0 +1,3 @@ +{ + "parent": "spectrum:block/paltaeria_floatblock" +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/paltaeria_fragment_block.json b/src/main/resources/assets/spectrum/models/item/paltaeria_fragment_block.json deleted file mode 100644 index f29966a7b4..0000000000 --- a/src/main/resources/assets/spectrum/models/item/paltaeria_fragment_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "spectrum:block/paltaeria_fragment_block" -} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/stratine_floatblock.json b/src/main/resources/assets/spectrum/models/item/stratine_floatblock.json new file mode 100644 index 0000000000..b50d2efa64 --- /dev/null +++ b/src/main/resources/assets/spectrum/models/item/stratine_floatblock.json @@ -0,0 +1,3 @@ +{ + "parent": "spectrum:block/stratine_floatblock" +} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/stratine_fragment_block.json b/src/main/resources/assets/spectrum/models/item/stratine_fragment_block.json deleted file mode 100644 index 6df39977e6..0000000000 --- a/src/main/resources/assets/spectrum/models/item/stratine_fragment_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "spectrum:block/stratine_fragment_block" -} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/textures/block/paltaeria_fragment_block_side.png b/src/main/resources/assets/spectrum/textures/block/paltaeria_floatblock_side.png similarity index 100% rename from src/main/resources/assets/spectrum/textures/block/paltaeria_fragment_block_side.png rename to src/main/resources/assets/spectrum/textures/block/paltaeria_floatblock_side.png diff --git a/src/main/resources/assets/spectrum/textures/block/paltaeria_fragment_block_vertical.png b/src/main/resources/assets/spectrum/textures/block/paltaeria_floatblock_vertical.png similarity index 100% rename from src/main/resources/assets/spectrum/textures/block/paltaeria_fragment_block_vertical.png rename to src/main/resources/assets/spectrum/textures/block/paltaeria_floatblock_vertical.png diff --git a/src/main/resources/assets/spectrum/textures/block/stratine_fragment_block_side.png b/src/main/resources/assets/spectrum/textures/block/stratine_floatblock_side.png similarity index 100% rename from src/main/resources/assets/spectrum/textures/block/stratine_fragment_block_side.png rename to src/main/resources/assets/spectrum/textures/block/stratine_floatblock_side.png diff --git a/src/main/resources/assets/spectrum/textures/block/stratine_fragment_block_vertical.png b/src/main/resources/assets/spectrum/textures/block/stratine_floatblock_vertical.png similarity index 100% rename from src/main/resources/assets/spectrum/textures/block/stratine_fragment_block_vertical.png rename to src/main/resources/assets/spectrum/textures/block/stratine_floatblock_vertical.png diff --git a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json index 3d452a47f3..2f9851db41 100644 --- a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -81,8 +81,8 @@ "spectrum:radiating_ender", "spectrum:shimmerstone_block", "spectrum:azurite_block", - "spectrum:stratine_fragment_block", - "spectrum:paltaeria_fragment_block", + "spectrum:stratine_floatblock", + "spectrum:paltaeria_floatblock", "spectrum:hover_block", "spectrum:radiant_glass", "spectrum:radiant_glass_pane", @@ -107,8 +107,8 @@ "spectrum:ender_hopper", "spectrum:shimmerstone_block", "spectrum:azurite_block", - "spectrum:stratine_fragment_block", - "spectrum:paltaeria_fragment_block", + "spectrum:stratine_floatblock", + "spectrum:paltaeria_floatblock", "spectrum:hover_block", "spectrum:radiant_glass", "spectrum:bismuth_block", diff --git a/src/main/resources/data/spectrum/advancement/lategame/carry_too_many_low_gravity_blocks.json b/src/main/resources/data/spectrum/advancement/lategame/carry_too_many_low_gravity_blocks.json index 62a6bd0a1d..7a23a96431 100644 --- a/src/main/resources/data/spectrum/advancement/lategame/carry_too_many_low_gravity_blocks.json +++ b/src/main/resources/data/spectrum/advancement/lategame/carry_too_many_low_gravity_blocks.json @@ -2,7 +2,7 @@ "parent": "spectrum:lategame/collect_paltaeria", "display": { "icon": { - "item": "spectrum:paltaeria_fragment_block" + "item": "spectrum:paltaeria_floatblock" }, "hidden": true, "frame": "challenge", diff --git a/src/main/resources/data/spectrum/advancement/midgame/carry_too_many_heavy_gravity_blocks.json b/src/main/resources/data/spectrum/advancement/midgame/carry_too_many_heavy_gravity_blocks.json index 7461c2cc41..6b4b93d749 100644 --- a/src/main/resources/data/spectrum/advancement/midgame/carry_too_many_heavy_gravity_blocks.json +++ b/src/main/resources/data/spectrum/advancement/midgame/carry_too_many_heavy_gravity_blocks.json @@ -2,7 +2,7 @@ "parent": "spectrum:midgame/collect_stratine", "display": { "icon": { - "item": "spectrum:stratine_fragment_block" + "item": "spectrum:stratine_floatblock" }, "frame": "challenge", "title": { diff --git a/src/main/resources/data/spectrum/loot_table/blocks/stratine_fragment_block.json b/src/main/resources/data/spectrum/loot_table/blocks/fabrication_chest.json similarity index 83% rename from src/main/resources/data/spectrum/loot_table/blocks/stratine_fragment_block.json rename to src/main/resources/data/spectrum/loot_table/blocks/fabrication_chest.json index 124bb205ee..e5983830c4 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/stratine_fragment_block.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/fabrication_chest.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "spectrum:stratine_fragment_block" + "name": "spectrum:fabrication_chest" } ], "conditions": [ diff --git a/src/main/resources/data/spectrum/loot_table/blocks/paltaeria_fragment_block.json b/src/main/resources/data/spectrum/loot_table/blocks/paltaeria_floatblock.json similarity index 83% rename from src/main/resources/data/spectrum/loot_table/blocks/paltaeria_fragment_block.json rename to src/main/resources/data/spectrum/loot_table/blocks/paltaeria_floatblock.json index 84383f5305..a8de800cdd 100644 --- a/src/main/resources/data/spectrum/loot_table/blocks/paltaeria_fragment_block.json +++ b/src/main/resources/data/spectrum/loot_table/blocks/paltaeria_floatblock.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "spectrum:paltaeria_fragment_block" + "name": "spectrum:paltaeria_floatblock" } ], "conditions": [ diff --git a/src/main/resources/data/spectrum/loot_table/blocks/stratine_floatblock.json b/src/main/resources/data/spectrum/loot_table/blocks/stratine_floatblock.json new file mode 100644 index 0000000000..8533ec9075 --- /dev/null +++ b/src/main/resources/data/spectrum/loot_table/blocks/stratine_floatblock.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "spectrum:stratine_floatblock" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/general/paltaeria.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/general/paltaeria.json index 92cd5c4b19..37ec40e9f3 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/general/paltaeria.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/general/paltaeria.json @@ -37,13 +37,13 @@ }, { "type": "modonomicon:spotlight", - "title": "block.spectrum.paltaeria_fragment_block", + "title": "block.spectrum.paltaeria_floatblock", "condition": { "type": "modonomicon:advancement", "advancement_id": "spectrum:lategame/carry_too_many_low_gravity_blocks" }, "item": { - "item": "spectrum:paltaeria_fragment_block" + "item": "spectrum:paltaeria_floatblock" }, "text": "book.spectrum.guidebook.paltaeria.page2.text" }, @@ -55,7 +55,7 @@ }, "text": "book.spectrum.guidebook.paltaeria.page3.text", "title": "container.spectrum.rei.pedestal_recipe", - "recipe_id": "spectrum:pedestal/tier1/compacting/paltaeria_fragment_block" + "recipe_id": "spectrum:pedestal/tier1/compacting/paltaeria_floatblock" } ] } diff --git a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/general/stratine.json b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/general/stratine.json index 6ded6c5265..2df7d2d5c1 100644 --- a/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/general/stratine.json +++ b/src/main/resources/data/spectrum/modonomicon/books/guidebook/entries/general/stratine.json @@ -33,13 +33,13 @@ }, { "type": "modonomicon:spotlight", - "title": "block.spectrum.stratine_fragment_block", + "title": "block.spectrum.stratine_floatblock", "condition": { "type": "modonomicon:advancement", "advancement_id": "spectrum:midgame/carry_too_many_heavy_gravity_blocks" }, "item": { - "item": "spectrum:stratine_fragment_block" + "item": "spectrum:stratine_floatblock" }, "text": "book.spectrum.guidebook.stratine.page2.text" }, @@ -51,7 +51,7 @@ }, "text": "book.spectrum.guidebook.stratine.page3.text", "title": "container.spectrum.rei.pedestal_recipe", - "recipe_id": "spectrum:pedestal/tier1/compacting/stratine_fragment_block" + "recipe_id": "spectrum:pedestal/tier1/compacting/stratine_floatblock" } ] } diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/paltaeria_fragment_block.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/paltaeria_floatblock.json similarity index 90% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/paltaeria_fragment_block.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/paltaeria_floatblock.json index b0ca8e7ee9..2dd5a76692 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/paltaeria_fragment_block.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/paltaeria_floatblock.json @@ -20,7 +20,7 @@ } }, "result": { - "item": "spectrum:paltaeria_fragment_block", + "item": "spectrum:paltaeria_floatblock", "count": 1 }, "required_advancement": "spectrum:lategame/carry_too_many_low_gravity_blocks", diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/paltaeria_fragments_from_paltaeria_fragment_block.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/paltaeria_fragments_from_paltaeria_floatblock.json similarity index 89% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/paltaeria_fragments_from_paltaeria_fragment_block.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/paltaeria_fragments_from_paltaeria_floatblock.json index b8985d1e27..8b639d2e90 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/paltaeria_fragments_from_paltaeria_fragment_block.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/paltaeria_fragments_from_paltaeria_floatblock.json @@ -11,7 +11,7 @@ "experience": 0.0, "ingredients": [ { - "item": "spectrum:paltaeria_fragment_block" + "item": "spectrum:paltaeria_floatblock" } ], "result": { diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/stratine_fragment_block.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/stratine_floatblock.json similarity index 90% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/stratine_fragment_block.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/stratine_floatblock.json index 918a68b3e2..b097b3e25b 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/stratine_fragment_block.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/stratine_floatblock.json @@ -20,7 +20,7 @@ } }, "result": { - "item": "spectrum:stratine_fragment_block", + "item": "spectrum:stratine_floatblock", "count": 1 }, "required_advancement": "spectrum:midgame/carry_too_many_heavy_gravity_blocks", diff --git a/src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/stratine_fragments_from_stratine_fragment_block.json b/src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/stratine_fragments_from_stratine_floatblock.json similarity index 89% rename from src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/stratine_fragments_from_stratine_fragment_block.json rename to src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/stratine_fragments_from_stratine_floatblock.json index c96aba2c4d..f2b6515deb 100644 --- a/src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/stratine_fragments_from_stratine_fragment_block.json +++ b/src/main/resources/data/spectrum/recipe/pedestal/tier1/compacting/stratine_fragments_from_stratine_floatblock.json @@ -11,7 +11,7 @@ "experience": 0.0, "ingredients": [ { - "item": "spectrum:stratine_fragment_block" + "item": "spectrum:stratine_floatblock" } ], "result": { From 9fd388b1249b490d5455ed6331526a400d7778b1 Mon Sep 17 00:00:00 2001 From: DaFuqs Date: Sun, 17 Nov 2024 14:03:36 +0100 Subject: [PATCH 05/14] fanciful_tuff_ring -> fanciful_tuff_ring purple_star_candy -> enchanted_star_candy --- .../items/food/EnchantedStarCandyItem.java | 9 ++--- .../pedestal/dynamic/StarCandyRecipe.java | 6 +-- .../registries/SpectrumFoodComponents.java | 4 +- .../registries/SpectrumItemGroups.java | 4 +- .../spectrum/registries/SpectrumItems.java | 8 ++-- .../resources/assets/spectrum/lang/en_us.json | 12 +++--- .../resources/assets/spectrum/lang/pt_br.json | 12 +++--- .../resources/assets/spectrum/lang/ru_ru.json | 12 +++--- .../resources/assets/spectrum/lang/zh_cn.json | 12 +++--- ...ne_ring.json => enchanted_star_candy.json} | 2 +- .../models/item/purple_star_candy.json | 6 --- ...tar_candy.png => enchanted_star_candy.png} | Bin .../textures/item/fanciful_stone_ring.png | Bin 357 -> 0 bytes .../consume_enchanted_star_candy.json | 33 ++++++++++++++++ .../consume_purple_star_candy.json | 27 ------------- .../spectrum/advancement/eat_each_pastry.json | 10 ++++- ...json => collect_enchanted_star_candy.json} | 12 +++++- .../unlocks/trinkets/any_base_trinket.json | 6 +-- .../unlocks/trinkets/fanciful_stone_ring.json | 36 ------------------ .../chests/sub_tables/fancyful_trinkets.json | 2 +- .../undergrowth_manor/basement_eden.json | 2 +- .../entries/cuisine/enchanted_star_candy.json | 10 ++--- .../equipment/trinkets/base_trinkets.json | 8 ++-- .../trinkets/azure_dike_ring.json | 2 +- .../trinkets/heartsingers_reward.json | 2 +- .../fusion_shrine/trinkets/jeopardant.json | 2 +- .../trinkets/ring_of_denser_steps.json | 2 +- .../tier3/trinkets/fanciful_stone_ring.json | 26 ------------- 28 files changed, 109 insertions(+), 158 deletions(-) rename src/main/resources/assets/spectrum/models/item/{fanciful_stone_ring.json => enchanted_star_candy.json} (55%) delete mode 100644 src/main/resources/assets/spectrum/models/item/purple_star_candy.json rename src/main/resources/assets/spectrum/textures/item/{purple_star_candy.png => enchanted_star_candy.png} (100%) mode change 100755 => 100644 delete mode 100755 src/main/resources/assets/spectrum/textures/item/fanciful_stone_ring.png create mode 100644 src/main/resources/data/spectrum/advancement/consume_enchanted_star_candy.json delete mode 100644 src/main/resources/data/spectrum/advancement/consume_purple_star_candy.json rename src/main/resources/data/spectrum/advancement/hidden/{collect_purple_star_candy.json => collect_enchanted_star_candy.json} (56%) delete mode 100644 src/main/resources/data/spectrum/advancement/unlocks/trinkets/fanciful_stone_ring.json delete mode 100644 src/main/resources/data/spectrum/recipe/pedestal/tier3/trinkets/fanciful_stone_ring.json diff --git a/src/main/java/de/dafuqs/spectrum/items/food/EnchantedStarCandyItem.java b/src/main/java/de/dafuqs/spectrum/items/food/EnchantedStarCandyItem.java index 2509e34763..c2319d9bf2 100644 --- a/src/main/java/de/dafuqs/spectrum/items/food/EnchantedStarCandyItem.java +++ b/src/main/java/de/dafuqs/spectrum/items/food/EnchantedStarCandyItem.java @@ -1,11 +1,10 @@ package de.dafuqs.spectrum.items.food; import de.dafuqs.spectrum.items.trinkets.*; -import net.minecraft.client.item.*; import net.minecraft.entity.*; import net.minecraft.entity.player.*; import net.minecraft.item.*; -import net.minecraft.item.tooltip.TooltipType; +import net.minecraft.item.tooltip.*; import net.minecraft.text.*; import net.minecraft.util.*; import net.minecraft.world.*; @@ -31,12 +30,12 @@ public ItemStack finishUsing(ItemStack stack, World world, LivingEntity user) { } return itemStack; } - + @Override public void appendTooltip(ItemStack stack, TooltipContext context, List tooltip, TooltipType type) { super.appendTooltip(stack, context, tooltip, type); - tooltip.add(Text.translatable("item.spectrum.purple_star_candy.tooltip").formatted(Formatting.GRAY)); - tooltip.add(Text.translatable("item.spectrum.purple_star_candy.tooltip2").formatted(Formatting.GRAY)); + tooltip.add(Text.translatable("item.spectrum.enchanted_star_candy.tooltip").formatted(Formatting.GRAY)); + tooltip.add(Text.translatable("item.spectrum.enchanted_star_candy.tooltip2").formatted(Formatting.GRAY)); } @Override diff --git a/src/main/java/de/dafuqs/spectrum/recipe/pedestal/dynamic/StarCandyRecipe.java b/src/main/java/de/dafuqs/spectrum/recipe/pedestal/dynamic/StarCandyRecipe.java index 82277e61ea..9f9bd62ab3 100644 --- a/src/main/java/de/dafuqs/spectrum/recipe/pedestal/dynamic/StarCandyRecipe.java +++ b/src/main/java/de/dafuqs/spectrum/recipe/pedestal/dynamic/StarCandyRecipe.java @@ -19,7 +19,7 @@ public class StarCandyRecipe extends ShapedPedestalRecipe { public static final RecipeSerializer SERIALIZER = new EmptyRecipeSerializer<>(StarCandyRecipe::new); public static final Identifier UNLOCK_IDENTIFIER = SpectrumCommon.locate("unlocks/food/star_candy"); - public static final float PURPLE_STAR_CANDY_CHANCE = 0.02F; + public static final float ENCHANTED_STAR_CANDY_CHANCE = 0.02F; public StarCandyRecipe(Identifier id) { super(id, "", false, UNLOCK_IDENTIFIER, PedestalRecipeTier.BASIC, 3, 3, generateInputs(), Map.of(BuiltinGemstoneColor.YELLOW, 1), SpectrumItems.STAR_CANDY.getDefaultStack(), 1.0F, 20, false, false); @@ -28,8 +28,8 @@ public StarCandyRecipe(Identifier id) { @Override public ItemStack craft(Inventory inv, DynamicRegistryManager drm) { if (inv instanceof PedestalBlockEntity pedestal) { - if (pedestal.getWorld().random.nextFloat() < PURPLE_STAR_CANDY_CHANCE) { - return SpectrumItems.PURPLE_STAR_CANDY.getDefaultStack(); + if (pedestal.getWorld().random.nextFloat() < ENCHANTED_STAR_CANDY_CHANCE) { + return SpectrumItems.ENCHANTED_STAR_CANDY.getDefaultStack(); } } return this.output.copy(); diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumFoodComponents.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumFoodComponents.java index ee4b52478b..e4d5d0321c 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumFoodComponents.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumFoodComponents.java @@ -1,7 +1,7 @@ package de.dafuqs.spectrum.registries; import de.dafuqs.spectrum.status_effects.*; -import net.minecraft.component.type.FoodComponent; +import net.minecraft.component.type.*; import net.minecraft.entity.effect.*; public class SpectrumFoodComponents { @@ -53,7 +53,7 @@ public class SpectrumFoodComponents { .snack() .build(); - public static final FoodComponent PURPLE_STAR_CANDY = new FoodComponent.Builder() + public static final FoodComponent ENCHANTED_STAR_CANDY = new FoodComponent.Builder() .nutrition(20).saturationModifier(1.2F).snack() .build(); diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java index 3e375e8a17..a196c183b4 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItemGroups.java @@ -104,7 +104,7 @@ public static void register() { addEquipmentEntry(SpectrumItems.KNOTTED_SWORD, entries); addEquipmentEntry(SpectrumItems.NECTAR_LANCE, entries); addEquipmentEntry(SpectrumItems.OMNI_ACCELERATOR, entries); - addEquipmentEntry(SpectrumItems.FANCIFUL_STONE_RING, entries); + addEquipmentEntry(SpectrumItems.FANCIFUL_TUFF_RING, entries); addEquipmentEntry(SpectrumItems.FANCIFUL_BELT, entries); addEquipmentEntry(SpectrumItems.FANCIFUL_PENDANT, entries); addEquipmentEntry(SpectrumItems.FANCIFUL_CIRCLET, entries); @@ -367,7 +367,7 @@ public static void register() { entries.add(SpectrumItems.MILKY_RESIN); entries.add(SpectrumItems.SCONE); entries.add(SpectrumItems.STAR_CANDY); - entries.add(SpectrumItems.PURPLE_STAR_CANDY); + entries.add(SpectrumItems.ENCHANTED_STAR_CANDY); entries.add(SpectrumItems.CHEONG); entries.add(SpectrumItems.MERMAIDS_JAM); entries.add(SpectrumItems.MERMAIDS_POPCORN); diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java index b0444aca17..5f7ac906d6 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java @@ -341,7 +341,7 @@ public void addDefaultEnchantments(RegistryWrapper.Impl impl, ItemE public static final Item DIVINATION_HEART = new Item(IS.of().food(SpectrumFoodComponents.DIVINATION_HEART)); public static final Item STAR_CANDY = new StarCandyItem(IS.of(Rarity.UNCOMMON).food(SpectrumFoodComponents.STAR_CANDY)); - public static final Item PURPLE_STAR_CANDY = new EnchantedStarCandyItem(IS.of(Rarity.UNCOMMON).food(SpectrumFoodComponents.PURPLE_STAR_CANDY)); + public static final Item ENCHANTED_STAR_CANDY = new EnchantedStarCandyItem(IS.of(Rarity.UNCOMMON).food(SpectrumFoodComponents.ENCHANTED_STAR_CANDY)); public static final Item ENCHANTED_GOLDEN_CARROT = new ItemWithGlint(IS.of(Rarity.EPIC).food(SpectrumFoodComponents.ENCHANTED_GOLDEN_CARROT)); public static final Item JARAMEL = new Item(IS.of().food(SpectrumFoodComponents.JARAMEL)); @@ -477,7 +477,7 @@ public void addDefaultEnchantments(RegistryWrapper.Impl impl, ItemE // Trinkets public static final Item FANCIFUL_BELT = new Item(IS.of(16, Rarity.UNCOMMON)); public static final Item FANCIFUL_PENDANT = new Item(IS.of(16, Rarity.UNCOMMON)); - public static final Item FANCIFUL_STONE_RING = new Item(IS.of(16, Rarity.UNCOMMON)); + public static final Item FANCIFUL_TUFF_RING = new Item(IS.of(16, Rarity.UNCOMMON)); public static final Item FANCIFUL_CIRCLET = new Item(IS.of(16, Rarity.UNCOMMON)); public static final Item FANCIFUL_GLOVES = new Item(IS.of(16, Rarity.UNCOMMON)); public static final Item FANCIFUL_BISMUTH_RING = new Item(IS.of(16, Rarity.UNCOMMON)); @@ -865,7 +865,7 @@ public static void registerConsumables() { register("scone", SCONE, DyeColor.PINK); register("star_candy", STAR_CANDY, DyeColor.PINK); - register("purple_star_candy", PURPLE_STAR_CANDY, DyeColor.PINK); + register("enchanted_star_candy", ENCHANTED_STAR_CANDY, DyeColor.PINK); register("lucky_roll", LUCKY_ROLL, DyeColor.PINK); register("honey_pastry", HONEY_PASTRY, DyeColor.PINK); @@ -950,7 +950,7 @@ public static void registerInkStorage() { } public static void registerTrinkets() { - register("fanciful_stone_ring", FANCIFUL_STONE_RING, DyeColor.GREEN); + register("fanciful_tuff_ring", FANCIFUL_TUFF_RING, DyeColor.GREEN); register("fanciful_belt", FANCIFUL_BELT, DyeColor.GREEN); register("fanciful_pendant", FANCIFUL_PENDANT, DyeColor.GREEN); register("fanciful_circlet", FANCIFUL_CIRCLET, DyeColor.GREEN); diff --git a/src/main/resources/assets/spectrum/lang/en_us.json b/src/main/resources/assets/spectrum/lang/en_us.json index 37733200b1..196ef56b76 100644 --- a/src/main/resources/assets/spectrum/lang/en_us.json +++ b/src/main/resources/assets/spectrum/lang/en_us.json @@ -161,8 +161,8 @@ "advancements.spectrum.collect_warden_head_using_treasure_hunter.title": "Warden't", "advancements.spectrum.collect_wither_head_using_treasure_hunter.description": "Collect a Wither Skull using a weapon enchanted with Treasure Hunter", "advancements.spectrum.collect_wither_head_using_treasure_hunter.title": "A Withious Cycle", - "advancements.spectrum.consume_purple_star_candy.description": "Get a hold of and eat an Enchanted Star Cookie", - "advancements.spectrum.consume_purple_star_candy.title": "The Best 1 Star Menu", + "advancements.spectrum.consume_enchanted_star_candy.description": "Get a hold of and eat an Enchanted Star Cookie", + "advancements.spectrum.consume_enchanted_star_candy.title": "The Best 1 Star Menu", "advancements.spectrum.craft_and_get_25_xp.description": "Craft a single Pedestal Recipe that rewards you with 25 XP", "advancements.spectrum.craft_and_get_25_xp.title": "Experienced Artist", "advancements.spectrum.craft_blacklisted_memory_fail.description": "Successfully fail to remember a Memory of a creature too powerful to be resurrected", @@ -4472,7 +4472,7 @@ "item.spectrum.fanciful_circlet": "Fanciful Circlet", "item.spectrum.fanciful_gloves": "Fanciful Gloves", "item.spectrum.fanciful_pendant": "Fanciful Pendant", - "item.spectrum.fanciful_stone_ring": "Fanciful Tuff Ring", + "item.spectrum.fanciful_tuff_ring": "Fanciful Tuff Ring", "item.spectrum.ferocious_chestplate": "Ferocious Chestplate", "item.spectrum.ferocious_chestplate.tooltip": "Grants Absorption & Resistance when hit", "item.spectrum.ferocious_glass_crest_bident": "Ferocious Glass Crest Bident", @@ -4827,9 +4827,9 @@ "item.spectrum.pure_redstone": "Pure Redstone", "item.spectrum.pure_zinc": "Pure Zinc", "item.spectrum.purple_pigment": "Purple Pigment", - "item.spectrum.purple_star_candy": "Enchanted Star Candy", - "item.spectrum.purple_star_candy.tooltip": "Cures all negative status effects", - "item.spectrum.purple_star_candy.tooltip2": "Fully heals & fills hunger", + "item.spectrum.enchanted_star_candy": "Enchanted Star Candy", + "item.spectrum.enchanted_star_candy.tooltip": "Cures all negative status effects", + "item.spectrum.enchanted_star_candy.tooltip2": "Fully heals & fills hunger", "item.spectrum.pyrite_chunk": "Pyrite Chunk", "item.spectrum.quitoxic_powder": "Quitoxic Powder", "item.spectrum.rabbit_cream_pie": "Rabbit Cream Pie", diff --git a/src/main/resources/assets/spectrum/lang/pt_br.json b/src/main/resources/assets/spectrum/lang/pt_br.json index 80875cc75d..56c8448acf 100644 --- a/src/main/resources/assets/spectrum/lang/pt_br.json +++ b/src/main/resources/assets/spectrum/lang/pt_br.json @@ -1405,7 +1405,7 @@ "trinkets.slot.head.crown": "Coroa", "trinkets.slot.legs.pigment_palette": "Paleta de Pigmentos", - "item.spectrum.fanciful_stone_ring": "Anel de Pedra Fantástico", + "item.spectrum.fanciful_tuff_ring": "Anel de Pedra Fantástico", "item.spectrum.fanciful_belt": "Cinto Fantástico", "item.spectrum.fanciful_pendant": "Pingente Fantástico", "item.spectrum.fanciful_circlet": "Bracelete Fantástico", @@ -1828,8 +1828,8 @@ "advancements.spectrum.collect_pure_resource.title": "Same, but Different", "advancements.spectrum.collect_warden_head_using_treasure_hunter.description": "Collect the Warden's Head using a Weapon enchanted with Treasure Hunter", "advancements.spectrum.collect_warden_head_using_treasure_hunter.title": "Warden't", - "advancements.spectrum.consume_purple_star_candy.description": "Get a hold of and eat an Enchanted Star Cookie", - "advancements.spectrum.consume_purple_star_candy.title": "The Best 1 Star Menu", + "advancements.spectrum.consume_enchanted_star_candy.description": "Get a hold of and eat an Enchanted Star Cookie", + "advancements.spectrum.consume_enchanted_star_candy.title": "The Best 1 Star Menu", "advancements.spectrum.craft_salted_jaramel_trifle_or_tart.description": "Bake with the Tears of your Enemies", "advancements.spectrum.craft_salted_jaramel_trifle_or_tart.title": "Extra Salty", "advancements.spectrum.create_big_pastel_network.description": "Create a giant Pastel Network spanning over 32 nodes", @@ -4738,9 +4738,9 @@ "item.spectrum.pure_prismarine": "Pure Prismarine", "item.spectrum.pure_quartz": "Pure Quartz", "item.spectrum.pure_redstone": "Pure Redstone", - "item.spectrum.purple_star_candy": "Enchanted Star Candy", - "item.spectrum.purple_star_candy.tooltip": "Cures all negative status effects", - "item.spectrum.purple_star_candy.tooltip2": "Fully heals & fills hunger", + "item.spectrum.enchanted_star_candy": "Enchanted Star Candy", + "item.spectrum.enchanted_star_candy.tooltip": "Cures all negative status effects", + "item.spectrum.enchanted_star_candy.tooltip2": "Fully heals & fills hunger", "item.spectrum.pyrite_chunk": "Pyrite Chunk", "item.spectrum.rabbit_cream_pie": "Rabbit Cream Pie", "item.spectrum.rabbit_cream_pie.tooltip": "§oGreat for sharing", diff --git a/src/main/resources/assets/spectrum/lang/ru_ru.json b/src/main/resources/assets/spectrum/lang/ru_ru.json index 912917c6fb..ddab110012 100644 --- a/src/main/resources/assets/spectrum/lang/ru_ru.json +++ b/src/main/resources/assets/spectrum/lang/ru_ru.json @@ -2426,7 +2426,7 @@ "trinkets.slot.legs.pigment_palette": "Пигментная Палитра", "item.spectrum.creative_only": "Только для Творческого Режима", - "item.spectrum.fanciful_stone_ring": "Чудное Кольцо из Туфа", + "item.spectrum.fanciful_tuff_ring": "Чудное Кольцо из Туфа", "item.spectrum.fanciful_belt": "Чудной Пояс", "item.spectrum.fanciful_pendant": "Чудной Кулон", "item.spectrum.fanciful_circlet": "Чудная Диадема", @@ -2534,9 +2534,9 @@ "item.spectrum.triple_meat_pot_pie": "Тройной Пирог с Мясом", "item.spectrum.star_candy": "Сладкая Звёздочка", "item.spectrum.star_candy.tooltip": "Убирает один негативный эффект", - "item.spectrum.purple_star_candy": "Сладкая Звёздочка", - "item.spectrum.purple_star_candy.tooltip": "Убирает все негативные эффекты", - "item.spectrum.purple_star_candy.tooltip2": "Полностью насыщает и исцеляет", + "item.spectrum.enchanted_star_candy": "Сладкая Звёздочка", + "item.spectrum.enchanted_star_candy.tooltip": "Убирает все негативные эффекты", + "item.spectrum.enchanted_star_candy.tooltip2": "Полностью насыщает и исцеляет", "item.spectrum.suspicious_brew": "Подозрительное Варево", "item.spectrum.suspicious_brew.tooltip": "Что же смешано здесь?", "item.spectrum.suspicious_brew.tooltip.preview": "Увеличивает длительность эффекта с увеличением процента алкоголя", @@ -3206,8 +3206,8 @@ "advancements.spectrum.collect_amaranth.description": "Найдите зёрна Бархатника", "advancements.spectrum.collect_amaranth_bushel.title": "Красочность", "advancements.spectrum.collect_amaranth_bushel.description": "Вырастите Бархатник, чтобы собрать его", - "advancements.spectrum.consume_purple_star_candy.title": "1-звёздочное меню", - "advancements.spectrum.consume_purple_star_candy.description": "Попробуйте фиолетовую сладкую звёздочку", + "advancements.spectrum.consume_enchanted_star_candy.title": "1-звёздочное меню", + "advancements.spectrum.consume_enchanted_star_candy.description": "Попробуйте фиолетовую сладкую звёздочку", "advancements.spectrum.tap_titration_barrel.title": "Бахнуть холодненького", "advancements.spectrum.tap_titration_barrel.description": "Откройте бочку для брожения и попробуйте освежающий (или не очень) напиток.", "advancements.spectrum.drink_jade_wine.title": "1000-летнее Пойло", diff --git a/src/main/resources/assets/spectrum/lang/zh_cn.json b/src/main/resources/assets/spectrum/lang/zh_cn.json index c656881813..001ee8720e 100644 --- a/src/main/resources/assets/spectrum/lang/zh_cn.json +++ b/src/main/resources/assets/spectrum/lang/zh_cn.json @@ -2959,7 +2959,7 @@ "info.spectrum.tooltip.adulterated.effect": "被 %s 污染", "item.spectrum.creative_only": "创造模式专属", - "item.spectrum.fanciful_stone_ring": "华美石戒指", + "item.spectrum.fanciful_tuff_ring": "华美石戒指", "item.spectrum.fanciful_belt": "华美腰带", "item.spectrum.fanciful_pendant": "华美吊坠", "item.spectrum.fanciful_circlet": "华美头箍", @@ -3104,9 +3104,9 @@ "item.spectrum.triple_meat_pot_pie": "肉夹馍", "item.spectrum.star_candy": "星糖", "item.spectrum.star_candy.tooltip": "祛除单一的负面状态效果", - "item.spectrum.purple_star_candy": "星糖", - "item.spectrum.purple_star_candy.tooltip": "祛除所有负面效果", - "item.spectrum.purple_star_candy.tooltip2": "并恢复全部生命值和饱食度", + "item.spectrum.enchanted_star_candy": "星糖", + "item.spectrum.enchanted_star_candy.tooltip": "祛除所有负面效果", + "item.spectrum.enchanted_star_candy.tooltip2": "并恢复全部生命值和饱食度", "item.spectrum.cheong": "水果糖浆", "item.spectrum.cheong.tooltip": "一种水果甜味剂", "item.spectrum.le_fishe_au_chocolat": "巧克力鱼", @@ -6050,8 +6050,8 @@ "advancements.spectrum.collect_amaranth.description": "找到苋菜粒", "advancements.spectrum.collect_amaranth_bushel.title": "生机勃勃", "advancements.spectrum.collect_amaranth_bushel.description": "种植苋菜并收获", - "advancements.spectrum.consume_purple_star_candy.title": "来自星星的糖果", - "advancements.spectrum.consume_purple_star_candy.description": "制作并吃下一块星糖", + "advancements.spectrum.consume_enchanted_star_candy.title": "来自星星的糖果", + "advancements.spectrum.consume_enchanted_star_candy.description": "制作并吃下一块星糖", "advancements.spectrum.tap_titration_barrel.title": "发酵工艺", "advancements.spectrum.tap_titration_barrel.description": "解封发酵桶,给自己倒一杯清爽（或不那么清爽）的饮品", "advancements.spectrum.drink_jade_wine.title": "宫廷玉液酒", diff --git a/src/main/resources/assets/spectrum/models/item/fanciful_stone_ring.json b/src/main/resources/assets/spectrum/models/item/enchanted_star_candy.json similarity index 55% rename from src/main/resources/assets/spectrum/models/item/fanciful_stone_ring.json rename to src/main/resources/assets/spectrum/models/item/enchanted_star_candy.json index ef2b8bb8b3..93e482550b 100644 --- a/src/main/resources/assets/spectrum/models/item/fanciful_stone_ring.json +++ b/src/main/resources/assets/spectrum/models/item/enchanted_star_candy.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "spectrum:item/fanciful_stone_ring" + "layer0": "spectrum:item/enchanted_star_candy" } } \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/models/item/purple_star_candy.json b/src/main/resources/assets/spectrum/models/item/purple_star_candy.json deleted file mode 100644 index 3f6169204e..0000000000 --- a/src/main/resources/assets/spectrum/models/item/purple_star_candy.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "spectrum:item/purple_star_candy" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/spectrum/textures/item/purple_star_candy.png b/src/main/resources/assets/spectrum/textures/item/enchanted_star_candy.png old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/assets/spectrum/textures/item/purple_star_candy.png rename to src/main/resources/assets/spectrum/textures/item/enchanted_star_candy.png diff --git a/src/main/resources/assets/spectrum/textures/item/fanciful_stone_ring.png b/src/main/resources/assets/spectrum/textures/item/fanciful_stone_ring.png deleted file mode 100755 index c965426614ddf47149eadbf64515d4e23d526f73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 357 zcmV-r0h<1aP)Px$A4x<(R5*>*lCeqyK@f(&gA`VgyOwT#hZ11!rKx27T=f2WU7W|rmNdWOS(IBr_yt&l^U_2gaK%OR){eV182*V}-H`iAh z;uVYgceenP{lI85PZJ{!!={E9BPb2;2d*@Yl_dazYR%q3y*dxT>&v?_